Changeset 290 for trunk/thune/math.c

Timestamp:

10/02/06 01:01:55 (2 years ago)

Author:

krobillard

Message:

Thune - Added 'minimum & 'maximum. Math operators work on vec3!.

Files:

• trunk/thune/math.c (modified) (5 diffs)

trunk/thune/math.c

@@ -36 +36 @@
 
 
-#define MJ_INT_INT  0
-#define MJ_INT_DEC  1
-#define MJ_DEC_INT  2
-#define MJ_DEC_DEC  3
-#define MJ_NAN      4
+#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_NAN          7
 
 static int _mathJumpIndex( const UCell* a, const UCell* b )
@@ -57 +60 @@
         if( ur_is(b, UT_DECIMAL) || ur_is(b, UT_TIME) )
             return MJ_DEC_DEC;
+        if( ur_is(b, UT_VEC3) )
+            return MJ_DEC_VEC3;
+    }
+    else if( ur_is(a, UT_VEC3) )
+    {
+        if( ur_is(b, UT_VEC3) )
+            return MJ_VEC3_VEC3;
+        if( ur_is(b, UT_DECIMAL) )
+            return MJ_VEC3_DEC;
     }
     return MJ_NAN;
@@ -149 +161 @@
             ur_decimal(res) = ur_decimal(res) OP ur_decimal(tos); \
             break; \
+        case MJ_DEC_VEC3: {\
+            double d = ur_decimal(res); \
+            ur_initType(res, UT_VEC3); \
+            res->vec3.xyz[0] = d OP tos->vec3.xyz[0]; \
+            res->vec3.xyz[1] = d OP tos->vec3.xyz[1]; \
+            res->vec3.xyz[2] = d OP tos->vec3.xyz[2]; \
+            } break; \
+        case MJ_VEC3_DEC: \
+            res->vec3.xyz[0] = res->vec3.xyz[0] OP ur_decimal(tos); \
+            res->vec3.xyz[1] = res->vec3.xyz[1] OP ur_decimal(tos); \
+            res->vec3.xyz[2] = res->vec3.xyz[2] OP ur_decimal(tos); \
+            break; \
+        case MJ_VEC3_VEC3: \
+            res->vec3.xyz[0] = res->vec3.xyz[0] OP tos->vec3.xyz[0]; \
+            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; \
         default: \
             ur_throwErr( ur_thread, UR_EX_DATATYPE, \
-                         "Math operator requires int!/decimal!" ); \
+                         "Math operator requires int!/decimal!/vec3!" ); \
             break; \
     }
@@ -260 +289 @@
         ur_initType(res, UT_INT);
         ur_int(res) ^= ur_int(tos);
+    }
+}
+
+
+// (number number -- min)
+UR_CALL( uc_minimum )
+{
+    UCell* res;
+    UR_S_DROP;
+    res = UR_TOS;
+
+    switch( _mathJumpIndex(res, tos) )
+    {
+        case MJ_INT_INT:
+            if( ur_int(res) > ur_int(tos) )
+                ur_int(res) = ur_int(tos);
+            break;
+        case MJ_INT_DEC:
+        {
+            double d = ur_decimal(res);
+            if( d > ur_decimal(tos) )
+            {
+                ur_initType(res, UT_DECIMAL);
+                ur_decimal(res) = ur_decimal(tos);
+            }
+        }
+            break;
+        case MJ_DEC_INT:
+        {
+            double d = ur_decimal(tos);
+            if( ur_decimal(res) > d )
+                ur_decimal(res) = d;
+        }
+            break;
+        case MJ_DEC_DEC:
+            if( ur_decimal(res) > ur_decimal(tos) )
+                ur_decimal(res) = ur_decimal(tos);
+            break;
+        case MJ_VEC3_VEC3:
+            if( res->vec3.xyz[0] > tos->vec3.xyz[0] )
+                res->vec3.xyz[0] = tos->vec3.xyz[0];
+            if( res->vec3.xyz[1] > tos->vec3.xyz[1] )
+                res->vec3.xyz[1] = tos->vec3.xyz[1];
+            if( res->vec3.xyz[2] > tos->vec3.xyz[2] )
+                res->vec3.xyz[2] = tos->vec3.xyz[2];
+            break;
+        default:
+            ur_throwErr( ur_thread, UR_EX_DATATYPE,
+                         "Invalid type for 'minimum" );
+            break;
+    }
+}
+
+
+// (number number -- max)
+UR_CALL( uc_maximum )
+{
+    UCell* res;
+    UR_S_DROP;
+    res = UR_TOS;
+
+    switch( _mathJumpIndex(res, tos) )
+    {
+        case MJ_INT_INT:
+            if( ur_int(res) < ur_int(tos) )
+                ur_int(res) = ur_int(tos);
+            break;
+        case MJ_INT_DEC:
+        {
+            double d = ur_decimal(res);
+            if( d < ur_decimal(tos) )
+            {
+                ur_initType(res, UT_DECIMAL);
+                ur_decimal(res) = ur_decimal(tos);
+            }
+        }
+            break;
+        case MJ_DEC_INT:
+        {
+            double d = ur_decimal(tos);
+            if( ur_decimal(res) < d )
+                ur_decimal(res) = d;
+        }
+            break;
+        case MJ_DEC_DEC:
+            if( ur_decimal(res) < ur_decimal(tos) )
+                ur_decimal(res) = ur_decimal(tos);
+            break;
+        case MJ_VEC3_VEC3:
+            if( res->vec3.xyz[0] < tos->vec3.xyz[0] )
+                res->vec3.xyz[0] = tos->vec3.xyz[0];
+            if( res->vec3.xyz[1] < tos->vec3.xyz[1] )
+                res->vec3.xyz[1] = tos->vec3.xyz[1];
+            if( res->vec3.xyz[2] < tos->vec3.xyz[2] )
+                res->vec3.xyz[2] = tos->vec3.xyz[2];
+            break;
+        default:
+            ur_throwErr( ur_thread, UR_EX_DATATYPE,
+                         "Invalid type for 'maximum" );
+            break;
     }
 }
@@ -651 +780 @@
     { uc_or,           "or" },
     { uc_xor,          "xor" },
+    { uc_minimum,      "minimum" },
+    { uc_maximum,      "maximum" },
     { uc_to_deg,       "to-deg" },
     { uc_to_rad,       "to-rad" },