Changeset 295Tweet

Timestamp:

Jan 26, 2011, 5:48:40 PM (9 years ago)

Author:

sam

Message:

Fix a few warnings here and there, and try to use the vector classes.

Location:

trunk

Files:

• deushax/debugsprite.cpp (modified) (4 diffs)
• monsterz/board.cpp (modified) (2 diffs)
• src/input.cpp (modified) (1 diff)
• src/matrix.h (modified) (3 diffs)

trunk/deushax/debugsprite.cpp

@@ -25 +25 @@
     Game *game;
     int tiler;
-    float x, y, z;
+    float3 pos;
 };
 
@@ -39 +39 @@
     data->tiler = Tiler::Register("art/test/character-dress.png",
                                   32, 32, sqrtf(2));
-    data->x = 320;
-    data->y = 206;
-    data->z = 0;
+    data->pos = float3(320, 206, 0);
 }
 
@@ -48 +46 @@
     Entity::TickGame(deltams);
 
-    float2 axis = Input::GetAxis(0);
-    data->x += 0.1f * sqrtf(2.0f) * deltams * axis.x;
-    data->y += 0.1f * deltams * axis.y;
+    float3 move = deltams * 0.1f * (float3)Input::GetAxis(0);
+    data->pos = data->pos + move * float3(sqrtf(2.0f), 1.0f, 1.0f);
 }
 
@@ -57 +54 @@
     Entity::TickDraw(deltams);
 
-    int x = data->x;
-    int y = data->y;
-    int z = data->z;
+    int3 pos = (int3)data->pos;
 
     Scene::GetDefault()->AddTile((data->tiler << 16) | 31,
-                                 x - 16, y, z, 1);
+                                 pos.x - 16, pos.y, pos.z, 1);
     Scene::GetDefault()->AddTile((data->tiler << 16) | 15,
-                                 x - 16, y, z + 32, 1);
+                                 pos.x - 16, pos.y, pos.z + 32, 1);
 }
 

trunk/monsterz/board.cpp

@@ -70 +70 @@
     data->whip = Sampler::Register(WAV_WHIP);
 
-    data->emitter = new Emitter(data->tiles, float3(0, -0.0003, 0));
+    data->emitter = new Emitter(data->tiles, float3(0, -0.0003f, 0));
     Ticker::Ref(data->emitter);
 
@@ -113 +113 @@
         int id = 110 + 20 * (rand() % 7);
         float3 pos(RandF(500.0f), RandF(500.0f), 8.0f);
-        float3 vel(RandF(-0.1, 0.1f), RandF(0.05f, 0.1f), 0.0f);
+        float3 vel(RandF(-0.1f, 0.1f), RandF(0.05f, 0.1f), 0.0f);
         data->emitter->AddParticle(id, pos, vel);
     }

trunk/src/input.cpp

@@ -58 +58 @@
     f.y += up;
     if (left && up)
-    {
-        f.x *= invsqrt2;
-        f.y *= invsqrt2;
-    }
+        f = f * invsqrt2;
 
     return f;

trunk/src/matrix.h

@@ -47 +47 @@
     }
 
+#define CAST_OP(elems, dest) \
+    inline operator Vec##dest<T>() const \
+    { \
+        Vec##dest<T> ret; \
+        for (int n = 0; n < elems && n < dest; n++) \
+            ret[n] = (*this)[n]; \
+        return ret; \
+    }
+
 #define OPERATORS(elems) \
     inline T& operator[](int n) { return *(&x + n); } \
@@ -63 +72 @@
     SCALAR_OP(elems, *) \
     SCALAR_OP(elems, /) \
+    \
+    CAST_OP(elems, 2) \
+    CAST_OP(elems, 3) \
+    CAST_OP(elems, 4) \
     \
     template<typename U> \
@@ -85 +98 @@
         return sqrtf((float)sqlen()); \
     }
+
+template <typename T> struct Vec2;
+template <typename T> struct Vec3;
+template <typename T> struct Vec4;
 
 template <typename T> struct Vec2