*******************************************************************************/
+#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/Exception.hh>
+#include <Moof/Log.hh>
+#include <Moof/Math.hh>
+#include <Moof/OpenGL.hh>
+#include <Moof/Settings.hh>
+#include <Moof/Thread.hh>
+#include <Moof/Timer.hh>
+#include <Moof/Video.hh>
#include "YoinkApp.hh"
std::string files;
char* configFile = getenv("YOINKRC");
+ char* dataDir = getenv("YOINK_DATADIR");
if (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;
}
-
-YoinkApp::YoinkApp(int argc, char* argv[]) :
- dc::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)
{
- dc::resource::addSearchPath(dataDir);
+ // look first in the data directory specified by the environment
+ Mf::Resource::addSearchPath(dataDir);
}
- dc::resource::addSearchPath(YOINK_DATADIR);
+ // then look in the configured data directory
+ Mf::Resource::addSearchPath(YOINK_DATADIR);
- dc::dispatcher::instance().addHandler("video.context_recreated",
+ return Mf::Resource::getPath("yoink.png");
+}
+
+
+YoinkApp::YoinkApp(int argc, char* argv[]) :
+ Mf::Engine(argc, argv, configFiles(), PACKAGE_STRING, iconFile()),
+ music("NightFusionIntro"),
+ punchSound("RobotPunch")
+{
+ Mf::dispatcher::addHandler("video.context_recreated",
boost::bind(&YoinkApp::contextRecreated, this, _1), this);
setupGL();
- state = 0.0;
-
- someChar = new Character("RobotTrooper");
- someChar->getAnimation().startSequence("Run");
+ music.setLooping(true);
+ music.enqueue("NightFusionLoop");
+ music.stream();
- font = new TilemapFont;
+ heroine = Character::alloc("RobotTrooper");
+ heroine->getAnimation().startSequence("Run");
- 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::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -2.0, 1.0};
+ interp.init(a, 2.0, Mf::Interpolator::OSCILLATE);
- dc::scalar coeff[2] = {1.0, 0.0};
- fadeIn.init(coeff, 0.5f);
+ Mf::Scalar b[2] = {1.0, 0.0};
+ fadeIn.init(b, 1.0);
- testScene = new dc::scene("Test");
+ octree = Mf::loadScene("Classic");
+ heroine->treeNode = octree->insert(heroine);
}
YoinkApp::~YoinkApp()
{
- delete someChar;
- delete font;
-
- dc::dispatcher::instance().removeHandler(this);
-
- std::cout << "Goodbye..." << std::endl;
+ Mf::dispatcher::removeHandler(this);
}
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);
+ //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);
}
-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.
+ // Whenever the context is destroyed and a new one created, it probably
+ // won't contain our state so we need to set that up again.
setupGL();
}
-void YoinkApp::update(dc::scalar t, dc::scalar dt)
+void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
{
- //dt *= 0.2;
-
+ //dt *= 0.7;
+
fadeIn.update(dt);
+ camera.update(t, dt);
+ heroine->update(t, dt);
- someChar->getAnimation().update(t, dt);
- interp.update(dt);
+ // reinsert heroine
+ heroine->treeNode = octree->reinsert(heroine, heroine->treeNode);
+ octree->print(heroine->treeNode);
+
+ //camera.lookAt(heroine->getSphere().point);
+ camera.setPosition(Mf::Vector3(-heroine->current.position[0],
+ -heroine->current.position[1], -256));
- prevstate = state;
- state += dt;
+ interp.update(dt);
+ hud.setBar1Progress(interp.getState(dt));
+ hud.setBar2Progress(1.0 - interp.getState(dt));
}
-void YoinkApp::draw(dc::scalar alpha)
+void YoinkApp::draw(Mf::Scalar alpha)
{
- //dc::vector4 meh;
- //meh.random(0.0, 1.0);
- //static dc::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);
-
-
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- gluPerspective(60.0, 1.33333, 1.0, 2000.0);
-
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.getModelviewMatrix().data());
// DRAW THE SCENE
- testScene->draw(alpha);
-
-
- /*
- someChar->getTilemap().bind();
- glColor3f(1.0, 1.0, 1.0);
-
- unsigned heroFrame = someChar->getAnimation().getFrame();
-
- float coords[8];
- someChar->getTilemap().getTileCoords(heroFrame, 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();
+ Mf::Texture::resetBind();
+ glEnableClientState(GL_VERTEX_ARRAY);
+ glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- someChar->getTilemap().getTileCoords(heroFrame, coords,
- dc::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();
+ octree->drawIfVisible(alpha, camera.getFrustum());
- glColor4f(1.0,0.0,0.0,0.5);
+ //heroine->draw(alpha);
+ heroine->getAabb().draw();
- glBindTexture(GL_TEXTURE_2D, 0);
- glColor4fv(c1.data());
-
- glRectd(-cosstate, -sinstate, sinstate, cosstate);
- glRectf(0.0f, 0.0f, sinstate, cosstate);
-
- 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();
-
- font->getTileCoords('h', coords);
-
- 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();
-
- 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]);
- glVertex3f(0.0, -1.0, 0.0);
- glTexCoord2f(coords[2], coords[3]);
- glVertex3f(1.0, -1.0, 0.0);
- glTexCoord2f(coords[4], coords[5]);
- glVertex3f(1.0, 0.0, 0.0);
- glTexCoord2f(coords[6], coords[7]);
- glVertex3f(0.0, 0.0, 0.0);
- glEnd();
+ hud.draw();
+ // DRAW FADE
glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glDisable(GL_DEPTH_TEST);
-
- glBindTexture(GL_TEXTURE_2D, 0);
- glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
+ glMatrixMode(GL_PROJECTION);
+ glPushMatrix();
+ glLoadIdentity();
+ glMatrixMode(GL_MODELVIEW);
+ glPushMatrix();
+ glLoadIdentity();
+ glColor4f(0.0f, 0.0f, 0.0f, fadeIn.getState(alpha));
+ Mf::Texture::resetBind();
- glBegin(GL_LINES);
- glVertex2f(0.0f, 0.0f);
- glVertex2fv(interp.getState(alpha).data());
+ //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();
- 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);*/
+
+ glMatrixMode(GL_PROJECTION);
+ glPopMatrix();
+ glMatrixMode(GL_MODELVIEW);
+ glPopMatrix();
}
-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();
+ break;
}
- else if (e.key.keysym.sym == SDLK_f)
+ else if (event.key.keysym.sym == SDLK_f)
{
getVideo().toggleFull();
+ break;
}
- else if (e.key.keysym.sym == SDLK_a)
- {
- someChar->getAnimation().startSequence("Punch");
- }
- else if (e.key.keysym.sym == SDLK_RIGHT)
+ else if (event.key.keysym.sym == SDLK_SPACE)
{
- x -= 50.0;
+ heroine->getAnimation().startSequence("Punch");
+ punchSound.play();
+ break;
}
- else if (e.key.keysym.sym == SDLK_LEFT)
+ else if (event.key.keysym.sym == SDLK_t)
{
- x += 50.0;
+ Mf::dispatcher::dispatch("video.context_recreated");
+ break;
}
- else if (e.key.keysym.sym == SDLK_UP)
+ else if (event.key.keysym.sym == SDLK_p)
{
- y -= 50.0;
+ music.toggle();
+ break;
}
- else if (e.key.keysym.sym == SDLK_DOWN)
+ else if (event.key.keysym.sym == SDLK_l)
{
- y += 50.0;
- }
- else if (e.key.keysym.sym == SDLK_PAGEUP)
- {
- z += 50.0;
- }
- else if (e.key.keysym.sym == SDLK_PAGEDOWN)
- {
- z -= 50.0;
+ getVideo().toggleCursorGrab();
+ getVideo().toggleCursorVisible();
+ break;
}
+
+ case SDL_KEYUP:
+ heroine->handleEvent(event);
+
+ case SDL_MOUSEMOTION:
+ case SDL_MOUSEBUTTONDOWN:
+ camera.handleEvent(event);
break;
case SDL_QUIT:
break;
case SDL_VIDEORESIZE:
- glViewport(0, 0, e.resize.w, e.resize.h);
+ 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) / double(event.resize.h), 32.0, 2500.0);
+ camera.uploadProjectionToGL();
break;
}
}
int main(int argc, char* argv[])
{
- YoinkApp app(argc, argv);
- return app.run();
+ std::cout << std::endl << PACKAGE_STRING << std::endl
+ << "Compiled " << __TIME__ " " __DATE__ << std::endl
+ << "Send patches and bug reports to <"
+ PACKAGE_BUGREPORT << ">." << std::endl << std::endl;
+
+#if YOINK_LOGLEVEL >= 4
+ Mf::setLogLevel(Mf::LOG_DEBUG);
+#elif YOINK_LOGLEVEL >= 3
+ Mf::setLogLevel(Mf::LOG_INFO);
+#elif YOINK_LOGLEVEL >= 2
+ Mf::setLogLevel(Mf::LOG_WARNING);
+#elif YOINK_LOGLEVEL >= 1
+ Mf::setLogLevel(Mf::LOG_ERROR);
+#elif YOINK_LOGLEVEL
+ Mf::setLogLevel(Mf::LOG_NONE);
+#endif
+
+ int status = 0;
+
+ try
+ {
+ YoinkApp app(argc, argv);
+ status = app.run();
+ }
+ catch (Mf::Exception e)
+ {
+ Mf::logError("unhandled exception: <<%s>>", e.what());
+ Mf::logInfo("it's time to crash now :-(");
+ //status = 1;
+ throw e;
+ }
+
+ std::cout << std::endl << "Goodbye..." << std::endl << std::endl;
+ return status;
}
+
/** vim: set ts=4 sw=4 tw=80: *************************************************/
projects / chaz / yoink / blobdiff