sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate TechniqueDef.isUsingShaders(). Do not use it anywhere in the engine.

Browse Source
This commit is contained in:
shadowislord 2015-02-01 17:22:12 -05:00
parent a7517c17c0
commit c212fab37a
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jme3-core/src/tools/java/jme3tools/shadercheck/ShaderCheck.java
View File

@ -36,23 +36,21 @@ public class ShaderCheck {
private static void checkMatDef(String matdefName){ private static void checkMatDef(String matdefName){
MaterialDef def = (MaterialDef) assetManager.loadAsset(matdefName); MaterialDef def = (MaterialDef) assetManager.loadAsset(matdefName);
for (TechniqueDef techDef : def.getDefaultTechniques()){ for (TechniqueDef techDef : def.getDefaultTechniques()){
if (techDef.isUsingShaders()){ DefineList dl = new DefineList();
DefineList dl = new DefineList(); dl.addFrom(techDef.getShaderPresetDefines());
dl.addFrom(techDef.getShaderPresetDefines()); ShaderKey shaderKey = new ShaderKey(techDef.getVertexShaderName(),
ShaderKey shaderKey = new ShaderKey(techDef.getVertexShaderName(), techDef.getFragmentShaderName(),
techDef.getFragmentShaderName(), dl,
dl, techDef.getVertexShaderLanguage(),
techDef.getVertexShaderLanguage(), techDef.getFragmentShaderLanguage());
techDef.getFragmentShaderLanguage()); Shader shader = assetManager.loadShader(shaderKey);
Shader shader = assetManager.loadShader(shaderKey);
for (Validator validator : validators){ for (Validator validator : validators){
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
validator.validate(shader, sb); validator.validate(shader, sb);
System.out.println("==== Validator: " + validator.getName() + " " + System.out.println("==== Validator: " + validator.getName() + " " +
validator.getInstalledVersion() + " ===="); validator.getInstalledVersion() + " ====");
System.out.println(sb.toString()); System.out.println(sb.toString());
}
} }
} }
} }