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

Better error reporting when loading shaderNodeDefinition

Browse Source
fix-456
Nehon 8 years ago
parent e860fa6ce6
commit 5ac5731ebf
1 changed files with 45 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 75
      jme3-core/src/plugins/java/com/jme3/material/plugins/ShaderNodeLoaderDelegate.java

75
jme3-core/src/plugins/java/com/jme3/material/plugins/ShaderNodeLoaderDelegate.java
Unescape View File

@ -232,40 +232,52 @@ public class ShaderNodeLoaderDelegate {
protected void readShaderNodeDefinition(List<Statement> statements, ShaderNodeDefinitionKey key) throws IOException { protected void readShaderNodeDefinition(List<Statement> statements, ShaderNodeDefinitionKey key) throws IOException {
boolean isLoadDoc = key instanceof ShaderNodeDefinitionKey && ((ShaderNodeDefinitionKey) key).isLoadDocumentation(); boolean isLoadDoc = key instanceof ShaderNodeDefinitionKey && ((ShaderNodeDefinitionKey) key).isLoadDocumentation();
for (Statement statement : statements) { for (Statement statement : statements) {
String[] split = statement.getLine().split("[ \\{]"); try {
String line = statement.getLine(); String[] split = statement.getLine().split("[ \\{]");
String line = statement.getLine();
if (line.startsWith("Type")) {
String type = line.substring(line.lastIndexOf(':') + 1).trim(); if (line.startsWith("Type")) {
shaderNodeDefinition.setType(Shader.ShaderType.valueOf(type)); String type = line.substring(line.lastIndexOf(':') + 1).trim();
} else if (line.startsWith("Shader ")) { shaderNodeDefinition.setType(Shader.ShaderType.valueOf(type));
readShaderStatement(statement); } else if (line.startsWith("Shader ")) {
shaderNodeDefinition.getShadersLanguage().add(shaderLanguage); readShaderStatement(statement);
shaderNodeDefinition.getShadersPath().add(shaderName); shaderNodeDefinition.getShadersLanguage().add(shaderLanguage);
} else if (line.startsWith("Documentation")) { shaderNodeDefinition.getShadersPath().add(shaderName);
if (isLoadDoc) { } else if (line.startsWith("Documentation")) {
String doc = ""; if (isLoadDoc) {
String doc = "";
for (Statement statement1 : statement.getContents()) {
doc += "\n" + statement1.getLine();
}
shaderNodeDefinition.setDocumentation(doc);
}
} else if (line.startsWith("Input")) {
varNames = "";
for (Statement statement1 : statement.getContents()) { for (Statement statement1 : statement.getContents()) {
doc += "\n" + statement1.getLine(); try {
shaderNodeDefinition.getInputs().add(readVariable(statement1));
} catch (RuntimeException e) {
throw new MatParseException(e.getMessage(), statement1, e);
}
} }
shaderNodeDefinition.setDocumentation(doc); } else if (line.startsWith("Output")) {
} varNames = "";
} else if (line.startsWith("Input")) { for (Statement statement1 : statement.getContents()) {
varNames = ""; try {
for (Statement statement1 : statement.getContents()) { if (statement1.getLine().trim().equals("None")) {
shaderNodeDefinition.getInputs().add(readVariable(statement1)); shaderNodeDefinition.setNoOutput(true);
} } else {
} else if (line.startsWith("Output")) { shaderNodeDefinition.getOutputs().add(readVariable(statement1));
varNames = ""; }
for (Statement statement1 : statement.getContents()) { } catch (RuntimeException e) {
if(statement1.getLine().trim().equals("None")){ throw new MatParseException(e.getMessage(), statement1, e);
shaderNodeDefinition.setNoOutput(true); }
}else{
shaderNodeDefinition.getOutputs().add(readVariable(statement1));
} }
} else {
throw new MatParseException("one of Type, Shader, Documentation, Input, Output", split[0], statement);
} }
} else { } catch (RuntimeException e) {
throw new MatParseException("one of Type, Shader, Documentation, Input, Output", split[0], statement); throw new MatParseException(e.getMessage(), statement, e);
} }
} }
} }
@ -280,6 +292,9 @@ public class ShaderNodeLoaderDelegate {
protected ShaderNodeVariable readVariable(Statement statement) throws IOException { protected ShaderNodeVariable readVariable(Statement statement) throws IOException {
String line = statement.getLine().trim().replaceAll("\\s*\\[", "["); String line = statement.getLine().trim().replaceAll("\\s*\\[", "[");
String[] splitVar = line.split("\\s"); String[] splitVar = line.split("\\s");
if (splitVar.length != 2) {
throw new MatParseException("2 arguments", splitVar.length + "", statement);
}
String varName = splitVar[1]; String varName = splitVar[1];
String varType = splitVar[0]; String varType = splitVar[0];
String multiplicity = null; String multiplicity = null;

Write Preview
Loading…
Cancel
Save