Changeset 1963 for trunkTweet

Timestamp:

Oct 1, 2012, 1:49:53 AM (7 years ago)

Author:

sam

Message:

gpu: add support for triangle strips and fans, and change the DrawElement
calls so that they take a number of vertices or indexes, not elements.

Location:

trunk

Files:

• src/easymesh/easymesh.cpp (modified) (1 diff)
• src/gpu/vertexbuffer.cpp (modified) (4 diffs)
• src/gpu/vertexbuffer.h (modified) (2 diffs)
• src/gradient.cpp (modified) (1 diff)
• src/scene.cpp (modified) (1 diff)
• tutorial/01_triangle.cpp (modified) (1 diff)
• tutorial/02_cube.cpp (modified) (1 diff)
• tutorial/03_noise.cpp (modified) (1 diff)
• tutorial/08_fbo.cpp (modified) (3 diffs)
• tutorial/11_fractal.cpp (modified) (1 diff)

trunk/src/easymesh/easymesh.cpp

@@ -126 +126 @@
     m_gpu.vdecl->DrawIndexedElements(MeshPrimitive::Triangles,
                                      0, 0, m_gpu.vertexcount,
-                                     0, m_gpu.indexcount / 3);
+                                     0, m_gpu.indexcount);
     m_gpu.ibo->Unbind();
     m_gpu.vdecl->Unbind();

trunk/src/gpu/vertexbuffer.cpp

@@ -136 +136 @@
     {
     case MeshPrimitive::Triangles:
-        if (FAILED(g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST, skip, count)))
+        if (FAILED(g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST,
+                                              skip, count)))
+            Abort();
+        break;
+    case MeshPrimitive::TriangleStrips:
+        if (FAILED(g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLESTRIP,
+                                              skip, count)))
+            Abort();
+        break;
+    case MeshPrimitive::TriangleFans:
+        if (FAILED(g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLEFAN,
+                                              skip, count)))
             Abort();
         break;
     case MeshPrimitive::Points:
-        if (FAILED(g_d3ddevice->DrawPrimitive(D3DPT_POINTLIST, skip, count)))
+        if (FAILED(g_d3ddevice->DrawPrimitive(D3DPT_POINTLIST,
+                                              skip, count)))
             Abort();
         break;
@@ -158 +170 @@
     {
     case MeshPrimitive::Triangles:
-        glDrawArrays(GL_TRIANGLES, skip * 3, count * 3);
+        glDrawArrays(GL_TRIANGLES, skip, count);
+        break;
+    case MeshPrimitive::TriangleStrips:
+        glDrawArrays(GL_TRIANGLE_STRIP, skip, count);
+        break;
+    case MeshPrimitive::TriangleFans:
+        glDrawArrays(GL_TRIANGLE_FAN, skip, count);
         break;
     case MeshPrimitive::Points:
@@ -186 +204 @@
     {
     case MeshPrimitive::Triangles:
-        if (FAILED(g_d3ddevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, vbase, vskip, vcount, skip, count)))
+        if (FAILED(g_d3ddevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST,
+                                           vbase, vskip, vcount, skip, count)))
+            Abort();
+        break;
+    case MeshPrimitive::TriangleStrips:
+        if (FAILED(g_d3ddevice->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,
+                                           vbase, vskip, vcount, skip, count)))
+            Abort();
+        break;
+    case MeshPrimitive::TriangleFans:
+        if (FAILED(g_d3ddevice->DrawIndexedPrimitive(D3DPT_TRIANGLEFAN,
+                                           vbase, vskip, vcount, skip, count)))
             Abort();
         break;
     case MeshPrimitive::Points:
-        if (FAILED(g_d3ddevice->DrawIndexedPrimitive(D3DPT_POINTLIST, vbase, vskip, vcount, skip, count)))
+        if (FAILED(g_d3ddevice->DrawIndexedPrimitive(D3DPT_POINTLIST,
+                                           vbase, vskip, vcount, skip, count)))
             Abort();
         break;
@@ -210 +240 @@
         /* FIXME: ignores most of the arguments! */
         (void)vbase; (void)vskip; (void)vcount; (void)skip;
-        glDrawElements(GL_TRIANGLES, count * 3, GL_UNSIGNED_SHORT, 0);
+        glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, 0);
+        break;
+    case MeshPrimitive::TriangleStrips:
+        /* FIXME: ignores most of the arguments! */
+        (void)vbase; (void)vskip; (void)vcount; (void)skip;
+        glDrawElements(GL_TRIANGLE_STRIP, count, GL_UNSIGNED_SHORT, 0);
+        break;
+    case MeshPrimitive::TriangleFans:
+        /* FIXME: ignores most of the arguments! */
+        (void)vbase; (void)vskip; (void)vcount; (void)skip;
+        glDrawElements(GL_TRIANGLE_FAN, count, GL_UNSIGNED_SHORT, 0);
         break;
     case MeshPrimitive::Points:

trunk/src/gpu/vertexbuffer.h

@@ -73 +73 @@
     {
         Triangles,
+        TriangleStrips,
+        TriangleFans,
         Points,
     }
@@ -185 +187 @@
 
     void Bind();
+
+    /* Draw elements. See MeshPrimitive for a list of all available
+     * types. Both skip and count are numbers of vertices, not primitives. */
     void DrawElements(MeshPrimitive type, int skip, int count);
+
+    /* Draw elements. See MeshPrimitive for a list of all available
+     * types. Both skip and count are numbers of indices, not primitives. */
     void DrawIndexedElements(MeshPrimitive type, int vbase, int vskip,
                              int vcount, int skip, int count);
+
     void Unbind();
     void SetStream(VertexBuffer *vb, ShaderAttrib attr1,

trunk/src/gradient.cpp

@@ -118 +118 @@
 
     /* Draw arrays */
-    data->m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 2);
+    data->m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 6);
 }
 

trunk/src/scene.cpp

@@ -256 +256 @@
 
         /* Draw arrays */
-        data->m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, (n - i) * 2);
+        data->m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, (n - i) * 6);
         data->m_vdecl->Unbind();
         data->tiles[i].tileset->Unbind();

trunk/tutorial/01_triangle.cpp

@@ -60 +60 @@
         m_vdecl->SetStream(m_vbo, m_coord);
         m_vdecl->Bind();
-        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 1);
+        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 3);
         m_vdecl->Unbind();
     }

trunk/tutorial/02_cube.cpp

@@ -113 +113 @@
         m_ibo->Bind();
         m_vdecl->DrawIndexedElements(MeshPrimitive::Triangles, 0, 0,
-                                     m_mesh.Count(), 0, m_indices.Count());
+                                     m_mesh.Count(), 0, m_indices.Count() * 3);
         m_ibo->Unbind();
         m_vdecl->Unbind();

trunk/tutorial/03_noise.cpp

@@ -69 +69 @@
         m_vdecl->SetStream(m_vbo, m_coord);
         m_vdecl->Bind();
-        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 2);
+        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 6);
         m_vdecl->Unbind();
     }

trunk/tutorial/08_fbo.cpp

@@ -100 +100 @@
         m_vdecl->SetStream(m_vbo, m_coord);
         m_vdecl->Bind();
-        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 2);
+        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 6);
         m_vdecl->Unbind();
 #endif
@@ -109 +109 @@
         m_vdecl->SetStream(m_vbo, m_coord);
         m_vdecl->Bind();
-        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 2);
+        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 6);
         m_vdecl->Unbind();
         m_shader->Unbind();
@@ -119 +119 @@
         m_vdecl->SetStream(m_vbo, m_coord);
         m_vdecl->Bind();
-        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 2);
+        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 6);
         m_vdecl->Unbind();
         m_shader->Unbind();

trunk/tutorial/11_fractal.cpp

@@ -579 +579 @@
 #else
 #endif
-        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 2);
+        m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, 6);
         m_vdecl->Unbind();
     }