diff --git a/jme3-core/src/main/java/com/jme3/material/Material.java b/jme3-core/src/main/java/com/jme3/material/Material.java index 1cdc426ef..ddd75ace7 100644 --- a/jme3-core/src/main/java/com/jme3/material/Material.java +++ b/jme3-core/src/main/java/com/jme3/material/Material.java @@ -828,7 +828,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable { MatParam param = paramValues.getValue(i); VarType type = param.getVarType(); - if(isBO(type)) { + if (isBO(type)) { final ShaderBufferBlock bufferBlock = shader.getBufferBlock(param.getPrefixedName()); bufferBlock.setBufferObject((BufferObject) param.getValue()); diff --git a/jme3-core/src/main/java/com/jme3/renderer/opengl/GL.java b/jme3-core/src/main/java/com/jme3/renderer/opengl/GL.java index 1f80ad709..b2a57736f 100644 --- a/jme3-core/src/main/java/com/jme3/renderer/opengl/GL.java +++ b/jme3-core/src/main/java/com/jme3/renderer/opengl/GL.java @@ -66,6 +66,7 @@ public interface GL { public static final int GL_DST_ALPHA = 0x0304; public static final int GL_DST_COLOR = 0x306; public static final int GL_DYNAMIC_DRAW = 0x88E8; + public static final int GL_DYNAMIC_COPY = 0x88EA; public static final int GL_ELEMENT_ARRAY_BUFFER = 0x8893; public static final int GL_EQUAL = 0x202; public static final int GL_EXTENSIONS = 0x1F03; diff --git a/jme3-core/src/test/java/com/jme3/SetupTest.java b/jme3-core/src/test/java/com/jme3/SetupTest.java index a9969e179..fdf35dbf3 100644 --- a/jme3-core/src/test/java/com/jme3/SetupTest.java +++ b/jme3-core/src/test/java/com/jme3/SetupTest.java @@ -31,13 +31,6 @@ */ package com.jme3; -import com.jme3.material.Material; -import com.jme3.math.ColorRGBA; -import com.jme3.shader.BufferObject; -import com.jme3.shader.BufferObject.Layout; -import com.jme3.shader.BufferObjectField; -import com.jme3.shader.UniformBufferObject; -import com.jme3.shader.VarType; import org.junit.Test; /** @@ -48,20 +41,6 @@ public class SetupTest { @Test(expected=AssertionError.class) public void testAssertionEnabled() { - - Material material; - - final UniformBufferObject ubo = new UniformBufferObject(3, Layout.std140, - new BufferObjectField("light_1", VarType.Vector4), - new BufferObjectField("light_2", VarType.Vector4), - new BufferObjectField("array", VarType.FloatArray) - ); - ubo.setValue("light_1", ColorRGBA.Black); - ubo.setValue("light_2", ColorRGBA.Gray); - ubo.setValue("array", new float[] {1F, 2F, 3F}); - - material.setBufferObject("uboTest", ubo); - assert false; } }