Changeset 98 for trunk

Timestamp:

06/03/13 16:06:51 (12 years ago)

Author:

epyon

Message:

• window stores and can return it's device

Location:

trunk

Files:

• nv/gl/gl_window.hh (modified) (2 diffs)
• nv/interface/window.hh (modified) (2 diffs)
• src/gl/gl_device.cc (modified) (1 diff)
• src/gl/gl_window.cc (modified) (1 diff)

trunk/nv/gl/gl_window.hh

@@ -22 +22 @@
         {
         public:
-                gl_window( uint16 width, uint16 height );
+                gl_window( device* dev, uint16 width, uint16 height );
                 uint16 get_width() const;
                 uint16 get_height() const;
@@ -30 +30 @@
                 virtual bool poll_event( io_event& event );
                 virtual context* get_context() { return m_context; }
+                virtual device* get_device() { return m_device; };
+
                 virtual void swap_buffers();
                 virtual ~gl_window();
         private:
+                device*     m_device;
                 uint16      m_width;
                 uint16      m_height;

trunk/nv/interface/window.hh

@@ -20 +20 @@
 {
         class context;
+        class device;
         class window
         {
@@ -31 +32 @@
                 virtual bool poll_event( io_event& event ) = 0;
                 virtual void swap_buffers() = 0;
+                virtual device* get_device() = 0;
                 virtual ~window() = 0 {};
         };

trunk/src/gl/gl_device.cc

@@ -17 +17 @@
 window* gl_device::create_window( uint16 width, uint16 height )
 {
-        return new gl_window( width, height );
+        return new gl_window( this, width, height );
 }
 

trunk/src/gl/gl_window.cc

@@ -148 +148 @@
 
 
-gl_window::gl_window( uint16 width, uint16 height )
-        : m_width( width ), m_height( height ), m_title("NV Engine"), m_screen( nullptr )
+gl_window::gl_window( device* dev, uint16 width, uint16 height )
+        : m_device( dev ), m_width( width ), m_height( height ), m_title("NV Engine"), m_screen( nullptr )
 {
         int flags = SDL_OPENGL;