[Super-tux-commit] supertux/src camera.cpp,NONE,1.1 camera.h,NONE,1.1 Makefile.am,1.26,1.27 backgrou
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src camera.cpp,NONE,1.1 camera.h,NONE,1.1 Makefile.am,1.26,1.27 background.cpp,1.2,1.3 background.h,1.3,1.4 badguy.cpp,1.86,1.87 badguy.h,1.44,1.45 button.cpp,1.30,1.31 display_manager.cpp,1.3,1.4 display_manager.h,1.3,1.4 drawable.h,1.2,1.3 game_object.h,1.3,1.4 gameloop.cpp,1.136,1.137 gameobjs.cpp,1.34,1.35 gameobjs.h,1.22,1.23 leveleditor.cpp,1.125,1.126 particlesystem.cpp,1.7,1.8 particlesystem.h,1.5,1.6 player.cpp,1.119,1.120 player.h,1.60,1.61 special.cpp,1.49,1.50 special.h,1.22,1.23 tilemap.cpp,1.4,1.5 tilemap.h,1.3,1.4 world.cpp,1.110,1.111 world.h,1.48,1.49 viewport.cpp,1.2,NONE viewport.h,1.3,NONE
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17717 Modified Files: Makefile.am background.cpp background.h badguy.cpp badguy.h button.cpp display_manager.cpp display_manager.h drawable.h game_object.h gameloop.cpp gameobjs.cpp gameobjs.h leveleditor.cpp particlesystem.cpp particlesystem.h player.cpp player.h special.cpp special.h tilemap.cpp tilemap.h world.cpp world.h Added Files: camera.cpp camera.h Removed Files: viewport.cpp viewport.h Log Message: -renamed ViewPort to Camera -removed type() function from GameObject, you should better use C++ RTTI: * casting: BadGuy* badguy = dynamic_cast<BadGuy*> (object); * comparing for specific type if(typeid(object) == typeid(BadGuy)) * getting the name typeid(object).name() -moved camera handling into Camera class -tweaked camera behaviour. Look for details in http://netpanzer.berlios.de/supertux/index.php/Camera Horizontal scrolling seems to be nicely now, vertical scrolling is still a bit too hectically... Index: world.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.h,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- world.h 24 May 2004 11:59:59 -0000 1.48 +++ world.h 24 May 2004 21:02:44 -0000 1.49 @@ -64,6 +64,7 @@ std::vector<Bullet*> bullets; std::vector<GameObject*> gameobjects; + Camera* camera; DisplayManager displaymanager; public: @@ -84,7 +85,6 @@ void draw(); 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.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- special.cpp 22 May 2004 17:55:44 -0000 1.49 +++ special.cpp 24 May 2004 21:02:27 -0000 1.50 @@ -96,9 +96,9 @@ physic.set_velocity_y(-9); float scroll_x = - World::current()->displaymanager.get_viewport().get_translation().x; + World::current()->camera->get_translation().x; float scroll_y = - World::current()->displaymanager.get_viewport().get_translation().y; + World::current()->camera->get_translation().y; if (base.x < scroll_x || base.x > scroll_x + screen->w || base.y < scroll_y || @@ -112,7 +112,7 @@ } void -Bullet::draw(ViewPort& viewport, int ) +Bullet::draw(Camera& viewport, int ) { if(kind == FIRE_BULLET) img_firebullet->draw(viewport.world2screen(Vector(base.x, base.y))); @@ -187,9 +187,9 @@ /* Away from the screen? Kill it! */ float scroll_x = - World::current()->displaymanager.get_viewport().get_translation().x; + World::current()->camera->get_translation().x; float scroll_y = - World::current()->displaymanager.get_viewport().get_translation().y; + World::current()->camera->get_translation().y; if(base.x < scroll_x - X_OFFSCREEN_DISTANCE || base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE || @@ -243,7 +243,7 @@ } void -Upgrade::draw(ViewPort& viewport, int) +Upgrade::draw(Camera& viewport, int) { SDL_Rect dest; Index: drawable.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/drawable.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- drawable.h 20 May 2004 23:19:55 -0000 1.2 +++ drawable.h 24 May 2004 21:02:26 -0000 1.3 @@ -19,7 +19,7 @@ #ifndef __DRAWABLE_H__ #define __DRAWABLE_H__ -class ViewPort; +class Camera; /** interface for all game objects that can be drawn on screen. */ @@ -28,7 +28,7 @@ public: /** This function draws the object on screen. */ - virtual void draw(ViewPort& viewport, int layer) = 0; + virtual void draw(Camera& viewport, int layer) = 0; }; #endif Index: tilemap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tilemap.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- tilemap.cpp 20 May 2004 23:19:55 -0000 1.4 +++ tilemap.cpp 24 May 2004 21:02:27 -0000 1.5 @@ -42,7 +42,7 @@ } void -TileMap::draw(ViewPort& viewport, int layer) +TileMap::draw(Camera& viewport, int layer) { std::vector<unsigned int>* tiles; switch(layer) { Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.136 retrieving revision 1.137 diff -u -d -r1.136 -r1.137 --- gameloop.cpp 21 May 2004 00:22:57 -0000 1.136 +++ gameloop.cpp 24 May 2004 21:02:26 -0000 1.137 @@ -147,7 +147,7 @@ char str[60]; - ViewPort dummy; + Camera dummy; world->background->draw(dummy, LAYER_BACKGROUND0); sprintf(str, "%s", world->get_level()->name.c_str()); @@ -719,7 +719,7 @@ { char str[80]; - ViewPort dummy; + Camera dummy; world->background->draw(dummy, LAYER_BACKGROUND0); blue_text->drawf("Result:", 0, 200, A_HMIDDLE, A_TOP, 1); Index: special.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- special.h 20 May 2004 23:07:25 -0000 1.22 +++ special.h 24 May 2004 21:02:27 -0000 1.23 @@ -53,14 +53,11 @@ virtual ~Upgrade(); virtual void action(float frame_ratio); - virtual void draw(ViewPort& viewport, int layer); + virtual void draw(Camera& viewport, int layer); virtual void collision(const MovingObject& other, int); void collision(void* p_c_object, int c_object, CollisionType type); - virtual std::string type() const - { return "Upgrade"; }; - private: void bump(Player* player); }; @@ -77,12 +74,10 @@ int kind); virtual void action(float frame_ratio); - virtual void draw(ViewPort& viewport, int layer); + virtual void draw(Camera& viewport, int layer); void collision(int c_object); virtual void collision(const MovingObject& other_object, int type); - virtual std::string type() const - { return "Bullet"; }; int kind; Index: display_manager.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/display_manager.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- display_manager.h 20 May 2004 23:19:55 -0000 1.3 +++ display_manager.h 24 May 2004 21:02:26 -0000 1.4 @@ -22,7 +22,7 @@ #include <vector> #include "drawable.h" -#include "viewport.h" +#include "camera.h" // some constants for predefined layer values enum { @@ -51,10 +51,7 @@ void remove_drawable(Drawable* object); - void draw(); - - ViewPort& get_viewport() - { return viewport; } + void draw(Camera& camera); private: class DrawingQueueEntry { @@ -74,7 +71,6 @@ typedef std::vector<DrawingQueueEntry> DisplayList; DisplayList displaylist; - ViewPort viewport; }; #endif Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- badguy.cpp 22 May 2004 18:42:40 -0000 1.86 +++ badguy.cpp 24 May 2004 21:02:26 -0000 1.87 @@ -35,7 +35,7 @@ #include "gameloop.h" #include "display_manager.h" #include "lispwriter.h" -#include "viewport.h" +#include "camera.h" Sprite* img_mriceblock_flat_left; Sprite* img_mriceblock_flat_right; @@ -316,8 +316,7 @@ check_horizontal_bump(); if(mode == KICK && changed != dir) { - float scroll_x = World::current()->displaymanager - .get_viewport().get_translation().x; + float scroll_x = World::current()->camera->get_translation().x; /* handle stereo sound (number 10 should be tweaked...)*/ if (base.x < scroll_x + screen->w/2 - 10) @@ -518,8 +517,7 @@ dying = DYING_NOT; // now the bomb hurts timer.start(EXPLODETIME); - float scroll_x = World::current()->displaymanager - .get_viewport().get_translation().x; + float scroll_x = World::current()->camera->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) @@ -753,10 +751,8 @@ void BadGuy::action(float elapsed_time) { - float scroll_x = World::current()->displaymanager - .get_viewport().get_translation().x; - float scroll_y = World::current()->displaymanager - .get_viewport().get_translation().y; + float scroll_x = World::current()->camera->get_translation().x; + float scroll_y = World::current()->camera->get_translation().y; // BadGuy fall below the ground if (base.y > World::current()->get_level()->height * 32) { @@ -836,7 +832,7 @@ } void -BadGuy::draw(ViewPort& viewport, int) +BadGuy::draw(Camera& viewport, int) { float scroll_x = viewport.get_translation().x; float scroll_y = viewport.get_translation().y; Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- badguy.h 20 May 2004 23:07:24 -0000 1.44 +++ badguy.h 24 May 2004 21:02:26 -0000 1.45 @@ -118,10 +118,8 @@ virtual void write(LispWriter& writer); virtual void action(float frame_ratio); - virtual void draw(ViewPort& viewport, int layer); + virtual void draw(Camera& viewport, int layer); virtual void collision(const MovingObject& other, int type); - virtual std::string type() const - { return "BadGuy"; }; void collision(void* p_c_object, int c_object, CollisionType type = COLLISION_NORMAL); Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- gameobjs.cpp 24 May 2004 20:41:43 -0000 1.34 +++ gameobjs.cpp 24 May 2004 21:02:27 -0000 1.35 @@ -47,7 +47,7 @@ } void -BouncyDistro::draw(ViewPort& viewport, int ) +BouncyDistro::draw(Camera& viewport, int ) { img_distro[0]->draw(viewport.world2screen(position)); } @@ -71,7 +71,7 @@ } void -BrokenBrick::draw(ViewPort& viewport, int ) +BrokenBrick::draw(Camera& viewport, int ) { SDL_Rect src, dest; src.x = rand() % 16; @@ -110,7 +110,7 @@ } void -BouncyBrick::draw(ViewPort& viewport, int) +BouncyBrick::draw(Camera& viewport, int) { Tile::draw(viewport.world2screen(position + Vector(0, offset)), shape); } @@ -135,7 +135,7 @@ } void -FloatingScore::draw(ViewPort& viewport, int ) +FloatingScore::draw(Camera& viewport, int ) { gold_text->draw(str, viewport.world2screen(position)); } @@ -174,7 +174,7 @@ } void -Trampoline::draw(ViewPort& viewport, int ) +Trampoline::draw(Camera& viewport, int ) { img_trampoline[frame]->draw(viewport.world2screen(Vector(base.x, base.y))); frame = 0; @@ -264,8 +264,10 @@ else frame = 0; - if (squish_amount < 20) + if (squish_amount < 20) { pplayer_c->physic.set_velocity_y(power); + pplayer_c->fall_mode = Player::TRAMPOLINE_JUMP; + } else if (pplayer_c->physic.get_velocity_y() < 0) pplayer_c->physic.set_velocity_y(-squish_amount/32); } @@ -316,7 +318,7 @@ } void -FlyingPlatform::draw(ViewPort& viewport, int ) +FlyingPlatform::draw(Camera& viewport, int ) { img_flying_platform->draw(viewport.world2screen(Vector(base.x, base.y))); } --- NEW FILE: camera.cpp --- // $Id: camera.cpp,v 1.1 2004/05/24 21:02:26 matzebraun Exp $ // // SuperTux - A Jump'n Run // Copyright (C) 2004 Matthias Braun <ma...@br... // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "camera.h" #include <math.h> #include "lispwriter.h" #include "player.h" #include "level.h" #include "globals.h" Camera::Camera(Player* newplayer, Level* newlevel) : player(newplayer), level(newlevel), scrollchange(NONE) { if(!player || !level) mode = MANUAL; else mode = NORMAL; } Camera::~Camera() { } void Camera::set_translation(const Vector& newtranslation) { translation = newtranslation; } void Camera::write(LispWriter& writer) { writer.start_list("camera"); if(mode == NORMAL) { writer.write_string("mode", "normal"); } else if(mode == AUTOSCROLL) { writer.write_string("mode", "autoscroll"); } else if(mode == MANUAL) { writer.write_string("mode", "manual"); } writer.end_list("camera"); } static const float EPSILON = .00001; static const float max_speed_y = 1.4; void Camera::action(float elapsed_time) { if(mode == NORMAL) scroll_normal(elapsed_time); else if(mode == AUTOSCROLL) scroll_autoscroll(elapsed_time); } void Camera::scroll_normal(float elapsed_time) { assert(level != 0 && player != 0); // check that we don't have division by zero later if(elapsed_time < EPSILON) return; bool do_y_scrolling = true; if(player->dying) do_y_scrolling = false; if(do_y_scrolling) { float target_y; if(player->fall_mode == Player::JUMPING) target_y = player->last_ground_y + player->base.height; else target_y = player->base.y + player->base.height; float delta_y = translation.y - (target_y - screen->h/2); float speed_y = delta_y / elapsed_time; if(player->fall_mode != Player::FALLING && player->fall_mode != Player::TRAMPOLINE_JUMP) { if(speed_y > max_speed_y) speed_y = max_speed_y; else if(speed_y < -max_speed_y) speed_y = -max_speed_y; } translation.y -= speed_y * elapsed_time; // don't scroll before the start or after the level's end if(translation.y > level->height * 32 - screen->h) translation.y = level->height * 32 - screen->h; if(translation.y < 0) translation.y = 0; } if((player->dir == ::LEFT && scrollchange == RIGHT) || (player->dir == ::RIGHT && scrollchange == LEFT)) scrollchange = NONE; if(player->base.x < translation.x + screen->w/3) scrollchange = LEFT; else if(player->base.x > translation.x + screen->w/3*2) scrollchange = RIGHT; float target_x; if(scrollchange == LEFT) target_x = player->base.x - screen->w/3*2; else if(scrollchange == RIGHT) target_x = player->base.x - screen->w/3; else target_x = translation.x; float delta_x = translation.x - target_x; float speed_x = delta_x / elapsed_time; float maxv = 1 + fabsf(player->physic.get_velocity_x() * 2); printf("SX: %f MV: %f.\n", player->physic.get_velocity_x(), maxv); if(speed_x > maxv) speed_x = maxv; else if(speed_x < -maxv) speed_x = -maxv; translation.x -= speed_x * elapsed_time; // don't scroll before the start or after the level's end if(translation.x > level->width * 32 - screen->w) translation.x = level->width * 32 - screen->w; if(translation.x < 0) translation.x = 0; } void Camera::scroll_autoscroll(float elapsed_time) { // TODO } Index: game_object.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/game_object.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- game_object.h 20 May 2004 23:19:55 -0000 1.3 +++ game_object.h 24 May 2004 21:02:26 -0000 1.4 @@ -41,11 +41,6 @@ GameObject(); virtual ~GameObject(); - /** returns the name of the objecttype, this is mainly usefull for the editor. - * For the coding part you should use C++ RTTI (ie. typeid and dynamic_cast) - * instead. - */ - virtual std::string type() const = 0; /** This function is called once per frame and allows the object to update * it's state. The elapsed_time is the time since the last frame and should be * the base for all timed things. Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Makefile.am 20 May 2004 23:19:55 -0000 1.26 +++ Makefile.am 24 May 2004 21:02:26 -0000 1.27 @@ -77,8 +77,8 @@ music_manager.h \ musicref.cpp \ musicref.h \ -viewport.cpp \ -viewport.h \ +camera.cpp \ +camera.h \ game_object.cpp \ game_object.h \ display_manager.h \ Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- player.h 23 May 2004 00:11:58 -0000 1.60 +++ player.h 24 May 2004 21:02:27 -0000 1.61 @@ -112,6 +112,7 @@ public: enum HurtMode { KILL, SHRINK }; enum Power { NONE_POWER, FIRE_POWER, ICE_POWER }; + enum FallMode { ON_GROUND, JUMPING, TRAMPOLINE_JUMP, FALLING }; player_input_type input; int got_power; @@ -123,6 +124,9 @@ Direction dir; Direction old_dir; + float last_ground_y; + FallMode fall_mode; + bool jumping; bool can_jump; bool butt_jump; @@ -148,18 +152,16 @@ void grabdistros(); virtual void action(float elapsed_time); - virtual void draw(ViewPort& viewport, int layer); + virtual void draw(Camera& viewport, int layer); virtual void collision(const MovingObject& other_object, int collision_type); - virtual std::string type() const - { return "Player"; } void collision(void* p_c_object, int c_object); void kill(HurtMode mode); void is_dying(); bool is_dead(); void player_remove_powerups(); - void check_bounds(ViewPort& viewport, bool back_scrolling, bool hor_autoscroll); + void check_bounds(Camera& viewport, bool back_scrolling, bool hor_autoscroll); bool on_ground(); bool under_solid(); bool tiles_on_air(int tiles); --- viewport.h DELETED --- Index: particlesystem.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/particlesystem.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- particlesystem.cpp 20 May 2004 12:12:38 -0000 1.7 +++ particlesystem.cpp 24 May 2004 21:02:27 -0000 1.8 @@ -25,7 +25,7 @@ #include "world.h" #include "level.h" #include "scene.h" -#include "viewport.h" +#include "camera.h" #include "display_manager.h" ParticleSystem::ParticleSystem(DisplayManager& displaymanager) @@ -44,7 +44,7 @@ } } -void ParticleSystem::draw(ViewPort& viewport, int layer) +void ParticleSystem::draw(Camera& viewport, int layer) { std::vector<Particle*>::iterator i; for(i = particles.begin(); i != particles.end(); ++i) { Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- world.cpp 24 May 2004 11:59:59 -0000 1.110 +++ world.cpp 24 May 2004 21:02:27 -0000 1.111 @@ -33,7 +33,7 @@ #include "tile.h" #include "resources.h" #include "gameobjs.h" -#include "viewport.h" +#include "camera.h" #include "display_manager.h" #include "background.h" #include "tilemap.h" @@ -52,11 +52,11 @@ level->load(filename, this); tux = new Player(displaymanager); - gameobjects.push_back(tux); + add_object(tux); set_defaults(); - get_level()->load_gfx(); + level->load_gfx(); // add background activate_particle_systems(); background = new Background(displaymanager); @@ -65,14 +65,17 @@ } else { background->set_gradient(level->bkgd_top, level->bkgd_bottom); } - gameobjects.push_back(background); + add_object(background); // add tilemap - gameobjects.push_back(new TileMap(displaymanager, get_level())); - get_level()->load_song(); + add_object(new TileMap(displaymanager, level)); + level->load_song(); apply_bonuses(); + camera = new Camera(tux, level); + add_object(camera); + scrolling_timer.init(true); } @@ -217,7 +220,7 @@ World::draw() { /* Draw objects */ - displaymanager.draw(); + displaymanager.draw(*camera); } void @@ -229,9 +232,8 @@ for(size_t i = 0; i < gameobjects.size(); ++i) gameobjects[i]->action(elapsed_time); - tux->check_bounds(displaymanager.get_viewport(), + tux->check_bounds(*camera, level->back_scrolling, (bool)level->hor_autoscroll_speed); - scrolling(elapsed_time); /* Handle all possible collisions. */ collision_handler(); @@ -288,35 +290,59 @@ // should be less than screen->h/2 (300) #define Y_SPACE 250 +static const float max_speed_y = 1.4; + // the time it takes to move the camera (in ms) #define CHANGE_DIR_SCROLL_SPEED 2000 +static const float EPSILON = .0001; + +#if 0 /* 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; + if(elapsed_time < EPSILON) + return; + + Vector scroll = displaymanager.get_viewport().get_translation(); + bool do_y_scrolling = true; + + if(tux->dying) + do_y_scrolling = false; /* Y-axis scrolling */ + if(do_y_scrolling) { + float target_y; + // upwards we target the y position of the platforms tux stands on + if(tux->fall_mode != Player::FALLING) + target_y = tux->last_ground_y + tux->base.height; + else + target_y = tux->base.y + tux->base.height; - float tux_pos_y = tux->base.y + (tux->base.height/2); + float delta_y = scroll.y - (target_y - (screen->h/2)); + float speed_y = delta_y / elapsed_time; - if(level->height > VISIBLE_TILES_Y-1 && !tux->dying) - { - if (scroll_y < tux_pos_y - (screen->h - Y_SPACE)) - scroll_y = tux_pos_y - (screen->h - Y_SPACE); - else if (scroll_y > tux_pos_y - Y_SPACE) - scroll_y = tux_pos_y - Y_SPACE; - } + float max = max_speed_y; + if(fabsf(delta_y) > float(screen->h)/5.0) + max *= 5; + + if(speed_y > max) + speed_y = max; + else if(speed_y < -max) + speed_y = -max; - // this code prevent the screen to scroll before the start or after the level's end - if(scroll_y > level->height * 32 - screen->h) - scroll_y = level->height * 32 - screen->h; - if(scroll_y < 0) - scroll_y = 0; + scroll.y -= speed_y * elapsed_time; + + // don't scroll before the start or after the level's end + if(scroll.y > level->height * 32 - screen->h) + scroll.y = level->height * 32 - screen->h; + if(scroll.y < 0) + scroll.y = 0; + } /* X-axis scrolling */ +#if 0 /* Auto scrolling */ if(level->hor_autoscroll_speed) { @@ -324,7 +350,7 @@ displaymanager.get_viewport().set_translation(Vector(scroll_x, scroll_y)); return; } - +#endif /* Horizontal backscrolling */ float tux_pos_x = tux->base.x + (tux->base.width/2); @@ -371,31 +397,32 @@ float number = 2.5/(elapsed_time * CHANGE_DIR_SCROLL_SPEED/1000)*exp((CHANGE_DIR_SCROLL_SPEED-scrolling_timer.get_left())/1400.); if(left) number *= -1.; - scroll_x += number + scroll.x += number + constant1 * tux->physic.get_velocity_x() * elapsed_time + constant2 * tux->physic.get_acceleration_x() * elapsed_time * elapsed_time; - if ((right && final_scroll_x - scroll_x < 0) || (left && final_scroll_x - scroll_x > 0)) - scroll_x = final_scroll_x; - + if ((right && final_scroll_x - scroll.x < 0) || (left && final_scroll_x - + scroll.x > 0)) + scroll.x = final_scroll_x; } else { - if (right && scroll_x < tux_pos_x - (screen->w - X_SPACE)) - scroll_x = tux_pos_x - (screen->w - X_SPACE); - else if (left && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling) - scroll_x = tux_pos_x - X_SPACE; + if (right && scroll.x < tux_pos_x - (screen->w - X_SPACE)) + scroll.x = tux_pos_x - (screen->w - X_SPACE); + else if (left && scroll.x > tux_pos_x - X_SPACE && level->back_scrolling) + scroll.x = tux_pos_x - X_SPACE; } - // this code prevent the screen to scroll before the start or after the level's end - if(scroll_x > level->width * 32 - screen->w) - scroll_x = level->width * 32 - screen->w; - if(scroll_x < 0) - scroll_x = 0; + // don't scroll before the start or after the level's end + if(scroll.x > level->width * 32 - screen->w) + scroll.x = level->width * 32 - screen->w; + if(scroll.x < 0) + scroll.x = 0; - displaymanager.get_viewport().set_translation(Vector(scroll_x, scroll_y)); + displaymanager.get_viewport().set_translation(scroll); } +#endif void World::collision_handler() Index: gameobjs.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- gameobjs.h 24 May 2004 11:59:59 -0000 1.22 +++ gameobjs.h 24 May 2004 21:02:27 -0000 1.23 @@ -42,9 +42,7 @@ public: BouncyDistro(DisplayManager& displaymanager, const Vector& pos); virtual void action(float elapsed_time); - virtual void draw(ViewPort& viewport, int layer); - virtual std::string type() const - { return "BouncyDistro"; }; + virtual void draw(Camera& viewport, int layer); private: Vector position; @@ -65,10 +63,7 @@ const Vector& pos, const Vector& movement); virtual void action(float elapsed_time); - virtual void draw(ViewPort& viewport, int layer); - - virtual std::string type() const - { return "BrokenBrick"; }; + virtual void draw(Camera& viewport, int layer); private: Timer timer; @@ -82,11 +77,8 @@ public: BouncyBrick(DisplayManager& displaymanager, const Vector& pos); virtual void action(float elapsed_time); - virtual void draw(ViewPort& viewport, int layer); + virtual void draw(Camera& viewport, int layer); - virtual std::string type() const - { return "BouncyBrick"; }; - private: Vector position; float offset; @@ -100,9 +92,7 @@ FloatingScore(DisplayManager& displaymanager, const Vector& pos, int s); virtual void action(float elapsed_time); - virtual void draw(ViewPort& viewport, int layer); - virtual std::string type() const - { return "FloatingScore"; }; + virtual void draw(Camera& viewport, int layer); private: Vector position; @@ -117,9 +107,7 @@ virtual void write(LispWriter& writer); virtual void action(float frame_ratio); - virtual void draw(ViewPort& viewport, int layer); - virtual std::string type() const - { return "Trampoline"; }; + virtual void draw(Camera& viewport, int layer); virtual void collision(const MovingObject& other, int); void collision(void *p_c_object, int c_object, CollisionType type); @@ -139,9 +127,7 @@ virtual void write(LispWriter& writer); virtual void action(float frame_ratio); - virtual void draw(ViewPort& viewport, int layer); - virtual std::string type() const - { return "Trampoline"; }; + virtual void draw(Camera& viewport, int layer); virtual void collision(const MovingObject& other, int); void collision(void *p_c_object, int c_object, CollisionType type); Index: tilemap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tilemap.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tilemap.h 20 May 2004 23:19:55 -0000 1.3 +++ tilemap.h 24 May 2004 21:02:27 -0000 1.4 @@ -34,9 +34,7 @@ virtual ~TileMap(); virtual void action(float elapsed_time); - virtual void draw(ViewPort& viewport, int layer); - virtual std::string type() const - { return "TileMap"; } + virtual void draw(Camera& viewport, int layer); private: Level* level; Index: particlesystem.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/particlesystem.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- particlesystem.h 20 May 2004 23:07:25 -0000 1.5 +++ particlesystem.h 24 May 2004 21:02:27 -0000 1.6 @@ -48,7 +48,7 @@ ParticleSystem(DisplayManager& displaymanager); virtual ~ParticleSystem(); - virtual void draw(ViewPort& view, int layer); + virtual void draw(Camera& view, int layer); protected: class Particle --- NEW FILE: camera.h --- // $Id: camera.h,v 1.1 2004/05/24 21:02:26 matzebraun Exp $ // // SuperTux - A Jump'n Run // Copyright (C) 2004 Matthias Braun <ma...@br... // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef __VIEWPORT_H__ #define __VIEWPORT_H__ #include "vector.h" #include "game_object.h" #include "serializable.h" class LispReader; class Player; class Level; class Camera : public GameObject, public Serializable { public: Camera(Player* player = 0, Level* level = 0); virtual ~Camera(); /** transforms a coordinate in world space to screen space. * Basically you have to apply this function to each coordinate that you want * to display on screen. */ Vector world2screen(const Vector& worldpos) const { return worldpos - translation; } /// parse camera mode from lisp file void parse_camera(LispReader& reader); /// write camera mode to a lisp file virtual void write(LispWriter& writer); /** returns the current translation (=scroll) vector of the viewport */ const Vector& get_translation() const { return translation; } /** set the curren translation vector of the viewport */ void set_translation(const Vector& translation); virtual void action(float elapsed_time); enum CameraMode { NORMAL, AUTOSCROLL, MANUAL }; private: void scroll_normal(float elapsed_time); void scroll_autoscroll(float elapsed_time); enum LeftRightScrollChange { NONE, LEFT, RIGHT }; Vector translation; Player* player; Level* level; CameraMode mode; LeftRightScrollChange scrollchange; }; #endif --- viewport.cpp DELETED --- Index: button.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- button.cpp 20 May 2004 19:56:37 -0000 1.30 +++ button.cpp 24 May 2004 21:02:26 -0000 1.31 @@ -24,7 +24,7 @@ #include "screen.h" #include "globals.h" #include "button.h" -#include "viewport.h" +#include "camera.h" Timer Button::popup_timer; @@ -87,7 +87,7 @@ if(drawable) { - ViewPort viewport; + Camera viewport; viewport.set_translation(Vector(rect.x, rect.y)); drawable->draw(viewport, 0); } Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- leveleditor.cpp 21 May 2004 19:35:14 -0000 1.125 +++ leveleditor.cpp 24 May 2004 21:02:27 -0000 1.126 @@ -19,6 +19,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <map> +#include <typeinfo> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -942,8 +943,7 @@ Uint8 a; /* Draw the real background */ - le_world->background->draw(le_world->displaymanager.get_viewport(), - LAYER_BACKGROUND0); + le_world->background->draw(*le_world->camera, LAYER_BACKGROUND0); if(le_current.IsTile()) { @@ -1012,7 +1012,7 @@ continue; /* to support frames: img_bsod_left[(frame / 5) % 4] */ - ViewPort viewport; + Camera viewport; viewport.set_translation(Vector(pos_x, pos_y)); badguy->draw(viewport, 0); } @@ -1028,7 +1028,8 @@ Menu* object_properties_menu = new Menu(); bool loop = true; - object_properties_menu->additem(MN_LABEL,pobj->type() + " Properties",0,0); + std::string type = typeid(pobj).name(); + object_properties_menu->additem(MN_LABEL, type + " Properties",0,0); object_properties_menu->additem(MN_HL,"",0,0); BadGuy* pbad = dynamic_cast<BadGuy*>(pobj); @@ -1510,15 +1511,17 @@ if(le_current.IsObject()) { le_level_changed = true; - std::string type = le_current.obj->type(); + BadGuy* pbadguy = dynamic_cast<BadGuy*>(le_current.obj); - if(type == "BadGuy") + if(pbadguy) { - ViewPort viewport(le_world->displaymanager.get_viewport()); + Camera& camera = *le_world->camera; DisplayManager dummy; - BadGuy* pbadguy = dynamic_cast<BadGuy*>(le_current.obj); - le_world->bad_guys.push_back(new BadGuy(dummy, pbadguy->kind, cursor_x + viewport.get_translation().x, cursor_y + viewport.get_translation().y)); + le_world->bad_guys.push_back( + new BadGuy(dummy, pbadguy->kind, + cursor_x + camera.get_translation().x, + cursor_y + camera.get_translation().y)); le_world->gameobjects.push_back(le_world->bad_guys.back()); } } @@ -1678,11 +1681,11 @@ /* if there is a bad guy over there, remove it */ // XXX TODO for(std::vector<GameObject*>::iterator it = le_world->gameobjects.begin(); - it != le_world->gameobjects.end(); ++it) - if ((*it)->type() == "BadGuy") + it != le_world->gameobjects.end(); ++it) { + BadGuy* badguy = dynamic_cast<BadGuy*>((*it)); + if (badguy) { - BadGuy* pbadguy = dynamic_cast<BadGuy*>((*it)); - if(rectcollision(cursor_base, pbadguy->base)) + if(rectcollision(cursor_base, badguy->base)) { delete (*it); //le_world->bad_guys.erase(it); @@ -1690,6 +1693,7 @@ break; } } + } break; case SQUARE: @@ -1724,9 +1728,9 @@ for(std::vector<GameObject*>::iterator it = le_world->gameobjects.begin(); it != le_world->gameobjects.end(); ++it /* will be at end of loop */) { - if ((*it)->type() == "BadGuy") + MovingObject* pmobject = dynamic_cast<MovingObject*> (*it); + if (pmobject) { - MovingObject* pmobject = dynamic_cast<MovingObject*> (*it); if(pmobject->base.x/32 >= x1 && pmobject->base.x/32 <= x2 && pmobject->base.y/32 >= y1 && pmobject->base.y/32 <= y2) { Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- player.cpp 24 May 2004 11:59:59 -0000 1.119 +++ player.cpp 24 May 2004 21:02:27 -0000 1.120 @@ -101,6 +101,8 @@ duck = false; dying = DYING_NOT; + last_ground_y = 0; + fall_mode = ON_GROUND; jumping = false; can_jump = true; butt_jump = false; @@ -415,6 +417,17 @@ void Player::handle_vertical_input() { + // set fall mode... + if(on_ground()) { + fall_mode = ON_GROUND; + last_ground_y = base.y; + } else { + if(base.y > last_ground_y) + fall_mode = FALLING; + else if(fall_mode == ON_GROUND) + fall_mode = JUMPING; + } + // Press jump key if(input.up == DOWN && can_jump && on_ground()) { @@ -596,7 +609,7 @@ } void -Player::draw(ViewPort& viewport, int layer) +Player::draw(Camera& viewport, int layer) { PlayerSprite* sprite; @@ -857,9 +870,9 @@ bool Player::is_dead() { float scroll_x = - World::current()->displaymanager.get_viewport().get_translation().x; + World::current()->camera->get_translation().x; float scroll_y = - World::current()->displaymanager.get_viewport().get_translation().y; + World::current()->camera->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; @@ -877,7 +890,7 @@ } void -Player::check_bounds(ViewPort& viewport, +Player::check_bounds(Camera& viewport, bool back_scrolling, bool hor_autoscroll) { /* Keep tux in bounds: */ Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- background.cpp 20 May 2004 23:19:55 -0000 1.2 +++ background.cpp 24 May 2004 21:02:26 -0000 1.3 @@ -19,7 +19,7 @@ #include "background.h" #include "globals.h" -#include "viewport.h" +#include "camera.h" #include "display_manager.h" Background::Background(DisplayManager& displaymanager) @@ -53,7 +53,7 @@ } void -Background::draw(ViewPort& viewport, int ) +Background::draw(Camera& viewport, int ) { if(bgtype == BACKGROUND_GRADIENT) { drawgradient(gradient_top, gradient_bottom); Index: display_manager.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/display_manager.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- display_manager.cpp 20 May 2004 23:19:55 -0000 1.3 +++ display_manager.cpp 24 May 2004 21:02:26 -0000 1.4 @@ -51,10 +51,10 @@ } void -DisplayManager::draw() +DisplayManager::draw(Camera& camera) { for(DisplayList::iterator i = displaylist.begin(); i != displaylist.end(); ++i) - i->object->draw(viewport, i->layer); + i->object->draw(camera, i->layer); } Index: background.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- background.h 20 May 2004 23:19:55 -0000 1.3 +++ background.h 24 May 2004 21:02:26 -0000 1.4 @@ -40,12 +40,9 @@ void set_gradient(Color top, Color bottom); - virtual std::string type() const - { return "Background"; } - virtual void action(float elapsed_time); - virtual void draw(ViewPort& viewport, int layer); + virtual void draw(Camera& viewport, int layer); private: int bgtype; |
