use only triangles; no quads

[chaz/yoink] / src / Main.cc

diff --git a/src/Main.cc b/src/Main.cc
index 046c7bcffb71560e42b24b3b9e9f5d74c971946d..ae183ec49ab845ee9f5921f8b47642e6445526be 100644 (file)
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -153,13 +153,20 @@ void Main::setupGL()
        glEnable(GL_POLYGON_SMOOTH);
        glShadeModel(GL_SMOOTH);
 
-       //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);
 
        glClearColor(0.0, 0.0, 0.0, 1.0);
 
+       //glEnable(GL_LIGHTING);
+       glEnable(GL_LIGHT0);
+
+       float light[] = {1.0f, 1.0f, 1.0f, 1.0f};
+       glLightfv(GL_LIGHT0, GL_AMBIENT_AND_DIFFUSE, light);
+
+
        //glMatrixMode(GL_PROJECTION);
        //glLoadIdentity();
        //moof::scalar ratio = moof::core.getVideo()->width() /
@@ -221,35 +228,35 @@ void Main::printInfo(int argc, char* argv[])
                          << "     Compiler: " << COMPILER_STRING << std::endl
                          << "       Assets: " << assets << std::endl
                          << "Build options: "
-#ifndef HAVE_CLOCK_GETTIME
+#if !USE_CLOCK_GETTIME
                          << "-"
 #endif
                          << "clock_gettime "
-#ifdef NDEBUG
+#if !DEBUG
                          << "-"
 #endif
                          << "debug "
-#ifndef USE_DOUBLE_PRECISION
+#if !USE_DOUBLE_PRECISION
                          << "-"
 #endif
                          << "double-precision "
-#ifndef USE_GTK
+#if !USE_GTK
                          << "-"
 #endif
                          << "gtk "
-#ifndef USE_HOTLOADING
+#if !USE_HOTLOADING
                          << "-"
 #endif
                          << "hotloading "
-#ifndef PROFILING_ENABLED
+#if !PROFILING_ENABLED
                          << "-"
 #endif
                          << "profile "
-#ifndef USE_QT4
+#if !USE_QT4
                          << "-"
 #endif
                          << "qt4 "
-#ifndef USE_THREADS
+#if !USE_THREADS
                          << "-"
 #endif
                          << "threads" << std::endl
@@ -272,20 +279,9 @@ void goodbye()
 }
 
 
-#include <moof/image.hh>
-#include <moof/backend.hh>
-#include <moof/sprite.hh>
-
-
 int main(int argc, char* argv[])
 {
-       //moof::backend backend;
-       //moof::resource::add_search_paths(Main::getSearchPath());
-
-       //moof::image hey("textures/AlienWarrior.png");
-
-       //return 0;
-
+       moof::backend backend;
 
        // FIXME: This is temporary.
        moof::timer reloadTimer(boost::bind(&moof::resource::reload_as_needed),
@@ -324,8 +320,10 @@ int main(int argc, char* argv[])
                //iconPath = moof::resource::find_file(iconPath);
                //moof::image icon(iconPath);
                //icon.set_as_icon();
-               moof::image_handle icon(PACKAGE".png");
+               moof::image_handle icon(PACKAGE, "png");
                if (icon) icon->set_as_icon();
+               else moof::log_error("no icon loaded");
+               icon.unload();
 
                class moof::video::attributes attributes(settings);
                moof::video video(PACKAGE_STRING, attributes);