Changeset 504 for trunk/src/engine

Timestamp:

07/04/16 20:05:33 (9 years ago)

Author:

epyon

Message:

• temporary add_base_path for image manager
• random - warning fix
• debug_draw - shader upgrade

File:

• trunk/src/engine/image_manager.cc (modified) (1 diff)

trunk/src/engine/image_manager.cc

@@ -12 +12 @@
 using namespace nv;
 
+void nv::image_manager::add_base_path( const string_view& path )
+{
+        m_paths.emplace_back( path );
+}
+
 bool image_manager::load_resource( const string_view& filename )
 {
         png_loader loader;
         c_file_system fs;
-        stream* file = fs.open( filename );
-        image_data* result = loader.load( *file );
-        delete file;
-        add( filename, result );
+        image_data* result = nullptr;
+        if ( fs.exists( filename ) )
+        {
+                stream* file = fs.open( filename );
+                result = loader.load( *file );
+                delete file;
+        }
+        else if ( m_paths.size() > 0 )
+        {
+                for ( const auto& path : m_paths )
+                {
+                        string128 fpath = path;
+                        fpath.append( filename );
+                        if ( fs.exists( fpath ) )
+                        {
+                                stream* file = fs.open( fpath );
+                                result = loader.load( *file );
+                                delete file;
+                                break;
+                        }
+                }
+        }
+        if ( result ) 
+                add( filename, result );
         return result != nullptr;
 }