Changeset 326 for trunk/src/gl/gl_device.cc

Timestamp:

08/26/14 18:39:10 (11 years ago)

Author:

epyon

Message:

• window_manager interface added
• input interface added
• sdl::window_manager and sdl::input added
• gl_device/gl_window/gl_context made oblivious to sdl
• currently some setup is required, application class needed

File:

• trunk/src/gl/gl_device.cc (modified) (5 diffs)

trunk/src/gl/gl_device.cc

@@ -7 +7 @@
 #include "nv/gl/gl_window.hh"
 #include "nv/core/logging.hh"
-#include "nv/lib/sdl.hh"
 #include "nv/lib/sdl_image.hh"
 #include "nv/gl/gl_enum.hh"
@@ -14 +13 @@
 using namespace nv;
 
-window* gl_device::create_window( uint16 width, uint16 height, bool fullscreen )
-{
-        return new gl_window( this, width, height, fullscreen );
-}
-
-window* nv::gl_device::adopt_window( void* sys_w_handle, void* sys_dc )
-{
-        return new gl_window( this, sys_w_handle, sys_dc );
-}
-
-
-
 gl_device::gl_device()
 {
-        nv::load_sdl_library();
-        m_info = NULL;
-
-        if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_JOYSTICK ) < 0 )
-        {
-                NV_LOG( LOG_CRITICAL, "Video initialization failed: " << SDL_GetError( ) );
-                return; // TODO: Error report
-        }
-
-#if NV_SDL_VERSION == NV_SDL_12
-        m_info = SDL_GetVideoInfo( );
-
-        if ( !m_info )
-        {
-                NV_LOG( LOG_CRITICAL, "Video query failed: " << SDL_GetError( ) );
-                return; // TODO: Error report
-        }
-#endif
-
         m_shader_header  = "#version 120\n";
         for ( auto& i : get_uniform_factory() ) 
@@ -67 +35 @@
 // this is a temporary function that will be removed once we find a way to 
 // pass binary file data around
-image_data* nv::gl_device::create_image_data( const std::string& filename )
+image_data* gl_device::create_image_data( const std::string& filename )
 {
         load_sdl_image_library();
@@ -83 +51 @@
 }
 
-uint32 gl_device::get_ticks()
-{
-        return SDL_GetTicks();
-}
-
-void gl_device::delay( uint32 ms )
-{
-        return SDL_Delay( ms );
-}
 
 gl_device::~gl_device()
@@ -101 +60 @@
         while ( m_programs.size() > 0 )
                 release( m_programs.get_handle(0) );
-        SDL_Quit();
 }