Changeset 485

Timestamp:

10/14/07 05:15:23 (11 months ago)

Author:

krobillard

Message:

Math operators work on coord!.
GL - Added 'point-in.

Location:

trunk/thune

Files:

• gl/gx.c (modified) (2 diffs)
• math.c (modified) (3 diffs)

trunk/thune/gl/gx.c

@@ -1488 +1488 @@
 
 
+#define ur_setLogic(c,b)      ur_initType(c,UT_LOGIC); ur_logic(c) = b
+
+// (rect pnt -- logic)
+UR_CALL( uc_point_in )
+{
+    UCell* res = ur_s_prev(tos);
+    if( ur_is(tos, UT_COORD) && ur_is(res, UT_COORD) )
+    {
+        int inside;
+        int16_t* pnt  = tos->coord.elem;
+        int16_t* rect = res->coord.elem;
+        if( pnt[0] < rect[0] ||
+            pnt[1] < rect[1] ||
+            pnt[0] > (rect[0] + rect[2]) ||
+            pnt[1] > (rect[1] + rect[3]) )
+            inside = 0;
+        else
+            inside = 1;
+        ur_setLogic(res, inside);
+        UR_S_DROP;
+        return;
+    }
+    ur_throwErr( UR_ERR_DATATYPE, "point-in expected 2 coord! values" );
+}
+
+
 // Should 'gl-extensions, etc. be replaced with a single 'gl-info call that
 // returns a context holding version, extensions, max-textures, etc.?
@@ -1702 +1728 @@
     { uc_curve_value,    "curve-value" },
     { uc_animate,        "animate" },
+    { uc_point_in,       "point-in" },
     { uc_gl_extensions,  "gl-extensions" },
     { uc_gl_max_textures,"gl-max-textures" },

trunk/thune/math.c

@@ -37 +37 @@
 
 
-#define MJ_INT_INT      0
-#define MJ_INT_DEC      1
-#define MJ_DEC_INT      2
-#define MJ_DEC_DEC      3
-#define MJ_VEC3_DEC     4
-#define MJ_DEC_VEC3     5
-#define MJ_VEC3_VEC3    6
-#define MJ_INT_BIG      7
-#define MJ_BIG_INT      8
-#define MJ_DEC_BIG      9
-#define MJ_BIG_DEC      10
-#define MJ_BIG_BIG      11
-#define MJ_NAN          12
+enum MathJumpPair
+{
+    MJ_INT_INT,
+    MJ_INT_DEC,
+    MJ_DEC_INT,
+    MJ_DEC_DEC,
+    MJ_VEC3_DEC,
+    MJ_DEC_VEC3,
+    MJ_VEC3_VEC3,
+    MJ_COORD_INT,
+    MJ_COORD_COORD,
+    MJ_INT_BIG,
+    MJ_BIG_INT,
+    MJ_DEC_BIG,
+    MJ_BIG_DEC,
+    MJ_BIG_BIG,
+    MJ_NAN
+};
 
 static int _mathJumpIndex( const UCell* a, const UCell* b )
@@ -88 +93 @@
         if( ur_is(b, UT_BIGNUM) )
             return MJ_BIG_BIG;
+    }
+    else if( ur_is(a, UT_COORD) )
+    {
+        if( ur_is(b, UT_INT) )
+            return MJ_COORD_INT;
+        if( ur_is(b, UT_COORD) )
+            return MJ_COORD_COORD;
     }
 
@@ -215 +227 @@
             res->vec3.xyz[1] = res->vec3.xyz[1] OP tos->vec3.xyz[1]; \
             res->vec3.xyz[2] = res->vec3.xyz[2] OP tos->vec3.xyz[2]; \
-            break;
+            break; \
+        case MJ_COORD_INT: \
+        {   int i, count = res->coord.len; \
+            for( i = 0; i < count; ++i ) \
+                res->coord.elem[i] = res->coord.elem[i] OP ur_int(tos); \
+        }   break; \
+        case MJ_COORD_COORD: \
+        {   int i, count = res->coord.len; \
+            if( tos->coord.len < count ) \
+                count = tos->coord.len; \
+            for( i = 0; i < count; ++i ) \
+                res->coord.elem[i] = res->coord.elem[i] OP tos->coord.elem[i];\
+        }   break;
+
 
 #define MATH_OPERATION_END \