Changeset 442 for branches/thune/thread_safe/gl/draw_list.c

Timestamp:

08/05/07 00:26:17 (16 months ago)

Author:

krobillard

Message:

Added ++/-- to replace word inc/dec.
Renamed UR_FLAG_EOL as UR_FLAG_SOL.
GL - Added 'sphere draw opcode and 'curve-value call.

Files:

• branches/thune/thread_safe/gl/draw_list.c (modified) (6 diffs)

branches/thune/thread_safe/gl/draw_list.c

@@ -41 +41 @@
     EN_LIGHTING     = 0x0010,
     EN_LINE_SMOOTH  = 0x0020,
-    EN_POINT_SMOOTH = 0x0040,
-    EN_POINT_SPRITE = 0x0080,
-    EN_SCISSOR_TEST = 0x0100,
-    EN_STENCIL_TEST = 0x0200,
-    EN_TEXTURE_2D   = 0x0400,
-    EN_VERTEX_PROGRAM_POINT_SIZE = 0x0800
+    EN_MULTISAMPLE  = 0x0040,
+    EN_POINT_SMOOTH = 0x0080,
+    EN_POINT_SPRITE = 0x0100,
+    EN_SCISSOR_TEST = 0x0200,
+    EN_STENCIL_TEST = 0x0400,
+    EN_TEXTURE_2D   = 0x0800,
+    EN_VERTEX_PROGRAM_POINT_SIZE = 0x1000
 };
 
@@ -735 +736 @@
 
 /*
+   This should only be used from a compiled draw list since a GLUquadricObj
+   is created and deleted.
+*/
+static UCell* dop_sphere( UThread* ut, UCell* pc )
+{
+    GLdouble radius; 
+    GLint slices, stacks;
+
+    ++pc;
+    if( ur_is(pc, UT_DECIMAL) )
+        radius = ur_decimal(pc);
+    else if( ur_is(pc, UT_INT) )
+        radius = (GLdouble) ur_int(pc);
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "sphere expected number! for radius" );
+        return 0;
+    }
+
+    ++pc;
+    if( ur_is(pc, UT_COORD) )
+    {
+        slices = pc->coord.elem[0];
+        stacks = pc->coord.elem[1];
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE,
+                     "sphere expected coord! for slices,stacks" );
+        return 0;
+    }
+
+    GLUquadricObj* obj = gluNewQuadric();
+    if( obj )
+    {
+        gluQuadricTexture( obj, GL_TRUE );
+        gluQuadricNormals( obj, GLU_SMOOTH );
+        gluQuadricDrawStyle( obj, GLU_FILL );
+        gluQuadricOrientation( obj, GLU_OUTSIDE );
+
+        gluSphere( obj, radius, slices, stacks );
+
+        gluDeleteQuadric( obj );
+    }
+
+    return pc;
+}
+
+
+/*
   attrib/1 shader/my-attrib float-count #[...]
 
@@ -927 +978 @@
     PRINT_STATE( "GL_LIGHTING/l",     EN_LIGHTING,     GL_LIGHTING )
     PRINT_STATE( "GL_LINE_SMOOTH/n",  EN_LINE_SMOOTH,  GL_LINE_SMOOTH )
+    PRINT_STATE( "GL_MULTISAMPLE/m",  EN_MULTISAMPLE,  GL_MULTISAMPLE )
     PRINT_STATE( "GL_POINT_SMOOTH/o", EN_POINT_SMOOTH, GL_POINT_SMOOTH )
     PRINT_STATE( "GL_POINT_SPRITE/p", EN_POINT_SPRITE, GL_POINT_SPRITE )
@@ -970 +1022 @@
                 ENABLE( EN_LIGHTING, GL_LIGHTING )
                 break;
+            case 'm':
+                ENABLE( EN_MULTISAMPLE, GL_MULTISAMPLE )
+                break;
             case 'n':
                 ENABLE( EN_LINE_SMOOTH, GL_LINE_SMOOTH )
@@ -1023 +1078 @@
             case 'l':
                 DISABLE( EN_LIGHTING, GL_LIGHTING )
+                break;
+            case 'm':
+                DISABLE( EN_MULTISAMPLE, GL_MULTISAMPLE )
                 break;
             case 'n':
@@ -1209 +1267 @@
                         break;
                 }
+                break;
+
+            case DOP_SPHERE:                 // sphere rad silces,stacks
+                pc = dop_sphere( ut, pc );
+                if( ! pc )
+                    return 0;
                 break;