repositories
/
SugarCubes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
30673de
)
Set point size, re-comment drawBox()
author
Mark Slee
<mcslee@gmail.com>
Fri, 7 Mar 2014 08:11:24 +0000
(
00:11
-0800)
committer
Mark Slee
<mcslee@gmail.com>
Fri, 7 Mar 2014 08:11:24 +0000
(
00:11
-0800)
UIImplementation.pde
patch
|
blob
|
blame
|
history
diff --git
a/UIImplementation.pde
b/UIImplementation.pde
index b2320c6c0a4dc4aa03bebe652b3b7f827306ac4c..0f73b99aaa3a3839b5ebf06e72c0ba72d24de0fa 100644
(file)
--- a/
UIImplementation.pde
+++ b/
UIImplementation.pde
@@
-139,7
+139,8
@@
FloatBuffer vertData;
pgl.vertexAttribPointer(vertLoc, 3, PGL.FLOAT, false, 7 * SIZEOF_FLOAT, 0);
pgl.vertexAttribPointer(colorLoc, 4, PGL.FLOAT, false, 7 * SIZEOF_FLOAT, 3 * SIZEOF_FLOAT);
pgl.vertexAttribPointer(vertLoc, 3, PGL.FLOAT, false, 7 * SIZEOF_FLOAT, 0);
pgl.vertexAttribPointer(colorLoc, 4, PGL.FLOAT, false, 7 * SIZEOF_FLOAT, 3 * SIZEOF_FLOAT);
-
+ javax.media.opengl.GL2 gl2 = (javax.media.opengl.GL2) ((PJOGL)pgl).gl;
+ gl2.glPointSize(2f);
pgl.drawArrays(PGL.POINTS, 0, nvert);
pgl.disableVertexAttribArray(vertLoc);
pgl.drawArrays(PGL.POINTS, 0, nvert);
pgl.disableVertexAttribArray(vertLoc);
@@
-182,7
+183,7
@@
FloatBuffer allocateDirectFloatBuffer(int n) {
float in = .15;
noStroke();
fill(#393939);
float in = .15;
noStroke();
fill(#393939);
- drawBox(c.x+in, c.y+in, c.z+in, c.rx, c.ry, c.rz, Cube.EDGE_WIDTH-in*2, Cube.EDGE_HEIGHT-in*2, Cube.EDGE_WIDTH-in*2, Cube.CHANNEL_WIDTH-in);
+
//
drawBox(c.x+in, c.y+in, c.z+in, c.rx, c.ry, c.rz, Cube.EDGE_WIDTH-in*2, Cube.EDGE_HEIGHT-in*2, Cube.EDGE_WIDTH-in*2, Cube.CHANNEL_WIDTH-in);
}
void drawBox(float x, float y, float z, float rx, float ry, float rz, float xd, float yd, float zd, float sw) {
}
void drawBox(float x, float y, float z, float rx, float ry, float rz, float xd, float yd, float zd, float sw) {