Changeset 1046Tweet

Timestamp:

Nov 1, 2011, 6:55:19 PM (11 years ago)

Author:

sam

Message:

core: split vector operations into linear and non-linear so that we can
reuse the linear operations in quaternions. Also mark some constructors
explicit to better spot coding errors.

Location:

trunk

Files:

• deushax/debugsprite.cpp (modified) (1 diff)
• monsterz/board.cpp (modified) (2 diffs)
• monsterz/interface.cpp (modified) (1 diff)
• monsterz/piece.cpp (modified) (3 diffs)
• monsterz/thumbs.cpp (modified) (1 diff)
• monsterz/title.cpp (modified) (3 diffs)
• src/debug/record.cpp (modified) (1 diff)
• src/font.cpp (modified) (1 diff)
• src/image/codec/dummy-image.cpp (modified) (1 diff)
• src/input.cpp (modified) (2 diffs)
• src/map.cpp (modified) (1 diff)
• src/matrix.cpp (modified) (3 diffs)
• src/matrix.h (modified) (10 diffs)
• src/text.cpp (modified) (1 diff)
• src/tileset.cpp (modified) (1 diff)
• src/worldentity.cpp (modified) (1 diff)

trunk/deushax/debugsprite.cpp

@@ -41 +41 @@
     Ticker::Ref(game);
     data->tileset = Tiler::Register("deushax/art/test/character-dress.png",
-                                    32, 0, sqrtf(2));
+                                    ivec2(32), ivec2(0), sqrtf(2));
     data->pos = vec3(320, 206, 0);
 }

trunk/monsterz/board.cpp

@@ -94 +94 @@
     {
     case GAME_HUNT:
-        data->size = 48;
+        data->size = ivec2(48);
         break;
     }
@@ -102 +102 @@
     data->npieces = minnpieces;
     data->maxnpieces = maxnpieces;
-    data->screen = Tiler::Register(PNG_BACKGROUND, ivec2(640, 480), 0, 1.0f);
-    data->board = Tiler::Register(PNG_BOARD, 384, 0, 1.0f);
-    data->tiles = Tiler::Register(PNG_TILES, data->size, 0, 1.0f);
-    data->icons = Tiler::Register(PNG_ICONS, 24, 0, 1.0f);
+    data->screen = Tiler::Register(PNG_BACKGROUND, ivec2(640, 480), ivec2(0), 1.0f);
+    data->board = Tiler::Register(PNG_BOARD, ivec2(384), ivec2(0), 1.0f);
+    data->tiles = Tiler::Register(PNG_TILES, data->size, ivec2(0), 1.0f);
+    data->icons = Tiler::Register(PNG_ICONS, ivec2(24), ivec2(0), 1.0f);
     data->click = Sampler::Register(WAV_CLICK);
     data->whip = Sampler::Register(WAV_WHIP);

trunk/monsterz/interface.cpp

@@ -57 +57 @@
     data->title = NULL;
     data->board = NULL;
-    data->tiles = Tiler::Register(PNG_TILES, 48, 0, 1.0f);
+    data->tiles = Tiler::Register(PNG_TILES, ivec2(48), ivec2(0), 1.0f);
     data->state = InterfaceData::INIT;
 

trunk/monsterz/piece.cpp

@@ -93 +93 @@
     {
     case PIECE_HUNT:
-        data->size = 48;
-        data->tileset = Tiler::Register(PNG_TILES, data->size, 0, 1.0f);
+        data->size = ivec2(48);
+        data->tileset = Tiler::Register(PNG_TILES, data->size, ivec2(0), 1.0f);
         data->pieceid = 80 + 20 * pieceid;
         break;
@@ -100 +100 @@
 
     data->pos = data->cell * data->size;
-    data->off = 0;
+    data->off = ivec2(0);
 }
 
@@ -281 +281 @@
         if (t >= 1.0f)
             t = 1.0f;
-        data->pos = data->pos_src + (t * trip + 0.5f);
+        data->pos = data->pos_src + t * vec2(trip) + vec2(0.5f);
 
         float off_time = data->off_src.len() / data->speed;

trunk/monsterz/thumbs.cpp

@@ -47 +47 @@
   : data(new ThumbsData())
 {
-    data->icons = Tiler::Register(PNG_ICONS, 24, 0, 1.0f);
+    data->icons = Tiler::Register(PNG_ICONS, ivec2(24), ivec2(0), 1.0f);
 
     data->npieces = 0;

trunk/monsterz/title.cpp

@@ -139 +139 @@
     srand(rand() ^ time(NULL));
 
-    data->logo = Tiler::Register(PNG_TITLE_LOGO, ivec2(380, 181), 0, 1.0f);
+    data->logo = Tiler::Register(PNG_TITLE_LOGO, ivec2(380, 181), ivec2(0), 1.0f);
     data->logo_sprite = new Sprite(data->logo, 0);
     data->logo_sprite->position = vec3(640 / 2 - 380 / 2, 250, 10);
     Ticker::Ref(data->logo_sprite);
 
-    data->ground = Tiler::Register(PNG_TITLE_GROUND, ivec2(384, 80), 0, 1.0f);
+    data->ground = Tiler::Register(PNG_TITLE_GROUND, ivec2(384, 80), ivec2(0), 1.0f);
     data->ground_pos = ivec2((bbox[1] - bbox[0]).xy() / ivec2(2, 4))
                      - ivec2(192, 80);
 
-    data->rocks = Tiler::Register(PNG_TITLE_ROCKS, ivec2(640, 155), 0, 1.0f);
+    data->rocks = Tiler::Register(PNG_TITLE_ROCKS, ivec2(640, 155), ivec2(0), 1.0f);
     data->rocks_pos = ivec2((bbox[1] - bbox[0]).xy() / ivec2(2, 2))
                     - ivec2(320, 240);
 
-    data->title = Tiler::Register(PNG_TITLE, 384, 0, 1.0f);
-    data->stars = Tiler::Register(PNG_STARS, ivec2(384, 144), 0, 1.0f);
-    data->clouds = Tiler::Register(PNG_CLOUDS, ivec2(160, 32), 0, 1.0f);
-    data->eagle.tiles = Tiler::Register(PNG_EAGLE, 16, 0, 1.0f);
+    data->title = Tiler::Register(PNG_TITLE, ivec2(384), ivec2(0), 1.0f);
+    data->stars = Tiler::Register(PNG_STARS, ivec2(384, 144), ivec2(0), 1.0f);
+    data->clouds = Tiler::Register(PNG_CLOUDS, ivec2(160, 32), ivec2(0), 1.0f);
+    data->eagle.tiles = Tiler::Register(PNG_EAGLE, ivec2(16), ivec2(0), 1.0f);
     for (int n = 0; n < 6; n++)
         data->anim[n] = Tiler::Register(PNG_TITLEANIM[n],
-                                        animsize[n], 0, 1.0f);
+                                        animsize[n], ivec2(0), 1.0f);
     for (int n = 0; n < 7; n++)
         data->event[n] = Tiler::Register(PNG_TITLEEVENT[n],
-                                         eventsize[n], 0, 1.0f);
+                                         eventsize[n], ivec2(0), 1.0f);
     data->state = TitleData::IDLE;
     data->period = TitleData::DAY;
@@ -174 +174 @@
         data->cloudpos[n] = vec2(RandF((bbox[1] - bbox[0]).x),
                                  RandF(80) + (bbox[1] - bbox[0]).y - 300);
-        data->cloudspeed[n] = RandF(-0.01f, 0.01f);
+        data->cloudspeed[n] = vec2(RandF(-0.01f, 0.01f));
     }
 
@@ -362 +362 @@
     TileSet *tiler = NULL;
     int tileid = 0;
-    ivec2 pos = 0;
+    ivec2 pos = ivec2(0);
 
     switch (data->state)

trunk/src/debug/record.cpp

@@ -54 +54 @@
 
     data->path = strdup(path);
-    data->size = 0;
+    data->size = ivec2(0);
     data->fps = (int)(fps + 0.5f);
 #if defined USE_PIPI

trunk/src/font.cpp

@@ -47 +47 @@
     sprintf(data->name, "<font> %s", path);
 
-    data->tileset = Tiler::Register(path, 0, 16, 1.0f);
+    data->tileset = Tiler::Register(path, ivec2(0), ivec2(16), 1.0f);
     data->size = data->tileset->GetSize(0);
 

trunk/src/image/codec/dummy-image.cpp

@@ -45 +45 @@
 bool DummyImageData::Open(char const *path)
 {
-    size = 256;
+    size = ivec2(256);
     format = Image::FORMAT_RGBA;
     pixels = (uint8_t *)malloc(256 * 256 * 4 * sizeof(*pixels));

trunk/src/input.cpp

@@ -139 +139 @@
                 data->entities[n]->pressed = data->buttons;
             else
-                data->entities[n]->clicked = 0;
+                data->entities[n]->clicked = ivec3(0);
         }
         else
@@ -145 +145 @@
             data->entities[n]->mousepos = ivec2(-1);
             /* FIXME */
-            data->entities[n]->released = 0;
-            data->entities[n]->pressed = 0;
-            data->entities[n]->clicked = 0;
+            data->entities[n]->released = ivec3(0);
+            data->entities[n]->pressed = ivec3(0);
+            data->entities[n]->clicked = ivec3(0);
         }
     }

trunk/src/map.cpp

@@ -136 +136 @@
         {
             /* This is a tileset image file. Associate it with firstgid. */
-            data->tilesets[data->ntilers] = Tiler::Register(str, 32, 0,
-                                                          sqrtf(2));
+            data->tilesets[data->ntilers] = Tiler::Register(str, ivec2(32),
+                                                            ivec2(0), sqrtf(2));
             data->ntilers++;
             //Log::Debug("new tiler %s\n", str);

trunk/src/matrix.cpp

@@ -74 +74 @@
     float norm = v.len();
     if (!norm)
-        return vec4(0);
+        return vec4(0.0f);
     return v / norm;
 }
@@ -127 +127 @@
 }
 
+template<> void ivec2::printf() const
+{
+    Log::Debug("[ %i %i ]\n", x, y);
+}
+
 template<> void vec3::printf() const
 {
@@ -132 +137 @@
 }
 
+template<> void ivec3::printf() const
+{
+    Log::Debug("[ %i %i %i ]\n", x, y, z);
+}
+
 template<> void vec4::printf() const
 {
     Log::Debug("[ %6.6f %6.6f %6.6f %6.6f ]\n", x, y, z, w);
+}
+
+template<> void ivec4::printf() const
+{
+    Log::Debug("[ %i %i %i %i ]\n", x, y, z, w);
 }
 

trunk/src/matrix.h

@@ -64 +64 @@
     }
 
-#define OPERATORS(elems) \
+#define LINEAR_OPS(elems) \
     inline T& operator[](int n) { return *(&x + n); } \
     inline T const& operator[](int n) const { return *(&x + n); } \
@@ -70 +70 @@
     VECTOR_OP(elems, -) \
     VECTOR_OP(elems, +) \
+    \
+    BOOL_OP(elems, ==, ==, true) \
+    BOOL_OP(elems, !=, ==, false) \
+    \
+    SCALAR_OP(elems, *) \
+    SCALAR_OP(elems, /) \
+    \
+    inline Vec##elems<T> operator -() const \
+    { \
+        Vec##elems<T> ret; \
+        for (int n = 0; n < elems; n++) \
+            ret[n] = -(*this)[n]; \
+        return ret; \
+    } \
+    \
+    inline T sqlen() const \
+    { \
+        T acc = 0; \
+        for (int n = 0; n < elems; n++) \
+            acc += (*this)[n] * (*this)[n]; \
+        return acc; \
+    } \
+    \
+    inline float len() const \
+    { \
+        using namespace std; \
+        return sqrtf((float)sqlen()); \
+    } \
+    \
+    template<typename U> \
+    friend Vec##elems<U> normalize(Vec##elems<U>); \
+    \
+    void printf() const;
+
+#define OTHER_OPS(elems) \
     VECTOR_OP(elems, *) \
     VECTOR_OP(elems, /) \
     \
-    BOOL_OP(elems, ==, ==, true) \
-    BOOL_OP(elems, !=, ==, false) \
     BOOL_OP(elems, <=, <=, true) \
     BOOL_OP(elems, >=, >=, true) \
@@ -80 +113 @@
     BOOL_OP(elems, >, >, true) \
     \
-    SCALAR_OP(elems, -) \
-    SCALAR_OP(elems, +) \
-    SCALAR_OP(elems, *) \
-    SCALAR_OP(elems, /) \
-    \
     template<typename U> \
     inline operator Vec##elems<U>() const \
@@ -94 +122 @@
     } \
     \
-    inline Vec##elems<T> operator -() const \
-    { \
-        Vec##elems<T> ret; \
-        for (int n = 0; n < elems; n++) \
-            ret[n] = -(*this)[n]; \
-        return ret; \
-    } \
-    \
-    inline T sqlen() const \
-    { \
-        T acc = 0; \
-        for (int n = 0; n < elems; n++) \
-            acc += (*this)[n] * (*this)[n]; \
-        return acc; \
-    } \
-    \
-    inline float len() const \
-    { \
-        using namespace std; \
-        return sqrtf((float)sqlen()); \
-    } \
-    \
     template<typename U> \
-    friend U dot(Vec##elems<U>, Vec##elems<U>); \
-    template<typename U> \
-    friend Vec##elems<U> normalize(Vec##elems<U>); \
-    \
-    void printf() const;
+    friend U dot(Vec##elems<U>, Vec##elems<U>);
 
 #define SWIZZLE2(e1, e2) \
     inline Vec2<T> e1##e2() const \
     { \
-        return Vec2<T>(e1, e2); \
+        return Vec2<T>(this->e1, this->e2); \
     }
 
@@ -132 +134 @@
     inline Vec3<T> e1##e2##e3() const \
     { \
-        return Vec3<T>(e1, e2, e3); \
+        return Vec3<T>(this->e1, this->e2, this->e3); \
     }
 
@@ -138 +140 @@
     inline Vec4<T> e1##e2##e3##e4() const \
     { \
-        return Vec4<T>(e1, e2, e3, e4); \
+        return Vec4<T>(this->e1, this->e2, this->e3, this->e4); \
     }
 
@@ -195 +197 @@
 {
     inline Vec2() { }
-    inline Vec2(T val) { x = y = val; }
+    explicit inline Vec2(T val) { x = y = val; }
     inline Vec2(T _x, T _y) { x = _x; y = _y; }
 
-    OPERATORS(2)
+    LINEAR_OPS(2)
+    OTHER_OPS(2)
 
     SWIZZLE22(x); SWIZZLE22(y);
@@ -231 +234 @@
 {
     inline Vec3() { }
-    inline Vec3(T val) { x = y = z = val; }
+    explicit inline Vec3(T val) { x = y = z = val; }
     inline Vec3(T _x, T _y, T _z) { x = _x; y = _y; z = _z; }
     inline Vec3(Vec2<T> _xy, T _z) { x = _xy.x; y = _xy.y; z = _z; }
     inline Vec3(T _x, Vec2<T> _yz) { x = _x; y = _yz.x; z = _yz.y; }
 
-    OPERATORS(3)
+    LINEAR_OPS(3)
+    OTHER_OPS(3)
 
     SWIZZLE23(x); SWIZZLE23(y); SWIZZLE23(z);
@@ -273 +277 @@
 {
     inline Vec4() { }
-    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; }
-    inline Vec4(Vec2<T> _xy, T _z, T _w) { x = _xy.x; y = _xy.y; z = _z; w = _w; }
-    inline Vec4(T _x, Vec2<T> _yz, T _w) { x = _x; y = _yz.x; z = _yz.y; w = _w; }
-    inline Vec4(T _x, T _y, Vec2<T> _zw) { x = _x; y = _y; z = _zw.x; w = _zw.y; }
-    inline Vec4(Vec2<T> _xy, Vec2<T> _zw) { x = _xy.x; y = _xy.y; z = _zw.x; w = _zw.y; }
-    inline Vec4(Vec3<T> _xyz, T _w) { x = _xyz.x; y = _xyz.y; z = _xyz.z; w = _w; }
-    inline Vec4(T _x, Vec3<T> _yzw) { x = _x; y = _yzw.x; z = _yzw.y; w = _yzw.z; }
-
-    OPERATORS(4)
+    explicit inline Vec4(T val) : x(val), y(val), z(val), w(val) { }
+    inline Vec4(T _x, T _y, T _z, T _w) : x(_x), y(_y), z(_z), w(_w) { }
+    inline Vec4(Vec2<T> _xy, T _z, T _w) : x(_xy.x), y(_xy.y), z(_z), w(_w) { }
+    inline Vec4(T _x, Vec2<T> _yz, T _w) : x(_x), y(_yz.x), z(_yz.y), w(_w) { }
+    inline Vec4(T _x, T _y, Vec2<T> _zw) : x(_x), y(_y), z(_zw.x), w(_zw.y) { }
+    inline Vec4(Vec2<T> _xy, Vec2<T> _zw) : x(_xy.x), y(_xy.y), z(_zw.x), w(_zw.y) { }
+    inline Vec4(Vec3<T> _xyz, T _w) : x(_xyz.x), y(_xyz.y), z(_xyz.z), w(_w) { }
+    inline Vec4(T _x, Vec3<T> _yzw) : x(_x), y(_yzw.x), z(_yzw.y), w(_yzw.z) { }
+
+    LINEAR_OPS(4)
+    OTHER_OPS(4)
 
     SWIZZLE24(x); SWIZZLE24(y); SWIZZLE24(z); SWIZZLE24(w);
@@ -342 +347 @@
 {
     inline Mat4() { }
-    inline Mat4(T val)
+    explicit inline Mat4(T val)
     {
         for (int j = 0; j < 4; j++)

trunk/src/text.cpp

@@ -88 +88 @@
     {
         Font *font = Forge::GetFont(data->font);
-        vec3 delta = 0;
+        vec3 delta(0.0f);
         if (data->align == ALIGN_RIGHT)
             delta.x -= data->length * font->GetSize().x;

trunk/src/tileset.cpp

@@ -73 +73 @@
     {
         if (size.x <= 0 || size.y <= 0)
-            size = 32;
+            size = ivec2(32, 32);
         data->count.i = data->isize.x > size.i ? data->isize.x / size.i : 1;
         data->count.j = data->isize.y > size.j ? data->isize.y / size.j : 1;

trunk/src/worldentity.cpp

@@ -26 +26 @@
 WorldEntity::WorldEntity()
 {
-    position = 0;
-    rotation = 0;
-    velocity = 0;
-    bbox[0] = bbox[1] = 0;
+    position = vec3(0);
+    rotation = vec3(0);
+    velocity = vec3(0);
+    bbox[0] = bbox[1] = vec3(0);
 
-    mousepos = 0;
-    mousebuttons = 0;
-    pressed = 0;
-    clicked = 0;
-    released = 0;
+    mousepos = ivec2(0);
+    mousebuttons = ivec3(0);
+    pressed = ivec3(0);
+    clicked = ivec3(0);
+    released = ivec3(0);
 }