mesh and other random adjustments

[chaz/yoink] / src / Scene.cc

diff --git a/src/Scene.cc b/src/Scene.cc
index a1218f29b6f14eed579aa5bc0681f1fb35785705..af54c28768cfa92af735ccb9858d211f0a0789b2 100644 (file)
--- a/src/Scene.cc
+++ b/src/Scene.cc
@@ -18,6 +18,7 @@
 #include <moof/log.hh>
 #include <moof/manager.hh>
 #include <moof/math.hh>
+#include <moof/resource.hh>
 #include <moof/script.hh>
 #include <moof/settings.hh>
 #include <moof/sprite.hh>
@@ -39,7 +40,7 @@ struct Scene::impl : public moof::manager<impl>
                };
 
                Quad(const moof::vector3* vertices[4],
-                        const std::string& texture,
+                        const moof::image_handle& texture,
                         int tileIndex) :
                        mTilemap(texture, tileIndex),
                        mBlending(false),
@@ -119,7 +120,7 @@ struct Scene::impl : public moof::manager<impl>
 
 
        moof::matrix4           mTransform;
-       std::string                     mTexture;
+       moof::image_handle      mTexture;
 
        std::list< boost::shared_ptr<impl::Quad> >      mObjects;
        std::list<moof::line2>                                          mLines;
@@ -191,8 +192,8 @@ struct Scene::impl : public moof::manager<impl>
 
        static int loadBox(moof::script& script, moof::aabb3& aabb)
        {
-               script[1].require_table();
-               script[2].require_table();
+               script[1].require_table("point");
+               script[2].require_table("point");
 
                script[1].push_field(1).get(aabb.min[0]);
                script[1].push_field(2).get(aabb.min[1]);
@@ -206,8 +207,7 @@ struct Scene::impl : public moof::manager<impl>
 
        int setBounds(moof::script& script)
        {
-               int ret = loadBox(script, mBounds);
-               return ret;
+               return loadBox(script, mBounds);
        }
 
        int resetTransform(moof::script& script)
@@ -264,10 +264,10 @@ struct Scene::impl : public moof::manager<impl>
 
        int rotate(moof::script& script)
        {
-               size_t index = 0;
-               script[1].require_number().get(index);
+               size_t                  index = 0;
+               moof::scalar    value;
 
-               moof::scalar value;
+               script[1].require_number().get(index);
                script[2].require_number().get(value);
 
                moof::matrix_rotate_about_world_axis(mTransform, index,
@@ -278,7 +278,9 @@ struct Scene::impl : public moof::manager<impl>
 
        int setTexture(moof::script& script)
        {
-               script[1].require_string().get(mTexture);
+               std::string texture_name;
+               script[1].require_string().get(texture_name);
+               mTexture = moof::resource::load(texture_name, "png");
                return 0;
        }