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

1070 Commits

Author SHA1 Message Date
Kirill Vainer
b6729c46d4 code / comment cleanup 2016-04-10 12:15:01 -04:00
Kirill Vainer
876015ab47 deprecate alpha test / point sprite 2016-04-10 12:09:36 -04:00
Kirill Vainer
37f8ee91af more deprecation cleanup 2016-04-10 12:04:20 -04:00
Kirill Vainer
112a77fd5d test: don't use deprecated box constructor 2016-04-10 11:59:49 -04:00
Kirill Vainer
a563c6cc7b remove deprecated classes 2016-04-10 11:46:18 -04:00
Nehon
6a9c655be3 Merge branch 'master' into PBRisComing 
# Conflicts:
#	jme3-core/src/main/java/com/jme3/material/Material.java
 2016-04-10 10:59:45 +02:00
Nehon
7101bbe1e0 Fixed the name of shadow shaders in PBRLighting.j3md, it has changed since the merge with master 2016-04-10 10:17:06 +02:00
Kirill Vainer
2f26b34bd0 material: refer to default technique via constant 2016-04-09 12:12:02 -04:00
Kirill Vainer
fbcfbc0484 test: add required file 2016-04-08 23:38:02 -04:00
Kirill Vainer
e4f7916301 Material: allow multiple named techniques 2016-04-08 23:31:39 -04:00
Kirill Vainer
83259061d3 RM: add ability to force mat param 2016-04-08 23:28:02 -04:00
Kirill Vainer
d0035b0bc6 test: fix syntax error 2016-04-08 23:15:49 -04:00
Kirill Vainer
fc488be37b test: remove duplicate annotation 2016-04-08 23:13:28 -04:00
Kirill Vainer
2e6f2701c0 Material / MatParamTexture: remove texture unit fields 2016-04-08 23:09:19 -04:00
Kirill Vainer
f5c5d161d0 Merge branch 'master' of github.com:jMonkeyEngine/jmonkeyengine 2016-04-08 23:05:34 -04:00
Kirill Vainer
f72df167c0 MPO: make sure child overrides parent 2016-04-08 23:05:15 -04:00
Teencrusher
bffa2191e5 Moved glBlendEquationSeparate from GL2 interface to GL interface. Added an example of the feature. Minors issues. 2016-04-07 10:06:34 -04:00
Teencrusher
d1aae8d479 Added support to glBlendEquation for renderes implementing GL2, and material loading support 2016-04-06 13:56:13 -04:00
Nehon
17ef34ad3a Fixed a crash with singlepass an multipass TDL when a lightProbe is added to the scene 2016-04-06 19:14:59 +02:00
Nehon
0ec2263ae9 Merged master into PBR and migrated to TechniqueDefLogic 2016-04-05 21:51:26 +02:00
Paul Speed
80f4e04935 Fixed cloning to not confuse the hardware skinning safety check 
that attempts to protect users from shared materials.
 2016-04-05 11:01:27 -04:00
Paul Speed
271f6492dd Fixed a bug in cloning that prevented a null from being usable 
as a 'precloned' value.  This made Spatial attempt to clone its
parent.
 2016-04-05 09:12:45 -04:00
Kirill Vainer
a1fd3ff3d9 VB: indicate refresh when usage changes 2016-04-03 16:55:06 -04:00
Kirill Vainer
acda6e371c MPO: refresh MPOs on Spatial.deepClone() 2016-04-03 16:44:47 -04:00
Kirill Vainer
a4b65ec921 GLRenderer: fix line width 2016-04-02 17:30:48 -04:00
Kirill Vainer
3b5d1eebd8 renderstate: disallow line width < 1f 2016-04-02 16:28:00 -04:00
Kirill Vainer
49a9a6f99b fix renderer crash due to merge 2016-04-02 16:13:46 -04:00
Kirill Vainer
2e4148f3c3 merge fixes 2016-04-02 15:54:45 -04:00
Kirill Vainer
f3414acc73 MPO: fix unit test 2016-04-02 15:17:26 -04:00
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
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
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
e8df94de1c FastMathTest: ignore failing test (for now) 2016-04-02 14:57:33 -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