converted image management to resource handles

[chaz/yoink] / src / Main.cc

diff --git a/src/Main.cc b/src/Main.cc
index adda533e40fcc595e8cf5784d3be4de6361a9bad..046c7bcffb71560e42b24b3b9e9f5d74c971946d 100644 (file)
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -216,9 +216,9 @@ void Main::printInfo(int argc, char* argv[])
 #ifdef YOINK_GITHEAD
                          << "       Commit: "YOINK_GITHEAD << std::endl
 #endif
-                         << "      Version: "PACKAGE_VERSION << std::endl
+                         << "      Version: " << PACKAGE_VERSION << std::endl
                          << "        Built: " << COMPILE_TIME << std::endl
-                         << "     Compiler: "COMPILER_STRING << std::endl
+                         << "     Compiler: " << COMPILER_STRING << std::endl
                          << "       Assets: " << assets << std::endl
                          << "Build options: "
 #ifndef HAVE_CLOCK_GETTIME
@@ -272,8 +272,21 @@ 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;
+
+
        // FIXME: This is temporary.
        moof::timer reloadTimer(boost::bind(&moof::resource::reload_as_needed),
                                                        SCALAR(2.0),
@@ -307,10 +320,12 @@ int main(int argc, char* argv[])
 
        try
        {
-               std::string iconPath(PACKAGE".png");
-               iconPath = moof::resource::find_file(iconPath);
-               moof::image icon(iconPath);
-               icon.set_as_icon();
+               //std::string iconPath(PACKAGE".png");
+               //iconPath = moof::resource::find_file(iconPath);
+               //moof::image icon(iconPath);
+               //icon.set_as_icon();
+               moof::image_handle icon(PACKAGE".png");
+               if (icon) icon->set_as_icon();
 
                class moof::video::attributes attributes(settings);
                moof::video video(PACKAGE_STRING, attributes);