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

Fixes condition parsing for shader nodes

Browse Source
This commit is contained in:
Nehon 2018-03-12 08:09:42 +01:00
parent f5e11d23b2
commit 47406058a6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jme3-core/src/plugins/java/com/jme3/material/plugins/ConditionParser.java
View File

@ -51,8 +51,8 @@ public class ConditionParser {
public static void main(String argv[]) {
ConditionParser parser = new ConditionParser();
List<String> defines = parser.extractDefines("(LightMap && SeparateTexCoord) || !ColorMap");
//List<String> defines = parser.extractDefines("(LightMap && SeparateTexCoord) || !ColorMap");
List<String> defines = parser.extractDefines("RoughnessMap && MetallicRoughnessMap");
for (String string : defines) {
System.err.println(string);
}
@ -78,15 +78,15 @@ public class ConditionParser {
* parse a condition and returns the list of defines of this condition.
* additionally this methods updates the formattedExpression with uppercased
* defines names
*
* supported expression syntax example:
*
* supported expression syntax example:
* <code>
* "(LightMap && SeparateTexCoord) || !ColorMap"
* "#if (defined(LightMap) && defined(SeparateTexCoord)) || !defined(ColorMap)"
* "#ifdef LightMap"
* "#ifdef (LightMap && SeparateTexCoord) || !ColorMap"
* </code>
*
*
* @param expression the expression to parse
* @return the list of defines
*/
@ -99,13 +99,13 @@ public class ConditionParser {
while (m.find()) {
String match = m.group();
defines.add(match);
formattedExpression = formattedExpression.replaceAll(match, "defined(" + match.toUpperCase() + ")");
formattedExpression = formattedExpression.replaceAll("\\b" + match + "\\b", "defined(" + match.toUpperCase() + ")");
}
return defines;
}
/**
*
*
* @return the formatted expression previously updated by extractDefines
*/
public String getFormattedExpression() {