test.pl replace GL_QUADS with GL_TRIANGLES

Author: mohawk2

test.pl

@@ -129,44 +129,62 @@
   -1.0, -1.3, -1.0,
   1.0, -1.3, -1.0,
   1.0, -1.3,  1.0,
+  1.0, -1.3,  1.0,
   -1.0, -1.3,  1.0,
+  -1.0, -1.3, -1.0,
 
   -1.0,  1.3, -1.0,
   -1.0,  1.3,  1.0,
   1.0,  1.3,  1.0,
+  1.0,  1.3,  1.0,
   1.0,  1.3, -1.0,
+  -1.0,  1.3, -1.0,
 
   -1.0, -1.0, -1.3,
   -1.0,  1.0, -1.3,
   1.0,  1.0, -1.3,
+  1.0,  1.0, -1.3,
   1.0, -1.0, -1.3,
+  -1.0, -1.0, -1.3,
 
   1.3, -1.0, -1.0,
   1.3,  1.0, -1.0,
   1.3,  1.0,  1.0,
+  1.3,  1.0,  1.0,
   1.3, -1.0,  1.0,
+  1.3, -1.0, -1.0,
 
   -1.0, -1.0,  1.3,
   1.0, -1.0,  1.3,
   1.0,  1.0,  1.3,
+  1.0,  1.0,  1.3,
   -1.0,  1.0,  1.3,
+  -1.0, -1.0,  1.3,
 
   -1.3, -1.0, -1.0,
   -1.3, -1.0,  1.0,
   -1.3,  1.0,  1.0,
-  -1.3,  1.0, -1.0
+  -1.3,  1.0,  1.0,
+  -1.3,  1.0, -1.0,
+  -1.3, -1.0, -1.0,
 );
 my $verts = OpenGL::Array->new_list(GL_FLOAT,@verts);
 
 # Could calc norms on the fly
 my @norms =
 (
+  0.0, -1.0, 0.0,
   0.0, -1.0, 0.0,
   0.0, 1.0, 0.0,
+  0.0, 1.0, 0.0,
+  0.0, 0.0,-1.0,
   0.0, 0.0,-1.0,
   1.0, 0.0, 0.0,
+  1.0, 0.0, 0.0,
   0.0, 0.0, 1.0,
-  -1.0, 0.0, 0.0
+  0.0, 0.0, 1.0,
+  -1.0, 0.0, 0.0,
+  -1.0, 0.0, 0.0,
 );
 my $norms = OpenGL::Array->new_list(GL_FLOAT,@norms);
 
@@ -176,31 +194,43 @@
   0.9,0.2,0.2,.75,
   0.9,0.2,0.2,.75,
   0.9,0.2,0.2,.75,
+  0.9,0.2,0.2,.75,
+  0.9,0.2,0.2,.75,
 
   0.5,0.5,0.5,.5,
   0.5,0.5,0.5,.5,
   0.5,0.5,0.5,.5,
   0.5,0.5,0.5,.5,
+  0.5,0.5,0.5,.5,
+  0.5,0.5,0.5,.5,
 
   0.2,0.9,0.2,.5,
   0.2,0.9,0.2,.5,
   0.2,0.9,0.2,.5,
   0.2,0.9,0.2,.5,
+  0.2,0.9,0.2,.5,
+  0.2,0.9,0.2,.5,
 
   0.2,0.2,0.9,.25,
   0.2,0.2,0.9,.25,
   0.2,0.2,0.9,.25,
   0.2,0.2,0.9,.25,
+  0.2,0.2,0.9,.25,
+  0.2,0.2,0.9,.25,
 
   0.9, 0.2, 0.2, 0.5,
   0.2, 0.9, 0.2, 0.5,
   0.2, 0.2, 0.9, 0.5,
+  0.2, 0.2, 0.9, 0.5,
   0.1, 0.1, 0.1, 0.5,
+  0.9, 0.2, 0.2, 0.5,
 
   0.9,0.9,0.2,0.0,
   0.9,0.9,0.2,0.66,
   0.9,0.9,0.2,1.0,
-  0.9,0.9,0.2,0.33
+  0.9,0.9,0.2,1.0,
+  0.9,0.9,0.2,0.33,
+  0.9,0.9,0.2,0.0,
 );
 my $colors = OpenGL::Array->new_list(GL_FLOAT,@colors);
 
@@ -209,64 +239,79 @@
   0.9, 0.2, 0.2, 0.5,
   0.2, 0.9, 0.2, 0.5,
   0.2, 0.2, 0.9, 0.5,
-  0.1, 0.1, 0.1, 0.5
+  0.2, 0.2, 0.9, 0.5,
+  0.1, 0.1, 0.1, 0.5,
+  0.9, 0.2, 0.2, 0.5,
 );
-
 my $rainbow = OpenGL::Array->new_list(GL_FLOAT,@rainbow);
-my $rainbow_offset = 64;
+my $rainbow_offset = 96;
 my @rainbow_inc;
 
 my @texcoords =
 (
   0.800, 0.800,
   0.200, 0.800,
   0.200, 0.200,
+  0.200, 0.200,
   0.800, 0.200,
+  0.800, 0.800,
 
   0.005, 1.995,
   0.005, 0.005,
   1.995, 0.005,
+  1.995, 0.005,
   1.995, 1.995,
+  0.005, 1.995,
 
   0.995, 0.005,
   2.995, 2.995,
   0.005, 0.995,
+  0.005, 0.995,
   -1.995, -1.995,
+  0.995, 0.005,
 
   0.995, 0.005,
   0.995, 0.995,
   0.005, 0.995,
+  0.005, 0.995,
   0.005, 0.005,
+  0.995, 0.005,
 
   -0.5, -0.5,
   1.5, -0.5,
   1.5, 1.5,
+  1.5, 1.5,
   -0.5, 1.5,
+  -0.5, -0.5,
 
   0.005, 0.005,
   0.995, 0.005,
   0.995, 0.995,
-  0.005, 0.995
+  0.995, 0.995,
+  0.005, 0.995,
+  0.005, 0.005,
 );
 my $texcoords = OpenGL::Array->new_list(GL_FLOAT,@texcoords);
 
-my @indices = (0..23);
+my @indices = (0..35);
 my $indices = OpenGL::Array->new_list(GL_UNSIGNED_INT,@indices);
 
 my @xform =
 (
   1.0, 0.0, 0.0, 0.0,
   0.0, 1.0, 0.0, 0.0,
   0.0, 0.0, 1.0, 0.0,
-  0.0, 0.0, 0.0, 1.0
+  0.0, 0.0, 0.0, 1.0,
 );
 my $xform = OpenGL::Array->new_list(GL_FLOAT,@xform);
 
 my @fpsbox_coords = (
     0.0, -2.0, 0.0,
     0.0, 12.0, 0.0,
   140.0, 12.0, 0.0,
+  140.0, 12.0, 0.0,
   140.0, -2.0, 0.0,
+    0.0, -2.0, 0.0,
 );
 
 # ------
@@ -314,11 +359,12 @@ sub ourPrintString
 sub ourInitVertexBuffers
 {
   # Set initial colors for rainbow face
-  for (my $i=0; $i<16; $i++)
-  {
-    $rainbow[$i] = rand(1.0);
-    $rainbow_inc[$i] = 0.01 - rand(0.02);
-  }
+  @rainbow = map [map rand(1.0), 0..3], 0..3;
+  @rainbow = @rainbow[0,1,2,2,3,0];
+  @rainbow = map @$_, @rainbow;
+  @rainbow_inc = map [map 0.01 - rand(0.02), 0..3], 0..3;
+  @rainbow_inc = @rainbow_inc[0,1,2,2,3,0];
+  @rainbow_inc = map @$_, @rainbow_inc;
 
   # Initialize VBOs if supported
   if ($hasVBO)
@@ -860,9 +906,9 @@ sub cbRenderScene
   glEnableClientState(GL_COLOR_ARRAY);
   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
-  for (my $i=0; $i<scalar(@indices); $i+=4)
+  for (my $i=0; $i<scalar(@indices); $i+=3)
   {
-    glDrawArrays(GL_QUADS, $i, 4);
+    glDrawArrays(GL_TRIANGLES, $i, 3);
   }
 
   glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -928,7 +974,7 @@ sub cbRenderScene
   # Make sure we can read the FPS section by first placing a
   # dark, mostly opaque backdrop rectangle.
   glColor4f(0.2,0.2,0.2,0.75);
-  glBegin(GL_QUADS);
+  glBegin(GL_TRIANGLES);
   for (my $i=0; $i<scalar(@fpsbox_coords); $i+=3) {
     glVertex3f(@fpsbox_coords[$i..$i+2]);
   }