]> Dogcows Code - chaz/yoink/blobdiff - src/YoinkApp.cc
scene drawing correctly implemented; new classes
[chaz/yoink] / src / YoinkApp.cc
index 64decfb73a88f9e6b0b405f1c94fa3c7c9babc2e..023b3a30ce51837365e60d22136cc8a2e04cdce3 100644 (file)
 
 *******************************************************************************/
 
+#include <cstdlib>             // getenv
 #include <iostream>
 #include <string>
 
 #include <boost/bind.hpp>
 
-#include "opengl.hh"
-#include "video.hh"
-
-#include "vector.hh"
+#include <Moof/Math.hh>
+#include <Moof/OpenGL.hh>
+#include <Moof/Settings.hh>
+#include <Moof/Timer.hh>
+#include <Moof/Video.hh>
 
 #include "YoinkApp.hh"
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 
-YoinkApp::YoinkApp(int argc, char* argv[])
-               : dc::engine("Yoink "VERSION, argc, argv, "yoinkrc")
+static std::string configFiles()
 {
-       std::cout << "Yoink "VERSION << std::endl
-                         << "Compiled " << __TIME__ " " __DATE__ << std::endl
-                         << "Send requests, patches, and bug reports to <" PACKAGE_BUGREPORT
-                         << ">." << std::endl << std::endl;
+       std::string files;
+
+       char* configFile = getenv("YOINKRC");
+       char* dataDir = getenv("YOINK_DATADIR");
+
+       if (configFile)
+       {
+               // if a config file from the environment variable is specified, we want
+               // to load it first so it has precedence
+               files += configFile;
+               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;
+}
+
+static std::string iconFile()
+{
+       char* dataDir = getenv("YOINK_DATADIR");
+
+       // 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");
+}
+
+
+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();
 
        state = 0.0;
 
+       someChar = new Character("RobotTrooper");
+       someChar->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);
+       interp.init(coeffs, 1.0, Mf::Interpolator::OSCILLATE);
+
+       Mf::Scalar coeff[2] = {1.0, 0.0};
+       fadeIn.init(coeff, 0.5f);
+
+       testScene = new Mf::Scene("Test");
+
+       x = y = z = 0.0;
+}
+
+YoinkApp::~YoinkApp()
+{
+       delete someChar;
+       delete font;
+
+       Mf::Dispatcher::instance().removeHandler(this);
+}
+
+
+void YoinkApp::setupGL()
+{
        glEnable(GL_TEXTURE_2D);
 
-       heroineTexture = new dc::texture("Heroine.png");
+       //glEnable(GL_CULL_FACE);
+       glEnable(GL_DEPTH_TEST);
 
        glShadeModel(GL_SMOOTH);
-       //glEnable(GL_DEPTH_TEST);
+       //glEnable(GL_POLYGON_SMOOTH);
+
+       //int texSize;
+       //glGetIntegerv(GL_MAX_TEXTURE_SIZE, &texSize);
+       //std::cout << "texture size: " << texSize << std::endl;
        
-       // Enable transparency:
-       glEnable(GL_BLEND);
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       //glEnable(GL_BLEND);
+       //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       glEnable(GL_ALPHA_TEST);
+       glAlphaFunc(GL_GREATER, 0.0);
 
-       glLoadIdentity();
+       glClearColor(1.0, 0.0, 0.0, 1.0);
 
+       glMatrixMode(GL_PROJECTION);
+       glLoadIdentity();
+       gluPerspective(60.0, 1.33333, 1.0, 2500.0);
+       
+       //glLineWidth(10.0f);
 }
 
-YoinkApp::~YoinkApp()
+void YoinkApp::contextRecreated(const Mf::Notification& note)
 {
-       delete heroineTexture;
-       std::cout << "Goodbye..." << std::endl;
+       // Whenever the context and a new one created, it probably won't contain our
+       // state so we need to set that up again.
+       setupGL();
 }
 
 
-void YoinkApp::update(double t, double dt)
+void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
 {
-       //dt *= 0.1;
+       //dt *= 0.2;
+       
+       fadeIn.update(dt);
+
+       camera.update(t, dt);
+
+       someChar->getAnimation().update(t, dt);
+       interp.update(dt);
 
        prevstate = state;
        state += dt;
 }
 
-void drawrect(dc::scalar a, dc::scalar b, dc::scalar c, dc::scalar d)
+
+void YoinkApp::draw(Mf::Scalar alpha)
 {
+       //Mf::Vector4 meh;
+       //meh.random(0.0, 1.0);
+       //static Mf::Vector4 c1(meh);
+
+       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+       //Mf::Scalar drawstate = cml::lerp(prevstate, state, alpha);
+       //Mf::Scalar sinstate = std::sin(drawstate);
+       //Mf::Scalar cosstate = std::cos(drawstate);
+       
+
+
+       glMatrixMode(GL_MODELVIEW);
+       //glLoadIdentity();
+
+       glBindTexture(GL_TEXTURE_2D, 0);
+       //glRotatef(drawstate*15.0f, 0.0, 1.0, 0.0);
+       //glTranslatef(x, y, z);
+       glLoadMatrix(camera.getTransformation().data());
+
+       // DRAW THE SCENE
+       testScene->draw(alpha);
+
+
+       /*
+       glLoadIdentity();
+       
+       someChar->getTilemap().bind();
+       glColor3f(1.0, 1.0, 1.0);
+
+       Mf::Tilemap::Index heroFrame = someChar->getAnimation().getFrame();
+
+       Mf::Scalar coords[8];
+       someChar->getTilemap().getTileCoords(heroFrame, coords);
+
        glBegin(GL_QUADS);
-               glTexCoord2f(1.0, 1.0);
-               glVertex3d(a, d, 0.0);
-               glTexCoord2f(1.0, 0.0);
-               glVertex3d(a, b, 0.0);
-               glTexCoord2f(0.0, 0.0);
-               glVertex3d(c, b, 0.0);
-               glTexCoord2f(0.0, 1.0);
-               glVertex3d(c, d, 0.0);
+               glTexCoord2f(coords[0], coords[1]);
+               glVertex3f(-1.0, 0.0, 0.0);
+               glTexCoord2f(coords[2], coords[3]);
+               glVertex3f(0.0, 0.0, 0.0);
+               glTexCoord2f(coords[4], coords[5]);
+               glVertex3f(0.0, 1.0, 0.0);
+               glTexCoord2f(coords[6], coords[7]);
+               glVertex3f(-1.0, 1.0, 0.0);
        glEnd();
-}
 
-void YoinkApp::draw(double alpha)
-{
-       static dc::vector3 c1 = dc::vector3::random(0.0, 1.0);
-       static dc::vector3 c2 = dc::vector3::random(0.0, 1.0);
 
-       glClearColor(1.0, 0.0, 0.0, 1.0);
-       glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+       someChar->getTilemap().getTileCoords(heroFrame, coords,
+                       Mf::Tilemap::REVERSE);
+
+       glBegin(GL_QUADS);
+               glTexCoord2f(coords[0], coords[1]);
+               glVertex3f(0.0, 0.0, 0.0);
+               glTexCoord2f(coords[2], coords[3]);
+               glVertex3f(1.0, 0.0, 0.0);
+               glTexCoord2f(coords[4], coords[5]);
+               glVertex3f(1.0, 1.0, 0.0);
+               glTexCoord2f(coords[6], coords[7]);
+               glVertex3f(0.0, 1.0, 0.0);
+       glEnd();
 
-       double drawstate = state * alpha + prevstate * (1.0 - alpha);
-       double sinstate = std::sin(drawstate);
-       double cosstate = std::cos(drawstate);
+       glColor4f(1.0,0.0,0.0,0.5);
 
        glBindTexture(GL_TEXTURE_2D, 0);
+       glColor4v(c1.data());
 
-       glColor3dv(c1.array);
-       drawrect(-cosstate, -sinstate, sinstate, cosstate);
-       glColor3dv(c2.array);
-       drawrect(0.0, 0.0, sinstate, cosstate);
+       glRectd(-cosstate, -sinstate, sinstate, cosstate);
+       glRectf(0.0f, 0.0f, sinstate, cosstate);
 
-       glColor4f(1.0, 1.0, 1.0, 1.0);
+       font->bind();
+       
+       font->getTileCoords('c', coords);
+
+       glBegin(GL_QUADS);
+               glTexCoord2f(coords[0], coords[1]);
+               glVertex3f(-1.0, 0.0, 0.0);
+               glTexCoord2f(coords[2], coords[3]);
+               glVertex3f(0.0, 0.0, 0.0);
+               glTexCoord2f(coords[4], coords[5]);
+               glVertex3f(0.0, 1.0, 0.0);
+               glTexCoord2f(coords[6], coords[7]);
+               glVertex3f(-1.0, 1.0, 0.0);
+       glEnd();
 
-       heroineTexture->bind();
+       font->getTileCoords('h', coords);
 
        glBegin(GL_QUADS);
-               glTexCoord2f(0.0, 0.0);
+               glTexCoord2f(coords[0], coords[1]);
                glVertex3f(0.0, 0.0, 0.0);
-               glTexCoord2f(1.0/8.0, 0.0);
+               glTexCoord2f(coords[2], coords[3]);
                glVertex3f(1.0, 0.0, 0.0);
-               glTexCoord2f(1.0/8.0, 1.0/4.0);
+               glTexCoord2f(coords[4], coords[5]);
                glVertex3f(1.0, 1.0, 0.0);
-               glTexCoord2f(0.0, 1.0/4.0);
+               glTexCoord2f(coords[6], coords[7]);
                glVertex3f(0.0, 1.0, 0.0);
        glEnd();
+
+       font->getTileCoords('a', coords);
+
+       glBegin(GL_QUADS);
+               glTexCoord2f(coords[0], coords[1]);
+               glVertex3f(-1.0, -1.0, 0.0);
+               glTexCoord2f(coords[2], coords[3]);
+               glVertex3f(0.0, -1.0, 0.0);
+               glTexCoord2f(coords[4], coords[5]);
+               glVertex3f(0.0, 0.0, 0.0);
+               glTexCoord2f(coords[6], coords[7]);
+               glVertex3f(-1.0, 0.0, 0.0);
+       glEnd();
+
+       font->getTileCoords('z', coords);
+
+       glBegin(GL_QUADS);
+               glTexCoord2f(coords[0], coords[1]);
+               glVertex3(0.0, -1.0, 0.0);
+               glTexCoord2f(coords[2], coords[3]);
+               glVertex3(1.0, -1.0, 0.0);
+               glTexCoord2f(coords[4], coords[5]);
+               glVertex3(1.0, 0.0, 0.0);
+               glTexCoord2f(coords[6], coords[7]);
+               glVertex3(0.0, 0.0, 0.0);
+       glEnd();
+
+       glEnable(GL_BLEND);
+       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       glDisable(GL_DEPTH_TEST);
        
-       glFlush();
+       glBindTexture(GL_TEXTURE_2D, 0);
+       glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
+
+       glBegin(GL_LINES);
+               glVertex2f(0.0f, 0.0f);
+               glVertex2v(interp.getState(alpha).data());
+       glEnd();
+
+       glColor4f(0.0f, 0.0f, 0.0f, fadeIn.getState(alpha));
+       glRectf(-1.0f, -1.0f, 1.0f, 1.0f);
+
+       glDisable(GL_BLEND);
+       glEnable(GL_DEPTH_TEST);*/
 }
 
-void YoinkApp::dispatchEvent(const SDL_Event& event)
+void YoinkApp::handleEvent(const Mf::Event& event)
 {
        switch (event.type)
        {
@@ -143,40 +345,97 @@ void YoinkApp::dispatchEvent(const SDL_Event& event)
                        {
                                getVideo().toggleFull();
                        }
+                       else if (event.key.keysym.sym == SDLK_a)
+                       {
+                               someChar->getAnimation().startSequence("Punch");
+                       }
+                       else if (event.key.keysym.sym == SDLK_r)
+                       {
+                               testScene->refresh();
+                       }
+                       else if (event.key.keysym.sym == SDLK_l)
+                       {
+                               getVideo().toggleCursorGrab();
+                               getVideo().toggleCursorVisible();
+                       }
+                       //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)
+                       //{
+                               //y += 50.0;
+                       //}
+                       //else if (event.key.keysym.sym == SDLK_PAGEUP)
+                       //{
+                               //z += 50.0;
+                       //}
+                       //else if (event.key.keysym.sym == SDLK_PAGEDOWN)
+                       //{
+                               //z -= 50.0;
+                       //}
+
+               case SDL_MOUSEMOTION:
+               case SDL_MOUSEBUTTONDOWN:
+                       camera.adjustFromInput(event);
                        break;
 
                case SDL_QUIT:
                        stop();
                        break;
+
+               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);
+                       break;
        }
 }
 
 
-#include "dispatcher.hh"
+#include <Moof/Tree.hh>
 
-class Foo : public dc::notification
+int main(int argc, char* argv[])
 {
-public:
-       static void func(const dc::notification& meh)
+       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;
+
+       //Mf::Tree<Mf::Drawable> myTree;
+       //Mf::Tree<Mf::Drawable>::Ptr prev = myTree.previousSibling();
+       //myTree = *prev;
+
+       try
        {
-               std::cout << "func: " << std::endl;
+               YoinkApp app(argc, argv);
+               status = app.run();
        }
-
-       void snap(int zzz, const dc::notification& nice, float lean)
+       catch (Mf::Engine::Exception e)
        {
-               std::cout << "snap: " << zzz << "," << lean << std::endl;
+               std::cerr << "Unhandled exception: " << e.what() << std::endl;
+               status = 1;
        }
-};
 
-void MyHandler(const dc::notification& cool)
-{
-       std::cout << "MyHandler with a notification" << std::endl;
+       std::cout << "Goodbye..." << std::endl;
+       return status;
 }
 
-
-int main(int argc, char* argv[])
-{
-       YoinkApp app(argc, argv);
-       return app.run();
-}
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
 
This page took 0.032323 seconds and 4 git commands to generate.