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

started to implement new API to work with BO.

Browse Source
JavaSaBr-added_new_var_type
JavaSaBr 7 years ago committed by Nehon
parent d225030745
commit 4d42e4b624
5 changed files with 584 additions and 1 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      jme3-core/src/main/java/com/jme3/renderer/Renderer.java
  2. 5
      jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
  3. 494
      jme3-core/src/main/java/com/jme3/shader/BufferObject.java
  4. 76
      jme3-core/src/main/java/com/jme3/shader/BufferObjectField.java
  5. 2
      jme3-core/src/main/java/com/jme3/util/NativeObject.java

8
jme3-core/src/main/java/com/jme3/renderer/Renderer.java
Unescape View File

@ -35,6 +35,7 @@ import com.jme3.material.RenderState;
import com.jme3.math.ColorRGBA;
import com.jme3.scene.Mesh;
import com.jme3.scene.VertexBuffer;
import com.jme3.shader.BufferObject;
import com.jme3.shader.Shader;
import com.jme3.shader.Shader.ShaderSource;
import com.jme3.shader.ShaderStorageBufferObject;
@ -288,6 +289,13 @@ public interface Renderer {
*/
public void deleteBuffer(ShaderStorageBufferObject ssbo);
/**
* Deletes the buffer object from the GPU.
*
* @param bo the buffer object to delete.
*/
public void deleteBuffer(BufferObject bo);
/**
* Renders <code>count</code> meshes, with the geometry data supplied and
* per-instance data supplied.

5
jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
Unescape View File

@ -2614,6 +2614,11 @@ public final class GLRenderer implements Renderer {
ssbo.resetObject();
}
@Override
public void deleteBuffer(BufferObject bo) {
//TODO
}
public void clearVertexAttribs() {
IDList attribList = context.attribIndexList;
for (int i = 0; i < attribList.oldLen; i++) {

494
jme3-core/src/main/java/com/jme3/shader/BufferObject.java
Unescape View File

@ -0,0 +1,494 @@
package com.jme3.shader;
import com.jme3.math.*;
import com.jme3.renderer.Renderer;
import com.jme3.util.BufferUtils;
import com.jme3.util.NativeObject;
import com.jme3.util.SafeArrayList;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* The base implementation of BO.
*
* @author JavaSaBr
*/
public class BufferObject extends NativeObject {
public enum Layout {
std140,
}
/**
* The fields of this BO.
*/
private final Map<String, BufferObjectField> fields;
/**
* The buffer's data layout.
*/
private final Layout layout;
/**
* The binding number.
*/
private final int binding;
/**
* The previous data buffer.
*/
private ByteBuffer previosData;
public BufferObject(final int binding, final Layout layout, final BufferObjectField... fields) {
this.handleRef = new Object();
this.binding = binding;
this.layout = layout;
this.fields = new LinkedHashMap<>(fields.length);
for (final BufferObjectField field : fields) {
this.fields.put(field.getName(), field);
}
}
public BufferObject(final int id) {
super(id);
this.binding = -2;
this.fields = null;
this.layout = null;
}
/**
* Sets the value to the filed by the field's name.
*
* @param name the field's name.
* @param value the value.
*/
public void setValue(final String name, final Object value) {
final BufferObjectField field = fields.get(name);
if (field == null) {
throw new IllegalArgumentException("Unknown a field with the name " + name);
}
field.setValue(value);
setUpdateNeeded();
}
/**
* Gets the current value of the field by the name.
*
* @param name the field name.
* @param <T> the value's type.
* @return the current value.
*/
public <T> T getValue(final String name) {
final BufferObjectField field = fields.get(name);
if (field == null) {
throw new IllegalArgumentException("Unknown a field with the name " + name);
}
return (T) field.getValue();
}
/**
* Get the binding number.
*
* @return the binding number.
*/
public int getBinding() {
return binding;
}
@Override
public void resetObject() {
this.id = -1;
setUpdateNeeded();
}
/**
* Computes the current binary data of this BO.
*
* @param maxSize the max data size.
* @return the current binary data of this BO.
*/
public ByteBuffer computeData(final int maxSize) {
int estimateSize = 0;
for (final Map.Entry<String, BufferObjectField> entry : fields.entrySet()) {
final BufferObjectField field = entry.getValue();
estimateSize += estimateSize(field);
}
if(maxSize < estimateSize) {
throw new IllegalStateException("The estimated size(" + estimateSize + ") of this BO is bigger than " +
"maximum available size " + maxSize);
}
if (previosData != null) {
if (previosData.capacity() < estimateSize) {
BufferUtils.destroyDirectBuffer(previosData);
previosData = null;
}
}
final ByteBuffer data = previosData == null ? BufferUtils.createByteBuffer((int) (estimateSize * 1.1F)) : previosData;
for (final Map.Entry<String, BufferObjectField> entry : fields.entrySet()) {
writeField(entry.getValue(), data);
}
data.flip();
return data;
}
/**
* Estimates size of the field.
*
* @param field the field.
* @return the estimated size.
*/
protected int estimateSize(final BufferObjectField field) {
switch (field.getType()) {
case Int:
return 4;
case Float:
return 4;
case Boolean:
return 1;
case Vector2:
return 8;
case Vector3: {
final int multiplier = layout == Layout.std140 ? 4 : 3;
return 4 * multiplier;
}
case Vector4:
return 16;
case IntArray: {
return estimate((int[]) field.getValue());
}
case FloatArray: {
return estimate((float[]) field.getValue());
}
case Vector2Array: {
return estimateVecArray(field.getValue(), 2);
}
case Vector3Array: {
final int multiplier = layout == Layout.std140? 4 : 3;
return estimateVecArray(field.getValue(), multiplier);
}
case Vector4Array: {
return estimateVecArray(field.getValue(), 4);
}
default: {
throw new IllegalArgumentException("The type of BO field " + field.getType() + " doesn't support.");
}
}
}
/**
* Estimates bytes count to present the value on GPU.
*
* @param value the value.
* @param multiplier the multiplier.
* @return the estimated bytes cunt.
*/
protected int estimateVecArray(final Object value, final int multiplier) {
if (value instanceof Object[]) {
return ((Object[]) value).length * multiplier;
} else if (value instanceof Collection) {
return ((Collection) value).size() * multiplier;
}
throw new IllegalArgumentException("Unexpected value " + value);
}
/**
* Estimates bytes count to present the values on GPU.
*
* @param values the values.
* @return the estimated bytes cunt.
*/
protected int estimate(final float[] values) {
return values.length * 4;
}
/**
* Estimates bytes count to present the values on GPU.
*
* @param values the values.
* @return the estimated bytes cunt.
*/
protected int estimate(final int[] values) {
return values.length * 4;
}
/**
* Writes the field to the data buffer.
*
* @param field the field.
* @param data the data buffer.
*/
protected void writeField(final BufferObjectField field, final ByteBuffer data) {
final Object value = field.getValue();
switch (field.getType()) {
case Int:
data.putInt(((Number) value).intValue());
break;
case Float:
data.putFloat(((Number) value).floatValue());
break;
case Boolean:
data.putInt(((Boolean) value) ? 1 : 0);
break;
case Vector2:
write(data, (Vector2f) value);
break;
case Vector3:
write(data, (Vector3f) value);
break;
case Vector4:
writeVec4(data, value);
break;
case IntArray: {
write(data, (int[]) value);
break;
}
case FloatArray: {
write(data, (float[]) value);
break;
}
case Vector2Array: {
writeVec2Array(data, value);
break;
}
case Vector3Array: {
writeVec3Array(data, value);
break;
}
case Vector4Array: {
writeVec4Array(data, value);
break;
}
default: {
throw new IllegalArgumentException("The type of BO field " + field.getType() + " doesn't support.");
}
}
}
/**
* Writes the value to the data buffer.
*
* @param data the data buffer.
* @param value the value.
*/
protected void writeVec4Array(final ByteBuffer data, final Object value) {
if (value instanceof Object[]) {
final Object[] values = (Object[]) value;
for (final Object vec : values) {
writeVec4(data, vec);
}
} else if(value instanceof SafeArrayList) {
final SafeArrayList<Object> values = (SafeArrayList<Object>) value;
for (final Object vec : values.getArray()) {
writeVec4(data, vec);
}
} else if(value instanceof Collection) {
final Collection<Object> values = (Collection<Object>) value;
for (final Object vec : values) {
writeVec4(data, vec);
}
}
}
/**
* Writes the value to the data buffer.
*
* @param data the data buffer.
* @param value the value.
*/
protected void writeVec3Array(final ByteBuffer data, final Object value) {
if (value instanceof Vector3f[]) {
final Vector3f[] values = (Vector3f[]) value;
for (final Vector3f vec : values) {
write(data, vec);
}
} else if(value instanceof SafeArrayList) {
final SafeArrayList<Vector3f> values = (SafeArrayList<Vector3f>) value;
for (final Vector3f vec : values.getArray()) {
write(data, vec);
}
} else if(value instanceof Collection) {
final Collection<Vector3f> values = (Collection<Vector3f>) value;
for (final Vector3f vec : values) {
write(data, vec);
}
}
}
/**
* Writes the value to the data buffer.
*
* @param data the data buffer.
* @param value the value.
*/
protected void writeVec2Array(final ByteBuffer data, final Object value) {
if (value instanceof Vector2f[]) {
final Vector2f[] values = (Vector2f[]) value;
for (final Vector2f vec : values) {
write(data, vec);
}
} else if(value instanceof SafeArrayList) {
final SafeArrayList<Vector2f> values = (SafeArrayList<Vector2f>) value;
for (final Vector2f vec : values.getArray()) {
write(data, vec);
}
} else if(value instanceof Collection) {
final Collection<Vector2f> values = (Collection<Vector2f>) value;
for (final Vector2f vec : values) {
write(data, vec);
}
}
}
/**
* Writes the value to the data buffer.
*
* @param data the data buffer.
* @param value the value.
*/
protected void write(final ByteBuffer data, final float[] value) {
for (float val : value) {
data.putFloat(val);
}
}
/**
* Writes the value to the data buffer.
*
* @param data the data buffer.
* @param value the value.
*/
protected void write(final ByteBuffer data, final int[] value) {
for (int val : value) {
data.putInt(val);
}
}
/**
* Writes the value to the data buffer.
*
* @param data the data buffer.
* @param value the value.
*/
protected void writeVec4(final ByteBuffer data, final Object value) {
if(value instanceof Vector4f) {
final Vector4f vec4 = (Vector4f) value;
data.putFloat(vec4.getX())
.putFloat(vec4.getY())
.putFloat(vec4.getZ())
.putFloat(vec4.getW());
} else if(value instanceof Quaternion) {
final Quaternion vec4 = (Quaternion) value;
data.putFloat(vec4.getX())
.putFloat(vec4.getY())
.putFloat(vec4.getZ())
.putFloat(vec4.getW());
} else if(value instanceof ColorRGBA) {
final ColorRGBA vec4 = (ColorRGBA) value;
data.putFloat(vec4.getRed())
.putFloat(vec4.getGreen())
.putFloat(vec4.getBlue())
.putFloat(vec4.getAlpha());
}
}
/**
* Writes the value to the data buffer.
*
* @param data the data buffer.
* @param value the value.
*/
protected void write(final ByteBuffer data, final Vector3f value) {
data.putFloat(value.getX())
.putFloat(value.getY())
.putFloat(value.getZ());
if (layout == Layout.std140) {
data.putInt(0);
}
}
/**
* Writes the value to the data buffer.
*
* @param data the data buffer.
* @param value the value.
*/
protected void write(final ByteBuffer data, final Vector2f value) {
data.putFloat(value.getX())
.putFloat(value.getY());
}
@Override
public void deleteObject(final Object rendererObject) {
if (!(rendererObject instanceof Renderer)) {
throw new IllegalArgumentException("This bo can't be deleted from " + rendererObject);
}
((Renderer) rendererObject).deleteBuffer(this);
}
@Override
public NativeObject createDestructableClone() {
return new BufferObject(id);
}
@Override
protected void deleteNativeBuffers() {
super.deleteNativeBuffers();
if (previosData != null) {
BufferUtils.destroyDirectBuffer(previosData);
previosData = null;
}
}
@Override
public long getUniqueId() {
return ((long) OBJTYPE_BO << 32) | ((long) id);
}
}

76
jme3-core/src/main/java/com/jme3/shader/BufferObjectField.java
Unescape View File

@ -0,0 +1,76 @@
package com.jme3.shader;
import static java.util.Objects.requireNonNull;
/**
* The class to describe a filed in BO.
*
* @author JavaSaBr
*/
public class BufferObjectField {
/**
* The field name.
*/
private final String name;
/**
* The field type.
*/
private final VarType type;
/**
* The field value.
*/
private Object value;
public BufferObjectField(final String name, final VarType type) {
this.name = name;
this.type = type;
}
/**
* Get the field name.
*
* @return the field name.
*/
public String getName() {
return name;
}
/**
* Gets the field type.
*
* @return the field type.
*/
public VarType getType() {
return type;
}
/**
* Gets the field value.
*
* @return the field value.
*/
public Object getValue() {
return value;
}
/**
* Sets the field value.
*
* @param value the field value.
*/
public void setValue(final Object value) {
this.value = requireNonNull(value, "The field's value can't be null.");
}
@Override
public String toString() {
return "BufferObjectField{" +
"name='" + name + '\'' +
", type=" + type +
", value=" + value +
'}';
}
}

2
jme3-core/src/main/java/com/jme3/util/NativeObject.java
Unescape View File

@ -53,7 +53,7 @@ public abstract class NativeObject implements Cloneable {
OBJTYPE_AUDIOBUFFER = 6,
OBJTYPE_AUDIOSTREAM = 7,
OBJTYPE_FILTER = 8,
OBJTYPE_SSBO = 9;
OBJTYPE_BO = 9;
/**
* The object manager to which this NativeObject is registered to.

Write Preview
Loading…
Cancel
Save