sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,536 Commits 21 Branches 35 Tags
Commit Graph

1075 Commits

Author SHA1 Message Date
Nehon
d08ce630f9 Merge branch 'master' into PBRisComing 2015-08-15 10:38:55 +02:00
Kirill Vainer
d32226db10 GLRenderer: use #version 100 for GLSL ES shaders 2015-08-14 15:25:32 -04:00
Nehon
cefdabf3c6 Merge branch 'master' into PBRisComing 2015-08-13 20:43:56 +02:00
Nehon
b5c946ef02 Fixed LightProbe selection according to distance and bounds 2015-08-13 20:33:49 +02:00
Nehon
a35b499ee7 Big refactoring to how PBR is handled. 
- Introduced a new Light type : LightProbes that are lights holding Image based Lighting information that are sent to the shader. For now, only the closest LightProbe from a geometry is sent to the shader. This will be enhanced later as it's obviously not the best way to handle this.
- Added a LightProbeFactory for easy creation and rendering of LightPorbes and associated maps. The maps generation process can also be monitored through a Listener class.
- Added various utility classses for debuging purpose.
- Added a new test case for environment with multiple LightProbes.
- Adapted the previous test case to the new system.
 2015-08-09 18:39:22 +02:00
Nehon
7b7c6951ad Fixed worldLightList sorting when a light is added to a node. 2015-08-09 18:26:34 +02:00
Kirill Vainer
b7ab6d003e build: separate full version from full name 2015-08-08 17:57:59 -04:00
Kirill Vainer
17887b1fb0 build: new build version info system 
* JmeVersion is no longer autogenerated, instead it pulls info from version.properties
 * Added version.gradle script to generate version info and expose it to other gradle scripts
 * Embed version info inside JAR manifest
 * Refactor NDK finding to use the same way as the version generation
 2015-08-08 17:35:05 -04:00
Nehon
d7b0292590 FilterPostProcessor now checks for ogl 3.2 capability to use multitsampled textures 2015-08-08 09:27:49 +02:00
Nehon
a730da35b4 FilterPostProcessor now checks for ogl 3.2 capability to use multitsampled textures 2015-08-08 09:26:55 +02:00
Nehon
fc0975c0cc removed old implementation 2015-08-08 09:25:41 +02:00
Nehon
69f1677649 Moved PBR implementation 2015-08-08 09:25:09 +02:00
Daniel Johansson
7f2626af65 Merge remote-tracking branch 'upstream/master' 2015-08-07 15:44:27 +01:00
Nehon
a655acb8f0 BatchNode now preserves the lineWidth for Line meshes when batching. 2015-08-07 08:34:11 +02:00
Matt Benson
25ca07d3d2 light constructors 2015-07-26 18:26:22 -05:00
Daniel Johansson
d319a7c5d3 Added unit test for J3MLoader to cover the new texture parameters available in #295. Also fixed a couple of issues in the code to reduce logging that was not needed and removed redundant code. This update also updates junit to 4.12 and adds Mockito and Fest Assertions as test dependencies. 2015-07-20 11:22:16 +01:00
Kirill Vainer
0ade3a69d4 GLRenderer: FBO always available in OpenGL ES 2 2015-07-18 17:47:40 -04:00
Nehon
4b1c61dec1 Merge branch 'master' into PBRisComing 2015-07-16 21:59:26 +02:00
Rémy Bouquet
292a891d1f Merge pull request #228 from davidB/fix_cinematic_clear 
fix a NPE and a ClassCastExcpetion on Cinematic.clear()
 2015-07-16 21:41:24 +02:00
Daniel Johansson
e33d2539ed Added additional convenience constructors to Light, AmbientLight, DirectionalLight, PointLight and SpotLight as mentioned in #297 2015-07-15 13:08:36 +01:00
Daniel Johansson
d3da4a7266 Merge remote-tracking branch 'upstream/master' 2015-07-15 09:37:12 +01:00
Daniel Johansson
9059eb30e4 Added support for setting minification and magnification filters on a texture in the j3m material file. This also adds support for double and single quoted paths as well as being able to set WrapMode for a specific WrapAxis. This resolves #295 2015-07-14 22:28:13 +01:00
Nehon
9a3976ed50 Merge branch 'master' into PBRisComing 2015-07-14 09:44:43 +02:00
Nehon
129faf00d7 Fixed warning when trying to find a srgb format for a Depth format. 2015-07-14 09:43:49 +02:00
Nehon
b0db53b5d6 Fixed warning when trying to find a srgb format for a Depth format. 2015-07-14 09:41:55 +02:00
Kirill Vainer
cad8ca4d8e Merge pull request #294 from davidB/david_gl3_mrt_unshaded 
add GL3 support for Unshaded and MRT (v2)
 2015-07-13 16:44:44 -04:00
Nehon
9256f2e4d4 Merge branch 'master' into PBRisComing 2015-07-13 16:22:19 +02:00
Nehon
c7606ccff2 Fixed issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/291 2015-07-12 20:43:54 +02:00
Nehon
327e0125d9 Merge branch 'master' into PBRisComing 
Conflicts:
	jme3-core/src/main/java/com/jme3/material/Material.java
	jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
 2015-07-11 21:34:30 +02:00
Nehon
95d5fdf9c5 Fixed issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/252 
This was due to a bug in the code where triangle data were stored after calculation.
 2015-07-11 21:15:42 +02:00
Nehon
57dd2748e2 Tested if a joystick axis is not the nullAxis before assigning action to it. 2015-07-10 21:28:42 +02:00
Nehon
34220640aa Fixed how model bound were refreshed in BathNode : issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/275 2015-07-06 19:01:00 +02:00
Nehon
6d1ab7af65 Redesign of the frag part of unshadedNodes so it's more modular, and can be properly used as GLSL 1.5 shader. 
Added a stress test for unshadedNodes.
Changed the name of the texture parameter to textureMap in TextureFetch shaderNode as it was conflicting with the texture function used to fetch a texel from a a texture in glsl 1.5
 2015-07-05 23:43:38 +02:00
Nehon
596954b056 Redesign of the frag part of unshadedNodes so it's more modular, and can be properly used as GLSL 1.5 shader. 
Added a stress test for unshadedNodes.
Changed the name of the texture parameter to textureMap in TextureFetch shaderNode as it was conflicting with the texture function used to fetch a texel from a a texture in glsl 1.5
 2015-07-05 23:35:34 +02:00
David Bernard
568ee09d17 add GLSL150 compatible Unshaded 2015-07-05 20:06:07 +02:00
David Bernard
704c3f1a10 enable MRT on gl3 2015-07-05 11:39:55 +02:00
Nehon
2b8898b7b2 Here is the rest of last commit 2015-07-04 19:05:57 +02:00
Nehon
dca050b96b Added a protected modifier to getReceivers in Abstract shadow renderer 
see issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/212
 2015-07-04 19:00:39 +02:00
Kirill Vainer
328966ba79 Merge pull request #293 from davidB/david_materiel_no_render 
add TechniqueDef.noRender
 2015-07-03 19:52:17 -04:00
Nehon
be58be75ef Merge branch 'master' into PBRisComing 2015-07-03 23:34:26 +02:00
Nehon
6d3377a2a8 Fixed Parallax without normal map in lighting.j3md 2015-07-03 23:33:19 +02:00
Nehon
485af7cf2a TextureFetch shader node now works with glgl1.5 2015-07-03 22:58:42 +02:00
Nehon
719a683c2c Fixed Parallax for PBR lighting 2015-07-03 22:53:29 +02:00
David Bernard
fe72dd67dd add TechniqueDef.noRender 2015-07-03 20:49:20 +02:00
Nehon
4342d97439 Fixed roughness fetch in the spec / gloss pipeline 
See issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/281
 2015-07-02 21:00:07 +02:00
Kirill Vainer
6312f1a813 Merge pull request #287 from riccardobl/master 
Fix for ZipLocator and path with the root slash
 2015-06-20 13:47:46 -04:00
Kirill Vainer
37c572434c Merge pull request #277 from zzuegg/master 
Added GL_MAX_VERTEX_UNIFORM_COMPONENTS
 2015-06-20 13:42:37 -04:00
zzuegg
8d0c371796 Hopefully fixed 2015-06-19 23:16:24 +02:00
zzuegg
a8b3407b46 Removed empty lines 2015-06-19 23:08:00 +02:00
zzuegg
8cb2be60fe Added a switch to use VECTORS on GLES and COMPONENTS/4 on Desktop 2015-06-19 22:26:12 +02:00