Merge lp:~unity-team/nux/nux.resolution-change into lp:nux

[Jay Taoko]

Support for window window size change in embedded mode.

[Neil J. Patel (njpatel)]

aweosme approved

review: Approve

=== modified file 'Nux/WindowThread.cpp'
--- Nux/WindowThread.cpp	2011-02-28 09:34:22 +0000
+++ Nux/WindowThread.cpp	2011-03-10 04:33:48 +0000
@@ -1581,7 +1581,19 @@
   void WindowThread::SetWindowSize (int width, int height)
   {
     if (_graphics_display)
-      _graphics_display->SetWindowSize (width, height);
+    {
+      if (IsEmbeddedWindow ())
+      {
+        // This is a passive way to set the window size through out the NuxGraphics system. This call gets the 
+        // current window size and sets its accordingly to all sub-system.
+        _graphics_display->ResetWindowSize ();
+      }
+      else
+      {
+        _graphics_display->SetWindowSize (width, height);
+        ReconfigureLayout ();
+      }
+    }
   }
 
   void WindowThread::SetWindowBackgroundPaintLayer (AbstractPaintLayer *bkg)

=== modified file 'Nux/WindowThread.h' (properties changed: -x to +x)
--- Nux/WindowThread.h	2011-02-23 03:28:38 +0000
+++ Nux/WindowThread.h	2011-03-10 04:33:48 +0000
@@ -560,12 +560,12 @@
       int             _uid;
     } EventInspectorStorage;
     
-  //! Map of events inspectors
-  /*!
-      Events inspectors get to examine events before they are processed.
-      They may also stop an event from being processed if they return true.
-  */
-  std::map<int, EventInspectorStorage> _event_inspectors_map; //!< map of events inspectors
+    //! Map of events inspectors
+    /*!
+        Events inspectors get to examine events before they are processed.
+        They may also stop an event from being processed if they return true.
+    */
+    std::map<int, EventInspectorStorage> _event_inspectors_map; //!< map of events inspectors
 
     friend class BasePainter;
     friend class SystemThread;

=== modified file 'NuxGraphics/GpuDevice.cpp' (properties changed: -x to +x)
--- NuxGraphics/GpuDevice.cpp	2011-02-17 06:49:43 +0000
+++ NuxGraphics/GpuDevice.cpp	2011-03-10 04:33:48 +0000
@@ -234,69 +234,6 @@
   }
 
   STREAMSOURCE GpuDevice::_StreamSource[MAX_NUM_STREAM];
-// ObjectPtr<IOpenGLIndexBuffer> GpuDevice::_CurrentIndexBuffer = 0;
-// ObjectPtr<IOpenGLVertexBuffer> GpuDevice::_CurrentVertexBuffer = 0;
-// ObjectPtr<IOpenGLVertexDeclaration> GpuDevice::_CurrentVertexDeclaration = 0;
-
-//void TestARBShaders()
-//{
-//    int OPENGL_PROGRAM_LENGTH_ARB;
-//    int OPENGL_PROGRAM_FORMAT_ARB;
-//    int OPENGL_PROGRAM_BINDING_ARB;
-//    int OPENGL_PROGRAM_INSTRUCTIONS_ARB;
-//    int OPENGL_MAX_PROGRAM_INSTRUCTIONS_ARB;
-//    int OPENGL_PROGRAM_NATIVE_INSTRUCTIONS_ARB;
-//    int OPENGL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB;
-//    int OPENGL_PROGRAM_TEMPORARIES_ARB;
-//    int OPENGL_MAX_PROGRAM_TEMPORARIES_ARB;
-//    int OPENGL_PROGRAM_NATIVE_TEMPORARIES_ARB;
-//    int OPENGL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB;
-//    int OPENGL_PROGRAM_PARAMETERS_ARB;
-//    int OPENGL_MAX_PROGRAM_PARAMETERS_ARB;
-//    int OPENGL_PROGRAM_NATIVE_PARAMETERS_ARB;
-//    int OPENGL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB;
-//    int OPENGL_PROGRAM_ATTRIBS_ARB;
-//    int OPENGL_MAX_PROGRAM_ATTRIBS_ARB;
-//    int OPENGL_PROGRAM_NATIVE_ATTRIBS_ARB;
-//    int OPENGL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB;
-//    int OPENGL_PROGRAM_ADDRESS_REGISTERS_ARB;
-//    int OPENGL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB;
-//    int OPENGL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB;
-//    int OPENGL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB;
-//    int OPENGL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB;
-//    int OPENGL_MAX_PROGRAM_ENV_PARAMETERS_ARB;
-//    int OPENGL_PROGRAM_UNDER_NATIVE_LIMITS_ARB;
-//
-//    // BEWARE glGetProgramiv != glGetProgramivARB (ARB fragment vertex program)
-//
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_LENGTH_ARB,                          &OPENGL_PROGRAM_LENGTH_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ARB,                          &OPENGL_PROGRAM_FORMAT_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_BINDING_ARB,                         &OPENGL_PROGRAM_BINDING_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_INSTRUCTIONS_ARB,                    &OPENGL_PROGRAM_INSTRUCTIONS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_INSTRUCTIONS_ARB,                &OPENGL_MAX_PROGRAM_INSTRUCTIONS_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB,             &OPENGL_PROGRAM_NATIVE_INSTRUCTIONS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB,         &OPENGL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_TEMPORARIES_ARB,                     &OPENGL_PROGRAM_TEMPORARIES_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_TEMPORARIES_ARB,                 &OPENGL_MAX_PROGRAM_TEMPORARIES_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_NATIVE_TEMPORARIES_ARB,              &OPENGL_PROGRAM_NATIVE_TEMPORARIES_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB,          &OPENGL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_PARAMETERS_ARB,                      &OPENGL_PROGRAM_PARAMETERS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_PARAMETERS_ARB,                  &OPENGL_MAX_PROGRAM_PARAMETERS_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_NATIVE_PARAMETERS_ARB,               &OPENGL_PROGRAM_NATIVE_PARAMETERS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB,           &OPENGL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_ATTRIBS_ARB,                         &OPENGL_PROGRAM_ATTRIBS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ATTRIBS_ARB,                     &OPENGL_MAX_PROGRAM_ATTRIBS_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_NATIVE_ATTRIBS_ARB,                  &OPENGL_PROGRAM_NATIVE_ATTRIBS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB,              &OPENGL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_ADDRESS_REGISTERS_ARB,               &OPENGL_PROGRAM_ADDRESS_REGISTERS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB,           &OPENGL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB,        &OPENGL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB,    &OPENGL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB,            &OPENGL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB) );
-//    CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB,              &OPENGL_MAX_PROGRAM_ENV_PARAMETERS_ARB) );
-//    //CHECKGL (glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB,             &OPENGL_PROGRAM_UNDER_NATIVE_LIMITS_ARB) );
-//}
-//
 
   GpuInfo::GpuInfo ()
   {
@@ -683,13 +620,13 @@
     CHECKGL (glPixelStorei (GL_UNPACK_ALIGNMENT, _PixelStoreAlignment));
     CHECKGL (glPixelStorei (GL_PACK_ALIGNMENT, _PixelStoreAlignment));
 
-    _DeviceWidth = DeviceWidth;
-    _DeviceHeight = DeviceHeight;
-
-    _ViewportX = 0;
-    _ViewportY = 0;
-    _ViewportWidth = DeviceWidth;
-    _ViewportHeight = DeviceHeight;
+//     _DeviceWidth = DeviceWidth;
+//     _DeviceHeight = DeviceHeight;
+// 
+//     _ViewportX = 0;
+//     _ViewportY = 0;
+//     _ViewportWidth = DeviceWidth;
+//     _ViewportHeight = DeviceHeight;
 
     for (int i = 0; i < MAX_NUM_STREAM; i++)
     {
@@ -996,54 +933,6 @@
 
     _FrameBufferObject->Activate();
   }
-  void GpuDevice::Clear (FLOAT red, FLOAT green, FLOAT blue, FLOAT alpha, FLOAT depth, int stencil)
-  {
-    CHECKGL ( glClearColor (red, green, blue, alpha) );
-    CHECKGL ( glClearDepth (depth) );
-    CHECKGL ( glClearStencil (stencil) );
-    CHECKGL ( glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT) );
-  }
-
-  void GpuDevice::ClearColorRT (FLOAT red, FLOAT green, FLOAT blue, FLOAT alpha)
-  {
-    CHECKGL ( glClearColor (red, green, blue, alpha) );
-    CHECKGL ( glClear (GL_COLOR_BUFFER_BIT) );
-  }
-
-  void GpuDevice::ClearDepthRT (FLOAT depth)
-  {
-    CHECKGL ( glClearDepth (depth) );
-    CHECKGL ( glClear (GL_DEPTH_BUFFER_BIT) );
-  }
-  void GpuDevice::ClearStencilRT (int stencil)
-  {
-    CHECKGL ( glClearStencil (stencil) );
-    CHECKGL ( glClear (GL_STENCIL_BUFFER_BIT) );
-  }
-
-  void GpuDevice::ClearFloatingPointColorRT (int x, int y, int width, int height,
-      FLOAT red, FLOAT green, FLOAT blue, FLOAT alpha) // use a Quad.
-  {
-    DrawQuad_FixPipe (x, y, width, height, red, green, blue, alpha);
-  }
-
-  void GpuDevice::ClearSurfaceWithColor (ObjectPtr<IOpenGLSurface> s_, const SURFACE_RECT *rect_, float r, float g, float b, float a)
-  {
-    if (!GetGpuInfo ().Support_EXT_Framebuffer_Object ())
-    {
-      nuxDebugMsg (TEXT ("[GpuDevice::ClearSurfaceWithColor] No support for OpenGL framebuffer extension.") );
-    }
-
-    FormatFrameBufferObject (s_->GetWidth(), s_->GetHeight(), s_->GetPixelFormat() );
-    SetColorRenderTargetSurface (0, s_);
-    SetDepthRenderTargetSurface (ObjectPtr<IOpenGLSurface> (0));
-    ActivateFrameBuffer();
-    ClearFloatingPointColorRT (rect_->left,
-                               rect_->top,
-                               rect_->right - rect_->left,
-                               rect_->bottom - rect_->top,
-                               r, g, b, a);
-  }
 
   void GpuDevice::SetCurrentFrameBufferObject (ObjectPtr<IOpenGLFrameBufferObject> fbo)
   {

=== modified file 'NuxGraphics/GpuDevice.h' (properties changed: -x to +x)
--- NuxGraphics/GpuDevice.h	2011-02-17 06:49:43 +0000
+++ NuxGraphics/GpuDevice.h	2011-03-10 04:33:48 +0000
@@ -305,16 +305,6 @@
     // When using shaders see how a shader sampler parameter links to a texture with a call to setTexture.
     int SetTexture (unsigned int TextureUnit, IOpenGLBaseTexture *texture);
 
-
-    void DrawQuad_FixPipe (int x, int y, int width, int height,
-                           FLOAT R, FLOAT G, FLOAT B, FLOAT A);
-
-    void DrawTextureQuad_FixPipe (ObjectPtr<IOpenGLTexture2D> texture, int x, int y, int width, int height,
-                                  FLOAT u0, FLOAT v0, FLOAT u1, FLOAT v1);
-
-    void DrawTextureQuad_FixPipe (ObjectPtr<IOpenGLSurface> surface, int x, int y, int width, int height,
-                                  FLOAT u0, FLOAT v0, FLOAT u1, FLOAT v1);
-
     int DrawIndexedPrimitive (
       ObjectPtr<IOpenGLIndexBuffer> IndexBuffer,
       ObjectPtr<IOpenGLVertexDeclaration> VertexDeclaration,
@@ -372,15 +362,6 @@
     void UnlockUnpackPixelBufferIndex (const int index);
     void UnlockPackPixelBufferIndex (const int index);
 
-    // Operations on the current render target.
-    void Clear (FLOAT red, FLOAT green, FLOAT blue, FLOAT alpha, FLOAT depth, int stencil);
-    void ClearColorRT (FLOAT red, FLOAT green, FLOAT blue, FLOAT alpha);
-    void ClearDepthRT (FLOAT depth);
-    void ClearStencilRT (int stencil);
-    void ClearFloatingPointColorRT (int x, int y, int width, int height,
-                                    FLOAT red, FLOAT green, FLOAT blue, FLOAT alpha); // use a Quad.
-    void ClearSurfaceWithColor (ObjectPtr<IOpenGLSurface> s_, const SURFACE_RECT *rect_, float r, float g, float b, float a);
-
     // All these operations are done on the default frame buffer object: _FrameBufferObject.
     int FormatFrameBufferObject (unsigned int Width, unsigned int Height, BitmapFormat PixelFormat);
     int SetColorRenderTargetSurface (unsigned int ColorAttachmentIndex, ObjectPtr<IOpenGLSurface> pRenderTargetSurface);
@@ -414,17 +395,8 @@
 
     std::vector<PixelBufferObject> _PixelBufferArray;
 
-  private:
-    int _DeviceWidth;
-    int _DeviceHeight;
-    int _ViewportX;
-    int _ViewportY;
-    int _ViewportWidth;
-    int _ViewportHeight;
-
   public:
 
-
 #if (NUX_ENABLE_CG_SHADERS)
     CGcontext GetCgContext()
     {

=== modified file 'NuxGraphics/GpuDeviceVertex.cpp' (properties changed: -x to +x)
--- NuxGraphics/GpuDeviceVertex.cpp	2011-02-17 06:49:43 +0000
+++ NuxGraphics/GpuDeviceVertex.cpp	2011-03-10 04:33:48 +0000
@@ -468,149 +468,39 @@
     return OGL_OK;
   }
 
-  void GpuDevice::DrawQuad_FixPipe (int x, int y, int width, int height,
-                                          FLOAT R, FLOAT G, FLOAT B, FLOAT A)
-  {
-    Matrix4 matrix;
-    matrix.Identity();
-    matrix.m[0][0] = 2.0f / (FLOAT) _ViewportWidth;
-    matrix.m[0][3] = -1.0f;
-    matrix.m[1][1] = - (2.0f / (FLOAT) _ViewportHeight);
-    matrix.m[1][3] = 1.0f;
-
-    matrix.Transpose();
-
-    FLOAT Vertices[16] =
-    {
-      x,          y,          0.0f, 1.0f,
-      x,          y + height,   0.0f, 1.0f,
-      x + width,  y + height,   0.0f, 1.0f,
-      x + width,  y,          0.0f, 1.0f
-    };
-
-    unsigned int Indices[] = {0, 1, 2, 0, 2, 3};
-
-    FLOAT VertexColors[16] =
-    {
-      R,        G,        B,       A,
-      R,        G,        B,       A,
-      R,        G,        B,       A,
-      R,        G,        B,       A
-    };
-
-    CHECKGL ( glMatrixMode (GL_MODELVIEW) );
-    CHECKGL ( glLoadIdentity() );
-    CHECKGL ( glLoadMatrixf ( (FLOAT *) matrix.m) );
-    CHECKGL ( glMatrixMode (GL_PROJECTION) );
-    CHECKGL ( glLoadIdentity() );
-    CHECKGL ( glPolygonMode (GL_FRONT_AND_BACK, GL_FILL) );
-
-    CHECKGL ( glUseProgramObjectARB (0) );
-    InvalidateVertexBuffer();
-    InvalidateIndexBuffer();
-    InvalidateTextureUnit (GL_TEXTURE0);
-
-    CHECKGL ( glEnableClientState (GL_VERTEX_ARRAY) );
-    CHECKGL ( glVertexPointer ( 4, GL_FLOAT, 0,  (void *) (&Vertices) ) );
-
-    CHECKGL ( glEnableClientState (GL_COLOR_ARRAY) );
-    CHECKGL ( glColorPointer ( 4, GL_FLOAT, 0,  (void *) (&VertexColors) ) );
-
-    CHECKGL ( glDrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_INT, (void *) (&Indices) ) );
-
-    CHECKGL ( glDisableClientState (GL_VERTEX_ARRAY) );
-    CHECKGL ( glDisableClientState (GL_COLOR_ARRAY) );
-  }
-
-  void GpuDevice::DrawTextureQuad_FixPipe (ObjectPtr<IOpenGLTexture2D> texture, int x, int y, int width, int height,
-      FLOAT u0, FLOAT v0, FLOAT u1, FLOAT v1)
-  {
-//    DirectX Matrix
-//    |   2/W     0       0       -(W+1)/W    |
-//    |   0       -2/H    0       (H+1)/H     |
-//    |   0       0       1       0           |
-//    |   0       0       0       1           |
-//
-//    Screen Quad(0, 0, W, H)
-//                  Normalized Coord       (Xn+1)/2 * W         Screen Coord
-//        X: 0 ---> -(1+1/W)                --->                -0.5
-//        X: W ---> 1-1/W                   --->                W-0.5
-//                                          -(Yn-1)/2 * H
-//        Y: 0 ---> (1+1/H)                 --->                -0.5
-//        Y: W ---> -1-1/H                  --->                H-0.5
-//
-//    The Matrix above is good to do quad on screen in DirectX. DirectX requires that the vertex coordinates be shifted
-//    by (-0.5,-0.5) in order for the center of texel to be located at the center of pixel.
-//    Note: OpenGL maps integral texture coordinates to the texel center
-//          whereas Direct3D maps  integral texture coordinates to the upper, left texel corner.
-
-//    In OpenGL we will use this matrix instead:
-//    |   2/W     0       0         -1  |
-//    |   0       -2/H    0         1   |
-//    |   0       0       1         0   |
-//    |   0       0       0         1   |
-//
-//    Screen Quad(0, 0, W, H)
-//                  Normalized Coord     (Xn+1)/2 * W         Screen Coord
-//        X: 0 ---> -1                      --->                0.0
-//        X: W ---> 1                       --->                W
-//                                       -(Yn-1)/2 * H
-//        Y: 0 ---> 1                       --->                0.0
-//        Y: W ---> -1
-
-
-    Matrix4 matrix;
-    matrix.Identity();
-    matrix.m[0][0] = 2.0f / 1280.0f;
-    matrix.m[3][0] = - (1280.0f + 1.0f) / 1280.0f;
-    matrix.m[1][1] = - (2.0f / 720.0f);
-    matrix.m[3][1] = (720.0f + 1.0f) / 720.0f;
-
-
-    matrix.Transpose();
-
-    FLOAT Vertices[16] =
-    {
-      x,          y,          0.0f, 1.0f,
-      x,          y + height,   0.0f, 1.0f,
-      x + width,  y + height,   0.0f, 1.0f,
-      x + width,  y,          0.0f, 1.0f
-    };
-
-    unsigned int Indices[] = {0, 1, 2, 0, 2, 3};
-
-    FLOAT UV[8] =
-    {
-      u0,          v1,
-      u0,          v0,
-      u1,          v0,
-      u1,          v1,
-    };
-
-    CHECKGL ( glMatrixMode (GL_MODELVIEW) );
-    CHECKGL ( glLoadIdentity() );
-    CHECKGL ( glLoadMatrixf ( (FLOAT *) matrix.m) );
-    CHECKGL ( glMatrixMode (GL_PROJECTION) );
-    CHECKGL ( glLoadIdentity() );
-    CHECKGL ( glPolygonMode (GL_FRONT_AND_BACK, GL_FILL) );
-
-    CHECKGL ( glUseProgramObjectARB (0) );
-    InvalidateVertexBuffer();
-    InvalidateIndexBuffer();
-
-    CHECKGL ( glEnableClientState (GL_VERTEX_ARRAY) );
-    CHECKGL ( glVertexPointer ( 4, GL_FLOAT, 0,  (void *) (&Vertices) ) );
-
-    CHECKGL ( glClientActiveTextureARB (GL_TEXTURE0) );
-    texture->BindTexture();
-    CHECKGL ( glEnableClientState (GL_TEXTURE_COORD_ARRAY) );
-    CHECKGL ( glTexCoordPointer ( 2, GL_FLOAT, 0,  (void *) (&UV) ) );
-
-    CHECKGL ( glDrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_INT, (void *) (&Indices) ) );
-
-    CHECKGL ( glDisableClientState (GL_VERTEX_ARRAY) );
-    CHECKGL ( glDisableClientState (GL_TEXTURE_COORD_ARRAY) );
-  }
+// //    DirectX Matrix
+// //    |   2/W     0       0       -(W+1)/W    |
+// //    |   0       -2/H    0       (H+1)/H     |
+// //    |   0       0       1       0           |
+// //    |   0       0       0       1           |
+// //
+// //    Screen Quad(0, 0, W, H)
+// //                  Normalized Coord       (Xn+1)/2 * W         Screen Coord
+// //        X: 0 ---> -(1+1/W)                --->                -0.5
+// //        X: W ---> 1-1/W                   --->                W-0.5
+// //                                          -(Yn-1)/2 * H
+// //        Y: 0 ---> (1+1/H)                 --->                -0.5
+// //        Y: W ---> -1-1/H                  --->                H-0.5
+// //
+// //    The Matrix above is good to do quad on screen in DirectX. DirectX requires that the vertex coordinates be shifted
+// //    by (-0.5,-0.5) in order for the center of texel to be located at the center of pixel.
+// //    Note: OpenGL maps integral texture coordinates to the texel center
+// //          whereas Direct3D maps  integral texture coordinates to the upper, left texel corner.
+// 
+// //    In OpenGL we will use this matrix instead:
+// //    |   2/W     0       0         -1  |
+// //    |   0       -2/H    0         1   |
+// //    |   0       0       1         0   |
+// //    |   0       0       0         1   |
+// //
+// //    Screen Quad(0, 0, W, H)
+// //                  Normalized Coord     (Xn+1)/2 * W         Screen Coord
+// //        X: 0 ---> -1                      --->                0.0
+// //        X: W ---> 1                       --->                W
+// //                                       -(Yn-1)/2 * H
+// //        Y: 0 ---> 1                       --->                0.0
+// //        Y: W ---> -1
+
 
   int GpuDevice::SetStreamSource (
     unsigned int StreamNumber,

=== modified file 'NuxGraphics/GraphicsDisplayWin.cpp' (properties changed: -x to +x)
--- NuxGraphics/GraphicsDisplayWin.cpp	2011-02-23 03:28:38 +0000
+++ NuxGraphics/GraphicsDisplayWin.cpp	2011-03-10 04:33:48 +0000
@@ -533,26 +533,34 @@
   // NUXTODO: remove this call. Make a direct access to GpuInfo via GpuDevice.
   bool GraphicsDisplay::HasFrameBufferSupport()
   {
-    return m_DeviceFactory->GetGpuInfo().Support_EXT_Framebuffer_Object ();
+    return m_DeviceFactory->GetGpuInfo ().Support_EXT_Framebuffer_Object ();
   }
 
 //---------------------------------------------------------------------------------------------------------
   void GraphicsDisplay::GetWindowSize (int &w, int &h)
   {
-    w = m_WindowSize.GetWidth();
-    h = m_WindowSize.GetHeight();
-  }
-
-//---------------------------------------------------------------------------------------------------------
-  int GraphicsDisplay::GetWindowWidth()
-  {
-    return m_WindowSize.GetWidth();
-  }
-
-//---------------------------------------------------------------------------------------------------------
-  int GraphicsDisplay::GetWindowHeight()
-  {
-    return m_WindowSize.GetHeight();
+    w = m_WindowSize.GetWidth ();
+    h = m_WindowSize.GetHeight ();
+  }
+
+//---------------------------------------------------------------------------------------------------------
+  int GraphicsDisplay::GetWindowWidth ()
+  {
+    return m_WindowSize.GetWidth ();
+  }
+
+//---------------------------------------------------------------------------------------------------------
+  int GraphicsDisplay::GetWindowHeight ()
+  {
+    return m_WindowSize.GetHeight ();
+  }
+
+  void GraphicsDisplay::ResetWindowSize ()
+  {
+    RECT rect;
+    ::GetClientRect (m_hWnd, &rect);
+    m_WindowSize = Size (rect.right - rect.left, rect.bottom - rect.top);
+    m_ViewportSize = Size (rect.right - rect.left, rect.bottom - rect.top);
   }
 
 //---------------------------------------------------------------------------------------------------------
@@ -579,18 +587,18 @@
 //---------------------------------------------------------------------------------------------------------
   void GraphicsDisplay::SetViewPort (int x, int y, int width, int height)
   {
-    if (IsGfxInterfaceCreated() )
+    if (IsGfxInterfaceCreated ())
     {
       //do not rely on m_ViewportSize: glViewport can be called directly
       m_ViewportSize.SetWidth (width);
       m_ViewportSize.SetHeight (height);
 
-      m_GraphicsContext->SetViewport (x, y, m_ViewportSize.GetWidth(), m_ViewportSize.GetHeight() );
+      m_GraphicsContext->SetViewport (x, y, m_ViewportSize.GetWidth (), m_ViewportSize.GetHeight ());
       m_GraphicsContext->SetScissor (0, 0, width, height);
     }
   }
 
-  Point GraphicsDisplay::GetMouseScreenCoord()
+  Point GraphicsDisplay::GetMouseScreenCoord ()
   {
     POINT pt;
     ::GetCursorPos (&pt);
@@ -599,7 +607,7 @@
     return point;
   }
 
-  Point GraphicsDisplay::GetMouseWindowCoord()
+  Point GraphicsDisplay::GetMouseWindowCoord ()
   {
     POINT pt;
     ::GetCursorPos (&pt);
@@ -608,7 +616,7 @@
     return point;
   }
 
-  Point GraphicsDisplay::GetWindowCoord()
+  Point GraphicsDisplay::GetWindowCoord ()
   {
     RECT rect;
     ::GetWindowRect (m_hWnd, &rect);
@@ -616,7 +624,7 @@
     return point;
   }
 
-  Rect GraphicsDisplay::GetWindowGeometry()
+  Rect GraphicsDisplay::GetWindowGeometry ()
   {
     RECT rect;
     ::GetClientRect (m_hWnd, &rect);
@@ -624,7 +632,7 @@
     return geo;
   }
 
-  Rect GraphicsDisplay::GetNCWindowGeometry()
+  Rect GraphicsDisplay::GetNCWindowGeometry ()
   {
     RECT rect;
     ::GetWindowRect (m_hWnd, &rect);

=== modified file 'NuxGraphics/GraphicsDisplayWin.h' (properties changed: -x to +x)
--- NuxGraphics/GraphicsDisplayWin.h	2011-02-17 06:49:43 +0000
+++ NuxGraphics/GraphicsDisplayWin.h	2011-03-10 04:33:48 +0000
@@ -204,6 +204,13 @@
     int GetWindowWidth();
     int GetWindowHeight();
 
+    //! Get the window size and reset the GraphicsEngine and GpuDevice accordingly.
+    /*!
+        This is a passive way to set the window size through out the NuxGraphics system. This call gets the 
+        current window size and sets its accordingly to all sub-system.
+    */
+    void ResetWindowSize ();
+
     bool HasFrameBufferSupport();
     void SetWindowCursor (HCURSOR cursor);
     HCURSOR GetWindowCursor() const;

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp' (properties changed: -x to +x)
--- NuxGraphics/GraphicsDisplayX11.cpp	2011-03-01 06:16:05 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2011-03-10 04:33:48 +0000
@@ -728,6 +728,28 @@
     }
   }
 
+  void GraphicsDisplay::ResetWindowSize ()
+  {
+    Window root_return;
+    int x_return, y_return;
+    unsigned int width_return, height_return;
+    unsigned int border_width_return;
+    unsigned int depth_return;
+
+    XGetGeometry (m_X11Display,
+      m_X11Window,
+      &root_return,
+      &x_return,
+      &y_return,
+      &width_return,
+      &height_return,
+      &border_width_return,
+      &depth_return);
+
+    m_WindowSize = Size (width_return, height_return);
+    m_WindowPosition = Point (x_return, y_return);
+  }
+
   Point GraphicsDisplay::GetMouseScreenCoord()
   {
     Window root_return;
@@ -2365,227 +2387,6 @@
     EndDndDrag (result);
   }
 
-  int GraphicsDisplay::X11KeySymToINL (int Keysym)
-  {
-    switch (Keysym)
-    {
-      case XK_BackSpace:
-        return NUX_VK_BACKSPACE;
-      case XK_Tab:
-        return NUX_VK_TAB;
-      case XK_Clear:
-        return NUX_VK_CLEAR;
-      case XK_Return:
-        return NUX_VK_ENTER;
-      case XK_Shift_L:
-        return NUX_VK_SHIFT;
-      case XK_Control_L:
-        return NUX_VK_CONTROL;
-      case XK_Alt_L:
-        return NUX_VK_MENU;
-      case XK_Pause:
-        return NUX_VK_PAUSE;
-      case XK_Caps_Lock:
-        return NUX_VK_CAPITAL;
-      case XK_Escape:
-        return NUX_VK_ESCAPE;
-      case XK_space:
-        return NUX_VK_SPACE;
-      case XK_Page_Up:
-        return NUX_VK_PAGE_UP;
-      case XK_Page_Down:
-        return NUX_VK_PAGE_DOWN;
-      case XK_End:
-        return NUX_VK_END;
-      case XK_Home:
-        return NUX_VK_HOME;
-      case XK_Left:
-        return NUX_VK_LEFT;
-      case XK_Up:
-        return NUX_VK_UP;
-      case XK_Right:
-        return NUX_VK_RIGHT;
-      case XK_Down:
-        return NUX_VK_DOWN;
-      case XK_Print:
-        return NUX_VK_PRINT;
-      case XK_Execute:
-        return NUX_VK_EXECUTE;
-      case XK_Insert:
-        return NUX_VK_INSERT;
-      case XK_Delete:
-        return NUX_VK_DELETE;
-      case XK_0:
-        return NUX_VK_0;
-      case XK_1:
-        return NUX_VK_1;
-      case XK_2:
-        return NUX_VK_2;
-      case XK_3:
-        return NUX_VK_3;
-      case XK_4:
-        return NUX_VK_4;
-      case XK_5:
-        return NUX_VK_5;
-      case XK_6:
-        return NUX_VK_6;
-      case XK_7:
-        return NUX_VK_7;
-      case XK_8:
-        return NUX_VK_8;
-      case XK_9:
-        return NUX_VK_9;
-      case XK_A:
-        return NUX_VK_A;
-      case XK_B:
-        return NUX_VK_B;
-      case XK_C:
-        return NUX_VK_C;
-      case XK_D:
-        return NUX_VK_D;
-      case XK_E:
-        return NUX_VK_E;
-      case XK_F:
-        return NUX_VK_F;
-      case XK_G:
-        return NUX_VK_G;
-      case XK_H:
-        return NUX_VK_H;
-      case XK_I:
-        return NUX_VK_I;
-      case XK_J:
-        return NUX_VK_J;
-      case XK_K:
-        return NUX_VK_K;
-      case XK_L:
-        return NUX_VK_L;
-      case XK_M:
-        return NUX_VK_M;
-      case XK_N:
-        return NUX_VK_N;
-      case XK_O:
-        return NUX_VK_O;
-      case XK_P:
-        return NUX_VK_P;
-      case XK_Q:
-        return NUX_VK_Q;
-      case XK_R:
-        return NUX_VK_R;
-      case XK_S:
-        return NUX_VK_S;
-      case XK_T:
-        return NUX_VK_T;
-      case XK_U:
-        return NUX_VK_U;
-      case XK_V:
-        return NUX_VK_V;
-      case XK_W:
-        return NUX_VK_W;
-      case XK_X:
-        return NUX_VK_X;
-      case XK_Y:
-        return NUX_VK_Y;
-      case XK_Z:
-        return NUX_VK_Z;
-      case XK_Super_L:
-        return NUX_VK_LWIN;
-      case XK_Super_R:
-        return NUX_VK_RWIN;
-      case XK_KP_0:
-        return NUX_VK_NUMPAD0;
-      case XK_KP_1:
-        return NUX_VK_NUMPAD1;
-      case XK_KP_2:
-        return NUX_VK_NUMPAD2;
-      case XK_KP_3:
-        return NUX_VK_NUMPAD3;
-      case XK_KP_4:
-        return NUX_VK_NUMPAD4;
-      case XK_KP_5:
-        return NUX_VK_NUMPAD5;
-      case XK_KP_6:
-        return NUX_VK_NUMPAD6;
-      case XK_KP_7:
-        return NUX_VK_NUMPAD7;
-      case XK_KP_8:
-        return NUX_VK_NUMPAD8;
-      case XK_KP_9:
-        return NUX_VK_NUMPAD9;
-      case XK_KP_Multiply:
-        return NUX_VK_MULTIPLY;
-      case XK_KP_Add:
-        return NUX_VK_ADD;
-      case XK_KP_Separator:
-        return NUX_VK_SEPARATOR;
-      case XK_KP_Subtract:
-        return NUX_VK_SUBTRACT;
-      case XK_KP_Decimal:
-        return NUX_VK_DECIMAL;
-      case XK_KP_Divide:
-        return NUX_VK_DIVIDE;
-      case XK_F1:
-        return NUX_VK_F1;
-      case XK_F2:
-        return NUX_VK_F2;
-      case XK_F3:
-        return NUX_VK_F3;
-      case XK_F4:
-        return NUX_VK_F4;
-      case XK_F5:
-        return NUX_VK_F5;
-      case XK_F6:
-        return NUX_VK_F6;
-      case XK_F7:
-        return NUX_VK_F7;
-      case XK_F8:
-        return NUX_VK_F8;
-      case XK_F9:
-        return NUX_VK_F9;
-      case XK_F10:
-        return NUX_VK_F10;
-      case XK_F11:
-        return NUX_VK_F11;
-      case XK_F12:
-        return NUX_VK_F12;
-      case XK_F13:
-        return NUX_VK_F13;
-      case XK_F14:
-        return NUX_VK_F14;
-      case XK_F15:
-        return NUX_VK_F15;
-      case XK_F16:
-        return NUX_VK_F16;
-      case XK_F17:
-        return NUX_VK_F17;
-      case XK_F18:
-        return NUX_VK_F18;
-      case XK_F19:
-        return NUX_VK_F19;
-      case XK_F20:
-        return NUX_VK_F20;
-      case XK_F21:
-        return NUX_VK_F21;
-      case XK_F22:
-        return NUX_VK_F22;
-      case XK_F23:
-        return NUX_VK_F23;
-      case XK_F24:
-        return NUX_VK_F24;
-      case XK_Num_Lock:
-        return NUX_VK_NUMLOCK;
-      case XK_Scroll_Lock:
-        return NUX_VK_SCROLL;
-      case XK_Shift_R:
-        return NUX_VK_RSHIFT;
-      case XK_Control_R:
-        return NUX_VK_RCONTROL;
-      case XK_Alt_R:
-        return NUX_VK_RMENU;
-      default:
-        return 0x0;
-    }
-  };
-
   void GraphicsDisplay::ShowWindow()
   {
     XMapRaised (m_X11Display, m_X11Window);

=== modified file 'NuxGraphics/GraphicsDisplayX11.h' (properties changed: -x to +x)
--- NuxGraphics/GraphicsDisplayX11.h	2011-03-01 06:16:05 +0000
+++ NuxGraphics/GraphicsDisplayX11.h	2011-03-10 04:33:48 +0000
@@ -130,8 +130,6 @@
 
     bool m_is_window_minimized;
 
-    static int X11KeySymToINL (int Keysym);
-
   public:
     typedef struct _DndSourceFuncs
     {
@@ -182,9 +180,20 @@
     void DestroyOpenGLWindow();
 
     void SetWindowTitle (const TCHAR *Title);
+
+    //! Set the window size.
+    /*!
+        Actively set the window size to the provided parameters.
+        \sa ResetWindowSize
+    */
     void SetWindowSize (int width, int height);
+
+    //! Set the window position.
     void SetWindowPosition (int width, int height);
+    
+    //! Set the OpenGL Viewport.
     void SetViewPort (int x, int y, int width, int height);
+
     Point GetMouseScreenCoord();
     Point GetMouseWindowCoord();
     Point GetWindowCoord();
@@ -252,8 +261,16 @@
 
     void GetDesktopSize (int &w, int &h);
     void GetWindowSize (int &w, int &h);
-    int GetWindowWidth();
-    int GetWindowHeight();
+    int GetWindowWidth ();
+    int GetWindowHeight ();
+
+    //! Get the window size and reset the GraphicsEngine and GpuDevice accordingly.
+    /*!
+        This is a passive way to set the window size through out the NuxGraphics system. This call gets the 
+        current window size and sets its accordingly to all sub-system.
+        \sa SetWindowSize
+    */
+    void ResetWindowSize ();
 
     bool HasFrameBufferSupport();
     /*void SetWindowCursor(HCURSOR cursor);

=== modified file 'NuxGraphics/GraphicsEngine.cpp'
--- NuxGraphics/GraphicsEngine.cpp	2011-02-27 00:34:59 +0000
+++ NuxGraphics/GraphicsEngine.cpp	2011-03-10 04:33:48 +0000
@@ -174,19 +174,29 @@
     SetScissor (0, 0, _graphics_display.GetWindowWidth(), _graphics_display.GetWindowHeight() );
     EnableScissoring (true);
 
+    bool opengl_14_support = true;
+
+    if ((_graphics_display.GetGpuDevice ()->GetOpenGLMajorVersion () == 1) &&
+      (_graphics_display.GetGpuDevice ()->GetOpenGLMinorVersion () < 4))
+    {
+      // OpenGL version is less than OpenGL 1.4
+      opengl_14_support = false;
+    }
+
     if (create_rendering_data)
     {
 #ifndef NUX_OPENGLES_20
       if (UsingGLSLCodePath () &&
         GetGpuDevice ()->GetGpuInfo ().Support_ARB_Fragment_Shader () &&
-        GetGpuDevice ()->GetGpuInfo ().Support_ARB_Vertex_Shader ())
+        GetGpuDevice ()->GetGpuInfo ().Support_ARB_Vertex_Shader () &&
+        opengl_14_support)
       {
-        InitSlColorShader();
-        InitSlTextureShader();
+        InitSlColorShader ();
+        InitSlTextureShader ();
         InitSlColorModTexMaskAlpha ();
-        InitSl2TextureAdd();
-        InitSl2TextureMod();
-        InitSl4TextureAdd();
+        InitSl2TextureAdd ();
+        InitSl2TextureMod ();
+        InitSl4TextureAdd ();
 
         InitSLComponentExponentiation ();
         InitSLAlphaReplicate ();
@@ -199,16 +209,17 @@
         InitSLHorizontalHQGaussFilter ();
         InitSLVerticalHQGaussFilter ();
       }
-      else if (GetGpuDevice()->GetGpuInfo().Support_ARB_Fragment_Shader() &&
-        GetGpuDevice()->GetGpuInfo().Support_ARB_Vertex_Program())
+      else if (GetGpuDevice ()->GetGpuInfo ().Support_ARB_Fragment_Shader () &&
+        GetGpuDevice ()->GetGpuInfo ().Support_ARB_Vertex_Program () &&
+        opengl_14_support)
       {
-        InitAsmColorShader();
-        InitAsmTextureShader();
-        InitAsmColorModTexMaskAlpha();
-        InitAsm2TextureAdd();
-        InitAsm2TextureMod();
-        InitAsm4TextureAdd();
-        InitAsmBlendModes();
+        InitAsmColorShader ();
+        InitAsmTextureShader ();
+        InitAsmColorModTexMaskAlpha ();
+        InitAsm2TextureAdd ();
+        InitAsm2TextureMod ();
+        InitAsm4TextureAdd ();
+        InitAsmBlendModes ();
 
         InitAsmComponentExponentiation ();
         InitAsmAlphaReplicate ();
@@ -218,12 +229,12 @@
         //InitAsm2TextureDepRead (); // NUXTODO: fix the shader
       }
 #else
-      InitSlColorShader();
-      InitSlTextureShader();
+      InitSlColorShader ();
+      InitSlTextureShader ();
       InitSlColorModTexMaskAlpha ();
-      InitSl2TextureAdd();
-      InitSl2TextureMod();
-      InitSl4TextureAdd();
+      InitSl2TextureAdd ();
+      InitSl2TextureMod ();
+      InitSl4TextureAdd ();
 
       InitSLComponentExponentiation ();
       InitSLAlphaReplicate ();