eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adding index data to PShape3D to deal with large models in android

Browse Source
This commit is contained in:
codeanticode
2012-01-26 01:06:29 +00:00
parent 7533d71404
commit cc57b0b195
4 changed files with 149 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/core/src/processing/core/PGL.java
+4 -4
View File
@@ -821,19 +821,19 @@ public class PGL {
}
public void setVertexFormat(int size, int stride, int offset) {
gl11.glVertexPointer(size, GL11.GL_FLOAT, stride, offset);
gl11.glVertexPointer(size, GL11.GL_FLOAT, stride, offset * SIZEOF_FLOAT);
}
public void setColorFormat(int size, int stride, int offset) {
gl11.glColorPointer(size, GL11.GL_FLOAT, stride, offset);
gl11.glColorPointer(size, GL11.GL_FLOAT, stride, offset* SIZEOF_FLOAT);
}
public void setNormalFormat(int size, int stride, int offset) {
gl11.glNormalPointer(GL11.GL_FLOAT, stride, offset);
gl11.glNormalPointer(GL11.GL_FLOAT, stride, offset* SIZEOF_FLOAT);
}
public void setTexCoordFormat(int size, int stride, int offset) {
gl11.glTexCoordPointer(size, GL11.GL_FLOAT, stride, offset);
gl11.glTexCoordPointer(size, GL11.GL_FLOAT, stride, offset* SIZEOF_FLOAT);
}
public void unbindVertexBuffer() {
android/core/src/processing/core/PGraphicsAndroid3D.java
+12 -7
View File
@@ -34,10 +34,12 @@ import javax.microedition.khronos.opengles.*;
// drawPixels is missing...calls to glDrawPixels are commented out
// setRasterPos() is also commented out
/*
* Android 3D renderer implemented with OpenGL ES 1.1
* By Andres Colubri
*
/**
* OpenGL renderer.
* Some optimization tips useful mostly for mobile:
* http://developer.apple.com/library/ios/#documentation/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/TechniquesforWorkingwithVertexData/TechniquesforWorkingwithVertexData.html
* http://code.google.com/p/webgl-loader/wiki/HappyBuddha
*
*/
public class PGraphicsAndroid3D extends PGraphics {
/** Interface between Processing and OpenGL */
@@ -6910,12 +6912,12 @@ public class PGraphicsAndroid3D extends PGraphics {
}
public int setFillVertex(int offset) {
firstFillVertex = 0;
firstFillVertex = 0;
if (0 < offset) {
firstFillVertex = offset + 1;
}
}
lastFillVertex = firstFillVertex + fillVertexCount - 1;
return lastFillVertex;
return lastFillVertex;
}
public int setFillIndex(int offset) {
@@ -6924,12 +6926,15 @@ public class PGraphicsAndroid3D extends PGraphics {
firstFillIndex = offset + 1;
}
/*
// The indices are update to take into account all the previous
// shapes in the hierarchy, as the entire geometry will be stored
// contiguously in a single VBO in the root node.
for (int i = 0; i < fillIndexCount; i++) {
fillIndices[i] += firstFillVertex;
}
*/
lastFillIndex = firstFillIndex + fillIndexCount - 1;
return lastFillIndex;
}
android/core/src/processing/core/PShape3D.java
+132 -12
View File
@@ -64,6 +64,10 @@ public class PShape3D extends PShape {
protected TessGeometry tess;
protected Tessellator tessellator;
protected ArrayList<IndexData> fillIndexData;
protected ArrayList<IndexData> lineIndexData;
protected ArrayList<IndexData> pointIndexData;
protected HashSet<PImage> textures;
protected PImage texture;
@@ -569,6 +573,11 @@ public class PShape3D extends PShape {
protected void vertexImpl(float x, float y, float z, float u, float v, int code) {
if (in.isFull()) {
PGraphics.showWarning("P3D: Too many vertices, try creating smaller shapes");
return;
}
if (family == GROUP) {
PGraphics.showWarning("Cannot add vertices to GROUP shape");
return;
@@ -2600,9 +2609,6 @@ public class PShape3D extends PShape {
} else {
if (0 < tess.fillVertexCount) {
root.lastFillVertexOffset = tess.setFillVertex(root.lastFillVertexOffset);
if (32767 < root.lastFillVertexOffset) {
PApplet.println("problems " + root.lastFillVertexOffset);
}
}
if (0 < tess.fillIndexCount) {
root.lastFillIndexOffset = tess.setFillIndex(root.lastFillIndexOffset);
@@ -2621,6 +2627,9 @@ public class PShape3D extends PShape {
if (0 < tess.pointIndexCount) {
root.lastPointIndexOffset = tess.setPointIndex(root.lastPointIndexOffset);
}
// recursive add up to the root level
addFillIndexData(tess.firstFillVertex, tess.firstFillIndex, tess.lastFillIndex - tess.firstFillIndex + 1);
}
hasFill = 0 < tess.fillVertexCount && 0 < tess.fillIndexCount;
@@ -2628,6 +2637,16 @@ public class PShape3D extends PShape {
hasPoints = 0 < tess.pointVertexCount && 0 < tess.pointIndexCount;
}
protected void addFillIndexData(int first, int offset, int size) {
if (fillIndexData == null) {
fillIndexData = new ArrayList<IndexData>();
}
IndexData data = new IndexData(first, offset, size);
fillIndexData.add(data);
if (parent != null) {
((PShape3D)parent).addFillIndexData(first, offset, size);
}
}
protected void initFillBuffers(int nvert, int nind) {
glFillVertexBufferID = renderer.createVertexBufferObject();
@@ -3332,23 +3351,23 @@ public class PShape3D extends PShape {
}
protected void renderFill(PImage textureImage) {
protected void renderFill0(PImage textureImage) {
pgl.enableVertexArrays();
pgl.enableColorArrays();
pgl.enableNormalArrays();
pgl.enableTexCoordArrays();
pgl.bindVertexBuffer(root.glFillVertexBufferID);
pgl.setVertexFormat(3, 0, 0);
//pgl.setVertexFormat(3, 0, 0);
pgl.bindVertexBuffer(root.glFillColorBufferID);
pgl.setColorFormat(4, 0, 0);
//pgl.setColorFormat(4, 0, 0);
pgl.bindVertexBuffer(root.glFillNormalBufferID);
pgl.setNormalFormat(3, 0, 0);
//pgl.setNormalFormat(3, 0, 0);
pgl.bindVertexBuffer(root.glFillTexCoordBufferID);
pgl.setTexCoordFormat(2, 0, 0);
//pgl.setTexCoordFormat(2, 0, 0);
PTexture tex = null;
if (textureImage != null) {
@@ -3360,10 +3379,25 @@ public class PShape3D extends PShape {
}
}
int offset = tess.firstFillIndex;
int size = tess.lastFillIndex - tess.firstFillIndex + 1;
pgl.bindIndexBuffer(root.glFillIndexBufferID);
pgl.renderIndexBuffer(offset, size);
pgl.bindIndexBuffer(root.glFillIndexBufferID);
for (int i = 0; i < fillIndexData.size(); i++) {
IndexData index = (IndexData)fillIndexData.get(i);
int first = index.first;
int offset = index.offset;
int size = index.size;
//PApplet.println(first + " " + offset + " " + size);
// pgl.setVertexFormat(3, 0, 3 * first);
// pgl.setColorFormat(4, 0, 4 * first);
// pgl.setNormalFormat(3, 0, 3 * first);
// pgl.setTexCoordFormat(2, 0, 2 * first);
pgl.renderIndexBuffer(offset, size);
}
// int offset = tess.firstFillIndex;
// int size = tess.lastFillIndex - tess.firstFillIndex + 1;
// pgl.renderIndexBuffer(offset, size);
if (tex != null) {
pgl.unbindTexture(tex.glTarget);
@@ -3378,6 +3412,92 @@ public class PShape3D extends PShape {
pgl.disableNormalArrays();
pgl.disableTexCoordArrays();
}
protected void renderFill(PImage textureImage) {
pgl.enableVertexArrays();
pgl.enableColorArrays();
pgl.enableNormalArrays();
pgl.enableTexCoordArrays();
for (int i = 0; i < fillIndexData.size(); i++) {
IndexData index = (IndexData)fillIndexData.get(i);
int first = index.first;
int offset = index.offset;
int size = index.size;
pgl.bindVertexBuffer(root.glFillVertexBufferID);
pgl.setVertexFormat(3, 0, 3 * first);
pgl.bindVertexBuffer(root.glFillColorBufferID);
pgl.setColorFormat(4, 0, 4 * first);
pgl.bindVertexBuffer(root.glFillNormalBufferID);
pgl.setNormalFormat(3, 0, 3 * first);
pgl.bindVertexBuffer(root.glFillTexCoordBufferID);
pgl.setTexCoordFormat(2, 0, 2 * first);
PTexture tex = null;
if (textureImage != null) {
tex = renderer.getTexture(textureImage);
if (tex != null) {
pgl.enableTexturing(tex.glTarget);
pgl.setActiveTexUnit(0);
pgl.bindTexture(tex.glTarget, tex.glID);
}
}
pgl.bindIndexBuffer(root.glFillIndexBufferID);
//PApplet.println(first + " " + offset + " " + size);
// pgl.setVertexFormat(3, 0, 3 * first);
// pgl.setColorFormat(4, 0, 4 * first);
// pgl.setNormalFormat(3, 0, 3 * first);
// pgl.setTexCoordFormat(2, 0, 2 * first);
pgl.renderIndexBuffer(offset, size);
// int offset = tess.firstFillIndex;
// int size = tess.lastFillIndex - tess.firstFillIndex + 1;
// pgl.renderIndexBuffer(offset, size);
if (tex != null) {
pgl.unbindTexture(tex.glTarget);
pgl.disableTexturing(tex.glTarget);
}
pgl.unbindIndexBuffer();
pgl.unbindVertexBuffer();
}
pgl.disableVertexArrays();
pgl.disableColorArrays();
pgl.disableNormalArrays();
pgl.disableTexCoordArrays();
}
///////////////////////////////////////////////////////////
//
protected class IndexData {
IndexData(int first, int offset, int size) {
this.first = first;
this.offset = offset;
this.size = size;
}
int first;
int offset;
int size;
}
///////////////////////////////////////////////////////////
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+1 -3
View File
@@ -45,9 +45,7 @@ import java.util.Stack;
import javax.media.opengl.GL;
/**
* New OpenGL renderer for Processing, entirely based on OpenGL 2.x
* (fixed-function pipeline) and OpenGL 3.x (programmable pipeline).
* By Andres Colubri
* OpenGL renderer.
*
*/
public class PGraphicsOpenGL extends PGraphics {