xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

html: tessellate, only use triangle indices

Browse Source
This commit is contained in:
Hannes Janetzek
2013-07-04 07:02:09 +02:00
parent aea7cf2a5f
commit 90ef5c26e9
2 changed files with 113 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/utils/geom/Triangulator.java
View File

@@ -4,11 +4,9 @@ import org.oscim.backend.Log;
import org.oscim.renderer.sublayers.VertexItem;
import com.google.gwt.core.client.JavaScriptException;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArrayInteger;
import com.google.gwt.core.client.JsArrayNumber;
import com.google.gwt.core.client.JsArrayUtils;
import com.google.gwt.typedarrays.shared.Float32Array;
import com.google.gwt.typedarrays.shared.Int32Array;
public class Triangulator {
@@ -16,32 +14,36 @@ public class Triangulator {
public static synchronized int triangulate(float[] points, int ppos, int plen, short[] index,
int ipos, int rings, int vertexOffset, VertexItem outTris) {
JavaScriptObject o;
//JavaScriptObject o;
Int32Array io;
try{
o = tessellate(JsArrayUtils.readOnlyJsArray(points), ppos, plen,
io = tessellate(JsArrayUtils.readOnlyJsArray(points), ppos, plen,
JsArrayUtils.readOnlyJsArray(index), ipos, rings);
} catch(JavaScriptException e){
e.printStackTrace();
return 0;
}
Float32Array vo = getPoints(o);
Int32Array io = getIndices(o);
if (vo.length() != plen) {
// TODO handle different output points
Log.d("", "other points out" + plen + ":" + vo.length() + ", " + io.length());
//for (int i = 0; i < vo.length(); i += 2)
// Log.d("<", vo.get(i) + " " + vo.get(i + 1));
//for (int i = ppos; i < ppos + plen; i += 2)
// Log.d(">", points[i]+ " " + points[i + 1]);
//Float32Array vo = getPoints(o);
//Int32Array io = getIndices(o);
if (io == null){
Log.d("Triangulator", "building tessellation failed");
return 0;
}
// if (vo.length() != plen) {
// // TODO handle different output points
// Log.d("", "other points out" + plen + ":" + vo.length() + ", " + io.length());
//
// //for (int i = 0; i < vo.length(); i += 2)
// // Log.d("<", vo.get(i) + " " + vo.get(i + 1));
// //for (int i = ppos; i < ppos + plen; i += 2)
// // Log.d(">", points[i]+ " " + points[i + 1]);
//
// return 0;
// }
int numIndices = io.length();
for (int k = 0, cnt = 0; k < numIndices; k += cnt) {
@@ -66,19 +68,26 @@ public class Triangulator {
return numIndices;
}
static native JavaScriptObject tessellate(JsArrayNumber points, int pOffset, int pLength,
static native Int32Array tessellate(JsArrayNumber points, int pOffset, int pLength,
JsArrayInteger bounds, int bOffset, int bLength)/*-{
return $wnd.tessellate(points, pOffset, pOffset + pLength, bounds,
bOffset, bOffset + bLength);
}-*/;
static native Float32Array getPoints(JavaScriptObject result)/*-{
return result.vertices;
}-*/;
// static native JavaScriptObject tessellate(JsArrayNumber points, int pOffset, int pLength,
// JsArrayInteger bounds, int bOffset, int bLength)/*-{
//
// return $wnd.tessellate(points, pOffset, pOffset + pLength, bounds,
// bOffset, bOffset + bLength);
// }-*/;
static native Int32Array getIndices(JavaScriptObject result)/*-{
return result.triangles;
}-*/;
// static native Float32Array getPoints(JavaScriptObject result)/*-{
// return result.vertices;
// }-*/;
// static native Int32Array getIndices(JavaScriptObject result)/*-{
// return result.triangles;
// }-*/;
}