Changeset 229 for trunk/src

Timestamp:

05/06/14 04:59:23 (11 years ago)

Author:

epyon

Message:

• framebuffer extension added to gl
• various minro changes and fixes

Location:

trunk/src

Files:

• gl/gl_device.cc (modified) (1 diff)
• resource_manager.cc (modified) (2 diffs)

trunk/src/gl/gl_device.cc

@@ -49 +49 @@
         SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
 
-        SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
-        SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, 4 );
+//      SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
+//      SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, 4 );
 
 #if NV_SDL_VERSION == NV_SDL_20

trunk/src/resource_manager.cc

@@ -14 +14 @@
 }
 
-resource::ptr resource_manager::get_raw_resource(uint32 id) const
+resource* resource_manager::get_raw_resource(uint32 id) const
 {
         return m_data[ id ];
 }
 
-resource::ptr resource_manager::get_raw_resource(const std::string& id) const
+resource* resource_manager::get_raw_resource(const std::string& id) const
 {
         auto i = m_id_map.find( id );
@@ -26 +26 @@
                 return m_data[ (unsigned int)i->second ];
         }
-        return resource::ptr();
+        return nullptr;
 }
 
-void resource_manager::register_resource_type( const std::string& name, resource_constructor_func c )
+void resource_manager::register_resource_type( const std::string& type_name, resource_constructor_func c )
 {
-        m_constructors[ name ] = c;
+        m_constructors[ type_name ] = c;
 }