Changeset 862Tweet

Timestamp:

Aug 26, 2011, 7:20:39 PM (10 years ago)

Author:

sam

Message:

core: add a Sprite class to try to factor some common logic currently
found in the game. Will be greatly improved later.

Location:

trunk

Files:

• monsterz/title.cpp (modified) (4 diffs)
• src/Makefile.am (modified) (1 diff)
• src/core.h (modified) (1 diff)
• src/sprite.cpp (added)
• src/sprite.h (added)

trunk/monsterz/title.cpp

@@ -44 +44 @@
     TileSet *event[7];
 
+    Sprite *logo_sprite;
+
     enum
     {
@@ -138 +140 @@
 
     data->logo = Tiler::Register(PNG_TITLE_LOGO, vec2i(380, 181), 0, 1.0f);
+    data->logo_sprite = new Sprite(data->logo, 0);
+    data->logo_sprite->position = vec3(26, 250, 3);
+    Ticker::Ref(data->logo_sprite);
+
     data->ground = Tiler::Register(PNG_TITLE_GROUND, vec2i(384, 80), 0, 1.0f);
     data->ground_pos = vec2i((vec2)(bbox[1] - bbox[0]) / vec2i(2, 4))
@@ -375 +381 @@
                                      vec3i(data->ground_pos.x + pos.x,
                                            data->ground_pos.y + pos.y, 1), 0);
-
-    /* The logo, on top of the rest. */
-    Scene::GetDefault()->AddTile(data->logo, 0, vec3i(26, 250, 3), 0);
 }
 
@@ -389 +392 @@
     Input::UntrackMouse(this);
     Tiler::Deregister(data->logo);
+    Ticker::Unref(data->logo_sprite);
     Tiler::Deregister(data->ground);
     Tiler::Deregister(data->title);

trunk/src/Makefile.am

@@ -11 +11 @@
     text.cpp text.h emitter.cpp emitter.h numeric.h hash.cpp hash.h \
     worldentity.cpp worldentity.h image.cpp image.h gradient.cpp gradient.h \
-    platform.cpp platform.h \
+    platform.cpp platform.h sprite.cpp sprite.h \
     \
     sdlapp.cpp sdlapp.h sdlinput.cpp sdlinput.h \

trunk/src/core.h

@@ -39 +39 @@
 #include "gradient.h"
 #include "sample.h"
+#include "sprite.h"
 #include "text.h"
 #include "tileset.h"