Changeset 51

Timestamp:

07/21/07 00:46:34 (1 year ago)

Author:

JoeCoder

Message:

Added yage.core.math (split from yage.core.misc) and yage.core.types (incomplete).

Files:

• trunk/bin/yage3d.exe (modified) (previous)
• trunk/src/yage/core/all.d (modified) (2 diffs)
• trunk/src/yage/core/math.d (added)
• trunk/src/yage/core/matrix.d (modified) (2 diffs)
• trunk/src/yage/core/misc.d (modified) (4 diffs)
• trunk/src/yage/core/quatrn.d (modified) (1 diff)
• trunk/src/yage/core/types.d (added)
• trunk/src/yage/core/vector.d (modified) (2 diffs)
• trunk/src/yage/node/light.d (modified) (1 diff)
• trunk/src/yage/node/sound.d (modified) (1 diff)
• trunk/src/yage/resource/texture.d (modified) (1 diff)
• trunk/src/yage/util/flyer.d (modified) (1 diff)

trunk/src/yage/core/all.d

@@ -16 +16 @@
-{   import yage.core.array;
-    import yage.core.freelist;
+    import yage.core.math;
-    import yage.core.matrix;
-    import yage.core.misc;
@@ -23 +24 @@
-    import yage.core.repeater;
-    import yage.core.timer;
+    import yage.core.types;
-    import yage.core.vector;
-    import yage.core.xml;

trunk/src/yage/core/matrix.d

@@ -12 +12 @@
-import yage.core.vector;
-import yage.core.quatrn;
+import yage.core.math;
-import yage.core.misc;
-import yage.core.parse;
@@ -120 +121 @@
-    bool almostEqual(Matrix s, float fudge=0.0001)
-    {   for (int i=0; i<v.length; i++)
-isc
+ath
-                return false;
-        return true;

trunk/src/yage/core/misc.d

@@ -19 +19 @@
-// extern (C) void *memcpy(void *, void *, uint);
-
-const float PI_180 = 0.01745329251994;  // PI / 180
-const float _180_PI = 57.2957795130823; // 180 / pi
-
-
-/**
- * Allow for easy bit-by-bit conversion from one two-byte type to another.
- * Example:
- * --------------------------------
- * short a;
- * word w;
- * w.s = a;
- * char c = w.c[1]; // c is the second byte of a.
- * --------------------------------*/
-union word
-{   short s;        /// Union of various types.
-    ushort us;      /// ditto
-    byte[2] b;      /// ditto
-    ubyte[2] ub;    /// ditto
-    char[2] c;      /// ditto
-    
-    /// Convert ushort to word
-    static word opApply(ushort us)
-    {   word res;
-        res.us = us;
-        return res;
-    }
-}
-
-/// Allow for easy bit-by-bit conversion from one four-byte type to another
-struct dword
-{   union
-    {   int i;          /// Union of various types.
-        uint ui;        /// ditto
-        float f;        /// ditto
-        short[2] s;     /// ditto
-        ushort[2] us;   /// ditto
-        byte[4] b;      /// ditto
-        ubyte[4] ub;    /// ditto
-        char[4] c;      /// ditto
-    }
-
-    /// Convert uint to dword
-    static dword opApply(uint ui)
-    {   dword res;
-        res.ui = ui;
-        return res;
-    }
-}
-
-/// Allow for easy bit-by-bit conversion from one eight-byte type to another.
-union qword
-{   long l;         /// Union of various types.
-    ulong ul;       /// ditto
-    double d;       /// ditto
-    float[2] f;     /// ditto
-    int[2] i;       /// ditto
-    uint[2] ui;     /// ditto
-    short[4] s;     /// ditto
-    ushort[4] us;   /// ditto
-    byte[8] b;      /// ditto
-    ubyte[8] ub;    /// ditto
-    char[8] c;      /// ditto
-}
-
-/**
- * Check if two floats are almost equal, that is, they differ no more than
- * fudge from one another, relatively speaking.  If fudge is 0.0001 (the default)
- * Then 10000 and 10001 will compare equally and so will 1.000 and 1.0001; but if
- * either of those differ more, they are not considered equal.  Also,
- * numbers with an absolute difference less than or equal to fudge will always
- * compare equal.  This allows 0.00001 and 0 to be almost equal. */
-bool almostEqual(float a, float b, float fudge=0.0001)
-{   if (fabs(a-b) <= fudge)
-        return true;
-
-    if (fabs(b) > fabs(a))
-    {   if (fabs((a-b)/b) <= fudge)
-            return true;
-    }else
-        if (fabs((a-b)/b) <= fudge)
-            return true;
-    return false;
-}
-unittest
-{   assert(almostEqual(0, 0.0001));
-    assert(almostEqual(0, -0.0001));
-    assert(almostEqual(1, 1.000099));
-    assert(almostEqual(1000, 1000.1));
-    assert(!almostEqual(10000, 10001.01));
-    //assert(almostEqual(float.infinity, float.infinity));
-}
-
-/// Given relative path rel_path, returns an absolute path.
@@ -129 +40 @@
-    chdir(cur_path);
-    return result~filename;
-}
-
-/// Clamp v between l and u
-T clamp(T)(T v, T lower, T upper)
-{   if (v<lower) return lower;
-    if (v>upper) return upper;
-    return v;
-}
-
@@ -169 +73 @@
-}
-
-/**
- * Returns the first integer n such that 2^n >= input.
- * Example:
- * nextPow2(9); // returns 16 */
-uint nextPow2(uint input)
-{   if (0 == input)
-        return 1;
-    int msb = std.intrinsic.bsr(input); // get first bit set, starting with most significant.
-    if ((1 << msb) == input)                // If already equal to a power of two
-        return input;
-    return 2 << msb;
-}
-unittest
-{   assert(nextPow2(9) == 16);
-    assert(nextPow2(1) == 1);   // 2^0 == 1
-    assert(nextPow2(16) == 16);
-}
-
-/// Map a value from one range to another
-float map(float v, float oldmin, float oldmax, float newmin, float newmax)
-{   return ((newmax-newmin)*v/(oldmax-oldmin))+newmin;
-}
-
-
-/// Return the maximum of all arguments 
-T[0] max(T...)(T a)
-{   typeof(a[0]) max = a[0];
-    foreach(T x; a)
-        if (x>max)
-            max = x;
-    return max;
-}
-unittest
-{   assert(max(3, 4, -1) == 4);
-}
-
-/// Return the minimum of all arguments.
-T[0] min(T...)(T a)
-{   typeof(a[0]) min = a[0];
-    foreach (T x; a)
-        if (x<min)
-            min = x;
-    return min;
-}
-unittest
-{   assert(min(3, 4, -1) == -1);
-}
-
-
-///
-long getCPUCount()
@@ -238 +93 @@
-    printf("\n");
-}
-
-/// Generate a random number between min and max.
-float random(float min, float max)
-{   return (rand()/4294967296.0f)*(max-min)+min;
-}
-

trunk/src/yage/core/quatrn.d

@@ -150 +150 @@
-    bool almostEqual(Quatrn s, float fudge=0.0001)
-    {   for (int i=0; i<v.length; i++)
-isc
+ath
-                return false;
-        return true;

trunk/src/yage/core/vector.d

@@ -9 +9 @@
-import std.math;
-import std.stdio;
-parse
+all
-import yage.core.matrix;
+import yage.core.math;
-import yage.core.quatrn;
-import yage.core.misc;
-
-
-/**
- * This is a template to create a vector of any type with any number of elements.
@@ -291 +289 @@
-    bool almostEqual(Vec3f s, float fudge=0.0001)
-    {   for (int i=0; i<v.length; i++)
-isc
+ath
-                return false;
-        return true;

trunk/src/yage/node/light.d

@@ -11 +11 @@
-import derelict.opengl.gl;
-import derelict.opengl.glext;
-
-
+
-import yage.resource.material;
-import yage.node.base;

trunk/src/yage/node/sound.d

@@ -11 +11 @@
-import std.stdio;
-import derelict.openal.al;
-isc
+ath
-import yage.resource.resource;
-import yage.resource.sound;

trunk/src/yage/resource/texture.d

@@ -16 +16 @@
-import derelict.opengl.glu;
-import derelict.opengl.glext;
-isc
+ath
-import yage.core.vector;
-import yage.resource.resource;

trunk/src/yage/util/flyer.d

@@ -7 +7 @@
-module yage.util.flyer;
-
-
-
-
+
-import yage.node.base;
-import yage.node.camera;