fixed up video and texture handling

[chaz/yoink] / src / YoinkApp.cc

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index 5b034d74646167996343b696b3e5a59c67c3773f..232c097425b4f3a70803951644e3bdf634d1e203 100644 (file)
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -64,24 +64,24 @@ static std::string configFiles()
        return files;
 }
 
-
-YoinkApp::YoinkApp(int argc, char* argv[]) :
-       Mf::Engine(PACKAGE_STRING, argc, argv, configFiles())
+static std::string iconFile()
 {
-       std::cout << PACKAGE_STRING << std::endl
-                         << "Compiled " << __TIME__ " " __DATE__ << std::endl
-                         << "Send requests, patches, and bug reports to <"
-                         PACKAGE_BUGREPORT << ">." << std::endl << std::endl;
-
        char* dataDir = getenv("YOINK_DATADIR");
 
+       // first set up the search paths so we can find the icon and other resources
        if (dataDir)
        {
                Mf::Resource::addSearchPath(dataDir);
        }
-
        Mf::Resource::addSearchPath(YOINK_DATADIR);
 
+       return Mf::Resource::getPathToResource("yoink.png");
+}
+
+
+YoinkApp::YoinkApp(int argc, char* argv[]) :
+       Mf::Engine(argc, argv, configFiles(), PACKAGE_STRING, iconFile())
+{
        Mf::Dispatcher::instance().addHandler("video.context_recreated",
                        boost::bind(&YoinkApp::contextRecreated, this, _1), this);
        setupGL();
@@ -104,6 +104,8 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
        fadeIn.init(coeff, 0.5f);
 
        testScene = new Mf::Scene("Test");
+
+       x = y = z = 0.0;
 }
 
 YoinkApp::~YoinkApp()
@@ -112,25 +114,29 @@ YoinkApp::~YoinkApp()
        delete font;
 
        Mf::Dispatcher::instance().removeHandler(this);
-
-       std::cout << "Goodbye..." << std::endl;
 }
 
 
 void YoinkApp::setupGL()
 {
        glEnable(GL_TEXTURE_2D);
+
        //glEnable(GL_CULL_FACE);
        glEnable(GL_DEPTH_TEST);
 
        glShadeModel(GL_SMOOTH);
+       glEnable(GL_POLYGON_SMOOTH);
+
+       //int texSize;
+       //glGetIntegerv(GL_MAX_TEXTURE_SIZE, &texSize);
+       //std::cout << "texture size: " << texSize << std::endl;
        
        //glEnable(GL_BLEND);
        //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        glEnable(GL_ALPHA_TEST);
        glAlphaFunc(GL_GREATER, 0.0);
 
-       glClearColor(0.0, 0.0, 1.0, 1.0);
+       glClearColor(1.0, 0.0, 0.0, 1.0);
 
        //glLineWidth(10.0f);
 }
@@ -159,9 +165,9 @@ void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
 
 void YoinkApp::draw(Mf::Scalar alpha)
 {
-       //Mf::vector4 meh;
+       //Mf::Vector4 meh;
        //meh.random(0.0, 1.0);
-       //static Mf::vector4 c1(meh);
+       //static Mf::Vector4 c1(meh);
 
        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -170,6 +176,7 @@ void YoinkApp::draw(Mf::Scalar alpha)
        //Mf::Scalar cosstate = std::cos(drawstate);
        
 
+
        glMatrixMode(GL_PROJECTION);
        glLoadIdentity();
        gluPerspective(60.0, 1.33333, 1.0, 2000.0);
@@ -186,12 +193,14 @@ void YoinkApp::draw(Mf::Scalar alpha)
 
 
        /*
+       glLoadIdentity();
+       
        someChar->getTilemap().bind();
        glColor3f(1.0, 1.0, 1.0);
 
-       unsigned heroFrame = someChar->getAnimation().getFrame();
+       Mf::Tilemap::Index heroFrame = someChar->getAnimation().getFrame();
 
-       float coords[8];
+       Mf::Scalar coords[8];
        someChar->getTilemap().getTileCoords(heroFrame, coords);
 
        glBegin(GL_QUADS);
@@ -207,7 +216,7 @@ void YoinkApp::draw(Mf::Scalar alpha)
 
 
        someChar->getTilemap().getTileCoords(heroFrame, coords,
-                       Mf::tilemap::reverse);
+                       Mf::Tilemap::REVERSE);
 
        glBegin(GL_QUADS);
                glTexCoord2f(coords[0], coords[1]);
@@ -223,7 +232,7 @@ void YoinkApp::draw(Mf::Scalar alpha)
        glColor4f(1.0,0.0,0.0,0.5);
 
        glBindTexture(GL_TEXTURE_2D, 0);
-       glColor4fv(c1.data());
+       glColor4v(c1.data());
 
        glRectd(-cosstate, -sinstate, sinstate, cosstate);
        glRectf(0.0f, 0.0f, sinstate, cosstate);
@@ -273,13 +282,13 @@ void YoinkApp::draw(Mf::Scalar alpha)
 
        glBegin(GL_QUADS);
                glTexCoord2f(coords[0], coords[1]);
-               glVertex3f(0.0, -1.0, 0.0);
+               glVertex3(0.0, -1.0, 0.0);
                glTexCoord2f(coords[2], coords[3]);
-               glVertex3f(1.0, -1.0, 0.0);
+               glVertex3(1.0, -1.0, 0.0);
                glTexCoord2f(coords[4], coords[5]);
-               glVertex3f(1.0, 0.0, 0.0);
+               glVertex3(1.0, 0.0, 0.0);
                glTexCoord2f(coords[6], coords[7]);
-               glVertex3f(0.0, 0.0, 0.0);
+               glVertex3(0.0, 0.0, 0.0);
        glEnd();
 
        glEnable(GL_BLEND);
@@ -291,7 +300,7 @@ void YoinkApp::draw(Mf::Scalar alpha)
 
        glBegin(GL_LINES);
                glVertex2f(0.0f, 0.0f);
-               glVertex2fv(interp.getState(alpha).data());
+               glVertex2v(interp.getState(alpha).data());
        glEnd();
 
        glColor4f(0.0f, 0.0f, 0.0f, fadeIn.getState(alpha));
@@ -358,8 +367,26 @@ void YoinkApp::handleEvent(const Mf::Event& event)
 
 int main(int argc, char* argv[])
 {
-       YoinkApp app(argc, argv);
-       return app.run();
+       std::cout << PACKAGE_STRING << std::endl
+                         << "Compiled " << __TIME__ " " __DATE__ << std::endl
+                         << "Send requests, patches, and bug reports to <"
+                         PACKAGE_BUGREPORT << ">." << std::endl << std::endl;
+
+       int status = 0;
+
+       try
+       {
+               YoinkApp app(argc, argv);
+               status = app.run();
+       }
+       catch (Mf::Engine::Exception e)
+       {
+               std::cerr << "Unhandled exception: " << e.what() << std::endl;
+               status = 1;
+       }
+
+       std::cout << "Goodbye..." << std::endl;
+       return status;
 }
 
 /** vim: set ts=4 sw=4 tw=80: *************************************************/