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

Timestamp:

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

Author:

epyon

Message:

• several STL updates
• several minor fixes

File:

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

trunk/src/gl/gl_window.cc

@@ -9 +9 @@
 #include "nv/core/logging.hh"
 #include "nv/lib/gl.hh"
+#include "nv/lib/sdl.hh"
 
 using namespace nv;
@@ -31 +32 @@
         delete m_context;
         m_context = nullptr;
-        delete m_input;
 }
 
@@ -41 +41 @@
 
         m_handle = handle;
+        m_dc     = dc;
 
         // TODO: error checking
@@ -110 +111 @@
 }
 
+void nv::gl_window::make_current()
+{
+#if NV_PLATFORM == NV_WINDOWS
+        HDC hdc = reinterpret_cast<HDC>( m_hwnd );
+        dynwglMakeCurrent( hdc, reinterpret_cast<HGLRC>( m_context->get_native_handle() ) );
+#endif
+}
+
+nv::uint32 nv::gl_window::window_id()
+{
+        return SDL_GetWindowID( static_cast<SDL_Window*>( m_handle ) );
+}
+