Changeset 296 for trunk/thune/gl

Timestamp:

10/06/06 21:47:31 (2 years ago)

Author:

krobillard

Message:

Thune GL - Lighting works.

Location:

trunk/thune/gl

Files:

• draw_list.c (modified) (6 diffs)
• draw_ops.h (modified) (1 diff)
• gx.c (modified) (1 diff)
• gx.t (modified) (2 diffs)
• test.t (modified) (2 diffs)

trunk/thune/gl/draw_list.c

@@ -21 +21 @@
 #include <assert.h>
 #include "gx.h"
+#include "gx_atoms.h"
 #include "draw_ops.h"
 #include "gllist.h"
@@ -95 +96 @@
             break;
 
+        case GRS_MODEL:
+            glDepthMask( GL_TRUE );
+            glShadeModel( GL_SMOOTH );
+
+            //glColorMaterial( GL_FRONT, GL_DIFFUSE );
+            //glEnable( GL_COLOR_MATERIAL );
+
+            glEnable( GL_DEPTH_TEST );
+            glEnable( GL_LIGHTING );
+            glEnable( GL_CULL_FACE );
+
+            glDisable( GL_BLEND );
+
+            gr_disableTexture();
+            break;
+
         case GRS_TEXT:
             glDepthMask( GL_FALSE );
@@ -363 +380 @@
 
 
+static void _lightv3( GLenum light, GLenum pname, UCell* cell, GLfloat w )
+{
+    GLfloat pos[4];
+
+    pos[0] = cell->vec3.xyz[0];
+    pos[1] = cell->vec3.xyz[1];
+    pos[2] = cell->vec3.xyz[2];
+    pos[3] = w;
+
+    printf( "KR %d %d %g\n", light, pname, w );
+    glLightfv( light, pname, pos ); 
+}
+
+
+static void _lightEn( GLenum light, UCell* cell )
+{
+    if( ur_logic(cell) )
+        glEnable( light );
+    else
+        glDisable( light );
+}
+
+
+static void dop_light( UThread* ur_thread, UCell* val, int light )
+{
+    if( ur_is(val, UT_LOGIC) )
+    {
+        _lightEn( light, val );
+    }
+    else if( ur_is(val, UT_VEC3) )
+    {
+        _lightv3( light, GL_POSITION, val, 0.0f );
+    }
+    else if( ur_is(val, UT_BLOCK) )
+    {
+        UBlock* blk;
+        UCell* it;
+        UCell* end;
+        GLenum name = GL_POSITION;
+        GLfloat w = 0.0f;
+
+        blk = ur_block(val);
+        UR_ITER_BLOCK( it, end, blk, val );
+        while( it != end )
+        {
+            if( ur_isAWord(it) )
+            {
+                switch( ur_atom(it) )
+                {
+                    case UR_ATOM_AMBIENT: name = GL_AMBIENT;  w = 1.0f; break;
+                    case UR_ATOM_DIFFUSE: name = GL_DIFFUSE;  w = 1.0f; break;
+                    case UR_ATOM_POS:     name = GL_POSITION; w = 0.0f; break;
+
+                    default:
+                        val = ur_wordCell( ur_thread, it );
+                        if( val )
+                        {
+                            if( ur_is(val, UT_LOGIC) )
+                                _lightEn( light, val );
+                            else if( ur_is(val, UT_VEC3) )
+                                _lightv3( light, name, val, w );
+                        }
+                        break;
+                }
+            }
+            else if( ur_is(it, UT_VEC3) )
+            {
+                _lightv3( light, name, it, w );
+            }
+            else if( ur_is(it, UT_LOGIC) )
+            {
+                _lightEn( light, it );
+            }
+            ++it;
+        }
+    }
+}
+
 
 /*
@@ -470 +565 @@
                 break;
 
-            case DOP_CAMERA:
+            case DOP_MODEL:
+                gr_setState( GRS_MODEL );
+                break;
+
+            case DOP_CAMERA:    // context!
             {
                 //int ref = ur_selIsAtom(pc) ? ur_sel(pc) : 0;
@@ -478 +577 @@
                     dop_camera( val );
             }
+                break;
+
+            case DOP_LIGHT:     // logic!   on/off
+                                // vec3!    position
+            {
+                int light = ur_selIsAtom(pc) ? 0 : ur_sel(pc);
+                ++pc;
+                VAL_WORD_OR_PC
+                dop_light( ur_thread, val, GL_LIGHT0 + light );
+            }
+                break;
+
+            case DOP_LIGHTING:  // logic!   on/off
+                ++pc;
+                if( ur_is(pc, UT_LOGIC) )
+                {
+                    if( ur_logic(val) )
+                        glEnable( GL_LIGHTING );
+                    else
+                        glDisable( GL_LIGHTING );
+                }
                 break;
 
@@ -499 +619 @@
                 {
                     glColor3fv( pc->vec3.xyz );
+                  //glMaterialfv( GL_FRONT_AND_BACK, GL_DIFFUSE, pc->vec3.xyz );
                 }
                 else if( ur_is(pc, UT_INT) )

trunk/thune/gl/draw_ops.h

@@ -5 +5 @@
 #define DOP_CALL            2
 #define DOP_SOLID           3
-#define DOP_COLOR           4
-#define DOP_COLORS          5
-#define DOP_VERTS           6
-#define DOP_NORMALS         7
-#define DOP_UVS             8
-#define DOP_POINTS          9
-#define DOP_LINES           10
-#define DOP_LINE_STRIP      11
-#define DOP_TRIS            12
-#define DOP_TRI_STRIP       13
-#define DOP_TRI_FAN         14
-#define DOP_QUADS           15
-#define DOP_QUAD_STRIP      16
-#define DOP_CAMERA          17
-#define DOP_UNIT_XFORM      18
-#define DOP_PUSH            19
-#define DOP_POP             20
-#define DOP_TRANSLATE       21
-#define DOP_ROTATE          22
-#define DOP_SCALE           23
-#define DOP_FONT            24
-#define DOP_TEXT            25
+#define DOP_MODEL           4
+#define DOP_COLOR           5
+#define DOP_COLORS          6
+#define DOP_VERTS           7
+#define DOP_NORMALS         8
+#define DOP_UVS             9
+#define DOP_POINTS          10
+#define DOP_LINES           11
+#define DOP_LINE_STRIP      12
+#define DOP_TRIS            13
+#define DOP_TRI_STRIP       14
+#define DOP_TRI_FAN         15
+#define DOP_QUADS           16
+#define DOP_QUAD_STRIP      17
+#define DOP_CAMERA          18
+#define DOP_LIGHT           19
+#define DOP_LIGHTING        20
+#define DOP_PUSH            21
+#define DOP_POP             22
+#define DOP_TRANSLATE       23
+#define DOP_ROTATE          24
+#define DOP_SCALE           25
+#define DOP_FONT            26
+#define DOP_TEXT            27

trunk/thune/gl/gx.c

@@ -1844 +1844 @@
     FIXED_ATOM( "mouse-wheel", 11, UR_ATOM_MOUSE_WHEEL );
 
+    FIXED_ATOM( "ambient",  7, UR_ATOM_AMBIENT );
+    FIXED_ATOM( "diffuse",  7, UR_ATOM_DIFFUSE );
+    FIXED_ATOM( "specular", 8, UR_ATOM_SPECULAR );
+    FIXED_ATOM( "pos",      3, UR_ATOM_POS );
+
 #if MAKE_ATOM_HEADER
     exit(0);

trunk/thune/gl/gx.t

@@ -95 +95 @@
     call
     solid
+    model
 
     color
@@ -112 +113 @@
 
     camera
-    unit-xform
+    light
+    lighting
+    ;unit-xform
     push
     pop

trunk/thune/gl/test.t

@@ -106 +106 @@
     ]
     func :turntable
+
+    0 0 turntable
 ] make :visual-cam
 
@@ -166 +168 @@
     draw-list [
         camera visual-cam
-        solid
+        light   [on 1.0,0.8,1.0]
+        light/1 [on -1.0,-0.8,0.0 diffuse 0.8,0.5,0.5]
+        model
         call d7-list
 
         camera ortho-cam
+        lighting off
         push
             scale zoom