]> Dogcows Code - chaz/yoink/blobdiff - src/YoinkApp.cc
preliminary physics, sound, hud
[chaz/yoink] / src / YoinkApp.cc
index 232c097425b4f3a70803951644e3bdf634d1e203..a1c2dbbf8133f273e2aca98efdf2dc3f8db133ef 100644 (file)
 
 #include "YoinkApp.hh"
 
+#include <SDL/SDL_sound.h>
+#include <AL/al.h>
+#include <AL/alut.h>
+
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,6 +54,7 @@ static std::string configFiles()
        std::string files;
 
        char* configFile = getenv("YOINKRC");
+       char* dataDir = getenv("YOINK_DATADIR");
 
        if (configFile)
        {
@@ -59,8 +64,23 @@ static std::string configFiles()
                files += ":";
        }
 
+       // add the colon-delimited paths from configure
        files += YOINK_CONFIGFILES;
 
+       if (dataDir)
+       {
+               // if another data directory is set in the environment, look for a
+               // config file there
+               files += ":";
+               files += dataDir;
+               files += "/yoinkrc";
+       }
+
+       // look in the configured data directory last of all
+       files += ":";
+       files += (dataDir ? dataDir : YOINK_DATADIR);
+       files += "/yoinkrc";
+
        return files;
 }
 
@@ -71,47 +91,54 @@ static std::string iconFile()
        // first set up the search paths so we can find the icon and other resources
        if (dataDir)
        {
+               // look first in the data directory specified by the environment
                Mf::Resource::addSearchPath(dataDir);
        }
+
+       // then look in the configured data directory
        Mf::Resource::addSearchPath(YOINK_DATADIR);
 
-       return Mf::Resource::getPathToResource("yoink.png");
+       return Mf::Resource::getPath("yoink.png");
 }
 
 
 YoinkApp::YoinkApp(int argc, char* argv[]) :
-       Mf::Engine(argc, argv, configFiles(), PACKAGE_STRING, iconFile())
+       Mf::Engine(argc, argv, configFiles(), PACKAGE_STRING, iconFile()),
+       music("NightFusion"),
+       punchSound("RobotPunch")
 {
        Mf::Dispatcher::instance().addHandler("video.context_recreated",
                        boost::bind(&YoinkApp::contextRecreated, this, _1), this);
        setupGL();
 
+       music.play();
+
        state = 0.0;
 
-       someChar = new Character("RobotTrooper");
-       someChar->getAnimation().startSequence("Run");
+       heroine = CharacterPtr(new Character("RobotTrooper"));
+       heroine->getAnimation().startSequence("Run");
 
        font = new TilemapFont;
 
-       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);
+       Mf::Scalar coeffs[4];
+       coeffs[0] = 0.0;
+       coeffs[1] = 1.5;
+       coeffs[2] = -0.5;
+       coeffs[3] = 1.0;
        interp.init(coeffs, 1.0, Mf::Interpolator::OSCILLATE);
 
        Mf::Scalar coeff[2] = {1.0, 0.0};
-       fadeIn.init(coeff, 0.5f);
+       fadeIn.init(coeff, 0.1);
 
        testScene = new Mf::Scene("Test");
-
-       x = y = z = 0.0;
+       heroine->treeNode = testScene->getOctree()->insert(heroine);
 }
 
 YoinkApp::~YoinkApp()
 {
-       delete someChar;
+       //delete heroine;
        delete font;
+       delete testScene;
 
        Mf::Dispatcher::instance().removeHandler(this);
 }
@@ -125,7 +152,7 @@ void YoinkApp::setupGL()
        glEnable(GL_DEPTH_TEST);
 
        glShadeModel(GL_SMOOTH);
-       glEnable(GL_POLYGON_SMOOTH);
+       //glEnable(GL_POLYGON_SMOOTH);
 
        //int texSize;
        //glGetIntegerv(GL_MAX_TEXTURE_SIZE, &texSize);
@@ -138,6 +165,14 @@ 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);
+       camera.setProjection(cml::rad(60.0), 1.33333, 32.0, 2500.0);
+       camera.uploadProjectionToGL();
+
+       //glMatrixMode(GL_MODELVIEW);
+       
        //glLineWidth(10.0f);
 }
 
@@ -155,8 +190,17 @@ void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
        
        fadeIn.update(dt);
 
-       someChar->getAnimation().update(t, dt);
+       camera.update(t, dt);
+
+       heroine->update(t, dt);
+       heroine->treeNode = testScene->getOctree()->reinsert(heroine, heroine->treeNode);
+       
+       //camera.lookAt(heroine->getSphere().point);
+       camera.setPosition(Mf::Vector3(-heroine->current.position[0], -heroine->current.position[1], -256));
+
        interp.update(dt);
+       hud.setBar1Progress(interp.getValue());
+       hud.setBar2Progress(1.0 - interp.getValue());
 
        prevstate = state;
        state += dt;
@@ -176,21 +220,49 @@ void YoinkApp::draw(Mf::Scalar alpha)
        //Mf::Scalar cosstate = std::cos(drawstate);
        
 
+       glMatrixMode(GL_MODELVIEW);
+       //glLoadIdentity();
+
+       //glRotatef(drawstate*15.0f, 0.0, 1.0, 0.0);
+       //glTranslatef(x, y, z);
+       glLoadMatrix(camera.getModelviewMatrix().data());
+
+       // DRAW THE SCENE
+       Mf::Texture::resetBind();
+       testScene->draw(alpha, camera);
+
+
+
+       //heroine->draw(alpha);
+
 
+       hud.draw();
+
+
+       glEnable(GL_BLEND);
        glMatrixMode(GL_PROJECTION);
+       glPushMatrix();
        glLoadIdentity();
-       gluPerspective(60.0, 1.33333, 1.0, 2000.0);
-       
        glMatrixMode(GL_MODELVIEW);
+       glPushMatrix();
        glLoadIdentity();
+       glColor4f(0.0f, 0.0f, 0.0f, fadeIn.getState(alpha));
+       Mf::Texture::resetBind();
 
-       glBindTexture(GL_TEXTURE_2D, 0);
-       //glRotatef(drawstate*15.0f, 0.0, 1.0, 0.0);
-       glTranslatef(x, y, z);
+       //glRectf(-1.0f, -1.0f, 1.0f, 1.0f);
+       glBegin(GL_QUADS);
+               glVertex3f(-1.0, -1.0, -0.1);
+               glVertex3f(1.0, -1.0, -0.1);
+               glVertex3f(1.0, 1.0, -0.1);
+               glVertex3f(-1.0, 1.0, -0.1);
+       glEnd();
 
-       // DRAW THE SCENE
-       testScene->draw(alpha);
+       glDisable(GL_BLEND);
 
+       glMatrixMode(GL_PROJECTION);
+       glPopMatrix();
+       glMatrixMode(GL_MODELVIEW);
+       glPopMatrix();
 
        /*
        glLoadIdentity();
@@ -323,34 +395,27 @@ void YoinkApp::handleEvent(const Mf::Event& event)
                        {
                                getVideo().toggleFull();
                        }
-                       else if (event.key.keysym.sym == SDLK_a)
-                       {
-                               someChar->getAnimation().startSequence("Punch");
-                       }
-                       else if (event.key.keysym.sym == SDLK_RIGHT)
-                       {
-                               x -= 50.0;
-                       }
-                       else if (event.key.keysym.sym == SDLK_LEFT)
-                       {
-                               x += 50.0;
-                       }
-                       else if (event.key.keysym.sym == SDLK_UP)
-                       {
-                               y -= 50.0;
-                       }
-                       else if (event.key.keysym.sym == SDLK_DOWN)
+                       else if (event.key.keysym.sym == SDLK_SPACE)
                        {
-                               y += 50.0;
+                               heroine->getAnimation().startSequence("Punch");
+                               punchSound.play();
                        }
-                       else if (event.key.keysym.sym == SDLK_PAGEUP)
+                       else if (event.key.keysym.sym == SDLK_r)
                        {
-                               z += 50.0;
+                               testScene->refresh();
                        }
-                       else if (event.key.keysym.sym == SDLK_PAGEDOWN)
+                       else if (event.key.keysym.sym == SDLK_l)
                        {
-                               z -= 50.0;
+                               getVideo().toggleCursorGrab();
+                               getVideo().toggleCursorVisible();
                        }
+
+               case SDL_KEYUP:
+                       heroine->handleEvent(event);
+
+               case SDL_MOUSEMOTION:
+               case SDL_MOUSEBUTTONDOWN:
+                       camera.adjustFromInput(event);
                        break;
 
                case SDL_QUIT:
@@ -359,6 +424,9 @@ void YoinkApp::handleEvent(const Mf::Event& event)
 
                case SDL_VIDEORESIZE:
                        glViewport(0, 0, event.resize.w, event.resize.h);
+                       hud.resize(event.resize.w, event.resize.h);
+                       camera.setProjection(cml::rad(60.0), double(event.resize.w / event.resize.h), 32.0, 2500.0);
+                       camera.uploadProjectionToGL();
                        break;
        }
 }
@@ -369,7 +437,7 @@ int main(int argc, char* argv[])
 {
        std::cout << PACKAGE_STRING << std::endl
                          << "Compiled " << __TIME__ " " __DATE__ << std::endl
-                         << "Send requests, patches, and bug reports to <"
+                         << "Send patches and bug reports to <"
                          PACKAGE_BUGREPORT << ">." << std::endl << std::endl;
 
        int status = 0;
@@ -389,5 +457,6 @@ int main(int argc, char* argv[])
        return status;
 }
 
+
 /** vim: set ts=4 sw=4 tw=80: *************************************************/
 
This page took 0.025089 seconds and 4 git commands to generate.