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

Fixed an issue with the ShaderNodeGenerator that was missing some variable names in cases like that ',myVar,myVar.x'

Browse Source
This commit is contained in:
Nehon 2015-02-10 22:41:23 +01:00
parent 2066c98dd0
commit 0ebb3acb16
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-core/src/main/java/com/jme3/shader/Glsl100ShaderGenerator.java
View File

@ -517,7 +517,7 @@ public class Glsl100ShaderGenerator extends ShaderGenerator {
* @return the modified source code * @return the modified source code
*/ */
protected String replace(String nodeSource, ShaderNodeVariable var, String newName) { protected String replace(String nodeSource, ShaderNodeVariable var, String newName) {
nodeSource = nodeSource.replaceAll("(\\W)" + var.getName() + "(\\W)", "$1" + newName + "$2"); nodeSource = nodeSource.replaceAll("(?<=\\W)" + var.getName() + "(?=\\W)", newName);
return nodeSource; return nodeSource;
} }

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

@ -71,7 +71,6 @@ public abstract class ShaderGenerator {
/** /**
* Generate vertex and fragment shaders for the given technique * Generate vertex and fragment shaders for the given technique
* *
* @param technique the technique to use to generate the shaders
* @return a Shader program * @return a Shader program
*/ */
public Shader generateShader() { public Shader generateShader() {