Changeset 440 for branches/thune

Timestamp:

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

Author:

krobillard

Message:

Improved 'lerp.

Files:

• branches/thune/thread_safe/gl/gx.c (modified) (3 diffs)

branches/thune/thread_safe/gl/gx.c

@@ -1194 +1194 @@
     UCell* v2;
 
-#define INTERP(A,B)     A += (B - A) * ur_decimal(tos)
+#define INTERP(A,B)     A += (B - A) * frac;
 
     if( ur_is(tos, UT_DECIMAL) )
     {
+        double frac = ur_decimal(tos);
+
+        if( frac < 0.0 )
+            frac = 0.0;
+        else if( frac > 1.0 )
+            frac = 1.0;
+
         v2 = ur_s_prev(tos);
         v1 = ur_s_prev(v2);
@@ -1205 +1212 @@
             {
                 INTERP( ur_decimal(v1), ur_decimal(v2) );
-                UR_S_DROPN( 2 );
-                return;
             }
             else if( ur_is(v1, UT_VEC3) )
@@ -1213 +1218 @@
                 INTERP( v1->vec3.xyz[1], v2->vec3.xyz[1] );
                 INTERP( v1->vec3.xyz[2], v2->vec3.xyz[2] );
-                UR_S_DROPN( 2 );
+            }
+            else if( ur_is(v1, UT_COORD) )
+            {
+                int i;
+                int len = v1->coord.len;
+                if( v2->coord.len < len )
+                    len = v2->coord.len;
+                for( i = 0; i < len; ++i )
+                {
+                    INTERP( v1->coord.elem[i], v2->coord.elem[i] );
+                }
+            }
+            else
+            {
+                ur_throwErr( UR_ERR_DATATYPE,
+                             "lerp expected decimal!/vec3!/coord! value" );
                 return;
             }
-        }
-    }
-    ur_throwErr( UR_ERR_DATATYPE,
-                 "lerp expected decimal!/vec3! decimal!/vec3! decimal!" );
+            UR_S_DROPN( 2 );
+            return;
+        }
+        ur_throwErr( UR_ERR_DATATYPE,
+                     "lerp expected 2 values of the same type" );
+        return;
+    }
+    ur_throwErr( UR_ERR_DATATYPE, "lerp expected decimal! fraction" );
 }