sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed "test code".

Browse Source
This commit is contained in:
javasabr 2018-02-11 22:22:21 +03:00 committed by Nehon
parent 99c1cb7936
commit 7d5fcd0d40
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-core/src/main/java/com/jme3/material/Material.java
View File

@ -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());

1
jme3-core/src/main/java/com/jme3/renderer/opengl/GL.java
View File

@ -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;

21
jme3-core/src/test/java/com/jme3/SetupTest.java
View File

@ -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;
}
}