X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameobjs.cpp;h=5340bfb57b31712ce8c70592b46490391501aa3e;hb=e4db6eb50cd6bcba607858b5e6c4c5d53531ed1f;hp=f2d589b43595f55829d1cfc887d185e8f2aa1707;hpb=3e43c88abc23c09ac467b3f47d708a6b08938c66;p=supertux.git diff --git a/src/gameobjs.cpp b/src/gameobjs.cpp index f2d589b43..5340bfb57 100644 --- a/src/gameobjs.cpp +++ b/src/gameobjs.cpp @@ -18,22 +18,27 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. + #include #include -#include "world.h" +#include + +#include "app/globals.h" #include "tile.h" +#include "tile_manager.h" #include "gameloop.h" #include "gameobjs.h" -#include "sprite_manager.h" +#include "special/sprite_manager.h" #include "resources.h" -#include "level.h" -#include "display_manager.h" +#include "sector.h" +#include "tilemap.h" +#include "video/drawing_context.h" +#include "camera.h" -BouncyDistro::BouncyDistro(DisplayManager& displaymanager, const Vector& pos) +BouncyDistro::BouncyDistro(const Vector& pos) : position(pos) { ym = -2; - displaymanager.add_drawable(this, LAYER_OBJECTS); } void @@ -47,17 +52,15 @@ BouncyDistro::action(float elapsed_time) } void -BouncyDistro::draw(ViewPort& viewport, int ) +BouncyDistro::draw(DrawingContext& context) { - img_distro[0]->draw(viewport.world2screen(position)); + context.draw_surface(img_distro[0], position, LAYER_OBJECTS); } -BrokenBrick::BrokenBrick(DisplayManager& displaymanager, Tile* ntile, - const Vector& pos, const Vector& nmovement) +BrokenBrick::BrokenBrick(Tile* ntile,const Vector& pos, const Vector& nmovement) : tile(ntile), position(pos), movement(nmovement) { - displaymanager.add_drawable(this, LAYER_OBJECTS); timer.start(200); } @@ -71,28 +74,20 @@ BrokenBrick::action(float elapsed_time) } void -BrokenBrick::draw(ViewPort& viewport, int ) -{ - SDL_Rect src, dest; - src.x = rand() % 16; - src.y = rand() % 16; - src.w = 16; - src.h = 16; - - dest.x = (int)(position.x - viewport.get_translation().x); - dest.y = (int)(position.y - viewport.get_translation().y); - dest.w = 16; - dest.h = 16; - +BrokenBrick::draw(DrawingContext& context) +{ if (tile->images.size() > 0) - tile->images[0]->draw_part(src.x,src.y,dest.x,dest.y,dest.w,dest.h); + context.draw_surface_part(tile->images[0], + Vector(rand() % 16, rand() % 16), + Vector(16, 16), + position, LAYER_OBJECTS + 1); } -BouncyBrick::BouncyBrick(DisplayManager& displaymanager, const Vector& pos) - : position(pos), offset(0), offset_m(-BOUNCY_BRICK_SPEED) -{ - displaymanager.add_drawable(this, LAYER_OBJECTS); - shape = World::current()->get_level()->gettileid(pos.x, pos.y); +BouncyBrick::BouncyBrick(const Vector& pos) + : position(pos), offset(0), offset_m(-BOUNCY_BRICK_SPEED), + shape(Sector::current()->solids->get_tile_id_at(pos)) +{ + shape.hidden = true; } void @@ -106,63 +101,93 @@ BouncyBrick::action(float elapsed_time) /* Stop bouncing? */ if (offset >= 0) - remove_me(); + { + shape.hidden = false; + remove_me(); + } } void -BouncyBrick::draw(ViewPort& viewport, int) +BouncyBrick::draw(DrawingContext& context) { - Tile::draw(viewport.world2screen(position + Vector(0, offset)), shape); + TileManager::instance()-> + draw_tile(context, shape.id, position + Vector(0, offset), LAYER_TILES+1); } -FloatingScore::FloatingScore(DisplayManager& displaymanager, - const Vector& pos, int score) +FloatingText::FloatingText(const Vector& pos, const std::string& text_) + : position(pos), text(text_) +{ + timer.start(1000); + position.x -= text.size() * 8; +} + +FloatingText::FloatingText(const Vector& pos, int score) : position(pos) { - displaymanager.add_drawable(this, LAYER_OBJECTS); timer.start(1000); + + // turn int into a string + char str[10]; snprintf(str, 10, "%d", score); - position.x -= strlen(str) * 8; + text = str; + + position.x -= text.size() * 8; } void -FloatingScore::action(float elapsed_time) +FloatingText::action(float elapsed_time) { - position.y -= 2 * elapsed_time; + position.y -= 1.4 * elapsed_time; if(!timer.check()) remove_me(); } +#define FADING_TIME 350 + void -FloatingScore::draw(ViewPort& viewport, int ) +FloatingText::draw(DrawingContext& context) { - gold_text->draw(str, viewport.world2screen(position)); + // make an alpha animation when disapearing + int alpha; + if(timer.get_left() < FADING_TIME) + alpha = timer.get_left() * 255 / FADING_TIME; + else + alpha = 255; + + context.push_transform(); + context.set_alpha(alpha); + + context.draw_text(gold_text, text, position, LEFT_ALLIGN, LAYER_OBJECTS+1); + + context.pop_transform(); } /* Trampoline */ -#define TRAMPOLINE_FRAMES 4 -Sprite *img_trampoline[TRAMPOLINE_FRAMES]; +Sprite *img_trampoline; -void load_object_gfx() +Trampoline::Trampoline(LispReader& reader) { - char sprite_name[16]; + reader.read_float("x", base.x); + reader.read_float("y", base.y); + base.width = 32; + base.height = 32; + power = 7.5; + reader.read_float("power", power); - for (int i = 0; i < TRAMPOLINE_FRAMES; i++) - { - sprintf(sprite_name, "trampoline-%i", i+1); - img_trampoline[i] = sprite_manager->load(sprite_name); - } + frame = 0; + mode = M_NORMAL; + physic.reset(); } -void -Trampoline::init(float x, float y) +Trampoline::Trampoline(float x, float y) { base.x = x; base.y = y; base.width = 32; base.height = 32; + power = 7.5; frame = 0; mode = M_NORMAL; @@ -170,18 +195,27 @@ Trampoline::init(float x, float y) } void -Trampoline::draw() +Trampoline::write(LispWriter& writer) { - img_trampoline[frame]->draw((int)base.x, (int)base.y); + writer.start_list("trampoline"); - frame = 0; + writer.write_float("x", base.x); + writer.write_float("y", base.y); + writer.write_float("power", power); + + writer.end_list("trampoline"); +} - if (debug_mode) - fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75, 75, 0, 150); +void +Trampoline::draw(DrawingContext& context) +{ + img_trampoline->set_frame(frame); + img_trampoline->draw(context, base, LAYER_OBJECTS); + frame = 0; } void -Trampoline::action(double frame_ratio) +Trampoline::action(float frame_ratio) { // TODO: Remove if we're too far off the screen @@ -206,7 +240,7 @@ Trampoline::action(double frame_ratio) { /* FIXME: The trampoline object shouldn't know about pplayer objects. */ /* If we're holding the iceblock */ - Player& tux = *World::current()->get_tux(); + Player& tux = *Sector::current()->player; Direction dir = tux.dir; if(dir == RIGHT) @@ -227,11 +261,17 @@ Trampoline::action(double frame_ratio) } } - physic.apply(frame_ratio, base.x, base.y); + physic.apply(frame_ratio, base.x, base.y, Sector::current()->gravity); collision_swept_object_map(&old_base, &base); } void +Trampoline::collision(const MovingObject&, int) +{ + // comes later +} + +void Trampoline::collision(void *p_c_object, int c_object, CollisionType type) { Player* pplayer_c = NULL; @@ -258,8 +298,10 @@ Trampoline::collision(void *p_c_object, int c_object, CollisionType type) 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); } @@ -272,204 +314,229 @@ Trampoline::collision(void *p_c_object, int c_object, CollisionType type) } } +/* Flying Platform */ + +Sprite *img_flying_platform; + +FlyingPlatform::FlyingPlatform(LispReader& reader) +{ + reader.read_int_vector("x", pos_x); + reader.read_int_vector("y", pos_y); + + velocity = 2.0; + reader.read_float("velocity", velocity); + + base.x = pos_x[0]; + base.y = pos_y[0]; + base.width = 96; + base.height = 40; + + point = 0; + move = false; + + float x = pos_x[point+1] - pos_x[point]; + float y = pos_y[point+1] - pos_y[point]; + vel_x = x*velocity / sqrt(x*x + y*y); + vel_y = -(velocity - vel_x); -/* Object Manager */ -//--------------------------------------------------------------------------- + frame = 0; +} -ObjectManager::ObjectManager() +FlyingPlatform::FlyingPlatform(int x, int y) { - std::string filename = datadir + "/images/tilesets/supertux.stbg"; - load_badguys(filename); +base.x = x; +base.y = y; +point = 0; +move = false; } -ObjectManager::~ObjectManager() +void +FlyingPlatform::write(LispWriter& writer) { - for(std::vector::iterator i = badguys.begin(); i != badguys.end(); ++i) { - delete *i; - } + writer.start_list("flying-trampoline"); + + writer.write_int_vector("x", pos_x); + writer.write_int_vector("y", pos_y); + writer.write_float("velocity", velocity); + + writer.end_list("flying-trampoline"); +} + +void +FlyingPlatform::draw(DrawingContext& context) +{ + img_flying_platform->draw(context, base, LAYER_OBJECTS); } -void ObjectManager::load_badguys(std::string filename) +void +FlyingPlatform::action(float frame_ratio) { - (void) filename; + // TODO: Remove if we're too far off the screen + +if(!move) + return; + +if((unsigned)point+1 != pos_x.size()) + { + if(((pos_x[point+1] > pos_x[point] && base.x >= pos_x[point+1]) || + (pos_x[point+1] < pos_x[point] && base.x <= pos_x[point+1]) || + pos_x[point] == pos_x[point+1]) && + ((pos_y[point+1] > pos_y[point] && base.y >= pos_y[point+1]) || + (pos_y[point+1] < pos_y[point] && base.y <= pos_y[point+1]) || + pos_y[point] == pos_y[point+1])) + { + point++; + + float x = pos_x[point+1] - pos_x[point]; + float y = pos_y[point+1] - pos_y[point]; + vel_x = x*velocity / sqrt(x*x + y*y); + vel_y = -(velocity - vel_x); + } + } +else // last point + { + // point = 0; + // reverse vector + return; + } /* - lisp_object_t* root_obj = lisp_read_from_file(filename); +if(pos_x[point+1] > base.x) + base.x += velocity * frame_ratio; +else if(pos_x[point+1] < base.x) + base.x -= velocity * frame_ratio; + +if(pos_y[point+1] > base.y) + base.y += velocity * frame_ratio; +else if(pos_y[point+1] < base.y) + base.y -= velocity * frame_ratio; +*/ - if (!root_obj) - st_abort("Couldn't load file", filename); +base.x += vel_x * frame_ratio; +base.y += vel_y * frame_ratio; +} - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-badguys") == 0) +void +FlyingPlatform::collision(const MovingObject&, int) +{ + // comes later +} + +void +FlyingPlatform::collision(void *p_c_object, int c_object, CollisionType type) +{ +(void) p_c_object; +(void) type; + +// Player* pplayer_c = NULL; + switch (c_object) + { + case CO_PLAYER: +// pplayer_c = (Player*) p_c_object; + move = true; + + break; + + default: + break; + + } +} + +Sprite *img_smoke_cloud; + +SmokeCloud::SmokeCloud(const Vector& pos) + : position(pos) +{ + timer.start(300); +} + +void +SmokeCloud::action(float elapsed_time) +{ + position.y -= 1.2 * elapsed_time; + + if(!timer.check()) + remove_me(); +} + +void +SmokeCloud::draw(DrawingContext& context) +{ + img_smoke_cloud->draw(context, position, LAYER_OBJECTS+1); +} + +Particles::Particles(const Vector& epicenter, const Vector& velocity, const Vector& acceleration, int number, Color color_, int size_, int life_time) + : color(color_), size(size_), vel(velocity), accel(acceleration) +{ + if(life_time == 0) { - lisp_object_t* cur = lisp_cdr(root_obj); - - while(!lisp_nil_p(cur)) - { - lisp_object_t* element = lisp_car(cur); - - if (strcmp(lisp_symbol(lisp_car(element)), "badguy") == 0) - { - - - Tile* tile = new Tile; - tile->id = -1; - tile->solid = false; - tile->brick = false; - tile->ice = false; - tile->water = false; - tile->fullbox = false; - tile->distro = false; - tile->goal = false; - tile->data = 0; - tile->next_tile = 0; - tile->anim_speed = 25; - - LispReader reader(lisp_cdr(element)); - assert(reader.read_int("id", &tile->id)); - reader.read_bool("solid", &tile->solid); - reader.read_bool("brick", &tile->brick); - reader.read_bool("ice", &tile->ice); - reader.read_bool("water", &tile->water); - reader.read_bool("fullbox", &tile->fullbox); - reader.read_bool("distro", &tile->distro); - reader.read_bool("goal", &tile->goal); - reader.read_int("data", &tile->data); - reader.read_int("anim-speed", &tile->anim_speed); - reader.read_int("next-tile", &tile->next_tile); - reader.read_string_vector("images", &tile->filenames); - reader.read_string_vector("editor-images", &tile->editor_filenames); - - for(std::vector::iterator it = tile-> - filenames.begin(); - it != tile->filenames.end(); - ++it) - { - Surface* cur_image; - tile->images.push_back(cur_image); - tile->images[tile->images.size()-1] = new Surface( - datadir + "/images/tilesets/" + (*it), - USE_ALPHA); - } - for(std::vector::iterator it = tile->editor_filenames.begin(); - it != tile->editor_filenames.end(); - ++it) - { - Surface* cur_image; - tile->editor_images.push_back(cur_image); - tile->editor_images[tile->editor_images.size()-1] = new Surface( - datadir + "/images/tilesets/" + (*it), - USE_ALPHA); - } - - if (tile->id + tileset_id >= int(tiles.size()) - ) - tiles.resize(tile->id + tileset_id+1); - - tiles[tile->id + tileset_id] = tile; - } - else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0) - { - LispReader reader(lisp_cdr(element)); - std::string filename; - reader.read_string("file", &filename); - filename = datadir + "/images/tilesets/" + filename; - load_tileset(filename); - } - else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0) - { - TileGroup new_; - LispReader reader(lisp_cdr(element)); - reader.read_string("name", &new_.name); - reader.read_int_vector("tiles", &new_.tiles); - if(!tilegroups_) - tilegroups_ = new std::set; - tilegroups_->insert(new_).first; - } - else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0) - { - LispReader reader(lisp_cdr(element)); - reader.read_int("id", &tileset_id); - tileset_id *= 1000; - } - else - { - puts("Unhandled symbol"); - } - - cur = lisp_cdr(cur); - } + live_forever = true; } else { - assert(0); + live_forever = false; + timer.start(life_time); } - lisp_free(root_obj); -*/ + // create particles + for(int p = 0; p < number; p++) + { + Particle* particle = new Particle; + particle->pos = epicenter; + particle->angle = (rand() % 360) * (M_PI / 180); // in radius + + particles.push_back(particle); + } } -void ObjectManager::draw_bg() +Particles::~Particles() { -/* - for (unsigned int i = 0; i < bouncy_bricks.size(); ++i) - bouncy_bricks[i]->draw(); - - for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i) - (*i)->draw(); - - for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i) - (*i)->draw(); -*/ + // free particles + for(std::vector::iterator i = particles.begin(); i < particles.end(); i++) + delete (*i); } -void ObjectManager::draw_fg() +void +Particles::action(float elapsed_time) { -/* - for (unsigned int i = 0; i < bullets.size(); ++i) - bullets[i].draw(); + vel.x += accel.x * elapsed_time; + vel.y += accel.y * elapsed_time; - for (unsigned int i = 0; i < floating_scores.size(); ++i) - floating_scores[i]->draw(); + int camera_x = (int)Sector::current()->camera->get_translation().x; + int camera_y = (int)Sector::current()->camera->get_translation().y; - for (unsigned int i = 0; i < upgrades.size(); ++i) - upgrades[i].draw(); + // update particles + for(std::vector::iterator i = particles.begin(); i < particles.end(); i++) + { + (*i)->pos.x += sin((*i)->angle) * vel.x * elapsed_time; + (*i)->pos.y += cos((*i)->angle) * vel.y * elapsed_time; - for (unsigned int i = 0; i < bouncy_distros.size(); ++i) - bouncy_distros[i]->draw(); + if((*i)->pos.x < camera_x || (*i)->pos.x > screen->w + camera_x || + (*i)->pos.y < camera_y || (*i)->pos.y > screen->h + camera_y) + { + delete (*i); + particles.erase(i); + } + } - for (unsigned int i = 0; i < broken_bricks.size(); ++i) - broken_bricks[i]->draw(); -*/ + if((!timer.check() && !live_forever) || particles.size() == 0) + remove_me(); } -void ObjectManager::actions() +void +Particles::draw(DrawingContext& context) { -/* - for (unsigned int i = 0; i < bouncy_distros.size(); i++) - bouncy_distros[i]->action(frame_ratio); - - for (unsigned int i = 0; i < broken_bricks.size(); i++) - broken_bricks[i]->action(frame_ratio); - - // Handle all kinds of game objects - for (unsigned int i = 0; i < bouncy_bricks.size(); i++) - bouncy_bricks[i]->action(frame_ratio); - - for (unsigned int i = 0; i < floating_scores.size(); i++) - floating_scores[i]->action(frame_ratio); - - for (unsigned int i = 0; i < bullets.size(); ++i) - bullets[i].action(frame_ratio); - - for (unsigned int i = 0; i < upgrades.size(); i++) - upgrades[i].action(frame_ratio); - - for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i) - (*i)->action(frame_ratio); - - for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i) - (*i)->action(frame_ratio); -*/ + // draw particles + for(std::vector::iterator i = particles.begin(); i < particles.end(); i++) + { + context.draw_filled_rect((*i)->pos, Vector(size,size), color, LAYER_OBJECTS+10); + } } -/* EOF */ - +void load_object_gfx() +{ + img_trampoline = sprite_manager->load("trampoline"); + img_trampoline->start_animation(0); + img_flying_platform = sprite_manager->load("flying_platform"); + img_smoke_cloud = sprite_manager->load("stomp"); +}