Changeset 294Tweet

Timestamp:

Jan 26, 2011, 3:49:51 PM (12 years ago)

Author:

sam

Message:

Rename Float3 to float3, Int3 to int3 etc. and add the 4-member versions.

Location:

trunk

Files:

• deushax/debugsprite.cpp (modified) (1 diff)
• monsterz/board.cpp (modified) (11 diffs)
• monsterz/board.h (modified) (1 diff)
• monsterz/mash.cpp (modified) (2 diffs)
• monsterz/piece.cpp (modified) (7 diffs)
• monsterz/piece.h (modified) (2 diffs)
• src/debugfps.cpp (modified) (1 diff)
• src/emitter.cpp (modified) (3 diffs)
• src/emitter.h (modified) (1 diff)
• src/input.cpp (modified) (4 diffs)
• src/input.h (modified) (1 diff)
• src/matrix.h (modified) (3 diffs)
• src/sdlinput.cpp (modified) (1 diff)
• src/text.cpp (modified) (3 diffs)
• src/text.h (modified) (1 diff)

trunk/deushax/debugsprite.cpp

@@ -48 +48 @@
     Entity::TickGame(deltams);
 
-    Float2 axis = Input::GetAxis(0);
+    float2 axis = Input::GetAxis(0);
     data->x += 0.1f * sqrtf(2.0f) * deltams * axis.x;
     data->y += 0.1f * deltams * axis.y;

trunk/monsterz/board.cpp

@@ -40 +40 @@
     Mash *mashes;
     Emitter *emitter;
-    Int2 src_cell, dst_cell;
-
-    Int2 mouse;
-    Int3 buttons;
+    int2 src_cell, dst_cell;
+
+    int2 mouse;
+    int3 buttons;
     float nextblink, whipdelay;
 
@@ -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.0003, 0));
     Ticker::Ref(data->emitter);
 
@@ -80 +80 @@
         {
             int id = 100 + 20 * (rand() % 7);
-            data->pieces[i][j] = new Piece(game, Int2(i, j), id);
+            data->pieces[i][j] = new Piece(game, int2(i, j), id);
             if (j)
                 data->pieces[i][j]->SetBelow(data->pieces[i][j - 1]);
@@ -112 +112 @@
     {
         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 pos(RandF(500.0f), RandF(500.0f), 8.0f);
+        float3 vel(RandF(-0.1, 0.1f), RandF(0.05f, 0.1f), 0.0f);
         data->emitter->AddParticle(id, pos, vel);
     }
 
-    Int2 mouse = Input::GetMousePos();
-    Int3 buttons = Input::GetMouseButtons();
+    int2 mouse = Input::GetMousePos();
+    int3 buttons = Input::GetMouseButtons();
 
     /* If possible, make a random monster blink */
@@ -152 +152 @@
             if (x >= 0 && x < 8 * 48 && y >= 0 && y < 8 * 48)
             {
-                if (data->pieces[x / 48][y / 48]->Grab(Int2(0, 0)))
+                if (data->pieces[x / 48][y / 48]->Grab(int2(0, 0)))
                 {
                     Sampler::PlaySample(data->click);
                     data->grabbed = data->pieces[x / 48][y / 48];
-                    data->src_cell = Int2(x / 48, y / 48);
-                    data->dst_cell = Int2(-1);
+                    data->src_cell = int2(x / 48, y / 48);
+                    data->dst_cell = int2(-1);
                     data->state = BoardData::GRAB;
                 }
@@ -172 +172 @@
             /* Mouse is still in the window, keep grabbing */
             data->grabbed->Grab(mouse - data->mouse);
-            Int2 cur_pos = data->grabbed->GetPos();
-            Int2 cur_cell = (cur_pos + 24) / 48;
+            int2 cur_pos = data->grabbed->GetPos();
+            int2 cur_cell = (cur_pos + 24) / 48;
             if (cur_cell.i < 0 || cur_cell.i >= 8
                  || cur_cell.j < 0 || cur_cell.j >= 8
                  || (cur_pos - cur_cell * 48).sqlen() > 24 * 24
                  || (cur_cell - data->src_cell).sqlen() != 1)
-                cur_cell = Int2(-1);
+                cur_cell = int2(-1);
             /* If potential target changed, update our cache. */
             if (cur_cell != data->dst_cell)
@@ -187 +187 @@
                     data->whipdelay = DELAY_WHIP;
                 }
-                if (data->dst_cell != Int2(-1))
+                if (data->dst_cell != int2(-1))
                     data->pieces[data->dst_cell.i]
                                 [data->dst_cell.j]->Ungrab(data->dst_cell * 48);
-                if (cur_cell != Int2(-1))
+                if (cur_cell != int2(-1))
                     data->pieces[cur_cell.i]
                                 [cur_cell.j]->Ungrab(data->src_cell * 48);
@@ -202 +202 @@
             /* Mouse released, or exited window, or dragged too far. */
             data->grabbed->Ungrab(data->grabbed->GetCell() * 48);
-            if (data->dst_cell != Int2(-1))
+            if (data->dst_cell != int2(-1))
                 Switch(data->src_cell, data->dst_cell);
             data->state = BoardData::IDLE;
@@ -232 +232 @@
 }
 
-void Board::Switch(Int2 cell_a, Int2 cell_b)
+void Board::Switch(int2 cell_a, int2 cell_b)
 {
     Piece *a = data->pieces[cell_a.i][cell_a.j];
@@ -310 +310 @@
             {
                 data->pieces[i][j2 - 1] = data->pieces[i][j2];
-                data->pieces[i][j2 - 1]->SetCell(Int2(i, j2 - 1));
-                data->pieces[i][j2 - 1]->Move(Int2(i, j2 - 1) * 48);
+                data->pieces[i][j2 - 1]->SetCell(int2(i, j2 - 1));
+                data->pieces[i][j2 - 1]->Move(int2(i, j2 - 1) * 48);
                 list[i][j2 - 1] = list[i][j2];
             }
@@ -317 +317 @@
             /* Spawn a new piece above all the others and attach it to
              * the board. */
-            Int2 newpos = Int2(i * 48, below->GetPos().y + 48);
+            int2 newpos = int2(i * 48, below->GetPos().y + 48);
             int id = 100 + 20 * (rand() % 7);
-            data->pieces[i][7] = new Piece(data->game, Int2(i, 7), id);
+            data->pieces[i][7] = new Piece(data->game, int2(i, 7), id);
             data->pieces[i][7]->SetBelow(below);
             data->pieces[i][7]->SetPos(newpos);
-            data->pieces[i][7]->Move(Int2(i, 7) * 48);
+            data->pieces[i][7]->Move(int2(i, 7) * 48);
             Ticker::Ref(data->pieces[i][7]);
             list[i][7] = 0;

trunk/monsterz/board.h

@@ -27 +27 @@
     virtual void TickDraw(float deltams);
 
-    void Switch(Int2 cell_a, Int2 cell_b);
+    void Switch(int2 cell_a, int2 cell_b);
     int ListMashes(int list[8][8]);
 

trunk/monsterz/mash.cpp

@@ -33 +33 @@
     int duh, pop;
     Piece *pieces[8 * 8];
-    Int2 cells[8 * 8];
+    int2 cells[8 * 8];
     int npieces;
     float timer;
@@ -86 +86 @@
         for (int n = 0; n < data->npieces && allready; n++)
         {
-            Int2 dest = data->pieces[n]->GetCell() * 48;
-            Int2 cur = data->pieces[n]->GetPos();
+            int2 dest = data->pieces[n]->GetCell() * 48;
+            int2 cur = data->pieces[n]->GetPos();
 
             /* If piece is still too high, don't start the animation */

trunk/monsterz/piece.cpp

@@ -32 +32 @@
     Piece *above, *below;
     int tiler;
-    Int2 cell, pos, src, dst;
+    int2 cell, pos, src, dst;
     int id;
     float speed, timer;
@@ -53 +53 @@
  */
 
-Piece::Piece(Game *game, Int2 cell, int id)
+Piece::Piece(Game *game, int2 cell, int id)
   : data(new PieceData())
 {
@@ -67 +67 @@
 }
 
-void Piece::SetCell(Int2 cell)
+void Piece::SetCell(int2 cell)
 {
     data->cell = cell;
 }
 
-Int2 Piece::GetCell() const
+int2 Piece::GetCell() const
 {
     return data->cell;
 }
 
-void Piece::SetPos(Int2 pos)
+void Piece::SetPos(int2 pos)
 {
     data->pos = pos;
 }
 
-Int2 Piece::GetPos() const
+int2 Piece::GetPos() const
 {
     return data->pos;
@@ -176 +176 @@
 }
 
-int Piece::Grab(Int2 dir)
+int Piece::Grab(int2 dir)
 {
     switch (data->state)
@@ -197 +197 @@
 }
 
-int Piece::Ungrab(Int2 pos)
+int Piece::Ungrab(int2 pos)
 {
     switch (data->state)
@@ -217 +217 @@
 }
 
-int Piece::Move(Int2 pos)
+int Piece::Move(int2 pos)
 {
     switch (data->state)
@@ -254 +254 @@
     {
         data->timer += deltams;
-        Int2 trip = data->dst - data->src;
+        int2 trip = data->dst - data->src;
         float moving_time = trip.len() / data->speed;
         float t = moving_time ? data->timer / moving_time : 1.0f;

trunk/monsterz/piece.h

@@ -20 +20 @@
 {
 public:
-    Piece(Game *game, Int2 cell, int id);
+    Piece(Game *game, int2 cell, int id);
     virtual ~Piece();
 
-    void SetCell(Int2 cell);
-    Int2 GetCell() const;
-    void SetPos(Int2 pos);
-    Int2 GetPos() const;
+    void SetCell(int2 cell);
+    int2 GetCell() const;
+    void SetPos(int2 pos);
+    int2 GetPos() const;
     int GetId() const;
 
@@ -38 +38 @@
     int Blink();
     int Pop();
-    int Grab(Int2 dir);
-    int Ungrab(Int2 pos);
-    int Move(Int2 pos);
+    int Grab(int2 dir);
+    int Ungrab(int2 pos);
+    int Move(int2 pos);
 
 protected:

trunk/src/debugfps.cpp

@@ -40 +40 @@
     {
         data->lines[i] = new Text(NULL, "gfx/font/ascii.png");
-        data->lines[i]->SetPos(Int3(x, y + (i ? 8 : 0) + 16 * i, 0));
+        data->lines[i]->SetPos(int3(x, y + (i ? 8 : 0) + 16 * i, 0));
         Ticker::Ref(data->lines[i]);
     }

trunk/src/emitter.cpp

@@ -28 +28 @@
 private:
     int tiler;
-    Float3 gravity;
+    float3 gravity;
     int particles[100];
-    Float3 positions[100];
-    Float3 velocities[100];
+    float3 positions[100];
+    float3 velocities[100];
     int nparticles;
 };
@@ -39 +39 @@
  */
 
-Emitter::Emitter(int tiler, Float3 gravity)
+Emitter::Emitter(int tiler, float3 gravity)
   : data(new EmitterData())
 {
@@ -76 +76 @@
 }
 
-void Emitter::AddParticle(int id, Float3 pos, Float3 vel)
+void Emitter::AddParticle(int id, float3 pos, float3 vel)
 {
     if (data->nparticles >= 100)

trunk/src/emitter.h

@@ -24 +24 @@
 {
 public:
-    Emitter(int tiler, Float3 gravity);
+    Emitter(int tiler, float3 gravity);
     virtual ~Emitter();
 
-    void AddParticle(int id, Float3 pos, Float3 vel);
+    void AddParticle(int id, float3 pos, float3 vel);
 
 protected:

trunk/src/input.cpp

@@ -35 +35 @@
     { }
 
-    Int2 mouse;
-    Int3 buttons;
+    int2 mouse;
+    int3 buttons;
 }
 inputdata;
@@ -46 +46 @@
  */
 
-Float2 Input::GetAxis(int axis)
+float2 Input::GetAxis(int axis)
 {
     float invsqrt2 = sqrtf(0.5f);
-    Float2 f;
+    float2 f;
 
     /* Simulate a joystick using the keyboard. This SDL call is free. */
@@ -66 +66 @@
 }
 
-void Input::SetMousePos(Int2 coord)
+void Input::SetMousePos(int2 coord)
 {
     data->mouse = coord;
 }
 
-Int2 Input::GetMousePos()
+int2 Input::GetMousePos()
 {
     return data->mouse;
@@ -86 +86 @@
 }
 
-Int3 Input::GetMouseButtons()
+int3 Input::GetMouseButtons()
 {
     return data->buttons;

trunk/src/input.h

@@ -22 +22 @@
 {
 public:
-    static Float2 GetAxis(int axis);
-    static void SetMousePos(Int2 coord);
-    static Int2 GetMousePos();
+    static float2 GetAxis(int axis);
+    static void SetMousePos(int2 coord);
+    static int2 GetMousePos();
     static void SetMouseButton(int index);
     static void UnsetMouseButton(int index);
-    static Int3 GetMouseButtons();
+    static int3 GetMouseButtons();
 };
 

trunk/src/matrix.h

@@ -98 +98 @@
 };
 
-typedef Vec2<float> Float2;
-typedef Vec2<int> Int2;
+typedef Vec2<float> float2;
+typedef Vec2<int> int2;
 
 template <typename T> struct Vec3
@@ -114 +114 @@
 };
 
-typedef Vec3<float> Float3;
-typedef Vec3<int> Int3;
+typedef Vec3<float> float3;
+typedef Vec3<int> int3;
+
+template <typename T> struct Vec4
+{
+    inline Vec4() { x = y = z = w = 0; }
+    inline Vec4(T val) { x = y = z = w = val; }
+    inline Vec4(T _x, T _y, T _z, T _w) { x = _x; y = _y; z = _z; w = _w; }
+
+    OPERATORS(4)
+
+    union { T x; T a; T i; };
+    union { T y; T b; T j; };
+    union { T z; T c; T k; };
+    union { T w; T d; T l; };
+};
+
+typedef Vec4<float> float4;
+typedef Vec4<int> int4;
 
 #define SCALAR_GLOBAL(elems, op, U) \
@@ -140 +157 @@
 GLOBALS(2)
 GLOBALS(3)
+GLOBALS(4)
 
 #endif // __DH_MATRIX_H__

trunk/src/sdlinput.cpp

@@ -49 +49 @@
 
     /* Handle mouse input */
-    Int2 mouse;
+    int2 mouse;
     if (SDL_GetAppState() & SDL_APPMOUSEFOCUS)
     {

trunk/src/text.cpp

@@ -30 +30 @@
     int font;
     char *text;
-    Int3 pos;
+    int3 pos;
 };
 
@@ -42 +42 @@
     data->font = Forge::Register(font);
     data->text = text ? strdup(text) : NULL;
-    data->pos = Int3(0, 0, 0);
+    data->pos = int3(0, 0, 0);
 
     drawgroup = DRAWGROUP_HUD;
@@ -54 +54 @@
 }
 
-void Text::SetPos(Int3 pos)
+void Text::SetPos(int3 pos)
 {
     data->pos = pos;

trunk/src/text.h

@@ -28 +28 @@
 
     void SetText(char const *text);
-    void SetPos(Int3 pos);
+    void SetPos(int3 pos);
 
 protected: