// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
+#include <config.h>
+
#include <algorithm>
#include <iostream>
-#include "world.h"
+#include <cmath>
+
+#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)
+BouncyCoin::BouncyCoin(const Vector& pos)
: position(pos)
{
- ym = -2;
- displaymanager.add_drawable(this, LAYER_OBJECTS);
+ timer.start(.3);
+ sprite = sprite_manager->create("coin");
+ sprite->set_action("still");
+}
+
+BouncyCoin::~BouncyCoin()
+{
+ delete sprite;
}
void
-BouncyDistro::action(float elapsed_time)
+BouncyCoin::action(float elapsed_time)
{
- position.y += ym * elapsed_time;
+ position.y += -200 * elapsed_time;
- ym += 0.1 * elapsed_time; // not framerate independent... but who really cares
- if(ym >= 0)
+ if(timer.check())
remove_me();
}
void
-BouncyDistro::draw(Camera& viewport, int )
+BouncyCoin::draw(DrawingContext& context)
{
- img_distro[0]->draw(viewport.world2screen(position));
+ sprite->draw(context, position, LAYER_OBJECTS);
}
+//---------------------------------------------------------------------------
-BrokenBrick::BrokenBrick(DisplayManager& displaymanager, Tile* ntile,
+BrokenBrick::BrokenBrick(Sprite* nsprite,
const Vector& pos, const Vector& nmovement)
- : tile(ntile), position(pos), movement(nmovement)
+ : sprite(new Sprite(*nsprite)), position(pos), movement(nmovement)
{
- displaymanager.add_drawable(this, LAYER_OBJECTS);
- timer.start(200);
+ timer.start(.2);
+}
+
+BrokenBrick::~BrokenBrick()
+{
+ delete sprite;
}
void
{
position += movement * elapsed_time;
- if (!timer.check())
+ if (timer.check())
remove_me();
}
void
-BrokenBrick::draw(Camera& 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;
-
- if (tile->images.size() > 0)
- tile->images[0]->draw_part(src.x,src.y,dest.x,dest.y,dest.w,dest.h);
-}
-
-BouncyBrick::BouncyBrick(DisplayManager& displaymanager, const Vector& pos)
- : position(pos), offset(0), offset_m(-BOUNCY_BRICK_SPEED)
+BrokenBrick::draw(DrawingContext& context)
{
- displaymanager.add_drawable(this, LAYER_OBJECTS);
- shape = World::current()->get_level()->gettileid(pos.x, pos.y);
+ sprite->draw_part(context,
+ Vector(rand() % 16, rand() % 16), Vector(16, 16),
+ position, LAYER_OBJECTS + 1);
}
-void
-BouncyBrick::action(float elapsed_time)
-{
- offset += offset_m * elapsed_time;
-
- /* Go back down? */
- if (offset < -BOUNCY_BRICK_MAX_OFFSET)
- offset_m = BOUNCY_BRICK_SPEED;
+//---------------------------------------------------------------------------
- /* Stop bouncing? */
- if (offset >= 0)
- remove_me();
-}
-
-void
-BouncyBrick::draw(Camera& viewport, int)
+FloatingText::FloatingText(const Vector& pos, const std::string& text_)
+ : position(pos), text(text_)
{
- Tile::draw(viewport.world2screen(position + Vector(0, offset)), shape);
+ timer.start(.1);
+ position.x -= text.size() * 8;
}
-FloatingScore::FloatingScore(DisplayManager& displaymanager,
- const Vector& pos, int score)
+FloatingText::FloatingText(const Vector& pos, int score)
: position(pos)
{
- displaymanager.add_drawable(this, LAYER_OBJECTS);
- timer.start(1000);
+ timer.start(.1);
+
+ // 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())
+ if(timer.check())
remove_me();
}
+#define FADING_TIME .350
+
void
-FloatingScore::draw(Camera& viewport, int )
+FloatingText::draw(DrawingContext& context)
{
- gold_text->draw(str, viewport.world2screen(position));
+ // 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 */
-#define TRAMPOLINE_FRAMES 4
-Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+#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(DisplayManager& displaymanager, LispReader& reader)
+Trampoline::Trampoline(float x, float y)
{
- displaymanager.add_drawable(this, LAYER_OBJECTS);
-
- reader.read_float("x", &base.x);
- reader.read_float("y", &base.y);
+ base.x = x;
+ base.y = y;
base.width = 32;
base.height = 32;
power = 7.5;
- reader.read_float("power", &power);
frame = 0;
mode = M_NORMAL;
}
void
-Trampoline::draw(Camera& viewport, int )
+Trampoline::draw(DrawingContext& context)
{
- img_trampoline[frame]->draw(viewport.world2screen(Vector(base.x, base.y)));
+ img_trampoline->set_frame(frame);
+ img_trampoline->draw(context, base, LAYER_OBJECTS);
frame = 0;
}
{
/* 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)
}
}
- 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);
}
}
}
+#endif
/* Flying Platform */
+#if 0
Sprite *img_flying_platform;
-FlyingPlatform::FlyingPlatform(DisplayManager& displaymanager, LispReader& reader)
+FlyingPlatform::FlyingPlatform(LispReader& reader)
{
- displaymanager.add_drawable(this, LAYER_OBJECTS);
-
- reader.read_int_vector("x", &pos_x);
- reader.read_int_vector("y", &pos_y);
+ reader.read_int_vector("x", pos_x);
+ reader.read_int_vector("y", pos_y);
velocity = 2.0;
- reader.read_float("velocity", &velocity);
+ reader.read_float("velocity", velocity);
base.x = pos_x[0];
base.y = pos_y[0];
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
FlyingPlatform::write(LispWriter& writer)
{
}
void
-FlyingPlatform::draw(Camera& viewport, int )
+FlyingPlatform::draw(DrawingContext& context)
{
-img_flying_platform->draw(viewport.world2screen(Vector(base.x, base.y)));
+ img_flying_platform->draw(context, base, LAYER_OBJECTS);
}
void
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
// reverse vector
return;
}
-
+/*
if(pos_x[point+1] > base.x)
base.x += velocity * frame_ratio;
else if(pos_x[point+1] < base.x)
base.y += velocity * frame_ratio;
else if(pos_y[point+1] < base.y)
base.y -= velocity * frame_ratio;
-/*
-float x = pos_x[point+1] - pos_x[point];
-float y = pos_y[point+1] - pos_y[point];
-float vel_x = x*velocity / sqrt(x*x + y*y);
-float vel_y = velocity - vel_x;
+*/
base.x += vel_x * frame_ratio;
base.y += vel_y * frame_ratio;
-*/
}
void
}
}
+#endif
-void load_object_gfx()
+Sprite *img_smoke_cloud = 0;
+
+SmokeCloud::SmokeCloud(const Vector& pos)
+ : position(pos)
{
- char sprite_name[16];
+ timer.start(.3);
+}
- for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
- {
- sprintf(sprite_name, "trampoline-%i", i+1);
- img_trampoline[i] = sprite_manager->load(sprite_name);
+void
+SmokeCloud::action(float elapsed_time)
+{
+ 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++)
+ {
+ 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;
+
+ particles.push_back(particle);
+ }
+}
+
+Particles::~Particles()
+{
+ // free particles
+ for(std::vector<Particle*>::iterator i = particles.begin();
+ i < particles.end(); i++)
+ delete (*i);
+}
+
+void
+Particles::action(float elapsed_time)
+{
+ Vector camera = Sector::current()->camera->get_translation();
+
+ // update particles
+ for(std::vector<Particle*>::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((*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
+Particles::draw(DrawingContext& context)
+{
+ // draw particles
+ for(std::vector<Particle*>::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");
}
+
+void free_object_gfx()
+{
+ delete img_smoke_cloud;
+}
+
projects / supertux.git / blobdiff