From 0ebb3acb1659c096c03e3c343b3472676e85bcfe Mon Sep 17 00:00:00 2001 From: Nehon Date: Tue, 10 Feb 2015 22:41:23 +0100 Subject: [PATCH] Fixed an issue with the ShaderNodeGenerator that was missing some variable names in cases like that ',myVar,myVar.x' --- .../src/main/java/com/jme3/shader/Glsl100ShaderGenerator.java | 2 +- jme3-core/src/main/java/com/jme3/shader/ShaderGenerator.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/shader/Glsl100ShaderGenerator.java b/jme3-core/src/main/java/com/jme3/shader/Glsl100ShaderGenerator.java index 574fdcd3d..b00129005 100644 --- a/jme3-core/src/main/java/com/jme3/shader/Glsl100ShaderGenerator.java +++ b/jme3-core/src/main/java/com/jme3/shader/Glsl100ShaderGenerator.java @@ -517,7 +517,7 @@ public class Glsl100ShaderGenerator extends ShaderGenerator { * @return the modified source code */ 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; } diff --git a/jme3-core/src/main/java/com/jme3/shader/ShaderGenerator.java b/jme3-core/src/main/java/com/jme3/shader/ShaderGenerator.java index cf319dd18..5035ff787 100644 --- a/jme3-core/src/main/java/com/jme3/shader/ShaderGenerator.java +++ b/jme3-core/src/main/java/com/jme3/shader/ShaderGenerator.java @@ -71,7 +71,6 @@ public abstract class ShaderGenerator { /** * Generate vertex and fragment shaders for the given technique * - * @param technique the technique to use to generate the shaders * @return a Shader program */ public Shader generateShader() {