Changeset 422Tweet

Timestamp:

Feb 7, 2011, 9:21:50 PM (9 years ago)

Author:

sam

Message:

Start splitting the animations into smaller pieces.

Location:

trunk/monsterz

Files:

• gfx/logo.png (modified) (previous)
• gfx/title0.png (modified) (previous)
• gfx/titleanim0.png (modified) (previous)
• gfx/titleanim5.png (modified) (previous)
• gfx/titleclouds.png (added)
• gfx/titlestars.png (added)
• monsterz.h (modified) (1 diff)
• title.cpp (modified) (8 diffs)
• title.h (modified) (1 diff)

trunk/monsterz/monsterz.h

@@ -19 +19 @@
 static char const * const PNG_ICONS = "monsterz/gfx/icons.png";
 static char const * const PNG_TITLE = "monsterz/gfx/title0.png";
+static char const * const PNG_CLOUDS = "monsterz/gfx/titleclouds.png";
+static char const * const PNG_STARS = "monsterz/gfx/titlestars.png";
 static char const * const PNG_TITLEANIM[] =
 {

trunk/monsterz/title.cpp

@@ -31 +31 @@
 
 private:
-    int title, logo;
+    int title, stars, clouds, logo;
     int anim[6];
     int event[7];
@@ -51 +51 @@
     }
     period, nextperiod;
+
+    float2 cloudpos[5];
+    float2 cloudspeed[5];
 
     float timer, length;
@@ -109 +112 @@
     data->logo = Tiler::Register(PNG_LOGO, 380, 181, 1.0f);
     data->title = Tiler::Register(PNG_TITLE, 384, 384, 1.0f);
+    data->stars = Tiler::Register(PNG_STARS, 384, 144, 1.0f);
+    data->clouds = Tiler::Register(PNG_CLOUDS, 160, 32, 1.0f);
     for (int n = 0; n < 6; n++)
         data->anim[n] = Tiler::Register(PNG_TITLEANIM[n],
@@ -120 +125 @@
     data->timer = RandF(2000.0f, 3000.0f);
 
+    for (int n = 0; n < 5; n++)
+    {
+        data->cloudpos[n] = float2(RandF(384), RandF(130, 190));
+        data->cloudspeed[n] = RandF(-0.01f, 0.01f);
+    }
+
     position = int3(24, 72, 1);
     bbox[0] = position;
@@ -140 +151 @@
     static int const t1[] = { 31, 26, 7, 7, 32, 6, 31 };
     static int const t2[] = { 2, 4, 11, 4, 6, 2 };
+
+    for (int n = 0; n < 5; n++)
+    {
+        data->cloudpos[n].x += deltams * data->cloudspeed[n].x;
+        if (data->cloudpos[n].x > 384.0f)
+            data->cloudpos[n].x -= 384.0f;
+        else if (data->cloudpos[n].x < 0.0f)
+            data->cloudpos[n].x += 384.0f;
+    }
 
     switch (data->state)
@@ -235 +255 @@
     Scene::GetDefault()->AddTile((data->title << 16) | backid, 24, 72, 1, 0);
 
+    /* The stars */
+    if (data->period != TitleData::DAY)
+    {
+        Scene::GetDefault()->AddTile((data->stars << 16) | 0,
+                                     24 + 0, 72 + 240, 2, 0);
+    }
+
+    /* The clouds. FIXME: tune color grading later */
+    int cloudoff = data->period == TitleData::DAY ? 0 : 3;
+
+    for (int n = 0; n < 5; n++)
+    {
+        int cloudid = n * 4 + cloudoff;
+        Scene::GetDefault()->AddTile((data->clouds << 16) | cloudid,
+                                     24 + data->cloudpos[n].x,
+                                     72 + data->cloudpos[n].y, 2, 0);
+        Scene::GetDefault()->AddTile((data->clouds << 16) | cloudid,
+                                     24 + data->cloudpos[n].x - 384.0f,
+                                     72 + data->cloudpos[n].y, 2, 0);
+    }
+
     /* Maybe an animation? */
     int tiler = 0;
@@ -265 +306 @@
 
     /* The logo, on top of the rest. */
-    Scene::GetDefault()->AddTile((data->logo << 16) | 0, 26, 250, 2, 0);
+    Scene::GetDefault()->AddTile((data->logo << 16) | 0, 26, 250, 3, 0);
 }
 
@@ -278 +319 @@
     Tiler::Deregister(data->logo);
     Tiler::Deregister(data->title);
+    Tiler::Deregister(data->stars);
+    Tiler::Deregister(data->clouds);
     for (int n = 0; n < 6; n++)
         Tiler::Deregister(data->anim[n]);

trunk/monsterz/title.h

@@ -28 +28 @@
     virtual ~Title();
 
+    char const *GetName() { return "<title>"; }
+
     int IsClicked() const;