#include <Moof/Script.hh>
#include <Moof/Settings.hh>
+#include "Character.hh"
#include "Scene.hh"
#include "Tilemap.hh"
struct Scene::Impl : public Mf::Mippleton<Impl>
{
- class Quad : public Mf::Entity, public Mf::OctreeInsertable
+ struct Quad : public Mf::Entity, public Mf::OctreeInsertable
{
- Mf::Scalar vertices_[12];
- Mf::Scalar texCoords_[8];
-
- Tilemap tilemap_;
-
- bool blending_;
- bool fog_;
-
- Mf::Aabb aabb_;
- Mf::Sphere sphere_;
-
- public:
-
enum SURFACE_TYPE
{
+ NONE = 0,
LEFT = 1,
RIGHT = 2,
TOP = 3
Tilemap::Index tileIndex) :
tilemap_(texture),
blending_(false),
- fog_(false)
+ fog_(false),
+ surfaceType_(NONE)
{
for (int i = 0, num = 0; i < 4; ++i)
{
fog_ = fog;
}
+ void setSurfaceType(SURFACE_TYPE type)
+ {
+ surfaceType_ = type;
+ }
+
void draw(Mf::Scalar alpha = 0.0) const
{
if (blending_)
return octantNum;
}
+
+
+ Mf::Scalar vertices_[12];
+ Mf::Scalar texCoords_[8];
+
+ Tilemap tilemap_;
+
+ bool blending_;
+ bool fog_;
+ SURFACE_TYPE surfaceType_;
+
+ Mf::Aabb aabb_;
+ Mf::Sphere sphere_;
};
Mf::Octree<Quad>::Ptr octree;
+ Mf::Aabb playfieldBounds;
+ Mf::Aabb maximumBounds;
+
enum AXIS
{
script.importFunction("MakeBillboard",
boost::bind(&Impl::makeBillboard, this, _1));
- long detail = 3;
+ int detail = 3;
Mf::Settings::getInstance().get("detail", detail);
script.push(detail); script.set("detail");
- script.push(Quad::LEFT); script.set("LEFT");
- script.push(Quad::RIGHT); script.set("RIGHT");
- script.push(Quad::TOP); script.set("TOP");
-
script.push(X); script.set("X");
script.push(Y); script.set("Y");
script.push(Z); script.set("Z");
+
+ script.push(Quad::LEFT); script.set("LEFT");
+ script.push(Quad::RIGHT); script.set("RIGHT");
+ script.push(Quad::TOP); script.set("TOP");
}
script[2].requireTable()
};
- if (!table[0].isTable() || !table[1].isTable())
- {
- Mf::logWarning("wrong arguments to setPlayfieldBounds; ignoring...");
- return 0;
- }
-
for (int i = 0; i <= 1; ++i)
{
for (int j = 1; j <= 3; ++j)
{
- script.push((long)j);
+ script.push(j);
table[i].pushField();
}
}
int setPlayfieldBounds(Mf::Script& script)
{
- Mf::Aabb bounds;
- return loadBox(script, bounds);
+ return loadBox(script, playfieldBounds);
}
int setMaximumBounds(Mf::Script& script)
{
- Mf::Aabb bounds;
- int ret = loadBox(script, bounds);
- octree = Mf::Octree<Quad>::alloc(bounds);
+ int ret = loadBox(script, maximumBounds);
+ octree = Mf::Octree<Quad>::alloc(maximumBounds);
return ret;
}
int rotate(Mf::Script& script)
{
- Mf::Script::Value axis = script[1].requireString();
+ Mf::Script::Value axis = script[1].requireNumber();
Mf::Script::Value angle = script[2].requireNumber();
size_t index = 0;
int setTexture(Mf::Script& script)
{
- Mf::Script::Value name = script[1].requireString();
-
- name.get(texture);
-
+ script[1].requireString().get(texture);
return 0;
}
Mf::Script::Value table = script[1].requireTable();
Mf::Script::Value top = script[-1];
- long width = 1;
- long height = 1;
+ Quad::SURFACE_TYPE surfaceType;
+ table.pushField("surface_type");
+ top.get(surfaceType);
+
+ int width = 1;
+ int height = 1;
table.pushField("width");
top.get(width);
- long nTiles = 0;
+ int nTiles = 0;
table.pushField("tiles");
Mf::Script::Value tiles = script.getTop();
height = nTiles / width;
indices.resize(height);
- // the indices are stored upside-down in the scene file so that they
- // are easier to edit as text, so we'll need to load them last row
- // first
+ // the indices are stored upside-down in the scene file so that they are
+ // easier to edit as text, so we'll need to load them last row first
i = 1;
for (h = height - 1; h >= 0; --h)
for (w = 0; w < width; ++w, ++i)
{
script.checkStack(2);
- script.push(long(i));
+ script.push(i);
tiles.pushField();
Tilemap::Index index;
{
if (indices[h][w] == Tilemap::NO_TILE) continue;
- Mf::Vector3 quadVertices[4];
+ Mf::Vector3 demotedVertices[4];
- quadVertices[0] = Mf::demote(vertices[h][w]);
- quadVertices[1] = Mf::demote(vertices[h][w+1]);
- quadVertices[2] = Mf::demote(vertices[h+1][w+1]);
- quadVertices[3] = Mf::demote(vertices[h+1][w]);
+ demotedVertices[0] = Mf::demote(vertices[h][w]);
+ demotedVertices[1] = Mf::demote(vertices[h][w+1]);
+ demotedVertices[2] = Mf::demote(vertices[h+1][w+1]);
+ demotedVertices[3] = Mf::demote(vertices[h+1][w]);
- Quad* quad = new Quad(quadVertices, texture, indices[h][w]);
- boost::shared_ptr<Quad> quadPtr(quad);
+ Quad* quad = new Quad(demotedVertices, texture, indices[h][w]);
+ quad->setSurfaceType(surfaceType);
+ boost::shared_ptr<Quad> quadPtr(quad);
octree->insert(quadPtr);
}
}
Mf::Script::Value table = script[1];
Mf::Script::Value top = script[-1];
- long index = 0;
- long width = 1;
- bool blending = false;
- bool fog = false;
+ Tilemap::Index index = 0;
+ int width = 1;
+ bool blending = false;
+ bool fog = false;
if (table.isTable())
{
for (int w = 0; w < width; ++w)
{
- Mf::Vector3 quadVertices[4];
+ Mf::Vector3 demotedVertices[4];
- quadVertices[0] = Mf::demote(vertices[0][w]);
- quadVertices[1] = Mf::demote(vertices[0][w+1]);
- quadVertices[2] = Mf::demote(vertices[1][w+1]);
- quadVertices[3] = Mf::demote(vertices[1][w]);
+ demotedVertices[0] = Mf::demote(vertices[0][w]);
+ demotedVertices[1] = Mf::demote(vertices[0][w+1]);
+ demotedVertices[2] = Mf::demote(vertices[1][w+1]);
+ demotedVertices[3] = Mf::demote(vertices[1][w]);
- Quad* quad = new Quad(quadVertices, texture, Tilemap::Index(index));
+ Quad* quad = new Quad(demotedVertices, texture, index);
quad->setBlending(blending);
quad->setFog(fog);
boost::shared_ptr<Quad> quadPtr(quad);
-
octree->insert(quadPtr);
}
Scene::Scene(const std::string& name) :
// pass through
- impl_(Scene::Impl::getInstance(name)) {}
+ mImpl(Scene::Impl::getInstance(name)) {}
void Scene::draw(Mf::Scalar alpha) const
{
- impl_->octree->draw(alpha);
+ mImpl->octree->draw(alpha);
}
void Scene::drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const
{
- impl_->octree->drawIfVisible(alpha, frustum);
+ mImpl->octree->drawIfVisible(alpha, frustum);
+}
+
+
+bool Scene::checkForCollision(Character& character)
+{
+ std::list< boost::shared_ptr<Impl::Quad> > objects;
+ //std::list<Mf::Octree<Impl::Quad>::InsertableP> objects;
+ mImpl->octree->getNearbyObjects(objects, character);
+ mImpl->maximumBounds.draw();
+
+ Mf::logDebug("nearby objects: %d", objects.size());
+ return false;
}
projects / chaz / yoink / blobdiff