jatria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DEV] add elements debug

Browse Source
This commit is contained in:
Edouard DUPIN 2021-01-18 21:20:59 +01:00
parent 7fa5878d85
commit ea087ef912
2 changed files with 363 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.classpath
View File

@ -11,11 +11,6 @@
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/atriasoft-etk">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14">
<attributes> <attributes>
<attribute name="module" value="true"/> <attribute name="module" value="true"/>
@ -91,5 +86,15 @@
<attribute name="test" value="true"/> <attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/atriasoft-etk">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/jReactPhysics3D">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="out/eclipse/classes"/> <classpathentry kind="output" path="out/eclipse/classes"/>
</classpath> </classpath>

724
src/org/atriasoft/gale/resource/ResourceColored3DObject.java
View File

@ -8,17 +8,27 @@ import org.atriasoft.etk.Color;
import org.atriasoft.etk.Uri; import org.atriasoft.etk.Uri;
import org.atriasoft.etk.math.Matrix4f; import org.atriasoft.etk.math.Matrix4f;
import org.atriasoft.etk.math.Vector3f; import org.atriasoft.etk.math.Vector3f;
import org.atriasoft.gale.internal.Log;
import org.atriasoft.gale.backend3d.OpenGL; import org.atriasoft.gale.backend3d.OpenGL;
import org.atriasoft.gale.internal.Log;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
public class ResourceColored3DObject extends Resource { public class ResourceColored3DObject extends Resource {
private ResourceProgram program; public static ResourceColored3DObject create() {
final ResourceColored3DObject resource = new ResourceColored3DObject();
if (resource.resourceHasBeenCorectlyInit() == false) {
Log.critical("resource Is not correctly init: ResourceColored3DObject");
}
getManager().localAdd(resource);
return resource;
}
private final ResourceProgram program;
private int oGLPosition; private int oGLPosition;
private int oGLColor; private int oGLColor;
private int oGLMatrixTransformation; private int oGLMatrixTransformation;
private int oGLMatrixProjection; private int oGLMatrixProjection;
private int oGLMatrixView; private int oGLMatrixView;
protected ResourceColored3DObject() { protected ResourceColored3DObject() {
super(); super();
addResourceType("ResourceColored3DObject"); addResourceType("ResourceColored3DObject");
@ -27,16 +37,30 @@ public class ResourceColored3DObject extends Resource {
this.program = ResourceProgram.create(new Uri("DATA_EGE", "simple3D.vert"), new Uri("DATA_EGE", "simple3D.frag")); this.program = ResourceProgram.create(new Uri("DATA_EGE", "simple3D.vert"), new Uri("DATA_EGE", "simple3D.frag"));
if (this.program != null) { if (this.program != null) {
this.oGLMatrixTransformation = this.program.getUniform("in_matrixTransformation"); this.oGLMatrixTransformation = this.program.getUniform("in_matrixTransformation");
this.oGLMatrixProjection = this.program.getUniform("in_matrixProjection"); this.oGLMatrixProjection = this.program.getUniform("in_matrixProjection");
this.oGLMatrixView = this.program.getUniform("in_matrixView"); this.oGLMatrixView = this.program.getUniform("in_matrixView");
this.oGLPosition = this.program.getAttribute("in_position"); this.oGLPosition = this.program.getAttribute("in_position");
this.oGLColor = this.program.getUniform("in_colors"); this.oGLColor = this.program.getUniform("in_colors");
} }
} }
public void draw(List<Vector3f> vertices,
Color color, @Override
boolean updateDepthBuffer, public void cleanUp() {
boolean depthtest) { // TODO Auto-generated method stub
}
private float[] convertInFloat(final List<Vector3f> data) {
final float[] out = new float[data.size() * 3];
for (int iii = 0; iii < data.size(); iii++) {
out[iii * 3] = data.get(iii).x;
out[iii * 3 + 1] = data.get(iii).y;
out[iii * 3 + 2] = data.get(iii).z;
}
return out;
}
public void draw(final List<Vector3f> vertices, final Color color, final boolean updateDepthBuffer, final boolean depthtest) {
if (vertices.size() <= 0) { if (vertices.size() <= 0) {
return; return;
} }
@ -52,16 +76,16 @@ public class ResourceColored3DObject extends Resource {
} }
//Log.debug(" display " << this.coord.size() << " elements" ); //Log.debug(" display " << this.coord.size() << " elements" );
this.program.use(); this.program.use();
Matrix4f projectionMatrix = OpenGL.getMatrix(); final Matrix4f projectionMatrix = OpenGL.getMatrix();
Matrix4f viewMatrix = OpenGL.getCameraMatrix(); final Matrix4f viewMatrix = OpenGL.getCameraMatrix();
Matrix4f transformationMatrix = Matrix4f.identity(); final Matrix4f transformationMatrix = Matrix4f.identity();
this.program.uniformMatrix(this.oGLMatrixView, viewMatrix); this.program.uniformMatrix(this.oGLMatrixView, viewMatrix);
this.program.uniformMatrix(this.oGLMatrixProjection, projectionMatrix); this.program.uniformMatrix(this.oGLMatrixProjection, projectionMatrix);
this.program.uniformMatrix(this.oGLMatrixTransformation, transformationMatrix); this.program.uniformMatrix(this.oGLMatrixTransformation, transformationMatrix);
// color : // color :
this.program.uniformColor(this.oGLColor, color); this.program.uniformColor(this.oGLColor, color);
// position : // position :
FloatBuffer buffer = storeDataInFloatBuffer(convertInFloat(vertices)); final FloatBuffer buffer = storeDataInFloatBuffer(convertInFloat(vertices));
this.program.sendAttribute(this.oGLPosition, 3, buffer, 3); this.program.sendAttribute(this.oGLPosition, 3, buffer, 3);
if (color.a < 1.0f) { if (color.a < 1.0f) {
OpenGL.enable(OpenGL.Flag.flag_blend); OpenGL.enable(OpenGL.Flag.flag_blend);
@ -82,26 +106,8 @@ public class ResourceColored3DObject extends Resource {
OpenGL.disable(OpenGL.Flag.flag_depthTest); OpenGL.disable(OpenGL.Flag.flag_depthTest);
} }
} }
private float[] convertInFloat(List<Vector3f> data) {
float[] out = new float[data.size()*3]; public void draw(final List<Vector3f> vertices, final Color color, final Matrix4f transformationMatrix, final boolean updateDepthBuffer, final boolean depthtest) {
for (int iii=0; iii<data.size(); iii++) {
out[iii*3] = data.get(iii).x;
out[iii*3+1] = data.get(iii).y;
out[iii*3+2] = data.get(iii).z;
}
return out;
}
private FloatBuffer storeDataInFloatBuffer(float[] data) {
FloatBuffer buffer = BufferUtils.createFloatBuffer(data.length);
buffer.put(data);
buffer.flip();
return buffer;
}
public void draw(List<Vector3f> vertices,
Color color,
Matrix4f transformationMatrix,
boolean updateDepthBuffer,
boolean depthtest) {
if (vertices.size() <= 0) { if (vertices.size() <= 0) {
return; return;
} }
@ -118,13 +124,13 @@ public class ResourceColored3DObject extends Resource {
//Log.debug(" display " << this.coord.size() << " elements" ); //Log.debug(" display " << this.coord.size() << " elements" );
this.program.use(); this.program.use();
// set Matrix: translation/positionMatrix // set Matrix: translation/positionMatrix
Matrix4f projectionMatrix = OpenGL.getMatrix(); final Matrix4f projectionMatrix = OpenGL.getMatrix();
Matrix4f viewMatrix = OpenGL.getCameraMatrix(); final Matrix4f viewMatrix = OpenGL.getCameraMatrix();
this.program.uniformMatrix(this.oGLMatrixView, viewMatrix); this.program.uniformMatrix(this.oGLMatrixView, viewMatrix);
this.program.uniformMatrix(this.oGLMatrixProjection, projectionMatrix); this.program.uniformMatrix(this.oGLMatrixProjection, projectionMatrix);
this.program.uniformMatrix(this.oGLMatrixTransformation, transformationMatrix); this.program.uniformMatrix(this.oGLMatrixTransformation, transformationMatrix);
// position : // position :
FloatBuffer buffer = storeDataInFloatBuffer(convertInFloat(vertices)); final FloatBuffer buffer = storeDataInFloatBuffer(convertInFloat(vertices));
this.program.sendAttribute(this.oGLPosition, 3, buffer, 3); this.program.sendAttribute(this.oGLPosition, 3, buffer, 3);
// color : // color :
//Log.info("color= " + color + " " + this.oGLPosition); //Log.info("color= " + color + " " + this.oGLPosition);
@ -145,11 +151,254 @@ public class ResourceColored3DObject extends Resource {
OpenGL.disable(OpenGL.Flag.flag_depthTest); OpenGL.disable(OpenGL.Flag.flag_depthTest);
} }
} }
public void drawLine(List<Vector3f> vertices,
Color color, public void drawCapsule(final float radius, final float size, int lats, final int longs, final Matrix4f transformationMatrix, final Color tmpColor) {
Matrix4f transformationMatrix, final List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
boolean updateDepthBuffer, lats = lats / 2 * 2;
boolean depthtest) {
// center to border (TOP)
float offset = size * 0.5f;
for (int iii = lats / 2 + 1; iii <= lats; ++iii) {
final float lat0 = (float) Math.PI * (-0.5f + (float) (iii - 1) / lats);
final float z0 = radius * (float) Math.sin(lat0);
final float zr0 = radius * (float) Math.cos(lat0);
final float lat1 = (float) Math.PI * (-0.5f + (float) (iii) / lats);
final float z1 = radius * (float) Math.sin(lat1);
final float zr1 = radius * (float) Math.cos(lat1);
for (int jjj = 0; jjj < longs; ++jjj) {
float lng = 2.0f * (float) Math.PI * (jjj - 1) / longs;
float x = (float) Math.cos(lng);
float y = (float) Math.sin(lng);
final Vector3f v1 = new Vector3f(x * zr1, y * zr1, z1 + offset);
final Vector3f v4 = new Vector3f(x * zr0, y * zr0, z0 + offset);
lng = 2 * (float) Math.PI * (jjj) / longs;
x = (float) Math.cos(lng);
y = (float) Math.sin(lng);
final Vector3f v2 = new Vector3f(x * zr1, y * zr1, z1 + offset);
final Vector3f v3 = new Vector3f(x * zr0, y * zr0, z0 + offset);
tmpVertices.add(v1);
tmpVertices.add(v2);
tmpVertices.add(v3);
tmpVertices.add(v1);
tmpVertices.add(v3);
tmpVertices.add(v4);
}
}
// Cylinder
for (int jjj = 0; jjj < longs; ++jjj) {
float lng = 2.0f * (float) Math.PI * (jjj - 1) / longs;
final float z = size * 0.5f;
float x = (float) Math.cos(lng) * radius;
float y = (float) Math.sin(lng) * radius;
final Vector3f v2 = new Vector3f(x, y, z);
final Vector3f v2b = new Vector3f(x, y, -z);
lng = 2.0f * (float) Math.PI * (jjj) / longs;
x = (float) Math.cos(lng) * radius;
y = (float) Math.sin(lng) * radius;
final Vector3f v3 = new Vector3f(x, y, z);
final Vector3f v3b = new Vector3f(x, y, -z);
tmpVertices.add(v2);
tmpVertices.add(v3);
tmpVertices.add(v3b);
tmpVertices.add(v2);
tmpVertices.add(v3b);
tmpVertices.add(v2b);
}
// center to border (BUTTOM)
offset = -size * 0.5f;
for (int iii = 0; iii <= lats / 2; ++iii) {
final float lat0 = (float) Math.PI * (-0.5f + (float) (iii - 1) / lats);
final float z0 = radius * (float) Math.sin(lat0);
final float zr0 = radius * (float) Math.cos(lat0);
final float lat1 = (float) Math.PI * (-0.5f + (float) (iii) / lats);
final float z1 = radius * (float) Math.sin(lat1);
final float zr1 = radius * (float) Math.cos(lat1);
for (int jjj = 0; jjj < longs; ++jjj) {
float lng = 2.0f * (float) Math.PI * (jjj - 1) / longs;
float x = (float) Math.cos(lng);
float y = (float) Math.sin(lng);
final Vector3f v1 = new Vector3f(x * zr1, y * zr1, z1 + offset);
final Vector3f v4 = new Vector3f(x * zr0, y * zr0, z0 + offset);
lng = 2 * (float) Math.PI * (jjj) / longs;
x = (float) Math.cos(lng);
y = (float) Math.sin(lng);
final Vector3f v2 = new Vector3f(x * zr1, y * zr1, z1 + offset);
final Vector3f v3 = new Vector3f(x * zr0, y * zr0, z0 + offset);
tmpVertices.add(v1);
tmpVertices.add(v2);
tmpVertices.add(v3);
tmpVertices.add(v1);
tmpVertices.add(v3);
tmpVertices.add(v4);
}
}
draw(tmpVertices, tmpColor, transformationMatrix, true, true);
}
public void drawCone(final float radius, final float size, final int lats, final int longs, final Matrix4f transformationMatrix, final Color tmpColor) {
final List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
// center to border (TOP)
for (int jjj = 0; jjj < longs; ++jjj) {
float lng = 2.0f * (float) Math.PI * (jjj - 1) / longs;
final Vector3f v1 = new Vector3f(0.0f, 0.0f, -size / 2);
float x = (float) Math.cos(lng) * radius;
float y = (float) Math.sin(lng) * radius;
final Vector3f v2 = new Vector3f(x, y, size / 2);
lng = 2.0f * (float) Math.PI * (jjj) / longs;
x = (float) Math.cos(lng) * radius;
y = (float) Math.sin(lng) * radius;
final Vector3f v3 = new Vector3f(x, y, size / 2);
tmpVertices.add(v1);
tmpVertices.add(v3);
tmpVertices.add(v2);
}
// center to border (BUTTOM)
for (int jjj = 0; jjj < longs; ++jjj) {
float lng = 2.0f * (float) Math.PI * (jjj - 1) / longs;
final Vector3f v1 = new Vector3f(0.0f, 0.0f, size / 2);
float x = (float) Math.cos(lng) * radius;
float y = (float) Math.sin(lng) * radius;
final Vector3f v2 = new Vector3f(x, y, size / 2);
lng = 2.0f * (float) Math.PI * (jjj) / longs;
x = (float) Math.cos(lng) * radius;
y = (float) Math.sin(lng) * radius;
final Vector3f v3 = new Vector3f(x, y, size / 2);
tmpVertices.add(v1);
tmpVertices.add(v2);
tmpVertices.add(v3);
}
draw(tmpVertices, tmpColor, transformationMatrix, true, true);
}
public void drawCubeLine(final Vector3f min, final Vector3f max, final Color color, final Matrix4f transformationMatrix, final boolean updateDepthBuffer, final boolean depthtest) {
final List<Vector3f> vertices = new ArrayList<Vector3f>();
vertices.add(new Vector3f(min.x, min.y, min.z));
vertices.add(new Vector3f(max.x, min.y, min.z));
vertices.add(new Vector3f(max.x, min.y, min.z));
vertices.add(new Vector3f(max.x, min.y, max.z));
vertices.add(new Vector3f(max.x, min.y, max.z));
vertices.add(new Vector3f(min.x, min.y, max.z));
vertices.add(new Vector3f(min.x, min.y, max.z));
vertices.add(new Vector3f(min.x, min.y, min.z));
vertices.add(new Vector3f(min.x, max.y, min.z));
vertices.add(new Vector3f(max.x, max.y, min.z));
vertices.add(new Vector3f(max.x, max.y, min.z));
vertices.add(new Vector3f(max.x, max.y, max.z));
vertices.add(new Vector3f(max.x, max.y, max.z));
vertices.add(new Vector3f(min.x, max.y, max.z));
vertices.add(new Vector3f(min.x, max.y, max.z));
vertices.add(new Vector3f(min.x, max.y, min.z));
vertices.add(new Vector3f(min.x, min.y, min.z));
vertices.add(new Vector3f(min.x, max.y, min.z));
vertices.add(new Vector3f(max.x, min.y, min.z));
vertices.add(new Vector3f(max.x, max.y, min.z));
vertices.add(new Vector3f(max.x, min.y, max.z));
vertices.add(new Vector3f(max.x, max.y, max.z));
vertices.add(new Vector3f(min.x, min.y, max.z));
vertices.add(new Vector3f(min.x, max.y, max.z));
drawLine(vertices, color, transformationMatrix, updateDepthBuffer, depthtest);
}
public void drawCylinder(final float radius, final float size, final int lats, final int longs, final Matrix4f transformationMatrix, final Color tmpColor) {
final List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
// center to border (TOP)
// center to border (TOP)
for (int jjj = 0; jjj < longs; ++jjj) {
float lng = 2.0f * (float) Math.PI * (jjj - 1) / longs;
final float z = size * 0.5f;
final Vector3f v1 = new Vector3f(0.0f, 0.0f, z);
float x = (float) Math.cos(lng) * radius;
float y = (float) Math.sin(lng) * radius;
final Vector3f v2 = new Vector3f(x, y, z);
lng = 2.0f * (float) Math.PI * (jjj) / longs;
x = (float) Math.cos(lng) * radius;
y = (float) Math.sin(lng) * radius;
final Vector3f v3 = new Vector3f(x, y, z);
tmpVertices.add(v1);
tmpVertices.add(v3);
tmpVertices.add(v2);
}
// Cylinder
for (int jjj = 0; jjj < longs; ++jjj) {
float lng = 2.0f * (float) Math.PI * (jjj - 1) / longs;
final float z = size * 0.5f;
float x = (float) Math.cos(lng) * radius;
float y = (float) Math.sin(lng) * radius;
final Vector3f v2 = new Vector3f(x, y, z);
final Vector3f v2b = new Vector3f(x, y, -z);
lng = 2.0f * (float) Math.PI * (jjj) / longs;
x = (float) Math.cos(lng) * radius;
y = (float) Math.sin(lng) * radius;
final Vector3f v3 = new Vector3f(x, y, z);
final Vector3f v3b = new Vector3f(x, y, -z);
tmpVertices.add(v2);
tmpVertices.add(v3);
tmpVertices.add(v3b);
tmpVertices.add(v2);
tmpVertices.add(v3b);
tmpVertices.add(v2b);
}
// center to border (BUTTOM)
for (int jjj = 0; jjj < longs; ++jjj) {
float lng = 2.0f * (float) Math.PI * (jjj - 1) / longs;
final float z = size * -0.5f;
final Vector3f v1 = new Vector3f(0.0f, 0.0f, z);
float x = (float) Math.cos(lng) * radius;
float y = (float) Math.sin(lng) * radius;
final Vector3f v2 = new Vector3f(x, y, z);
lng = 2.0f * (float) Math.PI * (jjj) / longs;
x = (float) Math.cos(lng) * radius;
y = (float) Math.sin(lng) * radius;
final Vector3f v3 = new Vector3f(x, y, z);
tmpVertices.add(v1);
tmpVertices.add(v2);
tmpVertices.add(v3);
}
draw(tmpVertices, tmpColor, transformationMatrix, true, true);
}
public void drawLine(final List<Vector3f> vertices, final Color color, final Matrix4f transformationMatrix, final boolean updateDepthBuffer, final boolean depthtest) {
if (vertices.size() <= 0) { if (vertices.size() <= 0) {
return; return;
} }
@ -166,13 +415,13 @@ public class ResourceColored3DObject extends Resource {
//Log.debug(" display " << this.coord.size() << " elements" ); //Log.debug(" display " << this.coord.size() << " elements" );
this.program.use(); this.program.use();
// set Matrix: translation/positionMatrix // set Matrix: translation/positionMatrix
Matrix4f projectionMatrix = OpenGL.getMatrix(); final Matrix4f projectionMatrix = OpenGL.getMatrix();
Matrix4f viewMatrix = OpenGL.getCameraMatrix(); final Matrix4f viewMatrix = OpenGL.getCameraMatrix();
this.program.uniformMatrix(this.oGLMatrixView, viewMatrix); this.program.uniformMatrix(this.oGLMatrixView, viewMatrix);
this.program.uniformMatrix(this.oGLMatrixProjection, projectionMatrix); this.program.uniformMatrix(this.oGLMatrixProjection, projectionMatrix);
this.program.uniformMatrix(this.oGLMatrixTransformation, transformationMatrix); this.program.uniformMatrix(this.oGLMatrixTransformation, transformationMatrix);
// position : // position :
FloatBuffer buffer = storeDataInFloatBuffer(convertInFloat(vertices)); final FloatBuffer buffer = storeDataInFloatBuffer(convertInFloat(vertices));
this.program.sendAttribute(this.oGLPosition, 3, buffer, 3); this.program.sendAttribute(this.oGLPosition, 3, buffer, 3);
// color : // color :
this.program.uniformColor(this.oGLColor, color); this.program.uniformColor(this.oGLColor, color);
@ -192,346 +441,70 @@ public class ResourceColored3DObject extends Resource {
OpenGL.disable(OpenGL.Flag.flag_depthTest); OpenGL.disable(OpenGL.Flag.flag_depthTest);
} }
} }
public void drawCubeLine(Vector3f min,
Vector3f max,
Color color,
Matrix4f transformationMatrix,
boolean updateDepthBuffer,
boolean depthtest) {
List<Vector3f> vertices = new ArrayList<Vector3f>();
vertices.add(new Vector3f(min.x, min.y,min.z));
vertices.add(new Vector3f(max.x, min.y,min.z));
vertices.add(new Vector3f(max.x, min.y,min.z)); public void drawSphere(final float radius, final int lats, final int longs, final Matrix4f transformationMatrix, final Color tmpColor) {
vertices.add(new Vector3f(max.x, min.y,max.z)); final List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
for (int iii = 0; iii <= lats; ++iii) {
final float lat0 = (float) Math.PI * (-0.5f + (float) (iii - 1) / lats);
final float z0 = radius * (float) Math.sin(lat0);
final float zr0 = radius * (float) Math.cos(lat0);
vertices.add(new Vector3f(max.x, min.y,max.z)); final float lat1 = (float) Math.PI * (-0.5f + (float) (iii) / lats);
vertices.add(new Vector3f(min.x, min.y,max.z)); final float z1 = radius * (float) Math.sin(lat1);
final float zr1 = radius * (float) Math.cos(lat1);
vertices.add(new Vector3f(min.x, min.y,max.z)); for (int jjj = 0; jjj < longs; ++jjj) {
vertices.add(new Vector3f(min.x, min.y,min.z)); float lng = 2.0f * (float) Math.PI * (jjj - 1) / longs;
float x = (float) Math.cos(lng);
float y = (float) Math.sin(lng);
final Vector3f v1 = new Vector3f(x * zr1, y * zr1, z1);
final Vector3f v4 = new Vector3f(x * zr0, y * zr0, z0);
lng = 2 * (float) Math.PI * (jjj) / longs;
x = (float) Math.cos(lng);
y = (float) Math.sin(lng);
final Vector3f v2 = new Vector3f(x * zr1, y * zr1, z1);
final Vector3f v3 = new Vector3f(x * zr0, y * zr0, z0);
vertices.add(new Vector3f(min.x, max.y,min.z)); tmpVertices.add(v1);
vertices.add(new Vector3f(max.x, max.y,min.z)); tmpVertices.add(v2);
tmpVertices.add(v3);
vertices.add(new Vector3f(max.x, max.y,min.z)); tmpVertices.add(v1);
vertices.add(new Vector3f(max.x, max.y,max.z)); tmpVertices.add(v3);
tmpVertices.add(v4);
vertices.add(new Vector3f(max.x, max.y,max.z)); }
vertices.add(new Vector3f(min.x, max.y,max.z)); }
draw(tmpVertices, tmpColor, transformationMatrix, true, true);
vertices.add(new Vector3f(min.x, max.y,max.z));
vertices.add(new Vector3f(min.x, max.y,min.z));
vertices.add(new Vector3f(min.x, min.y,min.z));
vertices.add(new Vector3f(min.x, max.y,min.z));
vertices.add(new Vector3f(max.x, min.y,min.z));
vertices.add(new Vector3f(max.x, max.y,min.z));
vertices.add(new Vector3f(max.x, min.y,max.z));
vertices.add(new Vector3f(max.x, max.y,max.z));
vertices.add(new Vector3f(min.x, min.y,max.z));
vertices.add(new Vector3f(min.x, max.y,max.z));
drawLine(vertices, color, transformationMatrix, updateDepthBuffer, depthtest);
} }
public void drawSquare(Vector3f size,
Matrix4f transformationMatrix, public void drawSquare(final Vector3f size, final Matrix4f transformationMatrix, final Color tmpColor) {
Color tmpColor) { final List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
List<Vector3f> tmpVertices = new ArrayList<Vector3f>(); final int[] indices = { 0, 1, 2, 3, 2, 1, 4, 0, 6, 6, 0, 2, 5, 1, 4, 4, 1, 0, 7, 3, 1, 7, 1, 5, 5, 4, 7, 7, 4, 6, 7, 2, 3, 7, 6, 2 };
int[] indices = { 0,1,2, 3,2,1, 4,0,6, final Vector3f[] vertices = { new Vector3f(size.x, size.y, size.z), new Vector3f(-size.x, size.y, size.z), new Vector3f(size.x, -size.y, size.z), new Vector3f(-size.x, -size.y, size.z),
6,0,2, 5,1,4, 4,1,0, new Vector3f(size.x, size.y, -size.z), new Vector3f(-size.x, size.y, -size.z), new Vector3f(size.x, -size.y, -size.z), new Vector3f(-size.x, -size.y, -size.z) };
7,3,1, 7,1,5, 5,4,7,
7,4,6, 7,2,3, 7,6,2};
Vector3f[] vertices={ new Vector3f(size.x,size.y,size.z),
new Vector3f(-size.x,size.y,size.z),
new Vector3f(size.x,-size.y,size.z),
new Vector3f(-size.x,-size.y,size.z),
new Vector3f(size.x,size.y,-size.z),
new Vector3f(-size.x,size.y,-size.z),
new Vector3f(size.x,-size.y,-size.z),
new Vector3f(-size.x,-size.y,-size.z)};
tmpVertices.clear(); tmpVertices.clear();
for (int iii=0 ; iii<36 ; iii+=3) { for (int iii = 0; iii < 36; iii += 3) {
// normal calculation : // normal calculation :
//btVector3 normal = (vertices[indices[iii+2]]-vertices[indices[iii]]).cross(vertices[indices[iii+1]]-vertices[indices[iii]]); //btVector3 normal = (vertices[indices[iii+2]]-vertices[indices[iii]]).cross(vertices[indices[iii+1]]-vertices[indices[iii]]);
//normal.normalize (); //normal.normalize ();
tmpVertices.add(vertices[indices[iii]]); tmpVertices.add(vertices[indices[iii]]);
tmpVertices.add(vertices[indices[iii+1]]); tmpVertices.add(vertices[indices[iii + 1]]);
tmpVertices.add(vertices[indices[iii+2]]); tmpVertices.add(vertices[indices[iii + 2]]);
} }
draw(tmpVertices, tmpColor, transformationMatrix, true, true); draw(tmpVertices, tmpColor, transformationMatrix, true, true);
} }
public void drawSphere(float radius,
int lats,
int longs,
Matrix4f transformationMatrix,
Color tmpColor) {
List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
for(int iii=0; iii<=lats; ++iii) {
float lat0 = (float)Math.PI * (-0.5f + (float)(iii - 1) / lats);
float z0 = radius*(float)Math.sin(lat0);
float zr0 = radius*(float)Math.cos(lat0);
float lat1 = (float)Math.PI * (-0.5f + (float)(iii) / lats); public void drawTriangles(final List<Vector3f> vertex, final List<Integer> indice, final Matrix4f transformationMatrix, final Color tmpColor) {
float z1 = radius*(float)Math.sin(lat1); drawTriangles(vertex, indice, transformationMatrix, tmpColor, new Vector3f(0.0f, 0.0f, 0.1f));
float zr1 = radius*(float)Math.cos(lat1);
for(int jjj=0; jjj<longs; ++jjj) {
float lng = 2.0f * (float)Math.PI * (float)(jjj - 1) / longs;
float x = (float)Math.cos(lng);
float y = (float)Math.sin(lng);
Vector3f v1 = new Vector3f(x * zr1, y * zr1, z1);
Vector3f v4 = new Vector3f(x * zr0, y * zr0, z0);
lng = 2 * (float)Math.PI * (float)(jjj) / longs;
x = (float)Math.cos(lng);
y = (float)Math.sin(lng);
Vector3f v2 = new Vector3f(x * zr1, y * zr1, z1);
Vector3f v3 = new Vector3f(x * zr0, y * zr0, z0);
tmpVertices.add(v1);
tmpVertices.add(v2);
tmpVertices.add(v3);
tmpVertices.add(v1);
tmpVertices.add(v3);
tmpVertices.add(v4);
}
}
draw(tmpVertices, tmpColor, transformationMatrix, true, true);
} }
public void drawCylinder(float radius,
float size,
int lats,
int longs,
Matrix4f transformationMatrix,
Color tmpColor) {
List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
// center to border (TOP)
// center to border (TOP) public void drawTriangles(final List<Vector3f> vertex, final List<Integer> indice, final Matrix4f transformationMatrix, final Color tmpColor, final Vector3f offset) {
for(int jjj=0; jjj<longs; ++jjj) { final List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
float lng = 2.0f * (float)Math.PI * (float)(jjj - 1) / longs; for (int iii = 0; iii < indice.size() / 3; ++iii) {
tmpVertices.add(vertex.get(indice.get(iii * 3 + 0)).addNew(offset));
float z = size*0.5f; tmpVertices.add(vertex.get(indice.get(iii * 3 + 1)).addNew(offset));
Vector3f v1 = new Vector3f(0.0f, 0.0f, z); tmpVertices.add(vertex.get(indice.get(iii * 3 + 2)).addNew(offset));
float x = (float) Math.cos(lng)*radius;
float y = (float) Math.sin(lng)*radius;
Vector3f v2 = new Vector3f(x, y, z);
lng = 2.0f * (float)Math.PI * (float)(jjj) / longs;
x = (float) Math.cos(lng)*radius;
y = (float)Math.sin(lng)*radius;
Vector3f v3 = new Vector3f(x, y, z);
tmpVertices.add(v1);
tmpVertices.add(v3);
tmpVertices.add(v2);
}
// Cylinder
for(int jjj=0; jjj<longs; ++jjj) {
float lng = 2.0f * (float)Math.PI * (float)(jjj - 1) / longs;
float z = size*0.5f;
float x = (float) Math.cos(lng)*radius;
float y = (float) Math.sin(lng)*radius;
Vector3f v2 = new Vector3f(x, y, z);
Vector3f v2b = new Vector3f(x, y, -z);
lng = 2.0f * (float)Math.PI * (float)(jjj) / longs;
x = (float) Math.cos(lng)*radius;
y = (float) Math.sin(lng)*radius;
Vector3f v3 = new Vector3f(x, y, z);
Vector3f v3b = new Vector3f(x, y, -z);
tmpVertices.add(v2);
tmpVertices.add(v3);
tmpVertices.add(v3b);
tmpVertices.add(v2);
tmpVertices.add(v3b);
tmpVertices.add(v2b);
}
// center to border (BUTTOM)
for(int jjj=0; jjj<longs; ++jjj) {
float lng = 2.0f * (float)Math.PI * (float)(jjj - 1) / longs;
float z = size*-0.5f;
Vector3f v1 = new Vector3f(0.0f, 0.0f, z);
float x = (float)Math.cos(lng)*radius;
float y = (float)Math.sin(lng)*radius;
Vector3f v2 = new Vector3f(x, y, z);
lng = 2.0f * (float)Math.PI * (float)(jjj) / longs;
x = (float)Math.cos(lng)*radius;
y = (float)Math.sin(lng)*radius;
Vector3f v3 = new Vector3f(x, y, z);
tmpVertices.add(v1);
tmpVertices.add(v2);
tmpVertices.add(v3);
}
draw(tmpVertices, tmpColor, transformationMatrix, true, true);
}
public void drawCapsule(float radius,
float size,
int lats,
int longs,
Matrix4f transformationMatrix,
Color tmpColor) {
List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
lats = (int)(lats / 2)*2;
// center to border (TOP)
float offset = size*0.5f;
for(int iii=lats/2+1; iii<=lats; ++iii) {
float lat0 = (float)Math.PI * (-0.5f + (float)(iii - 1) / lats);
float z0 = radius*(float)Math.sin(lat0);
float zr0 = radius*(float)Math.cos(lat0);
float lat1 = (float)Math.PI * (-0.5f + (float)(iii) / lats);
float z1 = radius*(float)Math.sin(lat1);
float zr1 = radius*(float)Math.cos(lat1);
for(int jjj=0; jjj<longs; ++jjj) {
float lng = 2.0f * (float)Math.PI * (float)(jjj - 1) / longs;
float x = (float)Math.cos(lng);
float y = (float)Math.sin(lng);
Vector3f v1 = new Vector3f(x * zr1, y * zr1, z1+offset);
Vector3f v4 = new Vector3f(x * zr0, y * zr0, z0+offset);
lng = 2 * (float)Math.PI * (float)(jjj) / longs;
x = (float)Math.cos(lng);
y = (float)Math.sin(lng);
Vector3f v2 = new Vector3f(x * zr1, y * zr1, z1+offset);
Vector3f v3 = new Vector3f(x * zr0, y * zr0, z0+offset);
tmpVertices.add(v1);
tmpVertices.add(v2);
tmpVertices.add(v3);
tmpVertices.add(v1);
tmpVertices.add(v3);
tmpVertices.add(v4);
}
}
// Cylinder
for(int jjj=0; jjj<longs; ++jjj) {
float lng = 2.0f * (float)Math.PI * (float)(jjj - 1) / longs;
float z = size*0.5f;
float x = (float)Math.cos(lng)*radius;
float y = (float)Math.sin(lng)*radius;
Vector3f v2 = new Vector3f(x, y, z);
Vector3f v2b = new Vector3f(x, y, -z);
lng = 2.0f * (float)Math.PI * (float)(jjj) / longs;
x = (float)Math.cos(lng)*radius;
y = (float)Math.sin(lng)*radius;
Vector3f v3 = new Vector3f(x, y, z);
Vector3f v3b = new Vector3f(x, y, -z);
tmpVertices.add(v2);
tmpVertices.add(v3);
tmpVertices.add(v3b);
tmpVertices.add(v2);
tmpVertices.add(v3b);
tmpVertices.add(v2b);
}
// center to border (BUTTOM)
offset = -size*0.5f;
for(int iii=0; iii<=lats/2; ++iii) {
float lat0 = (float)Math.PI * (-0.5f + (float)(iii - 1) / lats);
float z0 = radius*(float)Math.sin(lat0);
float zr0 = radius*(float)Math.cos(lat0);
float lat1 = (float)Math.PI * (-0.5f + (float)(iii) / lats);
float z1 = radius*(float)Math.sin(lat1);
float zr1 = radius*(float)Math.cos(lat1);
for(int jjj=0; jjj<longs; ++jjj) {
float lng = 2.0f * (float)Math.PI * (float)(jjj - 1) / longs;
float x = (float)Math.cos(lng);
float y = (float)Math.sin(lng);
Vector3f v1 = new Vector3f(x * zr1, y * zr1, z1+offset);
Vector3f v4 = new Vector3f(x * zr0, y * zr0, z0+offset);
lng = 2 * (float)Math.PI * (float)(jjj) / longs;
x = (float)Math.cos(lng);
y = (float)Math.sin(lng);
Vector3f v2 = new Vector3f(x * zr1, y * zr1, z1+offset);
Vector3f v3 = new Vector3f(x * zr0, y * zr0, z0+offset);
tmpVertices.add(v1);
tmpVertices.add(v2);
tmpVertices.add(v3);
tmpVertices.add(v1);
tmpVertices.add(v3);
tmpVertices.add(v4);
}
}
draw(tmpVertices, tmpColor, transformationMatrix, true, true);
}
public void drawCone(float radius,
float size,
int lats,
int longs,
Matrix4f transformationMatrix,
Color tmpColor) {
List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
// center to border (TOP)
for(int jjj=0; jjj<longs; ++jjj) {
float lng = 2.0f * (float)Math.PI * (float)(jjj - 1) / longs;
Vector3f v1 = new Vector3f(0.0f, 0.0f, -size/2);
float x = (float)Math.cos(lng)*radius;
float y = (float)Math.sin(lng)*radius;
Vector3f v2 = new Vector3f(x, y, size/2);
lng = 2.0f * (float)Math.PI * (float)(jjj) / longs;
x = (float)Math.cos(lng)*radius;
y = (float)Math.sin(lng)*radius;
Vector3f v3 = new Vector3f(x, y, size/2);
tmpVertices.add(v1);
tmpVertices.add(v3);
tmpVertices.add(v2);
}
// center to border (BUTTOM)
for(int jjj=0; jjj<longs; ++jjj) {
float lng = 2.0f * (float)Math.PI * (float)(jjj - 1) / longs;
Vector3f v1 = new Vector3f(0.0f, 0.0f, size/2);
float x = (float)Math.cos(lng)*radius;
float y = (float)Math.sin(lng)*radius;
Vector3f v2 = new Vector3f(x, y, size/2);
lng = 2.0f * (float)Math.PI * (float)(jjj) / longs;
x = (float)Math.cos(lng)*radius;
y = (float)Math.sin(lng)*radius;
Vector3f v3 = new Vector3f(x, y, size/2);
tmpVertices.add(v1);
tmpVertices.add(v2);
tmpVertices.add(v3);
}
draw(tmpVertices, tmpColor, transformationMatrix, true, true);
}
public void drawTriangles(List<Vector3f> vertex,
List<Integer> indice,
Matrix4f transformationMatrix,
Color tmpColor,
Vector3f offset) {// = new Vector3f(0,0,0.1f)
List<Vector3f> tmpVertices = new ArrayList<Vector3f>();
for (int iii=0; iii<indice.size()/3; ++iii) {
tmpVertices.add(vertex.get(indice.get(iii*3 + 0)).addNew(offset));
tmpVertices.add(vertex.get(indice.get(iii*3 + 1)).addNew(offset));
tmpVertices.add(vertex.get(indice.get(iii*3 + 2)).addNew(offset));
//Log.info(" indices " << indice[iii*3 + 0] << " " << indice[iii*3 + 1] << " " << indice[iii*3 + 2]); //Log.info(" indices " << indice[iii*3 + 0] << " " << indice[iii*3 + 1] << " " << indice[iii*3 + 2]);
//Log.info(" triangle " << vertex[indice[iii*3 + 0]] << " " << vertex[indice[iii*3 + 1]] << " " << vertex[indice[iii*3 + 2]]); //Log.info(" triangle " << vertex[indice[iii*3 + 0]] << " " << vertex[indice[iii*3 + 1]] << " " << vertex[indice[iii*3 + 2]]);
} }
@ -539,17 +512,10 @@ public class ResourceColored3DObject extends Resource {
draw(tmpVertices, tmpColor, transformationMatrix, true, true); draw(tmpVertices, tmpColor, transformationMatrix, true, true);
} }
@Override private FloatBuffer storeDataInFloatBuffer(final float[] data) {
public void cleanUp() { final FloatBuffer buffer = BufferUtils.createFloatBuffer(data.length);
// TODO Auto-generated method stub buffer.put(data);
buffer.flip();
} return buffer;
public static ResourceColored3DObject create() {
ResourceColored3DObject resource = new ResourceColored3DObject();
if (resource.resourceHasBeenCorectlyInit() == false) {
Log.critical("resource Is not correctly init: ResourceColored3DObject");
}
getManager().localAdd(resource);
return resource;
} }
} }