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

Fix an issue in the ShaderGenerator where it was unable to find the main function in a shader source when there were additional spaces.

Browse Source 
Also made the error more explicit when the matching fail.
This commit is contained in:
Nehon 2014-08-28 10:52:35 +02:00
parent d33853d393
commit 124b5e51da
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jme3-core/src/main/java/com/jme3/shader/ShaderGenerator.java
View File

@ -146,8 +146,9 @@ public abstract class ShaderGenerator {
} }
if (shaderNode.getDefinition().getType() == type) { if (shaderNode.getDefinition().getType() == type) {
int index = findShaderIndexFromVersion(shaderNode, type); int index = findShaderIndexFromVersion(shaderNode, type);
String loadedSource = (String) assetManager.loadAsset(new AssetKey(shaderNode.getDefinition().getShadersPath().get(index))); String shaderPath = shaderNode.getDefinition().getShadersPath().get(index);
appendNodeDeclarationAndMain(loadedSource, sourceDeclaration, source, shaderNode, info); String loadedSource = (String) assetManager.loadAsset(new AssetKey(shaderPath));
appendNodeDeclarationAndMain(loadedSource, sourceDeclaration, source, shaderNode, info, shaderPath);
} }
} }
} }
@ -168,10 +169,13 @@ public abstract class ShaderGenerator {
* @param shaderNode the shader node. * @param shaderNode the shader node.
* @param info the ShaderGenerationInfo. * @param info the ShaderGenerationInfo.
*/ */
protected void appendNodeDeclarationAndMain(String loadedSource, StringBuilder sourceDeclaration, StringBuilder source, ShaderNode shaderNode, ShaderGenerationInfo info) { protected void appendNodeDeclarationAndMain(String loadedSource, StringBuilder sourceDeclaration, StringBuilder source, ShaderNode shaderNode, ShaderGenerationInfo info, String shaderPath) {
if (loadedSource.length() > 1) { if (loadedSource.length() > 1) {
loadedSource = loadedSource.substring(0, loadedSource.lastIndexOf("}")); loadedSource = loadedSource.substring(0, loadedSource.lastIndexOf("}"));
String[] sourceParts = loadedSource.split("void main\\(\\)\\{"); String[] sourceParts = loadedSource.split("\\s*void\\s*main\\s*\\(\\s*\\)\\s*\\{");
if(sourceParts.length<2){
throw new IllegalArgumentException("Syntax error in "+ shaderPath +". Cannot find 'void main(){' in \n"+ loadedSource);
}
generateDeclarativeSection(sourceDeclaration, shaderNode, sourceParts[0], info); generateDeclarativeSection(sourceDeclaration, shaderNode, sourceParts[0], info);
generateNodeMainSection(source, shaderNode, sourceParts[1], info); generateNodeMainSection(source, shaderNode, sourceParts[1], info);
} else { } else {