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

104 Commits

Author SHA1 Message Date
Riccardo Balbo
a9afcecc41
Recognize .glsl files as glsllib. 2019-09-02 09:25:41 +02:00
Lou H
f8dae05a52 #1107-Fix Javadoc warnings in OpenJDK 9+ (#1112) 2019-06-08 17:06:23 -07:00
Riccardo Balbo
3b24067a3c Add RGTC format 2019-04-07 10:22:18 -07:00
Riccardo Balbo
cf7b15bc23 j3md Fix for default textures (#1052) 2019-03-27 10:19:37 -07:00
Stephen Gold
75112201db more corrections in diagnostic messages 2019-03-09 12:04:43 -08:00
Stephen Gold
f33252f4d0 spelling corrections in diagnostic messages 2019-03-02 17:41:21 -08:00
Stephen Gold
c11fbe4dd8 jme3-core JavaDoc corrections (comments only) 2019-02-25 23:27:52 -08:00
MeFisto94
3d63433b28
Fixes #961 - Remove unused + deprecated Exception 2018-11-27 16:30:11 +01:00
Paul Speed
d5bfe1e813 Modified the J3M loader to be a little less like a 1980s text adventure. 
Added a message to the exception thrown when using an invalid light mode.
Converted it to an IOException instead of the UnsupportedOperationException
(which is a runtime exception) so that the calling code will output a meaningful
error about which asset actually failed.
 2018-11-20 03:31:00 -05:00
Stephen Gold
025b27c96d test cases and fix for issue #880 2018-09-13 20:48:24 -07:00
Nehon
302e746a94 Uses a HashSet for variable names in ShaderNodeLoaderDelegate instead of a String 2018-05-01 09:15:39 +02:00
Nehon
47406058a6 Fixes condition parsing for shader nodes 2018-03-12 08:11:07 +01:00
Stephen Gold
f40ba25a56 correct more grammar/spelling errors in comments 2018-02-23 22:20:22 -08:00
Stephen Gold
826908b042 correct more grammar/spelling errors in comments 2018-02-18 20:49:43 -08:00
Alexandr Brui
a8c7a85fc1 Implementing value mappings for shader nodes. (#786) 
* implemented value mappings for shader nodes.
 2018-02-06 19:36:14 +01:00
Stephen Gold
21425f81ef more comment corrections in jme3-core: mostly spelling and grammar 2018-01-16 18:03:05 -08:00
Stephen Gold
74d70c4ee0 comment corrections in jme3-core: mostly spelling and grammar 2018-01-15 22:01:33 -08:00
javasabr
43b52cb77c Fixed finding definitions during material loading. 2017-11-27 11:37:37 +01:00
javasabr
8674d8af4b fixed detecting varyings during loading shader nodes in the case, when we have several output parameters with the same name but with different name spaces. 2017-11-26 13:20:00 +01:00
javasabr
9578b0410e extended some things from shader node system. 2017-11-12 19:01:24 +01:00
Nehon
171007693b De duplicate imports when generating a shader from shader nodes 2017-10-28 18:16:17 +02:00
Alexandr Brui
556e3de1c0 fixed asset linked node to reuse shared data between loaded models. (#739) 
* fixed asset linked node to reuse shared data between loaded models.
* updated implementation of binary loader.
 2017-10-01 20:48:38 -04:00
Alexandr Brui
66137d53b8 added auto closing readers. (#738) 2017-09-21 15:33:12 -04:00
javasabr
fac8266b5c fixed two problems with asset manager: 
1. can't load classes from asset class loaders.
2. can't load resources from asset class loaders.
 2017-08-31 21:39:54 +02:00
Nehon
6ed4abf29e ShaderNodes: changed the way condition are used for variable declaration. 
Before each input (attribute, varying or uniform) depending on a define was declared inside a #ifdef statement, it appears that most compiler will optimize out any input that has not been set so this computation was useless and costly and the code to to it was kind of ugly.
So basically now it's only done in very particular cases when it's really needed.
 2017-07-18 21:09:19 +02:00
Nehon
5ac5731ebf Better error reporting when loading shaderNodeDefinition 2017-07-08 14:06:56 +02:00
Nehon
ee9c6d366a ShaderNodeVariable now has a prefix attribute that is concatenated to the name when generating the shader (basically g_ and m_ when the variable is an uniform) 
It avoid to change the name of the variable when loading the definition and always have weird inconsistencies with mat params because the name has a m_ or not.
 2017-06-02 00:37:01 +02:00
Nehon
2f06c9b37b ShaderNodeDefinition path is now set while loading the definition. 2017-06-02 00:37:01 +02:00
Nehon
26ccaaea88 DDSLoader now supports Luminance16f format (r16f) 2017-06-02 00:37:01 +02:00
Sebastian Weiß
02781e799f oh man, I should have learned it by now, that jme uses spaces, not tabs 2017-04-08 21:24:15 +02:00
Sebastian Weiß
04b0578173 Certain dds texture lack the DDSCAPS_TEXTURE-flag, but are still recognized by programs like IrfanView and can also be loaded in the engine. 
This commit weakens the check for this flag: Instead of throwing an exception, a warning is logged.
 2017-04-08 21:22:06 +02:00
Sebastian Weiß
a3cd3cbb04 Certain dds texture lack the DDSCAPS_TEXTURE-flag, but are still recognized by programs like IrfanView and can also be loaded in the engine. 
This commit weakens the check for this flag: Instead of throwing an exception, a warning is logged.
 2017-04-08 21:18:16 +02:00
Nehon
a64594eea9 Better cloning for TechniqueDefs 2017-01-20 23:33:17 +01:00
Nehon
b0ed053472 Fixed a cloning issue and some tests 2017-01-15 20:32:42 +01:00
Nehon
12a2f0f63c One can now define several versions for the shader in a Technique in a J3md file, ie: 
VertexShader GLSL150 GLSL110 : "path/to/shader/file.vert"
FragmentShader GLSL150 GLSL110 : "path/to/shader/file.frag"

Versions must be separated with spaces. They will be matched together when creating the technique so they have to follow the same order for different shaders.
 2017-01-15 18:57:53 +01:00
Nehon
4777c591b1 GLSLLoader now moves all extensions declaration found in the dependencies at the top of the shader code 2017-01-14 23:13:08 +01:00
Nehon
16023fa481 PBR has come 
Merge branch 'PBRisComing'

# Conflicts:
#	jme3-core/src/main/java/com/jme3/material/Material.java
#	jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
 2016-07-07 20:36:31 +02:00
Dokthar
a52a51cb27 typo fix in materials & shaders, also fix some javadoc 2016-05-11 22:56:57 +02:00
Kirill Vainer
e71cf81b96 J3M: allow static pass lighting to be selected 2016-04-20 16:40:11 -04:00
Nehon
f70151f2c7 Merge branch 'master' into PBRisComing 2016-04-15 20:17:26 +02:00
Nehon
c859cf375c Fixed an issue with shaderNodes loading 2016-04-11 20:19:16 +02:00
Nehon
c7d264fe8e Merge branch 'master' into PBRisComing 
# Conflicts:
#	jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
 2016-04-11 19:09:52 +02:00
Kirill Vainer
cb61e760ce Merge branch 'master' into BorealFeast-master 
Conflicts:
	jme3-core/src/main/java/com/jme3/material/RenderState.java
	jme3-core/src/main/java/com/jme3/renderer/opengl/GL.java
 2016-04-10 12:51:19 -04:00
Kirill Vainer
8bd5b59a0e material: warn / ignore fixed function techniques 2016-04-10 12:16:35 -04:00
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
Teencrusher
d1aae8d479 Added support to glBlendEquation for renderes implementing GL2, and material loading support 2016-04-06 13:56:13 -04:00
Nehon
0ec2263ae9 Merged master into PBR and migrated to TechniqueDefLogic 2016-04-05 21:51:26 +02:00
Kirill Vainer
280733c1ce material: move technique logic into its own package 2016-04-02 15:04:45 -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