X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FScene.cc;h=aa2249c596ae0b462e9910db1bd93362ef8ceabd;hp=452cc134cc85359894bac9877649806424f54938;hb=987971a961454d97082c6448fdc0bbeb540281bb;hpb=2d77fb5fb3480f522658f30af6addd5146530517 diff --git a/src/Scene.cc b/src/Scene.cc index 452cc13..aa2249c 100644 --- a/src/Scene.cc +++ b/src/Scene.cc @@ -27,12 +27,10 @@ *******************************************************************************/ #include -#include #include #include #include -#include #include #include #include @@ -50,7 +48,7 @@ struct Scene::Impl : public Mf::Library { struct Quad : public Mf::Entity { - enum SURFACE + enum Surface { NONE = 0, LEFT = 1, @@ -58,25 +56,26 @@ struct Scene::Impl : public Mf::Library TOP = 3 }; - Quad(const Mf::Vector3 vertices[4], const std::string& texture, + Quad(const Mf::Vector3* vertices[4], const std::string& texture, Tilemap::Index tileIndex) : mTilemap(texture), mBlending(false), mFog(false), mSurface(NONE) { - for (int i = 0, num = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { - for (int j = 0; j < 3; ++j, ++num) - { - mVertices[num] = vertices[i][j]; - } + mVertices[i] = *vertices[i]; + //for (int j = 0; j < 3; ++j, ++num) + //{ + //mVertices[num] = (*vertices[i])[j]; + //} } if (!mTilemap.getTileCoords(tileIndex, mTexCoords)) { - Mf::logWarning("no index %d in texture %s", tileIndex, - texture.c_str()); + Mf::logWarning << "no index " << tileIndex << + " in texture " << texture << std::endl; mTexCoords[0] = mTexCoords[1] = mTexCoords[3] = mTexCoords[6] = 0.0; @@ -84,7 +83,7 @@ struct Scene::Impl : public Mf::Library mTexCoords[5] = mTexCoords[7] = 1.0; } - mAabb.encloseVertices(vertices, 4); + mAabb.encloseVertices(mVertices, 4); mSphere.point = mAabb.getCenter(); mSphere.radius = (mAabb.min - mSphere.point).length(); } @@ -99,12 +98,12 @@ struct Scene::Impl : public Mf::Library mFog = fog; } - void setSurface(SURFACE type) + void setSurface(Surface type) { mSurface = type; } - SURFACE getSurface() const + Surface getSurface() const { return mSurface; } @@ -126,7 +125,7 @@ struct Scene::Impl : public Mf::Library //glColor4f(1.0f, 1.0f, 1.0f, 1.0f); mTilemap.bind(); - glVertexPointer(3, GL_SCALAR, 0, mVertices); + glVertexPointer(3, GL_SCALAR, 0, mVertices[0].data()); glTexCoordPointer(2, GL_SCALAR, 0, mTexCoords); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); @@ -141,14 +140,14 @@ struct Scene::Impl : public Mf::Library } - Mf::Scalar mVertices[12]; + Mf::Vector3 mVertices[4]; Mf::Scalar mTexCoords[8]; Tilemap mTilemap; bool mBlending; bool mFog; - SURFACE mSurface; + Surface mSurface; }; @@ -194,7 +193,7 @@ struct Scene::Impl : public Mf::Library boost::bind(&Impl::drawTile, this, _1)); int detail = 3; - Mf::Settings::getInstance().get("detail", detail); + Mf::settings.get("detail", detail); script.push(detail); script.set("detail"); script.push(1); script.set("LOW"); @@ -211,10 +210,14 @@ struct Scene::Impl : public Mf::Library } - Mf::Script::Status load(Mf::Script& script) + Mf::Script::Result load(Mf::Script& script) { std::string filePath = Scene::getPath(getName()); - if (filePath == "") return Mf::Script::FILE_ERROR; + if (filePath == "") + { + script.push("the scene file could not be found"); + return Mf::Script::FILE_ERROR; + } importSceneBindings(script); return script.doFile(filePath); @@ -223,18 +226,15 @@ struct Scene::Impl : public Mf::Library static int loadBox(Mf::Script& script, Mf::Aabb<3>& aabb) { - Mf::Script::Value table[] = - { - script[1].requireTable(), - script[2].requireTable() - }; + script[1].requireTable(); + script[2].requireTable(); + script.setSize(2); - for (int i = 0; i <= 1; ++i) + for (int i = 1; i <= 2; ++i) { for (int j = 1; j <= 3; ++j) { - script.push(j); - table[i].pushField(); + script[i].pushField(j); } } @@ -263,14 +263,11 @@ struct Scene::Impl : public Mf::Library int translate(Mf::Script& script) { - Mf::Script::Value x = script[1].requireNumber(); - Mf::Script::Value y = script[2].requireNumber(); - Mf::Script::Value z = script[3].requireNumber(); - Mf::Vector3 vec; - x.get(vec[0]); - y.get(vec[1]); - z.get(vec[2]); + + script[1].requireNumber().get(vec[0]); + script[2].requireNumber().get(vec[1]); + script[3].requireNumber().get(vec[2]); Mf::Matrix4 translation; cml::matrix_translation(translation, vec); @@ -311,14 +308,11 @@ struct Scene::Impl : public Mf::Library int rotate(Mf::Script& script) { - Mf::Script::Value axis = script[1].requireNumber(); - Mf::Script::Value angle = script[2].requireNumber(); - size_t index = 0; - axis.get(index); + script[1].requireNumber().get(index); Mf::Scalar value; - angle.get(value); + script[2].requireNumber().get(value); cml::matrix_rotate_about_world_axis(mTransform, index, cml::rad(value)); @@ -333,100 +327,94 @@ struct Scene::Impl : public Mf::Library int drawTilemap(Mf::Script& script) { - Mf::Script::Value table = script[1].requireTable(); - Mf::Script::Value top = script[-1]; + Mf::Script::Slot table = script[1].requireTable(); + Mf::Script::Slot top = script[-1]; - Quad::SURFACE surface; - table.pushField("surface"); - top.get(surface); - script.pop(); - - int width = 1; - int height = 1; + int width = 1; + int height = 1; + int nTiles = 0; table.pushField("width"); top.get(width); script.pop(); - int nTiles = 0; - - //table.pushField("tiles"); - Mf::Script::Value tiles = script.getTop(); - nTiles = tiles.getLength(); - + nTiles = table.getLength(); if (nTiles % width != 0) table.throwError("invalid number of tiles"); - std::vector< std::vector > indices; - - int i, w, h; - + if (width == 0) table.throwError("width field must not be zero"); height = nTiles / width; - indices.resize(height); + + Mf::Vector3 vertices[height+1][width+1]; // 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) + // do first row and first column of vertices + + for (int w = 0; w <= width; ++w) + { + vertices[height][w] = Mf::demote(mTransform * + Mf::Vector4(w, height, 0.0, 1.0)); + } + for (int h = 0; h < height; ++h) { - std::vector row; + vertices[h][0] = Mf::demote(mTransform * + Mf::Vector4(0.0, h, 0.0, 1.0)); + } - for (w = 0; w < width; ++w, ++i) + size_t i = 1; + for (int h = height - 1; h >= 0; --h) + { + for (int w = 0; w < width; ++w, ++i) { - script.checkStack(2); - script.push(i); - tiles.pushField(); + int wPlus1 = w + 1; + int hPlus1 = h + 1; + + table.pushField(i); Tilemap::Index index; top.get(index); - row.push_back(index); - } + script.pop(); - indices[h] = row; - } + vertices[h][wPlus1] = Mf::demote(mTransform * + Mf::Vector4(wPlus1, h, 0.0, 1.0)); - Mf::Vector4 vertices[height+1][width+1]; + if (index == Tilemap::NO_TILE) continue; - Mf::Matrix4 transposedTransform = mTransform; - transposedTransform.transpose(); + const Mf::Vector3* corners[4] = { + &vertices[h][w], + &vertices[h][wPlus1], + &vertices[hPlus1][wPlus1], + &vertices[hPlus1][w] + }; - for (int h = 0; h <= height; ++h) - { - for (int w = 0; w <= width; ++w) - { - vertices[h][w] = Mf::Vector4(w, h, 0.0, 1.0) * transposedTransform; + Quad* quad = new Quad(corners, mTexture, index); + //quad->setSurface(surface); + + boost::shared_ptr quadPtr(quad); + mObjects.push_back(quadPtr); } } - for (int h = 0; h < height; ++h) - { - for (int w = 0; w < width; ++w) - { - if (indices[h][w] == Tilemap::NO_TILE) continue; - - Mf::Vector3 demotedVertices[4]; + Quad::Surface surface = Quad::NONE; - 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]); + table.pushField("surface"); + top.get(surface); + script.pop(); - Quad* quad = new Quad(demotedVertices, mTexture, indices[h][w]); - quad->setSurface(surface); + if (surface != Quad::NONE) + { + // need a 2d line for collisions + // assuming the camera always looks directly to -z when the + // scene is built, simply demoting the vector again should + // project the points to the xy-plane - if (surface != Quad::NONE) - { - // need a 2d line for collisions - // assuming the camera always looks directly to -z when the - // scene is built, simply demoting the vector again should - // project the points to the xy-plane - } + Mf::Vector2 bl = Mf::demote(vertices[0][0]); + Mf::Vector2 tr = Mf::demote(vertices[height][width]); - boost::shared_ptr quadPtr(quad); - //mOctree->insert(quadPtr); - mObjects.push_back(quadPtr); - } + mLines.push_back(Mf::Line<2>(bl, tr)); + Mf::logInfo("new line"); } return 0; @@ -434,8 +422,8 @@ struct Scene::Impl : public Mf::Library int drawTile(Mf::Script& script) { - Mf::Script::Value param = script[1]; - Mf::Script::Value top = script[-1]; + Mf::Script::Slot param = script[1]; + Mf::Script::Slot top = script[-1]; Tilemap::Index index = 0; int width = 1; @@ -462,10 +450,7 @@ struct Scene::Impl : public Mf::Library param.get(index); } - Mf::Vector4 vertices[2][width+1]; - - Mf::Matrix4 transposedTransform = mTransform; - transposedTransform.transpose(); + Mf::Vector3 vertices[2][width+1]; Mf::Scalar xf; Mf::Scalar increment = 1.0 / Mf::Scalar(width); @@ -475,26 +460,27 @@ struct Scene::Impl : public Mf::Library xf = 0.0; for (int w = 0; w <= width; ++w, xf += increment) { - vertices[h][w] = Mf::Vector4(xf, Mf::Scalar(h), 0.0, 1.0) * - transposedTransform; + vertices[h][w] = Mf::demote(mTransform * + Mf::Vector4(xf, Mf::Scalar(h), 0.0, 1.0)); } } for (int w = 0; w < width; ++w) { - Mf::Vector3 demotedVertices[4]; + int wPlus1 = w + 1; - 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]); + const Mf::Vector3* corners[4] = { + &vertices[0][w], + &vertices[0][wPlus1], + &vertices[1][wPlus1], + &vertices[1][w] + }; - Quad* quad = new Quad(demotedVertices, mTexture, index); + Quad* quad = new Quad(corners, mTexture, index); quad->setBlending(blending); quad->setFog(fog); boost::shared_ptr quadPtr(quad); - //mOctree->insert(quadPtr); mObjects.push_back(quadPtr); } @@ -508,7 +494,7 @@ Scene::Scene(const std::string& name) : mImpl(Scene::Impl::getInstance(name)) {} -Mf::Script::Status Scene::load(Mf::Script& script) +Mf::Script::Result Scene::load(Mf::Script& script) { // pass through return mImpl->load(script); @@ -517,7 +503,6 @@ Mf::Script::Status Scene::load(Mf::Script& script) void Scene::draw(Mf::Scalar alpha) const { - //mImpl->mOctree->draw(alpha); std::list< boost::shared_ptr >& objects = mImpl->mObjects; std::list< boost::shared_ptr >::const_iterator it; @@ -531,7 +516,6 @@ void Scene::draw(Mf::Scalar alpha) const void Scene::drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const { - //mImpl->mOctree->drawIfVisible(alpha, frustum); std::list< boost::shared_ptr >& objects = mImpl->mObjects; std::list< boost::shared_ptr >::const_iterator it; @@ -540,10 +524,40 @@ void Scene::drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const (*it)->drawIfVisible(alpha, frustum); } + std::list< Mf::Line<2> >& lines = mImpl->mLines; + std::list< Mf::Line<2> >::const_iterator lit; + + for (lit = lines.begin(); lit != lines.end(); ++lit) + { + (*lit).draw(alpha); + } + mImpl->mBounds.draw(); } +bool Scene::castRay(const Mf::Ray<2>& ray, + std::list::Intersection>& hits) const +{ + std::list< Mf::Line<2> >& lines = mImpl->mLines; + std::list< Mf::Line<2> >::const_iterator it; + + for (it = lines.begin(); it != lines.end(); ++it) + { + Mf::Ray<2>::Intersection hit; + Mf::Scalar d = (*it).intersectRay(ray, hit); + if (d > 0.0) + { + hits.push_back(hit); + //return true; + } + } + + hits.sort(); + return !hits.empty(); + //return false; +} + bool Scene::checkForCollision(Character& character) { return false; @@ -559,7 +573,7 @@ bool Scene::checkForCollision(Character& character) for (it = objects.begin(); it != objects.end(); ++it) { - Impl::Quad::SURFACE type = (*it)->getSurface(); + Impl::Quad::Surface type = (*it)->getSurface(); if (type == Impl::Quad::NONE) continue; if (Mf::checkCollision(sphere, (*it)->getSphere())) @@ -599,7 +613,7 @@ bool Scene::checkForCollision(Character& character) if (collisions > 0) { - Mf::logInfo("collisions: %d", collisions); + Mf::logInfo << "collisions: " << collisions << std::endl; } return false;