diff options
| author | phil <[email protected]> | 2016-10-27 21:11:06 +1300 |
|---|---|---|
| committer | phil <[email protected]> | 2016-10-27 21:11:06 +1300 |
| commit | 63484c813664e213937ac44cdf66729071d3f9d0 (patch) | |
| tree | a567c6fa96bbb514cb39f30b8f8d28ffdd5dcc76 /src/main/java/org | |
| parent | 289227592c52d766d5413b2a6d9cb016ed5fbd0b (diff) | |
Index interleaved geom type tested correctly
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java index dfc8cc9..d62ca59 100644 --- a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java +++ b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java @@ -1428,7 +1428,6 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline // // IndexedGeometryArrayRetained methods // - // by-copy or interleaved, by reference, Java arrays @Override @@ -1770,8 +1769,8 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline } ////////////////////////////////////////////// - if (geo_type == GeometryRetained.GEO_TYPE_TRI_STRIP_SET || geo_type == GeometryRetained.GEO_TYPE_TRI_FAN_SET - || geo_type == GeometryRetained.GEO_TYPE_LINE_STRIP_SET) + if (geo_type == GeometryRetained.GEO_TYPE_INDEXED_TRI_STRIP_SET || geo_type == GeometryRetained.GEO_TYPE_INDEXED_TRI_FAN_SET + || geo_type == GeometryRetained.GEO_TYPE_INDEXED_LINE_STRIP_SET) { int primType = 0; @@ -1779,17 +1778,17 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline // each pair, what I want is a line between each set of 3 (that are not jumpers) if (ctx.polygonMode == PolygonAttributes.POLYGON_LINE) - geo_type = GeometryRetained.GEO_TYPE_LINE_STRIP_SET; + geo_type = GeometryRetained.GEO_TYPE_INDEXED_LINE_STRIP_SET; switch (geo_type) { - case GeometryRetained.GEO_TYPE_TRI_STRIP_SET: + case GeometryRetained.GEO_TYPE_INDEXED_TRI_STRIP_SET: primType = GL2ES2.GL_TRIANGLE_STRIP; break; - case GeometryRetained.GEO_TYPE_TRI_FAN_SET: + case GeometryRetained.GEO_TYPE_INDEXED_TRI_FAN_SET: primType = GL2ES2.GL_TRIANGLE_FAN; break; - case GeometryRetained.GEO_TYPE_LINE_STRIP_SET: + case GeometryRetained.GEO_TYPE_INDEXED_LINE_STRIP_SET: primType = GL2ES2.GL_LINE_LOOP; break; } |