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

Fixed finding definitions during material loading.

Browse Source
This commit is contained in:
javasabr 2017-11-27 13:22:45 +03:00 committed by Rémy Bouquet
parent a717a5e50f
commit 43b52cb77c
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -899,39 +899,51 @@ public class ShaderNodeLoaderDelegate {
}
/**
* find the definition from this statement (loads it if necessary)
* Find the definition from this statement (loads it if necessary)
*
* @param statement the statement being read
* @return the definition
* @throws IOException
*/
public ShaderNodeDefinition findDefinition(Statement statement) throws IOException {
String defLine[] = statement.getLine().split(":");
String defName = defLine[1].trim();
ShaderNodeDefinition def = getNodeDefinitions().get(defName);
if (def == null) {
if (defLine.length == 3) {
List<ShaderNodeDefinition> defs = null;
try {
defs = assetManager.loadAsset(new ShaderNodeDefinitionKey(defLine[2].trim()));
} catch (AssetNotFoundException e) {
throw new MatParseException("Couldn't find " + defLine[2].trim(), statement, e);
}
final String defLine[] = statement.getLine().split(":");
for (ShaderNodeDefinition definition : defs) {
if (defName.equals(definition.getName())) {
def = definition;
}
if (!(getNodeDefinitions().containsKey(definition.getName()))) {
getNodeDefinitions().put(definition.getName(), definition);
}
}
if (defLine.length != 3) {
throw new MatParseException("Can't find shader node definition for: ", statement);
}
final Map<String, ShaderNodeDefinition> nodeDefinitions = getNodeDefinitions();
final String definitionName = defLine[1].trim();
final String definitionPath = defLine[2].trim();
final String fullName = definitionName + ":" + definitionPath;
ShaderNodeDefinition def = nodeDefinitions.get(fullName);
if (def != null) {
return def;
}
List<ShaderNodeDefinition> defs;
try {
defs = assetManager.loadAsset(new ShaderNodeDefinitionKey(definitionPath));
} catch (final AssetNotFoundException e) {
throw new MatParseException("Couldn't find " + definitionPath, statement, e);
}
for (final ShaderNodeDefinition definition : defs) {
if (definitionName.equals(definition.getName())) {
def = definition;
}
if (def == null) {
throw new MatParseException(defName + " is not a declared as Shader Node Definition", statement);
final String key = definition.getName() + ":" + definitionPath;
if (!(nodeDefinitions.containsKey(key))) {
nodeDefinitions.put(key, definition);
}
}
if (def == null) {
throw new MatParseException(definitionName + " is not a declared as Shader Node Definition", statement);
}
return def;
}