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

5577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kirill Vainer
85ffb48efb unit test: more descriptive failure message 2016-04-02 15:17:21 -04:00
Kirill Vainer
c03e831f3c SkeletonControl: fix syntax error 
Conflicts:
	jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java
 2016-04-02 15:17:13 -04:00
Kirill Vainer
c6c6b48bda MPO: clone MPOs instead of sharing references 
Conflicts:
	jme3-core/src/main/java/com/jme3/scene/Spatial.java
 2016-04-02 15:15:40 -04:00
Kirill Vainer
14438e78e3 fix null checks 2016-04-02 15:09:04 -04:00
Kirill Vainer
21e63687cf MPO: add null override list check 2016-04-02 15:09:00 -04:00
Kirill Vainer
5588e859cb MPO: clear param for null textures 2016-04-02 15:08:55 -04:00
Kirill Vainer
06b817e116 MPO: add javadoc 2016-04-02 15:08:49 -04:00
Kirill Vainer
8344994328 MPO: use List instead of ArrayList 
Also rename get*Overrides to get*MatParamOverrides to be more specific.
 2016-04-02 15:08:45 -04:00
Kirill Vainer
50658b8e53 MPO: add ability to disable an override 2016-04-02 15:08:40 -04:00
Kirill Vainer
db691dab99 MPO: add example 2016-04-02 15:08:35 -04:00
Kirill Vainer
5d2f2b19e6 spatial: fix bug in remove/clear MPO 
add unit test for those methods
 2016-04-02 15:08:31 -04:00
Kirill Vainer
5be03af564 material: fix sort id unit test failure 2016-04-02 15:08:26 -04:00
Kirill Vainer
59614e177c MPO: implement overrides on uniforms and add test 2016-04-02 15:08:21 -04:00
Kirill Vainer
2b35f288c2 MPO: implement propagation and add test 
Conflicts:
	jme3-core/src/main/java/com/jme3/scene/Node.java
	jme3-core/src/main/java/com/jme3/scene/Spatial.java
 2016-04-02 15:08:17 -04:00
Kirill Vainer
280733c1ce material: move technique logic into its own package 2016-04-02 15:04:45 -04:00
Kirill Vainer
10a87ce24e add StaticPassLightingLogic 2016-04-02 15:04:40 -04:00
Kirill Vainer
cb5c1395b3 initial implementation of MPO (untested!) 2016-04-02 15:04:33 -04:00
Kirill Vainer
239524c85b desktop: don't show dialogs when headless 2016-04-02 15:04:27 -04:00
Kirill Vainer
80af02e1f3 syntax error fixes 2016-04-02 15:04:21 -04:00
Kirill Vainer
0f1c35c5f0 minor formatting changes 
Conflicts:
	jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java
 2016-04-02 15:03:52 -04:00
Kirill Vainer
01a67b6c66 gitignore: more cleanup 
Conflicts:
	.gitignore
 2016-04-02 15:01:41 -04:00
Kirill Vainer
4b8acb96a7 gitignore: cleanup 
Conflicts:
	.gitignore
 2016-04-02 15:00:21 -04:00
Kirill Vainer
e8df94de1c FastMathTest: ignore failing test (for now) 2016-04-02 14:57:33 -04:00
Kirill Vainer
47bae5af59 TestShaderNodes: fix build error 2016-04-02 14:57:27 -04:00
Kirill Vainer
6a47319dbb DefineList: fix build error 
Also add additional unit tests for DefineList.
 2016-04-02 14:57:21 -04:00
Kirill Vainer
9d035f747a Add the new material system 
Also includes some unrelated tests

Conflicts:
	jme3-core/src/main/java/com/jme3/renderer/RenderManager.java
	jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
 2016-04-02 14:57:10 -04:00
Kirill Vainer
49339497fa Uniform: fix crash when using vector4array 2016-04-02 14:47:59 -04:00
Kirill Vainer
e6d829fac4 GLRenderer: added fast uniforms - still need to fix Uniform.clear() 2016-04-02 14:47:53 -04:00
Kirill Vainer
b4d295ee1b Merge pull request #445 from Fadorico/master 
Fixed collision group listeners not being notified
 2016-04-01 12:00:57 -04:00
Kirill Vainer
ed90d3ef42 Merge pull request #462 from Georgeto/fix_lwjgl_alphabits 
Let lwjgl respect the AlphaBits setting
 2016-04-01 11:51:30 -04:00
Georgeto
b39c46a82a Let lwjgl respect the AlphaBits setting. 2016-04-01 09:19:50 +02:00
Fadorico
f61b1439cc Combine result of both listeners to determine if the collision should occur (jbullet) 2016-03-31 22:42:53 -04:00
Rémy Bouquet
cb2901c5d2 Merge pull request #461 from Perjin/shadow_renderer 
Texture arrays as render targets, bugfix for shader nodes and new getter and setter in Light class
 2016-03-31 17:15:00 +02:00
Fadorico
83b26be45a Combine result of both listeners to determine if the collision should occur 2016-03-31 01:39:54 -04:00
Jan Ivenz
75791883ec For LightFilter to be implementable frustumCheckNeeded and intersectsFrustum need to be accesible. 2016-03-30 22:14:24 +02:00
Jan Ivenz
98a9f5c628 Fixed shader generation bug for array variables. 2016-03-30 21:58:27 +02:00
Jan Ivenz
c6143ae640 Rendering depth to texture arrays. 2016-03-30 21:58:26 +02:00
Jan Ivenz
4162fb9447 Texture arrays are now allowed as color buffer render targets. 2016-03-30 21:58:25 +02:00
Kirill Vainer
099ebeaec9 Merge pull request #458 from JavaSaBr/fix_lwjgl3 
Fixes in lwjgl3
 2016-03-29 12:29:04 -04:00
javasabr
85e284a7b0 moved the magic number to constant 2016-03-29 19:13:00 +03:00
javasabr
98f1bfc0c1 fixed NPE 2016-03-29 06:48:47 +03:00
javasabr
7a3a0627c2 fixed the scroll of mouse and the buffer overflow. 2016-03-29 06:48:40 +03:00
javasabr
b5b6ebd97c fixed the input of chars for UI. 2016-03-29 06:47:36 +03:00
Paul Speed
68ace33dbd Fixed an NPE when jmeClone() was asked to clone a null. 2016-03-28 11:06:29 -04:00
Paul Speed
78a5a25fc1 Added the app state varargs constructor to LegacyApplication and 
modified SimpleApplication to use it.
 2016-03-28 11:03:58 -04:00
Kirill Vainer
47b37a088f gitignore: ignore .DS_Store files 2016-03-28 10:38:23 -04:00
Paul Speed
3c56afeae6 Converted Application to an interface and renamed the old Application to 
LegacyApplication.  This is a breaking change for any class extending Application
directly.
And regardless, if you refer to Application then you will need to clean build
your app... and any of your dependencies that also refer to Application.  Basically,
anything using an AppState will need to be clean built against the next alpha.
v3.1.0-alpha4 		2016-03-28 01:47:33 -04:00
Paul Speed
ab6fb03171 Converted spatial over to use Cloner to do its various 
deep and semi-shallow cloning.  I'd be very surprised if nothing
is broken as there is only so much testing I can easily do.
Also various fixes for places I forgot to call super.cloneFields().
 2016-03-27 06:14:52 -04:00
Paul Speed
0a876b04d2 Added a TestCloneSpatial example to do some basic clone testing. 2016-03-27 06:11:41 -04:00
Paul Speed
95d5f58d68 Modified the run task to pass through the log configurion 
settings system property.
 2016-03-27 06:10:50 -04:00