Changeset 1030
- Timestamp:
- Oct 21, 2011, 7:06:42 PM (11 years ago)
- Location:
- trunk/monsterz
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/monsterz/Makefile.am
r878 r1030 25 25 gfx/titleevent6.png gfx/titleclouds.png gfx/titlestars.png \ 26 26 gfx/titleeagle.png gfx/icons.png \ 27 gfx/title/logo.png gfx/title/ground.png 27 gfx/title/logo.png gfx/title/ground.png gfx/title/rocks.png 28 28 WAV = sound/applause.wav sound/boing.wav sound/click.wav sound/ding.wav \ 29 29 sound/duh.wav sound/grunt.wav sound/laugh.wav sound/pop.wav \ -
trunk/monsterz/monsterz.h
r791 r1030 20 20 static char const * const PNG_TITLE_LOGO = "monsterz/gfx/title/logo.png"; 21 21 static char const * const PNG_TITLE_GROUND = "monsterz/gfx/title/ground.png"; 22 static char const * const PNG_TITLE_ROCKS = "monsterz/gfx/title/rocks.png"; 22 23 23 24 static char const * const PNG_TITLE = "monsterz/gfx/title0.png"; -
trunk/monsterz/title.cpp
r958 r1030 40 40 41 41 private: 42 TileSet *title, *stars, *clouds, *logo, *ground ;42 TileSet *title, *stars, *clouds, *logo, *ground, *rocks; 43 43 TileSet *anim[6]; 44 44 TileSet *event[7]; … … 66 66 vec2 cloudspeed[MAX_CLOUDS]; 67 67 68 ivec2 ground_pos ;68 ivec2 ground_pos, rocks_pos; 69 69 70 70 struct … … 141 141 data->logo = Tiler::Register(PNG_TITLE_LOGO, ivec2(380, 181), 0, 1.0f); 142 142 data->logo_sprite = new Sprite(data->logo, 0); 143 data->logo_sprite->position = vec3(2 6, 250, 3);143 data->logo_sprite->position = vec3(226, 450, 3); 144 144 Ticker::Ref(data->logo_sprite); 145 145 … … 147 147 data->ground_pos = ivec2((vec2)(bbox[1] - bbox[0]) / ivec2(2, 4)) 148 148 - ivec2(384, 80); 149 150 data->rocks = Tiler::Register(PNG_TITLE_ROCKS, ivec2(640, 155), 0, 1.0f); 151 data->rocks_pos = ivec2((vec2)(bbox[1] - bbox[0]) / ivec2(2, 2)) 152 - ivec2(320, 240); 149 153 150 154 data->title = Tiler::Register(PNG_TITLE, 384, 0, 1.0f); … … 351 355 } 352 356 357 /* The rocks */ 358 Scene::GetDefault()->AddTile(data->rocks, 0, 359 ivec3(data->rocks_pos) + ivec3(0, 0, 10), 0); 360 353 361 /* Maybe an animation? */ 354 362 TileSet *tiler = NULL; … … 394 402 Ticker::Unref(data->logo_sprite); 395 403 Tiler::Deregister(data->ground); 404 Tiler::Deregister(data->rocks); 396 405 Tiler::Deregister(data->title); 397 406 Tiler::Deregister(data->stars);
Note: See TracChangeset
for help on using the changeset viewer.