[Super-tux-commit] supertux/src badguy.cpp,1.83,1.84 gameloop.cpp,1.135,1.136 level.cpp,1.81,1.82 le
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src badguy.cpp,1.83,1.84 gameloop.cpp,1.135,1.136 level.cpp,1.81,1.82 level.h,1.51,1.52 leveleditor.cpp,1.123,1.124 player.cpp,1.114,1.115 player.h,1.57,1.58 scene.cpp,1.28,1.29 scene.h,1.29,1.30 special.cpp,1.47,1.48 title.cpp,1.88,1.89 world.cpp,1.107,1.108 world.h,1.45,1.46
|
From: Matze B. <mat...@us...> - 2004-05-21 00:23:12
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15232/src Modified Files: badguy.cpp gameloop.cpp level.cpp level.h leveleditor.cpp player.cpp player.h scene.cpp scene.h special.cpp title.cpp world.cpp world.h Log Message: eliminated global scroll_x and scroll_y variables Index: scene.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/scene.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- scene.cpp 11 May 2004 21:53:50 -0000 1.28 +++ scene.cpp 21 May 2004 00:22:57 -0000 1.29 @@ -68,9 +68,6 @@ return PlayerStatus::NO_BONUS; } -// FIXME: Move this into a view class -float scroll_x, scroll_y; - unsigned int global_frame_counter; // EOF // Index: world.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- world.h 20 May 2004 23:07:25 -0000 1.45 +++ world.h 21 May 2004 00:22:57 -0000 1.46 @@ -33,6 +33,7 @@ #include "display_manager.h" class Level; +class Background; /** The World class holds a level and all the game objects (badguys, bouncy distros, etc) that are needed to run a game. */ @@ -54,6 +55,7 @@ static World* current_; public: + Background* background; BadGuys bad_guys; std::vector<Upgrade*> upgrades; @@ -79,8 +81,8 @@ void set_defaults(); void draw(); - void action(double frame_ratio); - void scrolling(double frame_ratio); // camera scrolling + void action(float elapsed_time); + void scrolling(float elapsed_time); // camera scrolling void play_music(int musictype); int get_music_type(); Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- special.cpp 20 May 2004 23:07:25 -0000 1.47 +++ special.cpp 21 May 2004 00:22:57 -0000 1.48 @@ -95,9 +95,14 @@ else if(physic.get_velocity_y() < -9) physic.set_velocity_y(-9); + float scroll_x = + World::current()->displaymanager.get_viewport().get_translation().x; + float scroll_y = + World::current()->displaymanager.get_viewport().get_translation().y; if (base.x < scroll_x || base.x > scroll_x + screen->w || - base.y > screen->h || + base.y < scroll_y || + base.y > scroll_y + screen->h || issolid(base.x + 4, base.y + 2) || issolid(base.x, base.y + 2) || life_count <= 0) @@ -181,11 +186,16 @@ } /* Away from the screen? Kill it! */ - if(base.x < scroll_x - OFFSCREEN_DISTANCE) { + float scroll_x = + World::current()->displaymanager.get_viewport().get_translation().x; + float scroll_y = + World::current()->displaymanager.get_viewport().get_translation().y; + if(base.x < scroll_x - OFFSCREEN_DISTANCE + || base.y < scroll_y - OFFSCREEN_DISTANCE) { remove_me(); return; } - if(base.y > screen->h) { + if(base.y > scroll_y + screen->h) { remove_me(); return; } Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- level.h 20 May 2004 23:07:24 -0000 1.51 +++ level.h 21 May 2004 00:22:57 -0000 1.52 @@ -140,9 +140,6 @@ /** Resize the level to a new width/height */ void resize(int new_width, int new_height); - /* Draw background */ - void draw_bg(); - /** Return the id of the tile at position x/y */ unsigned int gettileid(float x, float y) const; /** returns the id of the tile at position x,y Index: scene.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/scene.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- scene.h 11 May 2004 21:53:50 -0000 1.29 +++ scene.h 21 May 2004 00:22:57 -0000 1.30 @@ -46,7 +46,6 @@ extern PlayerStatus player_status; -extern float scroll_x, scroll_y; extern unsigned int global_frame_counter; #endif /*SUPERTUX_SCENE_H*/ Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- badguy.cpp 20 May 2004 23:07:24 -0000 1.83 +++ badguy.cpp 21 May 2004 00:22:57 -0000 1.84 @@ -35,6 +35,7 @@ #include "gameloop.h" #include "display_manager.h" #include "lispwriter.h" +#include "viewport.h" Sprite* img_mriceblock_flat_left; Sprite* img_mriceblock_flat_right; @@ -315,6 +316,9 @@ check_horizontal_bump(); if(mode == KICK && changed != dir) { + float scroll_x = World::current()->displaymanager + .get_viewport().get_translation().x; + /* handle stereo sound (number 10 should be tweaked...)*/ if (base.x < scroll_x + screen->w/2 - 10) play_sound(sounds[SND_RICOCHET], SOUND_LEFT_SPEAKER); @@ -514,6 +518,9 @@ dying = DYING_NOT; // now the bomb hurts timer.start(EXPLODETIME); + float scroll_x = World::current()->displaymanager + .get_viewport().get_translation().x; + /* play explosion sound */ // FIXME: is the stereo all right? maybe we should use player cordinates... if (base.x < scroll_x + screen->w/2 - 10) play_sound(sounds[SND_EXPLODE], SOUND_LEFT_SPEAKER); @@ -746,6 +753,9 @@ void BadGuy::action(float elapsed_time) { + float scroll_x = World::current()->displaymanager + .get_viewport().get_translation().x; + // Remove if it's far off the screen: if (base.x < scroll_x - OFFSCREEN_DISTANCE) { Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.135 retrieving revision 1.136 diff -u -d -r1.135 -r1.136 --- gameloop.cpp 20 May 2004 15:57:26 -0000 1.135 +++ gameloop.cpp 21 May 2004 00:22:57 -0000 1.136 @@ -53,6 +53,7 @@ #include "tile.h" #include "particlesystem.h" #include "resources.h" +#include "background.h" #include "music_manager.h" GameSession* GameSession::current_ = 0; @@ -145,8 +146,9 @@ music_manager->halt_music(); char str[60]; - - get_level()->draw_bg(); + + ViewPort dummy; + world->background->draw(dummy, LAYER_BACKGROUND0); sprintf(str, "%s", world->get_level()->name.c_str()); gold_text->drawf(str, 0, 220, A_HMIDDLE, A_TOP, 1); @@ -717,7 +719,8 @@ { char str[80]; - get_level()->draw_bg(); + ViewPort dummy; + world->background->draw(dummy, LAYER_BACKGROUND0); blue_text->drawf("Result:", 0, 200, A_HMIDDLE, A_TOP, 1); Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -u -d -r1.123 -r1.124 --- leveleditor.cpp 20 May 2004 23:07:24 -0000 1.123 +++ leveleditor.cpp 21 May 2004 00:22:57 -0000 1.124 @@ -42,6 +42,7 @@ #include "tile.h" #include "resources.h" #include "music_manager.h" +#include "background.h" #include "display_manager.h" /* definitions to aid development */ @@ -524,8 +525,6 @@ int le_init() { - - level_subsets = dsubdirs("/levels", "level1.stl"); le_level_subset = new LevelSubset; @@ -535,7 +534,6 @@ active_tm = TM_IA; le_show_grid = true; show_selections = true; - scroll_x = 0; done = 0; le_frame = 0; /* support for frames in some tiles, like waves and bad guys */ @@ -944,7 +942,8 @@ Uint8 a; /* Draw the real background */ - le_world->get_level()->draw_bg(); + le_world->background->draw(le_world->displaymanager.get_viewport(), + LAYER_BACKGROUND0); if(le_current.IsTile()) { Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- player.cpp 20 May 2004 23:46:50 -0000 1.114 +++ player.cpp 21 May 2004 00:22:57 -0000 1.115 @@ -669,7 +669,8 @@ } if (debug_mode) - fillrect(base.x - scroll_x, base.y - scroll_y, + fillrect(base.x - viewport.get_translation().x, + base.y - viewport.get_translation().y, base.width, base.height, 75,75,75, 150); } @@ -828,6 +829,10 @@ bool Player::is_dead() { + float scroll_x = + World::current()->displaymanager.get_viewport().get_translation().x; + float scroll_y = + World::current()->displaymanager.get_viewport().get_translation().y; if(base.y > screen->h + scroll_y || base.y > World::current()->get_level()->height*32 || base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL) // can happen in auto-scrolling return true; @@ -845,7 +850,8 @@ } void -Player::check_bounds(bool back_scrolling, bool hor_autoscroll) +Player::check_bounds(ViewPort& viewport, + bool back_scrolling, bool hor_autoscroll) { /* Keep tux in bounds: */ if (base.x < 0) @@ -860,17 +866,17 @@ kill(KILL); } - if(base.x < scroll_x && (!back_scrolling || hor_autoscroll)) // can happen if back scrolling is disabled - base.x = scroll_x; + if(base.x < viewport.get_translation().x && (!back_scrolling || hor_autoscroll)) // can happen if back scrolling is disabled + base.x = viewport.get_translation().x; if(hor_autoscroll) { - if(base.x == scroll_x) + if(base.x == viewport.get_translation().x) if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32))) kill(KILL); - if(base.x + base.width > scroll_x + screen->w) - base.x = scroll_x + screen->w - base.width; + if(base.x + base.width > viewport.get_translation().x + screen->w) + base.x = viewport.get_translation().x + screen->w - base.width; } } Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- player.h 20 May 2004 19:56:37 -0000 1.57 +++ player.h 21 May 2004 00:22:57 -0000 1.58 @@ -158,7 +158,7 @@ void is_dying(); bool is_dead(); void player_remove_powerups(); - void check_bounds(bool back_scrolling, bool hor_autoscroll); + void check_bounds(ViewPort& viewport, bool back_scrolling, bool hor_autoscroll); bool on_ground(); bool under_solid(); void grow(); Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- level.cpp 20 May 2004 23:07:24 -0000 1.81 +++ level.cpp 21 May 2004 00:22:57 -0000 1.82 @@ -613,25 +613,6 @@ } } -void Level::draw_bg() -{ - if(img_bkgd) - { - // Tile background horizontally - int sx = (int)((float)scroll_x * ((float)bkgd_speed/100.0f)) % img_bkgd->w; - int sy = (int)((float)scroll_y * ((float)bkgd_speed/100.0f)) % img_bkgd->h; - for (int x = 0; (x-1)*img_bkgd->w <= screen->w; x++) - for (int y = 0; (y-1)*img_bkgd->h <= screen->h; y++) - img_bkgd->draw_part(x == 0 ? sx : 0, y == 0 ? sy : 0, - x == 0 ? 0 : (img_bkgd->w * x) - sx, y == 0 ? 0 : (img_bkgd->h * y) - sy, - x == 0 ? img_bkgd->w - sx : img_bkgd->w, y == 0 ? img_bkgd->h - sy : img_bkgd->h); - } - else - { - drawgradient(bkgd_top, bkgd_bottom); - } -} - void Level::load_song() { Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- world.cpp 20 May 2004 23:58:31 -0000 1.107 +++ world.cpp 21 May 2004 00:22:57 -0000 1.108 @@ -59,13 +59,13 @@ get_level()->load_gfx(); // add background activate_particle_systems(); - Background* bg = new Background(displaymanager); + background = new Background(displaymanager); if(level->img_bkgd) { - bg->set_image(level->img_bkgd, level->bkgd_speed); + background->set_image(level->img_bkgd, level->bkgd_speed); } else { - bg->set_gradient(level->bkgd_top, level->bkgd_bottom); + background->set_gradient(level->bkgd_top, level->bkgd_bottom); } - gameobjects.push_back(bg); + gameobjects.push_back(background); // add tilemap gameobjects.push_back(new TileMap(displaymanager, get_level())); @@ -92,13 +92,13 @@ get_level()->load_gfx(); activate_particle_systems(); - Background* bg = new Background(displaymanager); + background = new Background(displaymanager); if(level->img_bkgd) { - bg->set_image(level->img_bkgd, level->bkgd_speed); + background->set_image(level->img_bkgd, level->bkgd_speed); } else { - bg->set_gradient(level->bkgd_top, level->bkgd_bottom); + background->set_gradient(level->bkgd_top, level->bkgd_bottom); } - gameobjects.push_back(bg); + gameobjects.push_back(background); // add tilemap gameobjects.push_back(new TileMap(displaymanager, get_level())); get_level()->load_song(); @@ -140,9 +140,6 @@ void World::set_defaults() { - // Set defaults: - scroll_x = 0; - player_status.score_multiplier = 1; counting_distros = false; @@ -213,7 +210,6 @@ World::draw() { /* Draw objects */ - displaymanager.get_viewport().set_translation(Vector(scroll_x, scroll_y)); displaymanager.draw(); } @@ -226,7 +222,8 @@ for(size_t i = 0; i < gameobjects.size(); ++i) gameobjects[i]->action(elapsed_time); - tux->check_bounds(level->back_scrolling, (bool)level->hor_autoscroll_speed); + tux->check_bounds(displaymanager.get_viewport(), + level->back_scrolling, (bool)level->hor_autoscroll_speed); scrolling(elapsed_time); /* Handle all possible collisions. */ @@ -284,6 +281,9 @@ /* This functions takes cares of the scrolling */ void World::scrolling(float elapsed_time) { + float scroll_x = displaymanager.get_viewport().get_translation().x; + float scroll_y = displaymanager.get_viewport().get_translation().y; + /* Y-axis scrolling */ float tux_pos_y = tux->base.y + (tux->base.height/2); @@ -308,6 +308,7 @@ if(level->hor_autoscroll_speed) { scroll_x += level->hor_autoscroll_speed * elapsed_time; + displaymanager.get_viewport().set_translation(Vector(scroll_x, scroll_y)); return; } @@ -379,6 +380,8 @@ scroll_x = level->width * 32 - screen->w; if(scroll_x < 0) scroll_x = 0; + + displaymanager.get_viewport().set_translation(Vector(scroll_x, scroll_y)); } void Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- title.cpp 20 May 2004 19:56:37 -0000 1.88 +++ title.cpp 21 May 2004 00:22:57 -0000 1.89 @@ -192,7 +192,6 @@ if(plevel->width * 32 - 320 < tux->base.x) { tux->level_begin(); - scroll_x = 0; } tux->can_jump = true; @@ -339,8 +338,6 @@ else if (process_load_game_menu()) { // FIXME: shouldn't be needed if GameSession doesn't relay on global variables - // reset tux - scroll_x = 0; //titletux.level_begin(); update_time = st_get_ticks(); } |
