extreme refactoring

[chaz/yoink] / src / YoinkApp.cc

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index 655aa3497928e5c22b6510f8725efa95d86a5368..5b034d74646167996343b696b3e5a59c67c3773f 100644 (file)
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -26,18 +26,17 @@
 
 *******************************************************************************/
 
+#include <cstdlib>             // getenv
 #include <iostream>
 #include <string>
 
-#include <cstdlib>             // getenv
-
 #include <boost/bind.hpp>
 
-#include "math.hh"
-#include "opengl.hh"
-#include "settings.hh"
-#include "timer.hh"
-#include "video.hh"
+#include <Moof/Math.hh>
+#include <Moof/OpenGL.hh>
+#include <Moof/Settings.hh>
+#include <Moof/Timer.hh>
+#include <Moof/Video.hh>
 
 #include "YoinkApp.hh"
 
@@ -67,7 +66,7 @@ static std::string configFiles()
 
 
 YoinkApp::YoinkApp(int argc, char* argv[]) :
-       dc::engine(PACKAGE_STRING, argc, argv, configFiles())
+       Mf::Engine(PACKAGE_STRING, argc, argv, configFiles())
 {
        std::cout << PACKAGE_STRING << std::endl
                          << "Compiled " << __TIME__ " " __DATE__ << std::endl
@@ -78,12 +77,12 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
 
        if (dataDir)
        {
-               dc::resource::addSearchPath(dataDir);
+               Mf::Resource::addSearchPath(dataDir);
        }
 
-       dc::resource::addSearchPath(YOINK_DATADIR);
+       Mf::Resource::addSearchPath(YOINK_DATADIR);
 
-       dc::dispatcher::instance().addHandler("video.context_recreated",
+       Mf::Dispatcher::instance().addHandler("video.context_recreated",
                        boost::bind(&YoinkApp::contextRecreated, this, _1), this);
        setupGL();
 
@@ -94,17 +93,17 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
 
        font = new TilemapFont;
 
-       dc::vector2 coeffs[4];
-       coeffs[0] = dc::vector2(0.0, 0.0);
-       coeffs[1] = dc::vector2(0.5, 0.0);
-       coeffs[2] = dc::vector2(0.5, 0.0);
-       coeffs[3] = dc::vector2(1.0, 0.0);
-       interp.init(coeffs, 1.0, dc::interpolator::oscillate);
+       Mf::Vector2 coeffs[4];
+       coeffs[0] = Mf::Vector2(0.0, 0.0);
+       coeffs[1] = Mf::Vector2(0.5, 0.0);
+       coeffs[2] = Mf::Vector2(0.5, 0.0);
+       coeffs[3] = Mf::Vector2(1.0, 0.0);
+       interp.init(coeffs, 1.0, Mf::Interpolator::OSCILLATE);
 
-       dc::scalar coeff[2] = {1.0, 0.0};
+       Mf::Scalar coeff[2] = {1.0, 0.0};
        fadeIn.init(coeff, 0.5f);
 
-       testScene = new dc::scene("Test");
+       testScene = new Mf::Scene("Test");
 }
 
 YoinkApp::~YoinkApp()
@@ -112,7 +111,7 @@ YoinkApp::~YoinkApp()
        delete someChar;
        delete font;
 
-       dc::dispatcher::instance().removeHandler(this);
+       Mf::Dispatcher::instance().removeHandler(this);
 
        std::cout << "Goodbye..." << std::endl;
 }
@@ -136,7 +135,7 @@ void YoinkApp::setupGL()
        //glLineWidth(10.0f);
 }
 
-void YoinkApp::contextRecreated(const dc::notification& note)
+void YoinkApp::contextRecreated(const Mf::Notification& note)
 {
        // Whenever the context and a new one created, it probably won't contain our
        // state so we need to set that up again.
@@ -144,7 +143,7 @@ void YoinkApp::contextRecreated(const dc::notification& note)
 }
 
 
-void YoinkApp::update(dc::scalar t, dc::scalar dt)
+void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
 {
        //dt *= 0.2;
        
@@ -158,17 +157,17 @@ void YoinkApp::update(dc::scalar t, dc::scalar dt)
 }
 
 
-void YoinkApp::draw(dc::scalar alpha)
+void YoinkApp::draw(Mf::Scalar alpha)
 {
-       //dc::vector4 meh;
+       //Mf::vector4 meh;
        //meh.random(0.0, 1.0);
-       //static dc::vector4 c1(meh);
+       //static Mf::vector4 c1(meh);
 
        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-       //dc::scalar drawstate = cml::lerp(prevstate, state, alpha);
-       //dc::scalar sinstate = std::sin(drawstate);
-       //dc::scalar cosstate = std::cos(drawstate);
+       //Mf::Scalar drawstate = cml::lerp(prevstate, state, alpha);
+       //Mf::Scalar sinstate = std::sin(drawstate);
+       //Mf::Scalar cosstate = std::cos(drawstate);
        
 
        glMatrixMode(GL_PROJECTION);
@@ -208,7 +207,7 @@ void YoinkApp::draw(dc::scalar alpha)
 
 
        someChar->getTilemap().getTileCoords(heroFrame, coords,
-                       dc::tilemap::reverse);
+                       Mf::tilemap::reverse);
 
        glBegin(GL_QUADS);
                glTexCoord2f(coords[0], coords[1]);
@@ -302,44 +301,44 @@ void YoinkApp::draw(dc::scalar alpha)
        glEnable(GL_DEPTH_TEST);*/
 }
 
-void YoinkApp::handleEvent(const dc::event& e)
+void YoinkApp::handleEvent(const Mf::Event& event)
 {
-       switch (e.type)
+       switch (event.type)
        {
                case SDL_KEYDOWN:
-                       if (e.key.keysym.sym == SDLK_ESCAPE)
+                       if (event.key.keysym.sym == SDLK_ESCAPE)
                        {
                                stop();
                        }
-                       else if (e.key.keysym.sym == SDLK_f)
+                       else if (event.key.keysym.sym == SDLK_f)
                        {
                                getVideo().toggleFull();
                        }
-                       else if (e.key.keysym.sym == SDLK_a)
+                       else if (event.key.keysym.sym == SDLK_a)
                        {
                                someChar->getAnimation().startSequence("Punch");
                        }
-                       else if (e.key.keysym.sym == SDLK_RIGHT)
+                       else if (event.key.keysym.sym == SDLK_RIGHT)
                        {
                                x -= 50.0;
                        }
-                       else if (e.key.keysym.sym == SDLK_LEFT)
+                       else if (event.key.keysym.sym == SDLK_LEFT)
                        {
                                x += 50.0;
                        }
-                       else if (e.key.keysym.sym == SDLK_UP)
+                       else if (event.key.keysym.sym == SDLK_UP)
                        {
                                y -= 50.0;
                        }
-                       else if (e.key.keysym.sym == SDLK_DOWN)
+                       else if (event.key.keysym.sym == SDLK_DOWN)
                        {
                                y += 50.0;
                        }
-                       else if (e.key.keysym.sym == SDLK_PAGEUP)
+                       else if (event.key.keysym.sym == SDLK_PAGEUP)
                        {
                                z += 50.0;
                        }
-                       else if (e.key.keysym.sym == SDLK_PAGEDOWN)
+                       else if (event.key.keysym.sym == SDLK_PAGEDOWN)
                        {
                                z -= 50.0;
                        }
@@ -350,7 +349,7 @@ void YoinkApp::handleEvent(const dc::event& e)
                        break;
 
                case SDL_VIDEORESIZE:
-                       glViewport(0, 0, e.resize.w, e.resize.h);
+                       glViewport(0, 0, event.resize.w, event.resize.h);
                        break;
        }
 }