converted image management to resource handles

[chaz/yoink] / src / Main.cc

diff --git a/src/Main.cc b/src/Main.cc
index 6cdadaf23ff4e8087845e697ea2120233a906bbc..046c7bcffb71560e42b24b3b9e9f5d74c971946d 100644 (file)
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -9,7 +9,7 @@
 *
 **************************************************************************/
 
-#include "../config.h"
+#include "config.h"
 
 #include <cstdlib>             // atexit
 #include <exception>
@@ -106,10 +106,8 @@ std::string Main::getSearchPath()
        // 1. YOINK_DATADIR (environment)
        // 2. YOINK_DATADIR (configure)
        
-       std::string                     path;
-       stlplus::env_vector     environment;
-
-       std::string datadir = environment["YOINK_DATADIR"];
+       std::string path;
+       std::string datadir = stlplus::env_vector()["YOINK_DATADIR"];
        if (!datadir.empty())
        {
                path += datadir;
@@ -128,17 +126,14 @@ std::string Main::getConfigPath()
        // 3. $HOME/.yoinkrc
        // 4. YOINKRC (environment)
 
-       std::string path("yoinkrc");
-       moof::resource::find(path);
-
-       stlplus::env_vector environment;
+       std::string path = moof::resource::find_file("yoinkrc");
 
 #if !defined(_WIN32)
        path += ":/etc/yoinkrc";
 #endif
        path += ":$HOME/.yoinkrc";
 
-       std::string rc_file = environment["YOINKRC"];
+       std::string rc_file = stlplus::env_vector()["YOINKRC"];
        if (!rc_file.empty())
        {
                path += ":";
@@ -221,9 +216,9 @@ void Main::printInfo(int argc, char* argv[])
 #ifdef YOINK_GITHEAD
                          << "       Commit: "YOINK_GITHEAD << std::endl
 #endif
-                         << "      Version: "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
@@ -277,8 +272,22 @@ 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),
                                                        moof::timer::repeat);
@@ -311,10 +320,12 @@ int main(int argc, char* argv[])
 
        try
        {
-               std::string iconPath(PACKAGE".png");
-               moof::resource::find(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);