Changeset 1200Tweet

Timestamp:

Apr 7, 2012, 11:55:36 PM (11 years ago)

Author:

sam

Message:

mrpigeon: implement a few animations for testing purposes.

Location:

trunk/mrpigeon

Files:

• mrpigeon.cpp (modified) (4 diffs)
• mrpigeon.h (modified) (1 diff)

trunk/mrpigeon/mrpigeon.cpp

@@ -23 +23 @@
 MrPigeon::MrPigeon()
 {
-    hudprogress = Tiler::Register("mrpigeon/gfx/HUD_timeline.png", ivec2(160,16), ivec2(0));
-    hudarrow = Tiler::Register("mrpigeon/gfx/HUD_timelineArrow.png", ivec2(16,16), ivec2(0));
+    hud_progress = Tiler::Register("mrpigeon/gfx/HUD_timeline.png", ivec2(160,16), ivec2(0));
+    hud_arrow = Tiler::Register("mrpigeon/gfx/HUD_timelineArrow.png", ivec2(16,16), ivec2(0));
+
+    deco_campagneback = Tiler::Register("mrpigeon/gfx/DECO_campagneBack.png", ivec2(144,168), ivec2(0));
+    deco_cityback = Tiler::Register("mrpigeon/gfx/DECO_cityBack3x.png", ivec2(96,96), ivec2(0));
+    deco_citybackdefense = Tiler::Register("mrpigeon/gfx/DECO_cityBackDefense3X.png", ivec2(288,96), ivec2(0));
+    deco_citybackpav = Tiler::Register("mrpigeon/gfx/DECO_cityBackPav3X.png", ivec2(192,96), ivec2(0));
+    deco_floorrails = Tiler::Register("mrpigeon/gfx/DECO_floorRails3x.png", ivec2(72,24), ivec2(0));
+
+    pigeon_flying = Tiler::Register("mrpigeon/gfx/pigeon_flying.png", ivec2(16,16), ivec2(0)); /* 2 frames */
+
+    player_dashdown = Tiler::Register("mrpigeon/gfx/player_DashDown.png", ivec2(16,32), ivec2(0));
+    player_death = Tiler::Register("mrpigeon/gfx/player_Fall.png", ivec2(16,32), ivec2(0));
+    player_fall = Tiler::Register("mrpigeon/gfx/player_Jump.png", ivec2(16,32), ivec2(0));
+    player_jump = Tiler::Register("mrpigeon/gfx/player_kickAir.png", ivec2(16,32), ivec2(0)); /* 3 frames */
+    player_kickair = Tiler::Register("mrpigeon/gfx/player_kickFloor.png", ivec2(16,32), ivec2(0)); /* 6 frames */
+    player_kickfloor = Tiler::Register("mrpigeon/gfx/player_WalkB.png", ivec2(16,32), ivec2(0)); /* 8 frames */
+    player_walkb = Tiler::Register("mrpigeon/gfx/player_Walk.png", ivec2(16,32), ivec2(0)); /* 8 frames */
+    player_walk = Tiler::Register("mrpigeon/gfx/player_WalkRaiseFist.png", ivec2(16,32), ivec2(0)); /* 8 frames */
+    player_walkraisefist = Tiler::Register("mrpigeon/gfx/player_Death.png", ivec2(16,32), ivec2(0)); /* 7 frames */
+
+    totaltime = 0.0f;
+    walktime = 0.0f;
+    flytime = 0.0f;
+    railtime = 0.0f;
+    backtime = 0.0f;
 }
 
@@ -30 +54 @@
 {
     WorldEntity::TickGame(deltams);
+deltams *= 6.3478;
+
+    totaltime += deltams;
+
+    flytime += deltams;
+    if (flytime > 400.0f)
+        flytime -= 400.0f;
+
+    walktime += deltams;
+    if (walktime > 700.0f)
+        walktime -= 700.0f;
+
+    railtime += deltams;
+    if (railtime > 1000.0f)
+        railtime -= 1000.0f;
+
+    backtime += deltams;
+    if (backtime > 5000.0f)
+        backtime -= 5000.0f;
 }
 
@@ -36 +79 @@
     WorldEntity::TickDraw(deltams);
 
-    Scene::GetDefault()->AddTile(hudarrow, 0, ivec3(30, 8, 0), 0, vec2(3.0f));
-    Scene::GetDefault()->AddTile(hudprogress, 0, ivec3(0, 0, 0), 0, vec2(3.0f));
+    Video::SetClearColor(vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+    Scene::GetDefault()->AddTile(hud_progress, 0, ivec3(18, 3, 0), 0, vec2(3.0f));
+
+    int n = (int)(totaltime * 372 / 156000.0f);
+    if (n > 372)
+        n = 372;
+    Scene::GetDefault()->AddTile(hud_arrow, 0, ivec3(48 + n, 18, 10), 0, vec2(3.0f));
+
+    for (int i = -(int)(backtime * 144 / 5000.0f); i < 512 + 144; i += 144)
+        Scene::GetDefault()->AddTile(deco_campagneback, 0, ivec3(i, 288, 0), 0, vec2(1.0f));
+    //for (int i = -(int)(backtime * 96 / 5000.0f); i < 512 + 96; i += 96)
+    //    Scene::GetDefault()->AddTile(deco_cityback, 0, ivec3(i, 288, 0), 0, vec2(1.0f));
+    //for (int i = -(int)(backtime * 288 / 5000.0f); i < 512 + 288; i += 288)
+    //    Scene::GetDefault()->AddTile(deco_citybackdefense, 0, ivec3(i, 288, 0), 0, vec2(1.0f));
+    //for (int i = -(int)(backtime * 192 / 5000.0f); i < 512 + 192; i += 192)
+    //    Scene::GetDefault()->AddTile(deco_citybackpav, 0, ivec3(i, 288, 0), 0, vec2(1.0f));
+
+    for (int i = -(int)(railtime * 72 / 1000.0f); i < 512 + 72; i += 72)
+        Scene::GetDefault()->AddTile(deco_floorrails, 0, ivec3(i, 57, 0), 0, vec2(1.0f));
+
+    Scene::GetDefault()->AddTile(pigeon_flying, (int)(flytime * 2 / 400.0f), ivec3(81, 147, 0), 0, vec2(3.0f));
+
+    Scene::GetDefault()->AddTile(player_walkb, (int)(walktime * 8 / 700.0f), ivec3(120, 81, 0), 0, vec2(3.0f));
 }
 
 MrPigeon::~MrPigeon()
 {
-    Tiler::Deregister(hudprogress);
-    Tiler::Deregister(hudarrow);
+    Tiler::Deregister(hud_progress);
+    Tiler::Deregister(hud_arrow);
+
+    Tiler::Deregister(deco_campagneback);
+    Tiler::Deregister(deco_cityback);
+    Tiler::Deregister(deco_citybackdefense);
+    Tiler::Deregister(deco_citybackpav);
+    Tiler::Deregister(deco_floorrails);
+
+    Tiler::Deregister(pigeon_flying);
+
+    Tiler::Deregister(player_dashdown);
+    Tiler::Deregister(player_death);
+    Tiler::Deregister(player_fall);
+    Tiler::Deregister(player_jump);
+    Tiler::Deregister(player_kickair);
+    Tiler::Deregister(player_kickfloor);
+    Tiler::Deregister(player_walkb);
+    Tiler::Deregister(player_walk);
+    Tiler::Deregister(player_walkraisefist);
 }
 
@@ -49 +132 @@
 {
     Application app("MrPigeon", ivec2(512,384), 60.0f);
-    new DebugFps(20, 20);
+    new DebugFps(2, 370);
     new MrPigeon();
     app.ShowPointer(false);

trunk/mrpigeon/mrpigeon.h

@@ -16 +16 @@
     virtual void TickDraw(float deltams);
 
-    TileSet *hudprogress, *hudarrow;
+    TileSet *hud_progress,
+            *hud_arrow;
+    TileSet *deco_campagneback,
+            *deco_cityback,
+            *deco_citybackdefense,
+            *deco_citybackpav,
+            *deco_floorrails;
+    TileSet *pigeon_flying;
+    TileSet *player_dashdown,
+            *player_death,
+            *player_fall,
+            *player_jump,
+            *player_kickair,
+            *player_kickfloor,
+            *player_walkb,
+            *player_walk,
+            *player_walkraisefist;
+
+    double totaltime;
+    float walktime, flytime, railtime, backtime;
 };