Просмотр исходного кода

Added a second vect4f to tempvars so renamed the
first one to follow other conventions. Seems like
Material is the only thing using it (and I think it
could get away with a vec3 really but no harm done).

pspeed42 11 лет назад
Родитель
Сommit
e0ee685466

+ 1 - 1
jme3-core/src/main/java/com/jme3/material/Material.java

@@ -841,7 +841,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
             Quaternion tmpLightDirection = vars.quat1;
             Quaternion tmpLightPosition = vars.quat2;
             ColorRGBA tmpLightColor = vars.color;
-            Vector4f tmpVec = vars.vect4f;
+            Vector4f tmpVec = vars.vect4f1;
 
             ColorRGBA color = l.getColor();
             tmpLightColor.set(color);

+ 2 - 1
jme3-core/src/main/java/com/jme3/util/TempVars.java

@@ -179,7 +179,8 @@ public class TempVars {
     public final Vector3f vect8 = new Vector3f();
     public final Vector3f vect9 = new Vector3f();
     public final Vector3f vect10 = new Vector3f();
-    public final Vector4f vect4f = new Vector4f();
+    public final Vector4f vect4f1 = new Vector4f();
+    public final Vector4f vect4f2 = new Vector4f();
     public final Vector3f[] tri = {new Vector3f(),
         new Vector3f(),
         new Vector3f()};