From be3a6c03b2619597ceecfcb1066b5df6de4f35d4 Mon Sep 17 00:00:00 2001 From: shadowislord Date: Thu, 5 Jun 2014 23:16:10 -0400 Subject: [PATCH] * Put comment markers around imported library contents when loading shader --- .../plugins/java/com/jme3/shader/plugins/GLSLLoader.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jme3-core/src/plugins/java/com/jme3/shader/plugins/GLSLLoader.java b/jme3-core/src/plugins/java/com/jme3/shader/plugins/GLSLLoader.java index b8aa155d0..544c0c048 100644 --- a/jme3-core/src/plugins/java/com/jme3/shader/plugins/GLSLLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/shader/plugins/GLSLLoader.java @@ -84,7 +84,10 @@ public class GLSLLoader implements AssetLoader { try { bufReader = new BufferedReader(reader); String ln; - while ((ln = bufReader.readLine()) != null) { + if (!nodeName.equals("[main]")) { + sb.append("// -- begin import ").append(nodeName).append(" --\n"); + } + while ((ln = bufReader.readLine()) != null) { if (ln.trim().startsWith("#import ")) { ln = ln.trim().substring(8).trim(); if (ln.startsWith("\"") && ln.endsWith("\"") && ln.length() > 3) { @@ -109,6 +112,9 @@ public class GLSLLoader implements AssetLoader { sb.append(ln).append('\n'); } } + if (!nodeName.equals("[main]")) { + sb.append("// -- end import ").append(nodeName).append(" --\n"); + } } catch (IOException ex) { if (bufReader != null) { try {