Changeset 245 for trunk/src/gl/gl_window.cc

Timestamp:

05/27/14 16:26:53 (11 years ago)

Author:

epyon

Message:

• gl library wgl support
• gl context and window adoption

File:

• trunk/src/gl/gl_window.cc (modified) (6 diffs)

trunk/src/gl/gl_window.cc

@@ -34 +34 @@
                         int capslock = !!(ke.keysym.mod & KMOD_CAPS);
                         if ((shifted ^ capslock) != 0) {
-                                kevent.key.ascii = SDL_toupper(ucode);
+                                kevent.key.ascii = (char8)SDL_toupper(ucode);
                         }
                 }
@@ -204 +204 @@
 
 gl_window::gl_window( device* dev, uint16 width, uint16 height, bool fullscreen )
-        : m_device( dev ), m_width( width ), m_height( height ), m_title("NV Engine"), m_handle( nullptr )
-{
+        : m_device( dev ), m_width( width ), m_height( height ), m_title("NV Engine"), m_handle( nullptr ), m_adopted( false )
+{
+        //      bpp = m_info->vfmt->BitsPerPixel;
+
+        SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 8 );
+        SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 8 );
+        SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 8 );
+        SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 24 );
+        SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
+
+        //      SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
+        //      SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, 4 );
+
+#if NV_SDL_VERSION == NV_SDL_20
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+        SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+#endif
+
+
 #if NV_SDL_VERSION == NV_SDL_12
         uint32 flags = SDL_OPENGL;
@@ -233 +252 @@
 
 
-        m_context = new gl_context( m_device, m_handle );
+        m_context = new sdl_gl_context( m_device, m_handle );
         m_context->set_viewport( nv::ivec4( 0, 0, m_width, m_height ) );
 }
@@ -254 +273 @@
 void gl_window::set_title( const string& title )
 {
+        if ( m_adopted ) return;
 #if NV_SDL_VERSION == NV_SDL_20
         SDL_SetWindowTitle( static_cast<SDL_Window*>( m_handle ), title.c_str() );
@@ -276 +296 @@
 void gl_window::swap_buffers()
 {
+        if ( m_adopted ) return; // NOT SURE
 #if NV_SDL_VERSION == NV_SDL_20
         SDL_GL_SwapWindow( static_cast<SDL_Window*>( m_handle ) );
@@ -287 +308 @@
         delete m_context;
 #if NV_SDL_VERSION == NV_SDL_20
-        SDL_DestroyWindow( static_cast<SDL_Window*>( m_handle ) );
-#endif
-}
+        if ( !m_adopted ) SDL_DestroyWindow( static_cast<SDL_Window*>( m_handle ) );
+#endif
+}
+
+nv::gl_window::gl_window( device* dev, void* handle, void* dc )
+        : m_device( dev ), m_width( 0 ), m_height( 0 ), m_title(), m_handle( nullptr ), m_adopted( true )
+{
+#if NV_PLATFORM == NV_WINDOWS
+#if NV_SDL_VERSION == NV_SDL_20
+        nv::load_gl_no_context();
+        m_context = new native_gl_context( m_device, dc );
+        SDL_Window* window = SDL_CreateWindowFrom( handle );
+        // Doesn't work :/
+//      RECT rect;
+//      GetClientRect( (HWND)handle, &rect );
+//      m_width   = (uint16)rect.right;
+//      m_height  = (uint16)rect.bottom;
+        m_handle  = window;
+        m_context->set_viewport( nv::ivec4( 0, 0, m_width, m_height ) );
+#else
+        NV_ASSERT( false, "Native GL context only working with SDL 2.0!" );
+#endif
+#else
+        NV_ASSERT( false, "Native GL context adoption not implemented for this platform!" );
+#endif
+}