// 02111-1307, USA.
#include <algorithm>
#include <iostream>
-#include "world.h"
+#include <math.h>
#include "tile.h"
#include "gameloop.h"
#include "gameobjs.h"
#include "sprite_manager.h"
#include "resources.h"
-#include "level.h"
-#include "display_manager.h"
+#include "sector.h"
+#include "tilemap.h"
-BouncyDistro::BouncyDistro(DisplayManager& displaymanager, const Vector& pos)
+BouncyDistro::BouncyDistro(const Vector& pos)
: position(pos)
{
ym = -2;
- displaymanager.add_drawable(this, LAYER_OBJECTS);
}
void
}
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);
}
}
void
-BrokenBrick::draw(ViewPort& viewport, int )
+BrokenBrick::draw(DrawingContext& context)
{
- 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);
+ 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)
+BouncyBrick::BouncyBrick(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);
+ shape = Sector::current()->solids->get_tile_id_at(pos);
}
void
}
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, position + Vector(0, offset), LAYER_TILES+1);
}
-FloatingScore::FloatingScore(DisplayManager& displaymanager,
- const Vector& pos, int score)
+FloatingScore::FloatingScore(const Vector& pos, int score)
: position(pos)
{
- displaymanager.add_drawable(this, LAYER_OBJECTS);
timer.start(1000);
snprintf(str, 10, "%d", score);
position.x -= strlen(str) * 8;
}
void
-FloatingScore::draw(ViewPort& viewport, int )
+FloatingScore::draw(DrawingContext& context)
{
- gold_text->draw(str, viewport.world2screen(position));
+ context.draw_text(gold_text, str, position, LAYER_OBJECTS);
}
/* Trampoline */
#define TRAMPOLINE_FRAMES 4
Sprite *img_trampoline[TRAMPOLINE_FRAMES];
-void load_object_gfx()
-{
- char sprite_name[16];
-
- for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
- {
- sprintf(sprite_name, "trampoline-%i", i+1);
- img_trampoline[i] = sprite_manager->load(sprite_name);
- }
-}
-
-void
-Trampoline::init(float x, float y)
+Trampoline::Trampoline(LispReader& reader)
{
- base.x = x;
- base.y = y;
+ 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;
}
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);
- if (debug_mode)
- fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75, 75, 0, 150);
+ writer.end_list("trampoline");
}
void
-Trampoline::action(double frame_ratio)
+Trampoline::draw(DrawingContext& context)
+{
+ img_trampoline[frame]->draw(context, Vector(base.x, base.y), LAYER_OBJECTS);
+ frame = 0;
+}
+
+void
+Trampoline::action(float frame_ratio)
{
// TODO: Remove if we're too far off the screen
{
/* 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)
}
void
+Trampoline::collision(const MovingObject&, int)
+{
+ // comes later
+}
+
+void
Trampoline::collision(void *p_c_object, int c_object, CollisionType type)
{
Player* pplayer_c = NULL;
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);
}
}
}
+/* 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);
+
+ frame = 0;
+}
+
+void
+FlyingPlatform::write(LispWriter& writer)
+{
+ 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, Vector(base.x, base.y), LAYER_OBJECTS);
+}
+
+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
+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;
+
+ }
+}
+
+void load_object_gfx()
+{
+ char sprite_name[16];
+
+ for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
+ {
+ sprintf(sprite_name, "trampoline-%i", i+1);
+ img_trampoline[i] = sprite_manager->load(sprite_name);
+ }
+ img_flying_platform = sprite_manager->load("flying_platform");
+}
projects / supertux.git / blobdiff