Changeset 295 for trunk/deushaxTweet

Timestamp:

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

Author:

sam

Message:

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

File:

• trunk/deushax/debugsprite.cpp (modified) (4 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);
 }