now using stlplus containers, especially ntree

[chaz/yoink] / src / YoinkApp.cc

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index 023b3a30ce51837365e60d22136cc8a2e04cdce3..493e6157cad7bdc2347f820cb26a1c1d406bbc39 100644 (file)
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -131,6 +131,7 @@ YoinkApp::~YoinkApp()
 {
        delete someChar;
        delete font;
+       delete testScene;
 
        Mf::Dispatcher::instance().removeHandler(this);
 }
@@ -157,9 +158,13 @@ void YoinkApp::setupGL()
 
        glClearColor(1.0, 0.0, 0.0, 1.0);
 
-       glMatrixMode(GL_PROJECTION);
-       glLoadIdentity();
-       gluPerspective(60.0, 1.33333, 1.0, 2500.0);
+       //glMatrixMode(GL_PROJECTION);
+       //glLoadIdentity();
+       //gluPerspective(60.0, 1.33333, 1.0, 2500.0);
+       camera.setProjection(cml::rad(60.0), 1.33333, 32.0, 2500.0);
+       camera.uploadProjectionToGL();
+
+       //glMatrixMode(GL_MODELVIEW);
        
        //glLineWidth(10.0f);
 }
@@ -208,10 +213,10 @@ void YoinkApp::draw(Mf::Scalar alpha)
        glBindTexture(GL_TEXTURE_2D, 0);
        //glRotatef(drawstate*15.0f, 0.0, 1.0, 0.0);
        //glTranslatef(x, y, z);
-       glLoadMatrix(camera.getTransformation().data());
+       glLoadMatrix(camera.getModelviewMatrix().data());
 
        // DRAW THE SCENE
-       testScene->draw(alpha);
+       testScene->draw(alpha, camera);
 
 
        /*
@@ -394,20 +399,13 @@ void YoinkApp::handleEvent(const Mf::Event& event)
 
                case SDL_VIDEORESIZE:
                        glViewport(0, 0, event.resize.w, event.resize.h);
-
-                       glMatrixMode(GL_PROJECTION);
-                       glLoadIdentity();
-
-
-                       gluPerspective(60.0, double(event.resize.w / event.resize.h), 1.0, 2500.0);
-
-                       glMatrixMode(GL_MODELVIEW);
+                       camera.setProjection(cml::rad(60.0), double(event.resize.w / event.resize.h), 32.0, 2500.0);
+                       camera.uploadProjectionToGL();
                        break;
        }
 }
 
 
-#include <Moof/Tree.hh>
 
 int main(int argc, char* argv[])
 {
@@ -418,10 +416,6 @@ int main(int argc, char* argv[])
 
        int status = 0;
 
-       //Mf::Tree<Mf::Drawable> myTree;
-       //Mf::Tree<Mf::Drawable>::Ptr prev = myTree.previousSibling();
-       //myTree = *prev;
-
        try
        {
                YoinkApp app(argc, argv);
@@ -437,5 +431,6 @@ int main(int argc, char* argv[])
        return status;
 }
 
+
 /** vim: set ts=4 sw=4 tw=80: *************************************************/