X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameobjs.cpp;h=3201eb285fe817eba0f1a07d3a33d3a1d7af195a;hb=8385faa306eca6d96ab11ed7dae293d85e9c4e4f;hp=828c89fdb8d6e1e2f918e64cb0f893f95da84d2e;hpb=9e082fc66762cb43a25955a971082a0a5aab0840;p=supertux.git diff --git a/src/gameobjs.cpp b/src/gameobjs.cpp index 828c89fdb..3201eb285 100644 --- a/src/gameobjs.cpp +++ b/src/gameobjs.cpp @@ -1,7 +1,8 @@ // $Id$ // // SuperTux -// Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details +// Copyright (C) 2000 Bill Kendrick +// Copyright (C) 2004 Tobias Glaesser // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -15,170 +16,530 @@ // // 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. +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. +#include -#include "world.h" +#include +#include +#include + +#include "app/globals.h" #include "tile.h" +#include "tile_manager.h" #include "gameloop.h" #include "gameobjs.h" +#include "special/sprite_manager.h" +#include "resources.h" +#include "sector.h" +#include "tilemap.h" +#include "video/drawing_context.h" +#include "camera.h" + +BouncyCoin::BouncyCoin(const Vector& pos) + : position(pos) +{ + timer.start(.3); + sprite = sprite_manager->create("coin"); + sprite->set_action("still"); +} + +BouncyCoin::~BouncyCoin() +{ + delete sprite; +} + +void +BouncyCoin::action(float elapsed_time) +{ + position.y += -200 * elapsed_time; + + if(timer.check()) + remove_me(); +} + +void +BouncyCoin::draw(DrawingContext& context) +{ + sprite->draw(context, position, LAYER_OBJECTS); +} + +//--------------------------------------------------------------------------- + +BrokenBrick::BrokenBrick(Sprite* nsprite, + const Vector& pos, const Vector& nmovement) + : sprite(new Sprite(*nsprite)), position(pos), movement(nmovement) +{ + timer.start(.2); +} + +BrokenBrick::~BrokenBrick() +{ + delete sprite; +} + +void +BrokenBrick::action(float elapsed_time) +{ + position += movement * elapsed_time; + + if (timer.check()) + remove_me(); +} void -BouncyDistro::init(float x, float y) +BrokenBrick::draw(DrawingContext& context) +{ + sprite->draw_part(context, + Vector(rand() % 16, rand() % 16), Vector(16, 16), + position, LAYER_OBJECTS + 1); +} + +//--------------------------------------------------------------------------- + +FloatingText::FloatingText(const Vector& pos, const std::string& text_) + : position(pos), text(text_) +{ + timer.start(.1); + position.x -= text.size() * 8; +} + +FloatingText::FloatingText(const Vector& pos, int score) + : position(pos) +{ + timer.start(.1); + + // turn int into a string + char str[10]; + snprintf(str, 10, "%d", score); + text = str; + + position.x -= text.size() * 8; +} + +void +FloatingText::action(float elapsed_time) +{ + position.y -= 1.4 * elapsed_time; + + if(timer.check()) + remove_me(); +} + +#define FADING_TIME .350 + +void +FloatingText::draw(DrawingContext& context) +{ + // make an alpha animation when disapearing + int alpha; + if(timer.get_timeleft() < FADING_TIME) + alpha = int(timer.get_timeleft() * 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 */ + +#if 0 +Sprite *img_trampoline; + +Trampoline::Trampoline(LispReader& reader) +{ + 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); + + frame = 0; + mode = M_NORMAL; + physic.reset(); +} + +Trampoline::Trampoline(float x, float y) { base.x = x; base.y = y; - base.ym = -2; + base.width = 32; + base.height = 32; + power = 7.5; + + frame = 0; + mode = M_NORMAL; + physic.reset(); } void -BouncyDistro::action(double frame_ratio) +Trampoline::write(LispWriter& writer) { - base.y = base.y + base.ym * frame_ratio; + writer.start_list("trampoline"); - base.ym += 0.1 * frame_ratio; + writer.write_float("x", base.x); + writer.write_float("y", base.y); + writer.write_float("power", power); - if (base.ym >= 0) - World::current()->bouncy_distros.erase(static_cast::iterator>(this)); + writer.end_list("trampoline"); } void -BouncyDistro::draw() +Trampoline::draw(DrawingContext& context) { - img_distro[0]->draw(base.x - scroll_x, - base.y); + img_trampoline->set_frame(frame); + img_trampoline->draw(context, base, LAYER_OBJECTS); + frame = 0; +} + +void +Trampoline::action(float frame_ratio) +{ + // TODO: Remove if we're too far off the screen + + // Falling + if (mode != M_HELD) + { + if (issolid(base.x + base.width/2, base.y + base.height)) + { + base.y = int((base.y + base.height)/32) * 32 - base.height; + + physic.enable_gravity(false); + physic.set_velocity_y(0.0f); + + physic.set_velocity_x(0); + } + else + { + physic.enable_gravity(true); + } + } + else // Player is carrying us around + { + /* FIXME: The trampoline object shouldn't know about pplayer objects. */ + /* If we're holding the iceblock */ + Player& tux = *Sector::current()->player; + Direction dir = tux.dir; + + if(dir == RIGHT) + { + base.x = tux.base.x + 16; + base.y = tux.base.y + tux.base.height/1.5 - base.height; + } + else /* facing left */ + { + base.x = tux.base.x - 16; + base.y = tux.base.y + tux.base.height/1.5 - base.height; + } + + if(collision_object_map(base)) + { + base.x = tux.base.x; + base.y = tux.base.y + tux.base.height/1.5 - base.height; + } + } + + 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 -BrokenBrick::init(Tile* tile_, float x, float y, float xm, float ym) +Trampoline::collision(void *p_c_object, int c_object, CollisionType type) +{ + Player* pplayer_c = NULL; + switch (c_object) + { + case CO_PLAYER: + pplayer_c = (Player*) p_c_object; + + if (type == COLLISION_NORMAL) + { + // Pick up if HELD (done in Player) + } + + else if (type == COLLISION_SQUISH) + { + int squish_amount = (32 - (int)pplayer_c->base.y % 32); + + if (squish_amount < 24) + frame = 3; + else if (squish_amount < 28) + frame = 2; + else if (squish_amount < 30) + frame = 1; + else + frame = 0; + + 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); + } + + break; + + default: + break; + + } +} +#endif + +/* Flying Platform */ + +#if 0 +Sprite *img_flying_platform; + +FlyingPlatform::FlyingPlatform(LispReader& reader) { - tile = tile_; - base.x = x; - base.y = y; - base.xm = xm; - base.ym = ym; + 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; - timer.init(true); - timer.start(200); + 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); + + frame = 0; +} + +FlyingPlatform::FlyingPlatform(int x, int y) +{ +base.x = x; +base.y = y; +point = 0; +move = false; } void -BrokenBrick::action(double frame_ratio) +FlyingPlatform::write(LispWriter& writer) { - base.x = base.x + base.xm * frame_ratio; - base.y = base.y + base.ym * frame_ratio; + writer.start_list("flying-trampoline"); - if (!timer.check()) - World::current()->broken_bricks.erase(static_cast::iterator>(this)); + 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 -BrokenBrick::draw() +FlyingPlatform::draw(DrawingContext& context) { - SDL_Rect src, dest; - src.x = rand() % 16; - src.y = rand() % 16; - src.w = 16; - src.h = 16; + img_flying_platform->draw(context, base, LAYER_OBJECTS); +} - dest.x = (int)(base.x - scroll_x); - dest.y = (int)base.y; - dest.w = 16; - dest.h = 16; - - if (tile->images.size() > 0) - tile->images[0]->draw_part(src.x,src.y,dest.x,dest.y,dest.w,dest.h); +void +FlyingPlatform::action(float frame_ratio) +{ + // 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; + } +/* +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; +*/ + +base.x += vel_x * frame_ratio; +base.y += vel_y * frame_ratio; } void -BouncyBrick::init(float x, float y) +FlyingPlatform::collision(const MovingObject&, int) { - base.x = x; - base.y = y; - offset = 0; - offset_m = -BOUNCY_BRICK_SPEED; - shape = World::current()->get_level()->gettileid(x, y); + // comes later } void -BouncyBrick::action(double frame_ratio) +FlyingPlatform::collision(void *p_c_object, int c_object, CollisionType type) { - offset = (offset + offset_m * frame_ratio); +(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; - /* Go back down? */ - if (offset < -BOUNCY_BRICK_MAX_OFFSET) - offset_m = BOUNCY_BRICK_SPEED; + default: + break; + + } +} +#endif +Sprite *img_smoke_cloud = 0; - /* Stop bouncing? */ - if (offset >= 0) - World::current()->bouncy_bricks.erase(static_cast::iterator>(this)); +SmokeCloud::SmokeCloud(const Vector& pos) + : position(pos) +{ + timer.start(.3); } void -BouncyBrick::draw() +SmokeCloud::action(float elapsed_time) { - int s; - SDL_Rect dest; - - if (base.x >= scroll_x - 32 && - base.x <= scroll_x + screen->w) + position.y -= 120 * 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, int min_angle, int max_angle, + const Vector& initial_velocity, const Vector& acceleration, int number, + Color color_, int size_, float life_time, int drawing_layer_) + : accel(acceleration), color(color_), size(size_), drawing_layer(drawing_layer_) +{ + if(life_time == 0) { + live_forever = true; + } else { + live_forever = false; + timer.start(life_time); + } + + // create particles + for(int p = 0; p < number; p++) { - dest.x = (int)(base.x - scroll_x); - dest.y = (int)base.y; - dest.w = 32; - dest.h = 32; - - Level* plevel = World::current()->get_level(); - - // FIXME: overdrawing hack to clean the tile from the screen to - // paint it later at on offseted position - if(plevel->bkgd_image[0] == '\0') - { - fillrect(base.x - scroll_x, base.y, - 32,32, - plevel->bkgd_top.red, plevel->bkgd_top.green, plevel->bkgd_top.blue, 0); -// FIXME: doesn't respect the gradient, futhermore is this necessary at all?? - } - else - { - s = (int)scroll_x / 30; - plevel->img_bkgd->draw_part(dest.x + s, dest.y, - dest.x, dest.y,dest.w,dest.h); - } + Particle* particle = new Particle; + particle->pos = epicenter; + + float angle = ((rand() % (max_angle-min_angle))+min_angle) + * (M_PI / 180); // convert to radius + particle->vel.x = /*fabs*/(sin(angle)) * initial_velocity.x; +// if(angle >= M_PI && angle < M_PI*2) +// particle->vel.x *= -1; // work around to fix signal + particle->vel.y = /*fabs*/(cos(angle)) * initial_velocity.y; +// if(angle >= M_PI_2 && angle < 3*M_PI_2) +// particle->vel.y *= -1; - Tile::draw(base.x - scroll_x, - base.y + offset, - shape); + particles.push_back(particle); } } -void -FloatingScore::init(float x, float y, int s) +Particles::~Particles() { - base.x = x; - base.y = y - 16; - timer.init(true); - timer.start(1000); - value = s; + // free particles + for(std::vector::iterator i = particles.begin(); + i < particles.end(); i++) + delete (*i); } void -FloatingScore::action(double frame_ratio) +Particles::action(float elapsed_time) { - base.y = base.y - 2 * frame_ratio; + Vector camera = Sector::current()->camera->get_translation(); + + // update particles + for(std::vector::iterator i = particles.begin(); + i != particles.end(); ) { + (*i)->pos.x += (*i)->vel.x * elapsed_time; + (*i)->pos.y += (*i)->vel.y * elapsed_time; + + (*i)->vel.x += accel.x * elapsed_time; + (*i)->vel.y += accel.y * elapsed_time; - if(!timer.check()) - World::current()->floating_scores.erase(static_cast::iterator>(this)); + 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); + i = particles.erase(i); + } else { + ++i; + } + } + + if((timer.check() && !live_forever) || particles.size() == 0) + remove_me(); } void -FloatingScore::draw() +Particles::draw(DrawingContext& context) { - char str[10]; - sprintf(str, "%d", value); - gold_text->draw(str, (int)base.x + 16 - strlen(str) * 8, (int)base.y, 1); + // draw particles + for(std::vector::iterator i = particles.begin(); + i != particles.end(); i++) { + context.draw_filled_rect((*i)->pos, Vector(size,size), color,drawing_layer); + } +} + +void load_object_gfx() +{ +#if 0 + img_trampoline = sprite_manager->load("trampoline"); + img_trampoline->start_animation(0); + img_flying_platform = sprite_manager->load("flying_platform"); +#endif + img_smoke_cloud = sprite_manager->create("stomp"); } -/* EOF */ +void free_object_gfx() +{ + delete img_smoke_cloud; +}