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

1202 Commits

Author SHA1 Message Date
Kirill Vainer
1fa6c4ac11 bounding: move intersection algorithms to shared class 
These algorithms are to be shared with the light filter.
 2015-09-13 22:05:18 -04:00
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
Rémy Bouquet
9f9daa13dc Merge pull request #301 from Kendanware/issue295 
Support for setting minification and magnification filters on a texture in the j3m material file
 2015-09-13 17:53:35 +02: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
Daniel Johansson
b84bd0d120 Merge remote-tracking branch 'upstream/master' into issue295 
Conflicts:
	common.gradle
 2015-09-08 09:25:29 +01: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
2db5f773e0 Merge branch 'master' into PBRisComing 2015-08-29 12:57:13 +02: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
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