projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial integration, lots of broken stuff
[supertux.git]
/
src
/
sector.cpp
diff --git
a/src/sector.cpp
b/src/sector.cpp
index
4380472
..
cd4276b
100644
(file)
--- a/
src/sector.cpp
+++ b/
src/sector.cpp
@@
-28,6
+28,8
@@
#include <float.h>
#include <math.h>
#include <limits>
#include <float.h>
#include <math.h>
#include <limits>
+//#include <physfs.h>
+#include <unison/vfs/FileSystem.hpp>
#include "sector.hpp"
#include "object/player.hpp"
#include "sector.hpp"
#include "object/player.hpp"
@@
-66,6
+68,7
@@
#include "scripting/squirrel_util.hpp"
#include "script_interface.hpp"
#include "log.hpp"
#include "scripting/squirrel_util.hpp"
#include "script_interface.hpp"
#include "log.hpp"
+#include "main.hpp"
Sector* Sector::_current = 0;
Sector* Sector::_current = 0;
@@
-74,7
+77,7
@@
bool Sector::draw_solids_only = false;
Sector::Sector(Level* parent)
: level(parent), currentmusic(LEVEL_MUSIC),
Sector::Sector(Level* parent)
: level(parent), currentmusic(LEVEL_MUSIC),
- ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(10.0), player(0), camera(0)
+ ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(10.0), player(0), camera(0)
{
add_object(new Player(player_status, "Tux"));
add_object(new DisplayEffect("Effect"));
{
add_object(new Player(player_status, "Tux"));
add_object(new DisplayEffect("Effect"));
@@
-175,6
+178,7
@@
Sector::parse_object(const std::string& name, const lisp::Lisp& reader)
void
Sector::parse(const lisp::Lisp& sector)
{
void
Sector::parse(const lisp::Lisp& sector)
{
+ bool has_background = false;
lisp::ListIterator iter(§or);
while(iter.next()) {
const std::string& token = iter.item();
lisp::ListIterator iter(§or);
while(iter.next()) {
const std::string& token = iter.item();
@@
-200,11
+204,22
@@
Sector::parse(const lisp::Lisp& sector)
} else {
GameObject* object = parse_object(token, *(iter.lisp()));
if(object) {
} else {
GameObject* object = parse_object(token, *(iter.lisp()));
if(object) {
+ if(dynamic_cast<Background *>(object)) {
+ has_background = true;
+ } else if(dynamic_cast<Gradient *>(object)) {
+ has_background = true;
+ }
add_object(object);
}
}
}
add_object(object);
}
}
}
+ if(!has_background) {
+ Gradient* gradient = new Gradient();
+ gradient->set_gradient(Color(0.3, 0.4, 0.75), Color(1, 1, 1));
+ add_object(gradient);
+ }
+
update_game_objects();
if(solid_tilemaps.size() < 1) log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl;
update_game_objects();
if(solid_tilemaps.size() < 1) log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl;
@@
-226,8
+241,17
@@
Sector::parse_old_format(const lisp::Lisp& reader)
reader.get("gravity", gravity);
std::string backgroundimage;
reader.get("gravity", gravity);
std::string backgroundimage;
- reader.get("background", backgroundimage);
- if (backgroundimage == "arctis2.jpg") backgroundimage = "arctis.jpg";
+ if (reader.get("background", backgroundimage) && (backgroundimage != "")) {
+ if (backgroundimage == "arctis.png") backgroundimage = "arctis.jpg";
+ if (backgroundimage == "arctis2.jpg") backgroundimage = "arctis.jpg";
+ if (backgroundimage == "ocean.png") backgroundimage = "ocean.jpg";
+ backgroundimage = "images/background/" + backgroundimage;
+ if (!Unison::VFS::FileSystem::get().exists(backgroundimage)) {
+ log_warning << "Background image \"" << backgroundimage << "\" not found. Ignoring." << std::endl;
+ backgroundimage = "";
+ }
+ }
+
float bgspeed = .5;
reader.get("bkgd_speed", bgspeed);
bgspeed /= 100;
float bgspeed = .5;
reader.get("bkgd_speed", bgspeed);
bgspeed /= 100;
@@
-250,8
+274,7
@@
Sector::parse_old_format(const lisp::Lisp& reader)
if(backgroundimage != "") {
Background* background = new Background();
if(backgroundimage != "") {
Background* background = new Background();
- background->set_image(
- std::string("images/background/") + backgroundimage, bgspeed);
+ background->set_image(backgroundimage, bgspeed);
add_object(background);
} else {
Gradient* gradient = new Gradient();
add_object(background);
} else {
Gradient* gradient = new Gradient();
@@
-278,7
+301,10
@@
Sector::parse_old_format(const lisp::Lisp& reader)
spawnpoints.push_back(spawn);
music = "chipdisko.ogg";
spawnpoints.push_back(spawn);
music = "chipdisko.ogg";
+ // skip reading music filename. It's all .ogg now, anyway
+ /*
reader.get("music", music);
reader.get("music", music);
+ */
music = "music/" + music;
int width = 30, height = 15;
music = "music/" + music;
int width = 30, height = 15;
@@
-299,18
+325,24
@@
Sector::parse_old_format(const lisp::Lisp& reader)
}
}
}
}
+ if (height < 19) tilemap->resize(width, 19);
add_object(tilemap);
}
if(reader.get_vector("background-tm", tiles)) {
TileMap* tilemap = new TileMap();
tilemap->set(width, height, tiles, LAYER_BACKGROUNDTILES, false);
add_object(tilemap);
}
if(reader.get_vector("background-tm", tiles)) {
TileMap* tilemap = new TileMap();
tilemap->set(width, height, tiles, LAYER_BACKGROUNDTILES, false);
+ if (height < 19) tilemap->resize(width, 19);
add_object(tilemap);
}
if(reader.get_vector("foreground-tm", tiles)) {
TileMap* tilemap = new TileMap();
tilemap->set(width, height, tiles, LAYER_FOREGROUNDTILES, false);
add_object(tilemap);
}
if(reader.get_vector("foreground-tm", tiles)) {
TileMap* tilemap = new TileMap();
tilemap->set(width, height, tiles, LAYER_FOREGROUNDTILES, false);
+
+ // fill additional space in foreground with tiles of ID 2035 (lightmap/black)
+ if (height < 19) tilemap->resize(width, 19, 2035);
+
add_object(tilemap);
}
add_object(tilemap);
}
@@
-404,16
+436,16
@@
Sector::fix_old_tiles()
// torch
if (tile->getID() == 1517) {
float pseudo_rnd = (float)((int)pos.x % 10) / 10;
// torch
if (tile->getID() == 1517) {
float pseudo_rnd = (float)((int)pos.x % 10) / 10;
- add_object(new PulsingLight(center, 1.0
+ pseudo_rnd, 0.9, 1.0, Color(1.0, 1.0, 0.6, 1.0
)));
+ add_object(new PulsingLight(center, 1.0
f + pseudo_rnd, 0.9f, 1.0f, Color(1.0f, 1.0f, 0.6f, 1.0f
)));
}
// lava or lavaflow
if ((tile->getID() == 173) || (tile->getID() == 1700) || (tile->getID() == 1705) || (tile->getID() == 1706)) {
// space lights a bit
}
// lava or lavaflow
if ((tile->getID() == 173) || (tile->getID() == 1700) || (tile->getID() == 1705) || (tile->getID() == 1706)) {
// space lights a bit
- if (((tm->get_tile(x-1, y)->getID() != tm->get_tile(x,y)->getID())
- && (tm->get_tile(x, y-1)->getID() != tm->get_tile(x,y)->getID()))
+ if (((tm->get_tile(x-1, y)->getID() != tm->get_tile(x,y)->getID())
+ && (tm->get_tile(x, y-1)->getID() != tm->get_tile(x,y)->getID()))
|| ((x % 3 == 0) && (y % 3 == 0))) {
float pseudo_rnd = (float)((int)pos.x % 10) / 10;
|| ((x % 3 == 0) && (y % 3 == 0))) {
float pseudo_rnd = (float)((int)pos.x % 10) / 10;
- add_object(new PulsingLight(center, 1.0
+ pseudo_rnd, 0.8, 1.0, Color(1.0, 0.3, 0.0, 1.0
)));
+ add_object(new PulsingLight(center, 1.0
f + pseudo_rnd, 0.8f, 1.0f, Color(1.0f, 0.3f, 0.0f, 1.0f
)));
}
}
}
}
@@
-571,7
+603,7
@@
Sector::activate(const Vector& player_pos)
npos.y-=32;
player->move(npos);
}
npos.y-=32;
player->move(npos);
}
-
+
camera->reset(player->get_pos());
update_game_objects();
camera->reset(player->get_pos());
update_game_objects();
@@
-612,7
+644,7
@@
Sector::get_active_region()
{
return Rect(
camera->get_translation() - Vector(1600, 1200),
{
return Rect(
camera->get_translation() - Vector(1600, 1200),
- camera->get_translation() + Vector(1600, 1200));
+ camera->get_translation() + Vector(1600, 1200)
+ Vector(SCREEN_WIDTH,SCREEN_HEIGHT)
);
}
void
}
void
@@
-665,6
+697,18
@@
Sector::update_game_objects()
gameobjects.push_back(object);
}
gameobjects_new.clear();
gameobjects.push_back(object);
}
gameobjects_new.clear();
+
+ /* update solid_tilemaps list */
+ //FIXME: this could be more efficient
+ solid_tilemaps.clear();
+ for(std::vector<GameObject*>::iterator i = gameobjects.begin();
+ i != gameobjects.end(); ++i)
+ {
+ TileMap* tm = dynamic_cast<TileMap*>(*i);
+ if (!tm) continue;
+ if (tm->is_solid()) solid_tilemaps.push_back(tm);
+ }
+
}
bool
}
bool
@@
-760,7
+804,7
@@
Sector::before_object_remove(GameObject* object)
moving_objects.erase(
std::find(moving_objects.begin(), moving_objects.end(), moving_object));
}
moving_objects.erase(
std::find(moving_objects.begin(), moving_objects.end(), moving_object));
}
-
+
if(_current == this)
try_unexpose(object);
}
if(_current == this)
try_unexpose(object);
}
@@
-819,7
+863,7
@@
Sector::draw(DrawingContext& context)
}
if(show_collrects) {
}
if(show_collrects) {
- Color col(0.2
, 0.2, 0.2, 0.7
);
+ Color col(0.2
f, 0.2f, 0.2f, 0.7f
);
for(MovingObjects::iterator i = moving_objects.begin();
i != moving_objects.end(); ++i) {
MovingObject* object = *i;
for(MovingObjects::iterator i = moving_objects.begin();
i != moving_objects.end(); ++i) {
MovingObject* object = *i;
@@
-846,11
+890,18
@@
void check_collisions(collision::Constraints* constraints,
if(!collision::intersects(r1, r2))
return;
if(!collision::intersects(r1, r2))
return;
+ MovingObject *moving_object = dynamic_cast<MovingObject*> (object);
+ CollisionHit dummy;
+ if(other != NULL && !other->collides(*object, dummy))
+ return;
+ if(moving_object != NULL && !moving_object->collides(*other, dummy))
+ return;
+
// calculate intersection
// calculate intersection
- float itop = r1.get_bottom() - r2.get_top();
+ float itop
= r1.get_bottom() - r2.get_top();
float ibottom = r2.get_bottom() - r1.get_top();
float ibottom = r2.get_bottom() - r1.get_top();
- float ileft = r1.get_right() - r2.get_left();
- float iright = r2.get_right() - r1.get_left();
+ float ileft
= r1.get_right() - r2.get_left();
+ float iright
= r2.get_right() - r1.get_left();
if(fabsf(movement.y) > fabsf(movement.x)) {
if(ileft < SHIFT_DELTA) {
if(fabsf(movement.y) > fabsf(movement.x)) {
if(ileft < SHIFT_DELTA) {
@@
-872,10
+923,10
@@
void check_collisions(collision::Constraints* constraints,
}
if(other != NULL) {
}
if(other != NULL) {
- CollisionHit dummy;
HitResponse response = other->collision(*object, dummy);
if(response == PASSTHROUGH)
return;
HitResponse response = other->collision(*object, dummy);
if(response == PASSTHROUGH)
return;
+
if(other->get_movement() != Vector(0, 0)) {
// TODO what todo when we collide with 2 moving objects?!?
constraints->ground_movement = other->get_movement();
if(other->get_movement() != Vector(0, 0)) {
// TODO what todo when we collide with 2 moving objects?!?
constraints->ground_movement = other->get_movement();
@@
-903,7
+954,7
@@
void check_collisions(collision::Constraints* constraints,
}
}
}
}
-static const float DELTA = .001;
+static const float DELTA = .001
f
;
void
Sector::collision_tilemap(collision::Constraints* constraints,
void
Sector::collision_tilemap(collision::Constraints* constraints,
@@
-1029,12
+1080,19
@@
Sector::collision_object(MovingObject* object1, MovingObject* object2) const
Vector normal;
get_hit_normal(r1, r2, hit, normal);
Vector normal;
get_hit_normal(r1, r2, hit, normal);
+ if(!object1->collides(*object2, hit))
+ return;
+ std::swap(hit.left, hit.right);
+ std::swap(hit.top, hit.bottom);
+ if(!object2->collides(*object1, hit))
+ return;
+ std::swap(hit.left, hit.right);
+ std::swap(hit.top, hit.bottom);
+
HitResponse response1 = object1->collision(*object2, hit);
std::swap(hit.left, hit.right);
std::swap(hit.top, hit.bottom);
HitResponse response2 = object2->collision(*object1, hit);
HitResponse response1 = object1->collision(*object2, hit);
std::swap(hit.left, hit.right);
std::swap(hit.top, hit.bottom);
HitResponse response2 = object2->collision(*object1, hit);
- assert( response1 != SOLID && response1 != PASSTHROUGH );
- assert( response2 != SOLID && response2 != PASSTHROUGH );
if(response1 == CONTINUE && response2 == CONTINUE) {
normal *= (0.5 + DELTA);
object1->dest.move(-normal);
if(response1 == CONTINUE && response2 == CONTINUE) {
normal *= (0.5 + DELTA);
object1->dest.move(-normal);
@@
-1125,8
+1183,10
@@
Sector::collision_static_constrains(MovingObject& object)
if(constraints.right < infinity) {
float width = constraints.right - constraints.left;
if(width + SHIFT_DELTA < owidth) {
if(constraints.right < infinity) {
float width = constraints.right - constraints.left;
if(width + SHIFT_DELTA < owidth) {
+#if 0
printf("Object %p crushed horizontally... L:%f R:%f\n", &object,
constraints.left, constraints.right);
printf("Object %p crushed horizontally... L:%f R:%f\n", &object,
constraints.left, constraints.right);
+#endif
CollisionHit h;
h.left = true;
h.right = true;
CollisionHit h;
h.left = true;
h.right = true;
@@
-1155,7
+1215,9
@@
Sector::collision_static_constrains(MovingObject& object)
if(constraints.bottom < infinity) {
float height = constraints.bottom - constraints.top;
if(height + SHIFT_DELTA < oheight) {
if(constraints.bottom < infinity) {
float height = constraints.bottom - constraints.top;
if(height + SHIFT_DELTA < oheight) {
+#if 0
printf("Object %p crushed vertically...\n", &object);
printf("Object %p crushed vertically...\n", &object);
+#endif
CollisionHit h;
h.top = true;
h.bottom = true;
CollisionHit h;
h.top = true;
h.bottom = true;
@@
-1165,6
+1227,10
@@
Sector::collision_static_constrains(MovingObject& object)
}
}
}
}
+namespace {
+ const float MAX_SPEED = 16.0f;
+}
+
void
Sector::handle_collisions()
{
void
Sector::handle_collisions()
{
@@
-1174,6
+1240,13
@@
Sector::handle_collisions()
for(MovingObjects::iterator i = moving_objects.begin();
i != moving_objects.end(); ++i) {
MovingObject* moving_object = *i;
for(MovingObjects::iterator i = moving_objects.begin();
i != moving_objects.end(); ++i) {
MovingObject* moving_object = *i;
+ Vector mov = moving_object->get_movement();
+
+ // make sure movement is never faster than MAX_SPEED. Norm is pretty fat, so two addl. checks are done before.
+ if (((mov.x > MAX_SPEED * M_SQRT1_2) || (mov.y > MAX_SPEED * M_SQRT1_2)) && (mov.norm() > MAX_SPEED)) {
+ moving_object->movement = mov.unit() * MAX_SPEED;
+ //log_debug << "Temporarily reduced object's speed of " << mov.norm() << " to " << moving_object->movement.norm() << "." << std::endl;
+ }
moving_object->dest = moving_object->get_bbox();
moving_object->dest.move(moving_object->get_movement());
moving_object->dest = moving_object->get_bbox();
moving_object->dest.move(moving_object->get_movement());
@@
-1230,6
+1303,11
@@
Sector::handle_collisions()
CollisionHit hit;
get_hit_normal(moving_object->dest, moving_object_2->dest,
hit, normal);
CollisionHit hit;
get_hit_normal(moving_object->dest, moving_object_2->dest,
hit, normal);
+ if(!moving_object->collides(*moving_object_2, hit))
+ continue;
+ if(!moving_object_2->collides(*moving_object, hit))
+ continue;
+
moving_object->collision(*moving_object_2, hit);
moving_object_2->collision(*moving_object, hit);
}
moving_object->collision(*moving_object_2, hit);
moving_object_2->collision(*moving_object, hit);
}
@@
-1269,7
+1347,7
@@
Sector::handle_collisions()
}
bool
}
bool
-Sector::is_free_of_tiles(const Rect& rect) const
+Sector::is_free_of_tiles(const Rect& rect
, const bool ignoreUnisolid
) const
{
using namespace collision;
{
using namespace collision;
@@
-1294,7
+1372,8
@@
Sector::is_free_of_tiles(const Rect& rect) const
Constraints constraints;
return collision::rectangle_aatriangle(&constraints, rect, triangle);
}
Constraints constraints;
return collision::rectangle_aatriangle(&constraints, rect, triangle);
}
- if(tile->getAttributes() & Tile::SOLID) return false;
+ if((tile->getAttributes() & Tile::SOLID) && !ignoreUnisolid) return false;
+ if((tile->getAttributes() & Tile::SOLID) && !(tile->getAttributes() & Tile::UNISOLID)) return false;
}
}
}
}
}
}
@@
-1303,11
+1382,11
@@
Sector::is_free_of_tiles(const Rect& rect) const
}
bool
}
bool
-Sector::is_free_of_statics(const Rect& rect, const MovingObject* ignore_object) const
+Sector::is_free_of_statics(const Rect& rect, const MovingObject* ignore_object
, const bool ignoreUnisolid
) const
{
using namespace collision;
{
using namespace collision;
- if (!is_free_of_tiles(rect)) return false;
+ if (!is_free_of_tiles(rect
, ignoreUnisolid
)) return false;
for(MovingObjects::const_iterator i = moving_objects.begin();
i != moving_objects.end(); ++i) {
for(MovingObjects::const_iterator i = moving_objects.begin();
i != moving_objects.end(); ++i) {
@@
-1334,7
+1413,7
@@
Sector::is_free_of_movingstatics(const Rect& rect, const MovingObject* ignore_ob
const MovingObject* moving_object = *i;
if (moving_object == ignore_object) continue;
if (!moving_object->is_valid()) continue;
const MovingObject* moving_object = *i;
if (moving_object == ignore_object) continue;
if (!moving_object->is_valid()) continue;
- if ((moving_object->get_group() == COLGROUP_MOVING)
+ if ((moving_object->get_group() == COLGROUP_MOVING)
|| (moving_object->get_group() == COLGROUP_MOVING_STATIC)
|| (moving_object->get_group() == COLGROUP_STATIC)) {
if(intersects(rect, moving_object->get_bbox())) return false;
|| (moving_object->get_group() == COLGROUP_MOVING_STATIC)
|| (moving_object->get_group() == COLGROUP_STATIC)) {
if(intersects(rect, moving_object->get_bbox())) return false;
@@
-1417,7
+1496,9
@@
Sector::inside(const Rect& rect) const
TileMap* solids = *i;
bool horizontally = ((rect.p2.x >= 0 + solids->get_x_offset()) && (rect.p1.x <= solids->get_width() * 32 + solids->get_x_offset()));
bool vertically = (rect.p1.y <= solids->get_height() * 32 + solids->get_y_offset());
TileMap* solids = *i;
bool horizontally = ((rect.p2.x >= 0 + solids->get_x_offset()) && (rect.p1.x <= solids->get_width() * 32 + solids->get_x_offset()));
bool vertically = (rect.p1.y <= solids->get_height() * 32 + solids->get_y_offset());
- if (horizontally && vertically) return true;
+
+ if (horizontally && vertically)
+ return true;
}
return false;
}
}
return false;
}
@@
-1426,10
+1507,14
@@
float
Sector::get_width() const
{
float width = 0;
Sector::get_width() const
{
float width = 0;
- for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) {
+ for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin();
+ i != solid_tilemaps.end(); i++) {
TileMap* solids = *i;
TileMap* solids = *i;
- if ((solids->get_width() * 32 + solids->get_x_offset()) > width) width = (solids->get_width() * 32 + solids->get_x_offset());
+ if ((solids->get_width() * 32 + solids->get_x_offset()) > width) {
+ width = solids->get_width() * 32 + solids->get_x_offset();
+ }
}
}
+
return width;
}
return width;
}
@@
-1437,10
+1522,14
@@
float
Sector::get_height() const
{
float height = 0;
Sector::get_height() const
{
float height = 0;
- for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) {
+ for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin();
+ i != solid_tilemaps.end(); i++) {
TileMap* solids = *i;
TileMap* solids = *i;
- if ((solids->get_height() * 32 + solids->get_y_offset()) > height) height = (solids->get_height() * 32 + solids->get_y_offset());
+ if ((solids->get_height() * 32 + solids->get_y_offset()) > height) {
+ height = solids->get_height() * 32 + solids->get_y_offset();
+ }
}
}
+
return height;
}
return height;
}