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

488 Commits

Author SHA1 Message Date
Kirill Vainer
45f8893f13 bounding: properly implement collideWith against other bounds 2015-09-13 18:40:08 -04:00
Daniel Johansson
dd6356eff1 Reverted some more light code which should not be in this branch. 2015-09-13 20:30:36 +01:00
Daniel Johansson
88bf9d4580 Reverted some changes to light classes which was not meant to be committed as part of #314. 2015-09-13 20:23:07 +01:00
Daniel Johansson
9ba90251d6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	jme3-bullet-native-android/build.gradle
 2015-09-13 20:15:22 +01:00
Kirill Vainer
e9245a753b GLTracer: generate syntax highlighting and easier to read output 2015-09-10 23:10:13 -04:00
Kirill Vainer
9da4b78830 GLRenderer: disable unused vertex attributes before rendering instead of after 2015-09-10 23:09:15 -04:00
Kirill Vainer
8fdc0f9c90 GLRenderer: avoid useless glActiveTexture calls 2015-09-10 23:08:50 -04:00
Kirill Vainer
f80364a8c2 GLRenderer: don't set depth function twice 2015-09-10 22:34:12 -04:00
Kirill Vainer
5845671409 GLRenderer: enable seamless cubemap globally 2015-09-10 22:33:08 -04:00
Kirill Vainer
edd183a2be GLRenderer: fix texture update regression introduced in 9f3a145dd7bd083c21b302e0faaf46eddfd82237 2015-09-09 22:43:37 -04:00
Kirill Vainer
148c78a943 GL: make lwjgl implementation classes final 2015-09-05 14:03:32 -04:00
Kirill Vainer
cb7d139488 GLSLCompat: support GLES compatibility 2015-09-05 13:56:28 -04:00
Kirill Vainer
616dadc498 Deprecate ColoredTextured.j3md 2015-09-03 09:46:34 -04:00
Daniel Johansson
c32ac172fb Merge remote-tracking branch 'upstream/master' 
Conflicts:
	jme3-core/src/main/java/com/jme3/light/AmbientLight.java
	jme3-core/src/main/java/com/jme3/light/DirectionalLight.java
	jme3-core/src/main/java/com/jme3/light/PointLight.java
	jme3-core/src/main/java/com/jme3/light/SpotLight.java
 2015-09-03 13:48:23 +01:00
Daniel Johansson
e9e4b4a122 Improved audio renderer information log message to include more information and to print out in a format consistent with the GL renderer information. 2015-09-03 13:32:06 +01:00
Nehon
168e1755ff Added some more constructors to SpotLight and PointLight, also added javadoc to all lights constructors. 2015-08-29 12:56:26 +02:00
Rémy Bouquet
609d9a1832 Merge pull request #306 from mbenson/light-ctors 
More convenient light constructors
 2015-08-29 11:00:12 +02:00
Daniel Johansson
8f77dca931 Added jme3-lwjgl3 module which ultimately adds support for LWJGL 3.x and GLFW. 2015-08-26 22:34:05 +01:00
Daniel Johansson
bf7643f06a Merge remote-tracking branch 'upstream/master' 2015-08-26 22:29:56 +01:00
Kirill Vainer
5a863c6075 Matrix4f: simpler fromFrame() without matrix multiplication 2015-08-21 22:29:26 -04:00
Kirill Vainer
57d560244e Transform: implement equals and hashCode 2015-08-21 22:26:26 -04:00
Kirill Vainer
1575e2a1d3 minor changes according to static analyzer 2015-08-21 22:24:51 -04:00
Kirill Vainer
a855915358 Bone: remove useless loadIdentity() 2015-08-21 20:38:35 -04:00
Kirill Vainer
d32226db10 GLRenderer: use #version 100 for GLSL ES shaders 2015-08-14 15:25:32 -04: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
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
Kirill Vainer
0ade3a69d4 GLRenderer: FBO always available in OpenGL ES 2 2015-07-18 17:47:40 -04: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
Nehon
129faf00d7 Fixed warning when trying to find a srgb format for a Depth format. 2015-07-14 09:43:49 +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
c7606ccff2 Fixed issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/291 2015-07-12 20:43:54 +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
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
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
David Bernard
fe72dd67dd add TechniqueDef.noRender 2015-07-03 20:49:20 +02: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