Commits

Michael Ludwig committed 2b564b5

Remove quad strips as a polygon type

Comments (0)

Files changed (4)

ferox-renderer/ferox-renderer-api/src/main/java/com/ferox/renderer/Renderer.java

             public int getPolygonSize() {
                 return 3;
             }
-        },
-        /**
-         * The first four vertices form a quad, and then every two vertices form
-         * a quad with the previous two vertices.
-         */
-        QUAD_STRIP {
-            @Override
-            public int getPolygonCount(int count) {
-                return Math.max(0, count - 2) >> 1;
-            }
-
-            @Override
-            public int getPolygonSize() {
-                return 4;
-            }
         };
 
         /**

ferox-renderer/ferox-renderer-jogl/src/main/java/com/ferox/renderer/impl/jogl/Utils.java

             return GL.GL_LINES;
         case POINTS:
             return GL.GL_POINTS;
-        case QUAD_STRIP:
-            return GL2.GL_QUAD_STRIP;
         case QUADS:
             return GL2.GL_QUADS;
         case TRIANGLE_STRIP:

ferox-renderer/ferox-renderer-lwjgl/src/main/java/com/ferox/renderer/impl/lwjgl/Utils.java

             return GL11.GL_LINES;
         case POINTS:
             return GL11.GL_POINTS;
-        case QUAD_STRIP:
-            return GL11.GL_QUAD_STRIP;
         case QUADS:
             return GL11.GL_QUADS;
         case TRIANGLE_STRIP:

ferox-scene/src/main/java/com/ferox/scene/controller/ffp/IndexBufferState.java

 
             if (indices == null) {
                 switch (polyType) {
-                case QUAD_STRIP:
-                    TopologyUtil.inflateQuadStripArray(indexOffset, indexCount,
-                                                       sortedIndicesShared, 0);
-                    break;
                 case TRIANGLE_STRIP:
                     TopologyUtil.inflateTriangleStripArray(indexOffset, indexCount,
                                                            sortedIndicesShared, 0);
                 }
             } else {
                 switch (polyType) {
-                case QUAD_STRIP:
-                    TopologyUtil.inflateQuadStrip(indices, indexOffset, indexCount,
-                                                  sortedIndicesShared, 0);
-                    break;
                 case TRIANGLE_STRIP:
                     TopologyUtil.inflateTriangleStrip(indices, indexOffset, indexCount,
                                                       sortedIndicesShared, 0);