Changeset 295 for trunk/thune/gl

Timestamp:

10/06/06 19:34:27 (2 years ago)

Author:

krobillard

Message:

Thune GL -

Added 'look-at.
mouse-move event now sends deltas.
Test now shows object with turntable camera.

Location:

trunk/thune/gl

Files:

• draw_list.c (modified) (5 diffs)
• gx.c (modified) (8 diffs)
• gx.h (modified) (2 diffs)
• gx.t (modified) (1 diff)
• test.t (modified) (7 diffs)

trunk/thune/gl/draw_list.c

@@ -23 +23 @@
 #include "draw_ops.h"
 #include "gllist.h"
+#include "math3d.h"
 
 #include <ft2build.h>
@@ -301 +302 @@
     UCell* val;
     UBlock* blk = ur_blockPtr( ctx->ctx.valBlk );
-
-    val = blk->ptr.cells + CAM_CTX_VIEWPORT;
+    UCell* ctxCells = blk->ptr.cells;
+
+    val = ctxCells + CAM_CTX_VIEWPORT;
     if( ur_is(val, UT_COORD) && (val->coord.len > 3) )
     {
@@ -320 +322 @@
         //       left, right, bottom, top, near, far
 
-        fov = number_d( blk->ptr.cells + CAM_CTX_FOV );
+        fov = number_d( ctxCells + CAM_CTX_FOV );
         if( fov > 0.0 )
         {
             gluPerspective( fov, aspect,
-                    number_d( blk->ptr.cells + CAM_CTX_NEAR ),
-                    number_d( blk->ptr.cells + CAM_CTX_FAR ) );
+                    number_d( ctxCells + CAM_CTX_NEAR ),
+                    number_d( ctxCells + CAM_CTX_FAR ) );
         }
         else
@@ -332 +334 @@
             h *= 0.5;
             glOrtho( -w, w, -h, h,
-                     number_d( blk->ptr.cells + CAM_CTX_NEAR ),
-                     number_d( blk->ptr.cells + CAM_CTX_FAR ) );
+                     number_d( ctxCells + CAM_CTX_NEAR ),
+                     number_d( ctxCells + CAM_CTX_FAR ) );
         }
 
         glMatrixMode( GL_MODELVIEW );
 
-        val = blk->ptr.cells + CAM_CTX_ORIENT;
-        if( ur_is(val, UT_MATRIX) )
-        {
-            //GLfloat eye[16];
-            //ur_matrixInverse( eye, arr->ptr.floats );
-            //glLoadMatrixf( eye );
-            glLoadIdentity();
+        val = ctxCells + CAM_CTX_ORIENT;
+        if( ur_is(val, UT_ARRAY) && (ur_arrayDT(val) == UT_DECIMAL) )
+        {
+            GLfloat eye[16];
+            UBinary* arr = ur_bin(val);
+            if( arr->used == 16 )
+            {
+                ur_matrixInverse( eye, arr->ptr.f );
+                glLoadMatrixf( eye );
+            }
+            else
+            {
+                glLoadIdentity();
+            }
         }
         else
@@ -462 +471 @@
 
             case DOP_CAMERA:
+            {
+                //int ref = ur_selIsAtom(pc) ? ur_sel(pc) : 0;
                 ++pc;
                 VAL_WORD_OR_PC
                 if( ur_is(val, UT_CONTEXT) )
                     dop_camera( val );
+            }
                 break;
 

trunk/thune/gl/gx.c

@@ -31 +31 @@
 #include "audio.h"
 #include "gllist.h"
-/*
 #include "math3d.h"
-#include <time.h>
-*/
+//#include <time.h>
 
 #ifdef __APPLE__
@@ -48 +46 @@
 #define colorU8ToF(n)    (((GLfloat) n) / 255.0f)
 
+#define MOUSE_UNSET     -9999
+
 
 #if 0
@@ -53 +53 @@
 
 #define RESTYPE    argc
-
-#define MOUSE_UNSET     -9999
 
 
@@ -220 +218 @@
             ur_initType(val, UT_LOGIC);
             ur_logic(val) = 1;
-/*
-            gEnv.prev_mouseX = MOUSE_UNSET;
-*/
+
+            env->prevMouseX = MOUSE_UNSET;
             break;
 
@@ -282 +279 @@
 
         case GLV_EVENT_MOTION:
-            val = _appendEvent( env->eventBlk, UR_ATOM_MOUSE_MOVE );
-            ++val;
-            ur_initType(val, UT_COORD);
-            val->coord.len     = 2;
-            val->coord.elem[0] = event->x;
-            val->coord.elem[1] = view->height - event->y - 1;
-/*
-        {
-            //printf( "KR mouse-move %d %d\n", event->x, event->y );
-
-            iv[ INPUT_MX ].integer = event->x;
-            iv[ INPUT_MY ].integer = gView->height - event->y - 1;
-
-            if( gEnv.prev_mouseX == MOUSE_UNSET )
+        {
+            int dx, dy;
+
+            if( env->prevMouseX == MOUSE_UNSET )
             {
-                printf( "KR mouse reset\n" );
-                iv[ INPUT_DX ].integer = 0;
-                iv[ INPUT_DY ].integer = 0;
+                printf( "KR mouse-move reset\n" );
+                dx = dy = 0;
             }
             else
             {
-                iv[ INPUT_DX ].integer = event->x - gEnv.prev_mouseX;
-                iv[ INPUT_DY ].integer = gEnv.prev_mouseY - event->y;
+                dx = event->x - env->prevMouseX;
+                dy = env->prevMouseY - event->y;
             }
-
-            orEvalBlock( orBLOCKS + blkV->index, blkV->series.it );
-            gxHandleError();
-
-            gEnv.prev_mouseX = event->x;
-            gEnv.prev_mouseY = event->y;
-        }
-*/
+            env->prevMouseX = event->x;
+            env->prevMouseY = event->y;
+
+            val = _appendEvent( env->eventBlk, UR_ATOM_MOUSE_MOVE );
+            ++val;
+
+            // coord elements: x, y, dx, dy
+
+            ur_initType(val, UT_COORD);
+            val->coord.len     = 5;
+            val->coord.elem[0] = event->x;
+            val->coord.elem[1] = view->height - event->y - 1;
+            val->coord.elem[2] = dx;
+            val->coord.elem[3] = dy;
+            val->coord.elem[4] = event->state;
+        }
             break;
 
@@ -1064 +1058 @@
     }
     UR_S_DROP;
+}
+
+
+// (matrix vec3 -- )
+UR_CALL( uc_look_at )
+{
+    UCell* prev;
+    UBinary* bin;
+    float* right;
+    float* up;
+    float* zv;
+
+    prev = ur_s_prev(tos);
+
+    if( ur_is(prev, UT_ARRAY) && ur_is(tos, UT_VEC3) )
+    {
+        bin = ur_bin( prev );
+
+        right = bin->ptr.f;
+        up    = bin->ptr.f + 4;
+        zv    = bin->ptr.f + 8;
+
+        zv[0] = zv[4] - tos->vec3.xyz[0];
+        zv[1] = zv[5] - tos->vec3.xyz[1];
+        zv[2] = zv[6] - tos->vec3.xyz[2];
+        ur_normalize( zv );
+
+        up[0] = 0.0;
+        up[1] = 1.0;
+        up[2] = 0.0;
+
+        ur_cross( up, zv, right );
+        ur_normalize( right );
+
+        // Recompute up to make perpendicular to right & zv.
+        ur_cross( zv, right, up );
+        ur_normalize( up );
+
+        UR_S_DROPN( 2 );
+        return;
+    }
+
+    ur_throwErr( UR_ERR_DATATYPE, "look-at expected array! vec3!" );
 }
 
@@ -1770 +1807 @@
     { uc_load_png,       "load-png" },
     { uc_load_wav,       "load-wav" },
-    { uc_display,        "display" }
+    { uc_display,        "display" },
+    { uc_look_at,        "look-at" }
 };
 
@@ -1819 +1857 @@
 
     gxEnv.view = 0;
+    gxEnv.prevMouseX = MOUSE_UNSET;
+    gxEnv.prevMouseY = MOUSE_UNSET;
 
     _createFixedAtoms( env );

trunk/thune/gl/gx.h

@@ -133 +133 @@
     double view_aspect;
 
+    int prevMouseX;
+    int prevMouseY;
+
     UIndex  eventBlkHold;
     UBlock* eventBlk;
 
 #if 0
-    UAtom atom_joystick;
-    UAtom atom_model;
-    UAtom atom_solid;
-
     UContext input_ctx;
     UCell*  input_values;
@@ -146 +145 @@
     UIndex  widgetCtxN;
     UIndex  drawListDialectBlkN;
-
-    int prev_mouseX;
-    int prev_mouseY;
 
     int running;

trunk/thune/gl/gx.t

@@ -15 +15 @@
 
 [
-    none :orientation
+    none :orient
     none :position
     none :viewport

trunk/thune/gl/test.t

@@ -41 +41 @@
 ]
 draw-list.compile :bg-list
+
+
+"data/d7.gx" load draw-list.compile :d7-list
 
 
@@ -73 +76 @@
 
 
+camera [
+    60.0  :fov
+     1.0  :near
+   9000.0 :far
+   20,20,200,200 :viewport
+   #[1.0  0    0    0
+     0    1.0  0    0
+     0    0    1.0  0
+     0    0   15.0  1.0] :orient
+
+    0.0  :azimuth
+    0.0  :elev
+    15.0 :dist
+    0.0,0.0,0.0 :focal-pnt
+
+    [dx dy /*| ced*/]
+    [
+        dx  0.5 mul to-rad azimuth add :azimuth
+        dy -0.5 mul to-rad elev add  -1.53938 1.53938 limit :elev
+
+        ;["az-el" azimuth to-deg elev to-deg] print 
+
+        elev cos dist mul dup /*:ced*/
+        azimuth cos /*ced*/  mul focal-pnt/1 add :orient/13
+        elev    sin  dist    mul focal-pnt/2 add :orient/14
+        azimuth sin /*ced*/  mul focal-pnt/3 add :orient/15
+
+        orient focal-pnt look-at
+    ]
+    func :turntable
+] make :visual-cam
+
 -1,-1 :mouse-pos
 -1,-1 :click-pos
+
+
+
+
+/*
+event-handler [
+    mouse-move [["move:" x y] print]
+    mouse-move left-button [visual-cam/orient dx dy]
+]
+*/
 
 [
@@ -90 +135 @@
         dup :area
         dup :ortho-cam/viewport
-        ;ortho-cam 'ortho update-projection
+
+        dup :.t
+        .t/3 2 div :.t/3
+        .t/4 2 div :.t/4
+        .t :visual-cam/viewport
     ]
 
@@ -96 +145 @@
         dup :mouse-pos
         ;"move: "   prin dup .
+
+        mouse-pos/5 zero? iff (
+            mouse-pos/3 mouse-pos/4 visual-cam/turntable
+        )
     ]
     mouse-down  [
@@ -112 +165 @@
 
     draw-list [
+        camera visual-cam
+        solid
+        call d7-list
+
         camera ortho-cam
         push
@@ -124 +181 @@
         text mouse-pos mouse-pos
 
-        ;font fontF
-        ;text 0,40 "Ceti Alpha III"
+        font fontF
+        text 0,40 "Ceti Alpha III"
 
         ;children ['draw get do] iter
@@ -228 +285 @@
 
 font! ["data/20thfont.ttf" 22] make :fontA
-;font! ["data/FederationBold_KR.ttf" 12 256,128] make :fontF
+font! ["data/FederationBold_KR.ttf" 12 256,128] make :fontF