#include "gameloop.h"
#include "resources.h"
#include "statistics.h"
+#include "collision_grid.h"
+#include "collision_grid_iterator.h"
+#include "object_factory.h"
#include "special/collision.h"
#include "math/rectangle.h"
#include "math/aatriangle.h"
#include "object/coin.h"
#include "object/block.h"
#include "object/invisible_block.h"
-#include "object/invisible_tile.h"
-#include "object/platform.h"
#include "object/bullet.h"
#include "badguy/jumpy.h"
-#include "badguy/snowball.h"
-#include "badguy/bouncing_snowball.h"
-#include "badguy/flame.h"
-#include "badguy/mriceblock.h"
-#include "badguy/mrbomb.h"
-#include "badguy/dispenser.h"
#include "badguy/spike.h"
-#include "badguy/spiky.h"
-#include "badguy/nolok_01.h"
-#include "trigger/door.h"
#include "trigger/sequence_trigger.h"
-#include "trigger/secretarea_trigger.h"
Sector* Sector::_current = 0;
song_title = "Mortimers_chipdisko.mod";
player = new Player();
add_object(player);
+
+ grid = new CollisionGrid(32000, 32000);
}
Sector::~Sector()
update_game_objects();
assert(gameobjects_new.size() == 0);
+ delete grid;
+
for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end();
++i) {
delete *i;
GameObject*
Sector::parse_object(const std::string& name, const lisp::Lisp& reader)
{
- if(name == "background") {
- return new Background(reader);
- } else if(name == "camera") {
+ if(name == "camera") {
Camera* camera = new Camera(this);
camera->parse(reader);
return camera;
- } else if(name == "tilemap") {
- return new TileMap(reader);
} else if(name == "particles-snow") {
SnowParticleSystem* partsys = new SnowParticleSystem();
partsys->parse(reader);
CloudParticleSystem* partsys = new CloudParticleSystem();
partsys->parse(reader);
return partsys;
- } else if(name == "door") {
- return new Door(reader);
- } else if(name == "secretarea") {
- return new SecretAreaTrigger(reader);
- } else if(name == "platform") {
- return new Platform(reader);
- } else if(name == "jumpy" || name == "money") {
+ } else if(name == "money") { // for compatibility with old maps
return new Jumpy(reader);
- } else if(name == "snowball") {
- return new SnowBall(reader);
- } else if(name == "bouncingsnowball") {
- return new BouncingSnowball(reader);
- } else if(name == "flame") {
- return new Flame(reader);
- } else if(name == "mriceblock") {
- return new MrIceBlock(reader);
- } else if(name == "mrbomb") {
- return new MrBomb(reader);
- } else if(name == "dispenser") {
- return new Dispenser(reader);
- } else if(name == "spike") {
- return new Spike(reader);
- } else if(name == "spiky") {
- return new Spiky(reader);
- } else if(name == "nolok_01") {
- return new Nolok_01(reader);
- }
-
- std::cerr << "Unknown object type '" << name << "'.\n";
+ }
+
+ try {
+ return create_object(name, reader);
+ } catch(std::exception& e) {
+ std::cerr << e.what() << "\n";
+ }
+
return 0;
}
if(tile->getID() == 112) {
add_object(new InvisibleBlock(pos));
solids->change(x, y, 0);
- } else if(tile->getID() == 1311) {
- add_object(new InvisibleTile(pos));
- solids->change(x, y, 0);
} else if(tile->getID() == 295) {
add_object(new Spike(pos, Spike::NORTH));
solids->change(x, y, 0);
return best_reset_point;
}
+Rectangle
+Sector::get_active_region()
+{
+ return Rectangle(
+ camera->get_translation() - Vector(1600, 1200),
+ camera->get_translation() + Vector(1600, 1200));
+}
+
void
Sector::action(float elapsed_time)
{
player->check_bounds(camera);
-
+
+#if 0
+ CollisionGridIterator iter(*grid, get_active_region());
+ while(MovingObject* object = iter.next()) {
+ if(!object->is_valid())
+ continue;
+
+ object->action(elapsed_time);
+ }
+#else
/* update objects */
for(GameObjects::iterator i = gameobjects.begin();
i != gameobjects.end(); ++i) {
object->action(elapsed_time);
}
-
+#endif
+
/* Handle all possible collisions. */
collision_handler();
update_game_objects();
/** cleanup marked objects */
for(std::vector<GameObject*>::iterator i = gameobjects.begin();
i != gameobjects.end(); /* nothing */) {
- if((*i)->is_valid() == false) {
- Bullet* bullet = dynamic_cast<Bullet*> (*i);
- if(bullet) {
- bullets.erase(
- std::remove(bullets.begin(), bullets.end(), bullet),
- bullets.end());
- }
- delete *i;
- i = gameobjects.erase(i);
- } else {
+ GameObject* object = *i;
+
+ if(object->is_valid()) {
++i;
+ continue;
+ }
+
+ Bullet* bullet = dynamic_cast<Bullet*> (object);
+ if(bullet) {
+ bullets.erase(
+ std::remove(bullets.begin(), bullets.end(), bullet),
+ bullets.end());
+ }
+ MovingObject* movingobject = dynamic_cast<MovingObject*> (object);
+ if(movingobject) {
+ grid->remove_object(movingobject);
}
+ delete *i;
+ i = gameobjects.erase(i);
}
/* add newly created objects */
for(std::vector<GameObject*>::iterator i = gameobjects_new.begin();
i != gameobjects_new.end(); ++i)
{
- Bullet* bullet = dynamic_cast<Bullet*> (*i);
+ GameObject* object = *i;
+
+ Bullet* bullet = dynamic_cast<Bullet*> (object);
if(bullet)
bullets.push_back(bullet);
- TileMap* tilemap = dynamic_cast<TileMap*> (*i);
+ MovingObject* movingobject = dynamic_cast<MovingObject*> (object);
+ if(movingobject)
+ grid->add_object(movingobject);
+
+ TileMap* tilemap = dynamic_cast<TileMap*> (object);
if(tilemap && tilemap->is_solid()) {
if(solids == 0) {
solids = tilemap;
}
}
- Camera* camera = dynamic_cast<Camera*> (*i);
+ Camera* camera = dynamic_cast<Camera*> (object);
if(camera) {
if(this->camera != 0) {
std::cerr << "Warning: Multiple cameras added. Ignoring.";
this->camera = camera;
}
- gameobjects.push_back(*i);
+ gameobjects.push_back(object);
}
gameobjects_new.clear();
}
{
context.push_transform();
context.set_translation(camera->get_translation());
-
+
+#if 0
+ CollisionGridIterator iter(*grid, get_active_region());
+ while(MovingObject* object = iter.next()) {
+ if(!object->is_valid())
+ continue;
+
+ object->draw(context);
+ }
+#else
for(GameObjects::iterator i = gameobjects.begin();
i != gameobjects.end(); ++i) {
GameObject* object = *i;
object->draw(context);
}
+#endif
context.pop_transform();
}
void
Sector::collision_handler()
{
+#if 0
+ grid->check_collisions();
+#else
for(std::vector<GameObject*>::iterator i = gameobjects.begin();
i != gameobjects.end(); ++i) {
GameObject* gameobject = *i;
movingobject->bbox.move(movingobject->get_movement());
movingobject->movement = Vector(0, 0);
}
+#endif
}
bool