Changeset 505 for trunk/src/engine/image_manager.cc

Timestamp:

07/12/16 20:22:23 (9 years ago)

Author:

epyon

Message:

• several STL updates
• several minor fixes

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 )
+bool image_manager::load_resource( const string_view& filename )
 {
-        m_paths.emplace_back( path );
+        c_file_system fs;
+        if ( stream* file = open_stream( fs, filename ) )
+        {
+                png_loader loader;
+                image_data* result = loader.load( *file );
+                delete file;
+                if ( result )
+                {
+                        add( filename, result );
+                        return true;
+                }
+        }
+        return false;
 }
 
-bool image_manager::load_resource( const string_view& filename )
-{
-        png_loader loader;
-        c_file_system fs;
-        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;
-}
-