From d754f17edda48a5e686eb4c29cc693cf9b318069 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 5 Sep 2016 03:25:16 -0400 Subject: [PATCH] v0.4.2: fixed bugs with new shader programs --- .../main/java/com/watabou/noosa/NoosaScript.java | 1 + .../com/watabou/noosa/NoosaScriptNoLighting.java | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/SPD-classes/src/main/java/com/watabou/noosa/NoosaScript.java b/SPD-classes/src/main/java/com/watabou/noosa/NoosaScript.java index 033a387d2..a7cb97afe 100644 --- a/SPD-classes/src/main/java/com/watabou/noosa/NoosaScript.java +++ b/SPD-classes/src/main/java/com/watabou/noosa/NoosaScript.java @@ -48,6 +48,7 @@ public class NoosaScript extends Script { public NoosaScript() { + super(); compile( shader() ); uCamera = uniform( "uCamera" ); diff --git a/SPD-classes/src/main/java/com/watabou/noosa/NoosaScriptNoLighting.java b/SPD-classes/src/main/java/com/watabou/noosa/NoosaScriptNoLighting.java index 1eb169704..d61012ff7 100644 --- a/SPD-classes/src/main/java/com/watabou/noosa/NoosaScriptNoLighting.java +++ b/SPD-classes/src/main/java/com/watabou/noosa/NoosaScriptNoLighting.java @@ -30,20 +30,6 @@ import com.watabou.glscripts.Script; // if this script is to be used many times try to block them together public class NoosaScriptNoLighting extends NoosaScript { - public NoosaScriptNoLighting() { - - compile( shader() ); - - //we can use the same components as regular noosascript - NoosaScript n = NoosaScript.get(); - uCamera = n.uCamera; - uModel = n.uModel; - uTex = n.uTex; - aXY = n.aXY; - aUV = n.aUV; - - } - @Override public void lighting(float rm, float gm, float bm, float am, float ra, float ga, float ba, float aa) { //Does nothing