rusefi
/
jzy3d-api
mirror of https://github.com/rusefi/jzy3d-api.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extract color/vertex method

This commit is contained in:
Martin Pernollet 2014-11-05 19:35:45 +01:00
parent 84734bbb78
commit 8733904de7
1 changed files with 93 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
jzy3d-api/src/api/org/jzy3d/plot3d/primitives/AbstractGeometry.java
View File

@ -30,8 +30,7 @@ public abstract class AbstractGeometry extends AbstractWireframeable implements
*/
public AbstractGeometry() {
super();
points = new ArrayList<Point>(4); // use Vector for synchro, or
// ArrayList for unsyncro.
points = new ArrayList<Point>(4);
bbox = new BoundingBox3d();
center = new Coord3d();
polygonOffsetFillEnable = true;
@ -79,12 +78,12 @@ public abstract class AbstractGeometry extends AbstractWireframeable implements
}
public void callPointsForWireframeGL2(GL gl) {
gl.getGL2().glColor4f(wfcolor.r, wfcolor.g, wfcolor.b, wfcolor.a);
colorGL2(gl, wfcolor);
gl.glLineWidth(wfwidth);
begin(gl);
for (Point p : points) {
gl.getGL2().glVertex3f(p.xyz.x, p.xyz.y, p.xyz.z);
vertexGL2(gl, p.xyz);
}
end(gl);
}
@ -105,15 +104,12 @@ public abstract class AbstractGeometry extends AbstractWireframeable implements
begin(gl);
for (Point p : points) {
if (mapper != null) {
Color c = mapper.getColor(p.xyz); // TODO: should cache
// result
// in the point color
GLES2CompatUtils.glColor4f(c.r, c.g, c.b, c.a);
Color c = mapper.getColor(p.xyz);
colorGLES2(c);
} else {
GLES2CompatUtils.glColor4f(p.rgb.r, p.rgb.g, p.rgb.b, p.rgb.a);
colorGLES2(p.rgb);
}
GLES2CompatUtils.glVertex3f(p.xyz.x, p.xyz.y, p.xyz.z);
vertexGL2(p.xyz);
}
end(gl);
}
@ -122,21 +118,35 @@ public abstract class AbstractGeometry extends AbstractWireframeable implements
begin(gl);
for (Point p : points) {
if (mapper != null) {
Color c = mapper.getColor(p.xyz); // TODO: should cache
// result
// in the point color
gl.getGL2().glColor4f(c.r, c.g, c.b, c.a);
Color c = mapper.getColor(p.xyz);
colorGL2(gl, c);
} else {
gl.getGL2().glColor4f(p.rgb.r, p.rgb.g, p.rgb.b, p.rgb.a);
colorGL2(gl, p.rgb);
}
gl.getGL2().glVertex3f(p.xyz.x, p.xyz.y, p.xyz.z);
vertexGL2(gl, p.xyz);
}
end(gl);
}
protected abstract void begin(GL gl);
protected void vertexGL2(GL gl, Coord3d c) {
gl.getGL2().glVertex3f(c.x, c.y, c.z);
}
protected void colorGL2(GL gl, Color c) {
gl.getGL2().glColor4f(c.r, c.g, c.b, c.a);
}
protected void vertexGL2(Coord3d c) {
GLES2CompatUtils.glVertex3f(c.x, c.y, c.z);
}
protected void colorGLES2(Color c) {
GLES2CompatUtils.glColor4f(c.r, c.g, c.b, c.a);
}
protected void end(GL gl) {
if (gl.isGL2()) {
gl.getGL2().glEnd();
@ -147,22 +157,13 @@ public abstract class AbstractGeometry extends AbstractWireframeable implements
protected void applyPolygonModeLine(GL gl) {
if (gl.isGL2()) {
switch (polygonMode) {
case FRONT:
gl.getGL2().glPolygonMode(GL2.GL_FRONT, GL2.GL_LINE);
break;
case BACK:
gl.getGL2().glPolygonMode(GL2.GL_BACK, GL2.GL_LINE);
break;
case FRONT_AND_BACK:
gl.getGL2().glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_LINE);
break;
default:
break;
}
applyPolygonModeLineGL2(gl);
} else {
// glPolygonMode does not exist in opengl es ??
applyPolygonModeLineGLES2();
}
}
protected void applyPolygonModeLineGLES2() {
switch (polygonMode) {
case FRONT:
GLES2CompatUtils.glPolygonMode(GL2.GL_FRONT, GL2.GL_LINE);
@ -177,26 +178,32 @@ public abstract class AbstractGeometry extends AbstractWireframeable implements
break;
}
}
}
protected void applyPolygonModeFill(GL gl) {
if (gl.isGL2()) {
protected void applyPolygonModeLineGL2(GL gl) {
switch (polygonMode) {
case FRONT:
gl.getGL2().glPolygonMode(GL.GL_FRONT, GL2.GL_FILL);
gl.getGL2().glPolygonMode(GL2.GL_FRONT, GL2.GL_LINE);
break;
case BACK:
gl.getGL2().glPolygonMode(GL.GL_BACK, GL2.GL_FILL);
gl.getGL2().glPolygonMode(GL2.GL_BACK, GL2.GL_LINE);
break;
case FRONT_AND_BACK:
gl.getGL2().glPolygonMode(GL.GL_FRONT_AND_BACK, GL2.GL_FILL);
gl.getGL2().glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_LINE);
break;
default:
break;
}
} else {
}
// glPolygonMode does not exist in opengl es ??
protected void applyPolygonModeFill(GL gl) {
if (gl.isGL2()) {
applyPolygonModeFillGL2(gl);
} else {
applyPolygonModeFillGLES2();
}
}
public void applyPolygonModeFillGLES2() {
switch (polygonMode) {
case FRONT:
GLES2CompatUtils.glPolygonMode(GL2.GL_FRONT, GL2.GL_FILL);
@ -210,7 +217,21 @@ public abstract class AbstractGeometry extends AbstractWireframeable implements
default:
break;
}
}
public void applyPolygonModeFillGL2(GL gl) {
switch (polygonMode) {
case FRONT:
gl.getGL2().glPolygonMode(GL.GL_FRONT, GL2.GL_FILL);
break;
case BACK:
gl.getGL2().glPolygonMode(GL.GL_BACK, GL2.GL_FILL);
break;
case FRONT_AND_BACK:
gl.getGL2().glPolygonMode(GL.GL_FRONT_AND_BACK, GL2.GL_FILL);
break;
default:
break;
}
}