Changeset 295 for trunk/src/gl

Timestamp:

07/31/14 02:32:59 (11 years ago)

Author:

epyon

Message:

• gl_context - support for integration with wxWindows
• wx.hh - simple wxWindows integration
• mesh_creator - flip normals and merge operations added
• fix in packed_indexed_array
• various minor fixes

File:

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

trunk/src/gl/gl_window.cc

@@ -206 +206 @@
 
 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_adopted( false )
+        : m_device( dev ), m_width( width ), m_height( height ), m_title("NV Engine"), m_handle( nullptr ), m_hwnd( 0 ), m_adopted( false )
 {
         //      bpp = m_info->vfmt->BitsPerPixel;
@@ -298 +298 @@
 void gl_window::swap_buffers()
 {
-        if ( m_adopted ) return; // NOT SURE
+        if ( m_adopted )
+        {
+#if NV_PLATFORM == NV_WINDOWS
+                ::SwapBuffers( (HDC)m_hwnd );
+#else
+        NV_ASSERT( false, "Native GL context only working with SDL 2.0!" );
+#endif
+
+        }
 #if NV_SDL_VERSION == NV_SDL_20
         SDL_GL_SwapWindow( static_cast<SDL_Window*>( m_handle ) );
@@ -328 +336 @@
 //      m_height  = (uint16)rect.bottom;
         m_handle  = window;
+        m_hwnd    = ::GetDC( (HWND)handle );
         m_context->set_viewport( nv::ivec4( 0, 0, m_width, m_height ) );
 #else