Merge lp:~unity-team/nux/nux-getmeshbuffer into lp:nux/2.0

[Jay Taoko]

* Code style fixes
* Added win32_keycode and win32_keysym in Event class for Windows
* Added GetCachedMeshBuffer in MeshBuffer class

[Tim Penhey (thumper)]

Just to confirm, we know this works by continuting to compile on both windows and linux and continues to render the test cases?

review: Needs Information

[Jay Taoko (jaytaoko)]

Yes, tests have been run with this branch and unity as well.

[Jay Taoko (jaytaoko)]

Note: Review and approve the code only, do not initiate the merge into trunk.

[Jason Smith (jassmith)]

+1 approve
love seeing all that dead code go.

review: Approve

[lp:~unity-team/nux/nux-getmeshbuffer]

552. By Jason Smith on 2012-02-02

UNBLOCK

Fixes severe slowness when laying lots of these bad boys out. Fixes: . Approved by Gord Allott, Jay Taoko.

553. By Jay Taoko on 2012-02-03

Merged with Nux trunk

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-01-30 08:33:47 +0000
+++ Nux/WindowCompositor.cpp	2012-02-03 23:06:21 +0000
@@ -961,7 +961,11 @@
         SendKeyEvent(key_focus_area_,
                     event.type,
                     event.GetKeySym(),
+#if defined(NUX_OS_WINDOWS)
+                    event.win32_keycode,
+#elif defined(NUX_OS_LINUX)
                     event.x11_keycode,
+#endif
                     event.GetKeyState(),
                     event.GetText(),
                     event.GetKeyRepeatCount());
@@ -980,7 +984,11 @@
           SendKeyEvent(static_cast<InputArea*>(parent),
             event.type,
             event.GetKeySym(),
+#if defined(NUX_OS_WINDOWS)
+            event.win32_keycode,
+#elif defined(NUX_OS_LINUX)
             event.x11_keycode,
+#endif
             event.GetKeyState(),
             event.GetText(),
             event.GetKeyRepeatCount());

=== modified file 'NuxGraphics/Events.cpp'
--- NuxGraphics/Events.cpp	2012-01-27 07:25:16 +0000
+++ NuxGraphics/Events.cpp	2012-02-03 23:06:21 +0000
@@ -50,7 +50,7 @@
     else if (button == NUX_MOUSE_BUTTON4)
       return(button_state & NUX_STATE_BUTTON4_DOWN) ? true : false;
 
-    return false;    
+    return false;
   }
   
   bool GetKeyModifierState(unsigned long key_modifiers_states, KeyModifier key_modifier)
@@ -80,9 +80,13 @@
     dy = 0;
     clicks = 0;
     is_click = 0;
-    
     wheel_delta = 0;
-    
+
+#if defined(NUX_OS_WINDOWS)
+    win32_keycode = 0;
+    win32_keysym = 0;
+#endif
+
 #if defined(NUX_OS_LINUX)
     x11_keycode = 0;
     x11_keysym = 0;
@@ -98,7 +102,17 @@
   {
     type = NUX_NO_EVENT;
     Memset(text, 0, sizeof(text));
+#if defined(NUX_OS_WINDOWS)
+    win32_keycode = 0;
+    win32_keysym = 0;
+#endif
+
+#if defined(NUX_OS_LINUX)
+    x11_keycode = 0;
     x11_keysym = 0;
+    x11_key_state = 0;
+#endif
+
     key_repeat_count = 0;
     key_modifiers = 0;
     wheel_delta = 0;
@@ -179,7 +193,15 @@
   */
   unsigned long Event::GetKeySym() const
   {
+#if defined(NUX_OS_WINDOWS)
+    return win32_keysym;
+#endif
+
+#if defined(NUX_OS_LINUX)
     return x11_keysym;
+#endif
+
+    return 0;
   }
   unsigned short Event::GetKeyRepeatCount() const
   {

=== modified file 'NuxGraphics/Events.h'
--- NuxGraphics/Events.h	2012-01-27 07:25:16 +0000
+++ NuxGraphics/Events.h	2012-02-03 23:06:21 +0000
@@ -386,6 +386,11 @@
     int clicks;
     int is_click;
 
+#if defined(NUX_OS_WINDOWS)
+    int win32_keycode; // Not used. Just a place holder.
+    int win32_keysym;
+#endif
+
 #if defined(NUX_OS_LINUX)
     Time          x11_timestamp;  //!< X11 timestamp.
     Window        x11_window;     //!< X11 window.

=== modified file 'NuxGraphics/GLVertexResourceManager.cpp'
--- NuxGraphics/GLVertexResourceManager.cpp	2011-10-19 20:32:38 +0000
+++ NuxGraphics/GLVertexResourceManager.cpp	2012-02-03 23:06:21 +0000
@@ -55,14 +55,14 @@
   }
 
   //! Copy constructor
-  VertexBuffer::VertexBuffer(const VertexBuffer &Other)
+  VertexBuffer::VertexBuffer(const VertexBuffer& Other)
   {
     _Data = Other._Data;
     _Stride = Other._Stride;
   }
 
   //! Assignment constructor
-  VertexBuffer &VertexBuffer::operator = (const VertexBuffer &Other)
+  VertexBuffer& VertexBuffer::operator = (const VertexBuffer& Other)
   {
     _Data = Other._Data;
     _Stride = Other._Stride;
@@ -117,7 +117,7 @@
     if (_Data.size() == 0)
       return 0;
 
-    return NUX_CONST_CAST(void*, ((NUX_CONST_CAST(const VertexBuffer *, this))->GetPtrRawData()));
+    return NUX_CONST_CAST(void*, ((NUX_CONST_CAST(const VertexBuffer*, this))->GetPtrRawData()));
   }
 
   IndexBuffer::IndexBuffer()
@@ -136,14 +136,14 @@
   }
 
   //! Copy constructor
-  IndexBuffer::IndexBuffer(const IndexBuffer &Other)
+  IndexBuffer::IndexBuffer(const IndexBuffer& Other)
   {
     _Data = Other._Data;
     _Stride = Other._Stride;
   }
 
   //! Assignment constructor
-  IndexBuffer &IndexBuffer::operator = (const IndexBuffer &Other)
+  IndexBuffer& IndexBuffer::operator = (const IndexBuffer& Other)
   {
     _Data = Other._Data;
     _Stride = Other._Stride;
@@ -194,7 +194,7 @@
 
   void* IndexBuffer::GetPtrRawData()
   {
-    return NUX_CONST_CAST(void*, ((NUX_CONST_CAST(const IndexBuffer *, this))->GetPtrRawData()));
+    return NUX_CONST_CAST(void*, ((NUX_CONST_CAST(const IndexBuffer*, this))->GetPtrRawData()));
   }
 
   VertexDeclaration::VertexDeclaration()
@@ -212,63 +212,10 @@
     _declaration.push_back(Component);
   }
 
-
-//   NMeshComponent::NMeshComponent()
-//     :   _Type(ATTRIB_DECLTYPE_UNKNOWN)
-//     ,   _StreamIndex(-1)
-//     ,   _Offset(0)
-//   {
-//   }
-// 
-//   NMeshComponent::NMeshComponent(const NMeshComponent &Other)
-//     :   _Type(ATTRIB_DECLTYPE_UNKNOWN)
-//     ,   _StreamIndex(-1)
-//     ,   _Offset(0)
-//   {
-//     _Type = Other._Type;
-//     _Offset = Other._Offset;
-//     _StreamIndex = Other._StreamIndex;
-//   }
-// 
-//   NMeshComponent::NMeshComponent(int StreamIndex/*ObjectPtr<VertexBuffer> VtxBuffer*/, int Offset, ATTRIB_DECL_TYPE Type)
-//   {
-//     nuxAssert(Offset >= 0);
-//     _Type = Type;
-//     _Offset = Offset;
-//     _StreamIndex = StreamIndex;
-//   }
-// 
-//   NMeshComponent::~NMeshComponent()
-//   {
-//   }
-// 
-//   NMeshComponent &NMeshComponent::operator = (const NMeshComponent &Other)
-//   {
-//     _Type = Other._Type;
-//     _Offset = Other._Offset;
-//     _StreamIndex = Other._StreamIndex;
-//     return *this;
-//   }
-// 
-//   int NMeshComponent::GetStreamIndex() const
-//   {
-//     return _StreamIndex;
-//   }
-// 
-// // int NMeshComponent::GetStride()
-// // {
-// //     return _VtxBuffer->GetStride();
-// // }
-// 
-//   int NMeshComponent::GetOffset()
-//   {
-//     return _Offset;
-//   }
-
-  CachedVertexBuffer::CachedVertexBuffer(NResourceSet *ResourceManager, VertexBuffer *SourceVtxBuffer)
-    :   CachedResourceData(ResourceManager)
-    ,   _Size(0)
-    ,   _Stride(0)
+  CachedVertexBuffer::CachedVertexBuffer(NResourceSet* ResourceManager, VertexBuffer* SourceVtxBuffer)
+  : CachedResourceData(ResourceManager)
+  , _Size(0)
+  , _Stride(0)
   {
     UpdateResource(SourceVtxBuffer);
   }
@@ -279,7 +226,7 @@
     _vertex_buffer = ObjectPtr<IOpenGLVertexBuffer> (0);
   }
 
-  bool CachedVertexBuffer::UpdateResource(ResourceData *Source)
+  bool CachedVertexBuffer::UpdateResource(ResourceData* Source)
   {
     if (Source == 0)
     {
@@ -288,12 +235,12 @@
       return true;
     }
 
-    VertexBuffer *SourceVtxBuffer = 0;
+    VertexBuffer* SourceVtxBuffer = 0;
     nuxAssert(Source->Type().IsDerivedFromType(VertexBuffer::StaticObjectType));
 
     if (Source->Type().IsDerivedFromType(VertexBuffer::StaticObjectType))
     {
-      SourceVtxBuffer = NUX_STATIC_CAST(VertexBuffer *, Source);
+      SourceVtxBuffer = NUX_STATIC_CAST(VertexBuffer* , Source);
     }
     else
     {
@@ -329,16 +276,16 @@
     return true;
   }
 
-  void CachedVertexBuffer::LoadVertexData(VertexBuffer *SourceVtxBuffer)
+  void CachedVertexBuffer::LoadVertexData(VertexBuffer* SourceVtxBuffer)
   {
     if ((SourceVtxBuffer == 0) || (SourceVtxBuffer->GetSize() == 0) || (SourceVtxBuffer->GetStride() == 0))
     {
       return;
     }
 
-    t_byte *pData;
+    t_byte* pData;
 
-    _vertex_buffer->Lock(0, 0, (void **) &pData);
+    _vertex_buffer->Lock(0, 0, (void**) &pData);
     Memcpy(pData, SourceVtxBuffer->GetPtrRawData(), SourceVtxBuffer->GetSize());
     _vertex_buffer->Unlock();
   }
@@ -353,7 +300,7 @@
     return _Stride;
   }
 
-  CachedIndexBuffer::CachedIndexBuffer(NResourceSet *ResourceManager, IndexBuffer *SourceIdxBuffer)
+  CachedIndexBuffer::CachedIndexBuffer(NResourceSet* ResourceManager, IndexBuffer* SourceIdxBuffer)
     :   CachedResourceData(ResourceManager)
     ,   _Size(0)
     ,   _Stride(0)
@@ -367,7 +314,7 @@
     _index_buffer = ObjectPtr<IOpenGLIndexBuffer> (0);
   }
 
-  bool CachedIndexBuffer::UpdateResource(ResourceData *Source)
+  bool CachedIndexBuffer::UpdateResource(ResourceData* Source)
   {
     if (Source == 0)
     {
@@ -377,12 +324,12 @@
       return true;
     }
 
-    IndexBuffer *SourceIdxBuffer = 0;
+    IndexBuffer* SourceIdxBuffer = 0;
     nuxAssert(Source->Type().IsDerivedFromType(IndexBuffer::StaticObjectType));
 
     if (Source->Type().IsDerivedFromType(IndexBuffer::StaticObjectType))
     {
-      SourceIdxBuffer = NUX_STATIC_CAST(IndexBuffer *, Source);
+      SourceIdxBuffer = NUX_STATIC_CAST(IndexBuffer*, Source);
     }
     else
     {
@@ -419,15 +366,15 @@
     return true;
   }
 
-  void CachedIndexBuffer::LoadIndexData(IndexBuffer *SourceIdxBuffer)
+  void CachedIndexBuffer::LoadIndexData(IndexBuffer* SourceIdxBuffer)
   {
     if ((SourceIdxBuffer == 0) || (SourceIdxBuffer->GetSize() == 0) || (SourceIdxBuffer->GetStride() == 0))
     {
       return;
     }
 
-    t_byte *pData;
-    _index_buffer->Lock(0, 0, (void **) &pData);
+    t_byte* pData;
+    _index_buffer->Lock(0, 0, (void**) &pData);
     Memcpy(pData, SourceIdxBuffer->GetPtrRawData(), SourceIdxBuffer->GetSize());
     _index_buffer->Unlock();
   }
@@ -447,7 +394,7 @@
     return _num_index;
   }
 
-  CachedVertexDeclaration::CachedVertexDeclaration(NResourceSet *ResourceManager, VertexDeclaration *SourceVertexDeclaration)
+  CachedVertexDeclaration::CachedVertexDeclaration(NResourceSet* ResourceManager, VertexDeclaration* SourceVertexDeclaration)
     :   CachedResourceData(ResourceManager)
   {
     UpdateResource(SourceVertexDeclaration);
@@ -458,7 +405,7 @@
     _declaration = ObjectPtr<IOpenGLVertexDeclaration> (0);
   }
 
-  bool CachedVertexDeclaration::UpdateResource(ResourceData *Source)
+  bool CachedVertexDeclaration::UpdateResource(ResourceData* Source)
   {
     if (Source == 0)
     {
@@ -466,12 +413,12 @@
       return true;
     }
 
-    VertexDeclaration *SourceVertexDeclaration = 0;
+    VertexDeclaration* SourceVertexDeclaration = 0;
     nuxAssert(Source->Type().IsDerivedFromType(VertexDeclaration::StaticObjectType));
 
     if (Source->Type().IsDerivedFromType(VertexDeclaration::StaticObjectType))
     {
-      SourceVertexDeclaration = NUX_STATIC_CAST(VertexDeclaration *, Source);
+      SourceVertexDeclaration = NUX_STATIC_CAST(VertexDeclaration*, Source);
     }
     else
     {
@@ -489,6 +436,7 @@
   }
 
   MeshBuffer::MeshBuffer(NUX_FILE_LINE_DECL)
+  : ResourceData(NUX_FILE_LINE_PARAM)
   {
     _vertex_buffer = 0;
     _index_buffer = 0;
@@ -539,6 +487,11 @@
     return true;
   }
 
+  ObjectPtr<CachedMeshBuffer> MeshBuffer::GetCachedMeshBuffer()
+  {
+    return GetGraphicsDisplay()->GetGraphicsEngine()->CacheResource(this);
+  }
+
   CachedMeshBuffer::CachedMeshBuffer(NResourceSet* ResourceManager, MeshBuffer* resource)
   : CachedResourceData(ResourceManager)
   {
@@ -563,251 +516,8 @@
     _cached_vertex_declaration->_declaration->SetVertexBuffer(2, _cached_vertex_buffer->_vertex_buffer);
 
     _mesh_primitive_type = mesh_buffer->_mesh_primitive_type;
-//       
+
     return true;
   }
-
-
-//   NMesh::NMesh()
-//   {
-// 
-//   }
-// 
-//   NMesh::~NMesh()
-//   {
-// 
-//   }
-// 
-// 
-//   NStaticMesh::NStaticMesh(NMeshObject *Object)
-//   {
-//     if (Object == 0)
-//       return;
-//   }
-// 
-//   NStaticMesh::~NStaticMesh()
-//   {
-//     delete m_pVertexDeclaration;
-//     delete m_pIndex;
-// 
-//     for (int i = 0; i < (int) m_pVertexStreamArray.size(); i++)
-//     {
-//       delete m_pVertexStreamArray[i];
-//     }
-//   }
-// 
-//   int NStaticMesh::GetNumStreams() const
-//   {
-//     return(int) m_pVertexStreamArray.size();
-//   }
-// 
-//   NGLStaticMesh::NGLStaticMesh(NResourceSet *ResourceManager, NStaticMesh *StaticMesh)
-//     :   CachedResourceData(ResourceManager)
-//   {
-//     int NumStreams = StaticMesh->GetNumStreams();
-// 
-//     for (int s = 0; s < NumStreams; s++)
-//     {
-//       m_VertexBufferArray.push_back(GetGraphicsDisplay()->GetGraphicsEngine()->CacheResource(StaticMesh->m_pVertexStreamArray[s]));
-//     }
-// 
-//     m_Index = ObjectPtr<CachedIndexBuffer> (GetGraphicsDisplay()->GetGraphicsEngine()->CacheResource(StaticMesh->m_pIndex));
-//     m_VertexDeclaration = ObjectPtr<CachedVertexDeclaration> (GetGraphicsDisplay()->GetGraphicsEngine()->CacheResource(StaticMesh->m_pVertexDeclaration));
-//   }
-// 
-//   NGLStaticMesh::~NGLStaticMesh()
-//   {
-// 
-//   }
-// 
-//   bool NGLStaticMesh::UpdateResource(ResourceData *Source)
-//   {
-//     if (Source == 0)
-//     {
-//       int NumStreams = m_VertexBufferArray.size();
-// 
-//       for (int s = 0; s < NumStreams; s++)
-//       {
-//         m_VertexBufferArray[s]->UpdateResource(0);
-//       }
-// 
-//       m_Index->UpdateResource(0);
-//       m_VertexDeclaration->UpdateResource(0);
-//       return true;
-//     }
-// 
-//     NStaticMesh *StaticMesh = 0;
-//     nuxAssert(Source->Type().IsDerivedFromType(NStaticMesh::StaticObjectType));
-// 
-//     if (Source->Type().IsDerivedFromType(NStaticMesh::StaticObjectType))
-//     {
-//       StaticMesh = NUX_STATIC_CAST(NStaticMesh *, Source);
-//     }
-//     else
-//     {
-//       return false;
-//     }
-// 
-//     int NumStreams = StaticMesh->GetNumStreams();
-// 
-//     for (int s = 0; s < NumStreams; s++)
-//     {
-//       GetGraphicsDisplay()->GetGraphicsEngine()->UpdateResource(StaticMesh->m_pVertexStreamArray[s]);
-//     }
-// 
-//     GetGraphicsDisplay()->GetGraphicsEngine()->UpdateResource(StaticMesh->m_pIndex);
-//     GetGraphicsDisplay()->GetGraphicsEngine()->UpdateResource(StaticMesh->m_pVertexDeclaration);
-//     return true;
-//   }
-
-
-// static void sWriteFloat(float** Ptr, float a, float b, float c, float d)
-// {
-//     *Ptr[0] = a; *Ptr[1] = b; *Ptr[2] = c; *Ptr[3] = d;
-//     *Ptr += 4;
-// }
-
-// NStaticMesh::NStaticMesh()
-// {
-//
-// }
-//
-//
-// NCubeVertexBuffer::NCubeVertexBuffer()
-// {
-//     VERTEXELEMENT decl [] =
-//     {
-//         {0/*Stream*/, 0/*Offset*/, ATTRIB_CT_FLOAT/*Type*/, 4/*NumComponent*/, ATTRIB_USAGE_DECL_POSITION/*Usage*/, 0/*UsageIndex*/, 0 /*CgParameter*/},
-//         DECL_END
-//     };
-//     INT i = 0;
-//     while (decl[i].Stream != 0xFF)
-//     {
-//         _DeclarationsArray.push_back(decl[i]);
-//         i++;
-//     }
-//
-//
-//     //          4+------+7
-//     //          /|     /|
-//     //         / |    / |        y
-//     //        / 5+---/--+6       |
-//     //      0+------+3 /         |
-//     //       | /    | /          *---x
-//     //       |/     |/          /
-//     //      1+------+2         /
-//     //                        z
-//
-//     float width_    = 1.0f;
-//     float height_   = 1.0f;
-//     float depth_    = 1.0f;
-//     float w_        = 1.0f;
-//
-//     Vector4 v0, v1, v2;
-//     // Front
-//     v0 = Vector4(-width_/2.0f, height_/2.0f, depth_/2.0f, w_);       // 0
-//     v1 = Vector4(-width_/2.0f, -height_/2.0f, depth_/2.0f, w_);      // 1
-//     v2 = Vector4(width_/2.0f, -height_/2.0f, depth_/2.0f, w_);       // 2
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     v0 = Vector4(-width_/2.0f, height_/2.0f, depth_/2.0f, w_);       // 0
-//     v1 = Vector4(width_/2.0f, -height_/2.0f, depth_/2.0f, w_);       // 2
-//     v2 = Vector4(width_/2.0f, height_/2.0f, depth_/2.0f, w_);        // 3
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     // Back
-//     v0 = Vector4(width_/2.0f, height_/2.0f, -depth_/2.0f, w_);       // 7
-//     v1 = Vector4(width_/2.0f, -height_/2.0f, -depth_/2.0f, w_);      // 6
-//     v2 = Vector4(-width_/2.0f, -height_/2.0f, -depth_/2.0f, w_);     // 5
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     v0 = Vector4(width_/2.0f, height_/2.0f, -depth_/2.0f, w_);       // 7
-//     v1 = Vector4(-width_/2.0f, -height_/2.0f, -depth_/2.0f, w_);     // 5
-//     v2 = Vector4(-width_/2.0f, height_/2.0f, -depth_/2.0f, w_);      // 4
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     // Top
-//     v0 = Vector4(-width_/2.0f, height_/2.0f, -depth_/2.0f, w_);      // 4
-//     v1 = Vector4(-width_/2.0f, height_/2.0f, depth_/2.0f, w_);       // 0
-//     v2 = Vector4(width_/2.0f, height_/2.0f, depth_/2.0f, w_);        // 3
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     v0 = Vector4(-width_/2.0f, height_/2.0f, -depth_/2.0f, w_);      // 4
-//     v1 = Vector4(width_/2.0f, height_/2.0f, depth_/2.0f, w_);        // 3
-//     v2 = Vector4(width_/2.0f, height_/2.0f, -depth_/2.0f, w_);       // 7
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     // Bottom
-//     v0 = Vector4(width_/2.0f, -height_/2.0f, -depth_/2.0f, w_);      // 6
-//     v1 = Vector4(width_/2.0f, -height_/2.0f, depth_/2.0f, w_);       // 2
-//     v2 = Vector4(-width_/2.0f, -height_/2.0f, depth_/2.0f, w_);      // 1
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     v0 = Vector4(width_/2.0f, -height_/2.0f, -depth_/2.0f, w_);      // 6
-//     v1 = Vector4(-width_/2.0f, -height_/2.0f, depth_/2.0f, w_);      // 1
-//     v2 = Vector4(-width_/2.0f, -height_/2.0f, -depth_/2.0f, w_);     // 5
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     // Left
-//     v0 = Vector4(-width_/2.0f, height_/2.0f, -depth_/2.0f, w_);      // 4
-//     v1 = Vector4(-width_/2.0f, -height_/2.0f, -depth_/2.0f, w_);     // 5
-//     v2 = Vector4(-width_/2.0f, -height_/2.0f, depth_/2.0f, w_);      // 1
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     v0 = Vector4(-width_/2.0f, height_/2.0f, -depth_/2.0f, w_);      // 4
-//     v1 = Vector4(-width_/2.0f, -height_/2.0f, depth_/2.0f, w_);      // 1
-//     v2 = Vector4(-width_/2.0f, height_/2.0f, depth_/2.0f, w_);       // 0
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     // Right
-//     v0 = Vector4(width_/2.0f, height_/2.0f, depth_/2.0f, w_);        // 3
-//     v1 = Vector4(width_/2.0f, -height_/2.0f, depth_/2.0f, w_);       // 2
-//     v2 = Vector4(width_/2.0f, -height_/2.0f, -depth_/2.0f, w_);      // 6
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     v0 = Vector4(width_/2.0f, height_/2.0f, depth_/2.0f, w_);        // 3
-//     v1 = Vector4(width_/2.0f, -height_/2.0f, -depth_/2.0f, w_);      // 6
-//     v2 = Vector4(width_/2.0f, height_/2.0f, -depth_/2.0f, w_);       // 7
-//     m_Vertex.push_back(v0); m_Vertex.push_back(v1); m_Vertex.push_back(v2);
-//
-//     m_Size = (INT)m_Vertex.size() * 4 * 4;  // bytes
-//     m_Stride = 0;
-// }
-//
-// NCubeVertexBuffer::~NCubeVertexBuffer()
-// {
-// }
-//
-// void NCubeVertexBuffer::GetData(void* Buffer)
-// {
-//     nuxAssert(Buffer);
-//
-//     float *Ptr = (float*)Buffer;
-//
-//     INT i = 0;
-//     for (i = 0; i < (INT)m_Vertex.size(); i++)
-//     {
-//         *Ptr++ = m_Vertex[i].x;
-//         *Ptr++ = m_Vertex[i].y;
-//         *Ptr++ = m_Vertex[i].z;
-//         *Ptr++ = m_Vertex[i].w;
-//     }
-// }
-//
-// INT NCubeVertexBuffer::GetSize()
-// {
-//     return m_Size; // bytes
-// }
-//
-// VERTEXELEMENT NCubeVertexBuffer::GetDeclaration(INT i)
-// {
-//     if (i < (INT)_DeclarationsArray.size())
-//     {
-//         return _DeclarationsArray[i];
-//     }
-//     VERTEXELEMENT decl = DECL_END;
-//     return decl;
-// }
-
 }
 

=== modified file 'NuxGraphics/GLVertexResourceManager.h'
--- NuxGraphics/GLVertexResourceManager.h	2011-10-19 20:32:38 +0000
+++ NuxGraphics/GLVertexResourceManager.h	2012-02-03 23:06:21 +0000
@@ -40,9 +40,9 @@
     virtual ~VertexBuffer();
     VertexBuffer(int Size, int Stride);
     //! Copy constructor
-    VertexBuffer(const VertexBuffer &);
+    VertexBuffer(const VertexBuffer&);
     //! Assignment constructor
-    VertexBuffer &operator = (const VertexBuffer &);
+    VertexBuffer& operator = (const VertexBuffer&);
 
     //! Allocate space for a "num_element", each of size "size".
     /*!
@@ -72,9 +72,9 @@
     virtual ~IndexBuffer();
     IndexBuffer(int Size, int Stride);
     //! Copy constructor
-    IndexBuffer(const IndexBuffer &);
+    IndexBuffer(const IndexBuffer&);
     //! Assignment constructor
-    IndexBuffer &operator = (const IndexBuffer &);
+    IndexBuffer& operator = (const IndexBuffer&);
 
     void Allocate(int Size, int Stride);
     int GetSize() const;
@@ -151,62 +151,6 @@
     ObjectPtr<IOpenGLVertexDeclaration> _declaration;
   };
 
-//   class NMeshComponent
-//   {
-//   public:
-//     NMeshComponent();
-//     NMeshComponent(const NMeshComponent &);
-//     NMeshComponent(int StreamIndex/*ObjectPtr<BaseMeshBuffer> VtxBuffer*/, int Offset, ATTRIB_DECL_TYPE Type);
-// 
-//     NMeshComponent &operator = (const NMeshComponent &);
-// 
-//     virtual ~NMeshComponent();
-// 
-//     int GetStreamIndex() const;
-// //     int GetStride();
-//     int GetOffset();
-//   private:
-//     ATTRIB_DECL_TYPE _Type;
-//     int _StreamIndex;
-//     int _Offset;
-//   };
-// 
-//   class NMesh: public ResourceData
-//   {
-//     NUX_DECLARE_OBJECT_TYPE(NStaticMesh, ResourceData);
-// 
-//     NMesh();
-//     virtual ~NMesh();
-//   };
-// 
-//   class NStaticMesh: public NMesh
-//   {
-//     NUX_DECLARE_OBJECT_TYPE(NStaticMesh, NMesh);
-//   public:
-//     NStaticMesh(NMeshObject *Object);
-//     ~NStaticMesh();
-// 
-//     int GetNumStreams() const;
-// 
-//     std::vector<BaseMeshBuffer*> m_pVertexStreamArray; // up to 8 stream of buffers on most GPU
-//     NIndexBuffer *m_pIndex;
-//     NVertexDeclaration *m_pVertexDeclaration;
-//   };
-// 
-//   class NGLStaticMesh: public CachedResourceData
-//   {
-//     NUX_DECLARE_OBJECT_TYPE(NGLStaticMesh, CachedResourceData);
-//   public:
-//     NGLStaticMesh(NResourceSet *ResourceManager, NStaticMesh *);
-//     ~NGLStaticMesh();
-//     bool UpdateResource(ResourceData *Resource);
-// 
-//     std::vector<ObjectPtr<CachedVertexBuffer> > m_VertexBufferArray;
-//     ObjectPtr<CachedIndexBuffer> m_Index;
-//     ObjectPtr<CachedVertexDeclaration> m_VertexDeclaration;
-//   };
-
-
   class CachedMeshBuffer;
 
   class MeshBuffer: public ResourceData
@@ -218,12 +162,12 @@
 
     bool Update(const MeshData* mesh_data);
 
-    //ObjectPtr <CachedMeshBuffer> GetCachedMeshBuffer();
+    ObjectPtr<CachedMeshBuffer> GetCachedMeshBuffer();
 
   public:
-    VertexBuffer      *_vertex_buffer;
-    IndexBuffer       *_index_buffer;
-    VertexDeclaration *_vertex_declaration;
+    VertexBuffer*       _vertex_buffer;
+    IndexBuffer*        _index_buffer;
+    VertexDeclaration*  _vertex_declaration;
     NuxMeshPrimitiveType _mesh_primitive_type;
   };
 

=== modified file 'NuxGraphics/GraphicsDisplayWin.cpp'
--- NuxGraphics/GraphicsDisplayWin.cpp	2012-01-04 00:10:39 +0000
+++ NuxGraphics/GraphicsDisplayWin.cpp	2012-02-03 23:06:21 +0000
@@ -1434,7 +1434,7 @@
       {
         event_->type = NUX_KEYDOWN;
         event_->key_modifiers = GetModifierKeyState();
-        event_->e_keysym = wParam;
+        event_->win32_keysym = wParam;
 
         if ((uMsg == WM_KEYDOWN) || (uMsg == WM_SYSKEYDOWN))
         {
@@ -1445,11 +1445,11 @@
         {
           if (lParam & (1 << 24))
           {
-            event_->e_keysym = NUX_VK_RCONTROL;
+            event_->win32_keysym = NUX_VK_RCONTROL;
           }
           else
           {
-            event_->e_keysym = NUX_VK_LCONTROL;
+            event_->win32_keysym = NUX_VK_LCONTROL;
           }
         }
 
@@ -1457,11 +1457,11 @@
         {
           if (lParam & (1 << 24))
           {
-            event_->e_keysym = NUX_VK_RALT;
+            event_->win32_keysym = NUX_VK_RALT;
           }
           else
           {
-            event_->e_keysym = NUX_VK_LALT;
+            event_->win32_keysym = NUX_VK_LALT;
           }
         }
 
@@ -1469,11 +1469,11 @@
         {
           if (HIWORD(GetAsyncKeyState(VK_LSHIFT)))
           {
-            event_->e_keysym = NUX_VK_LSHIFT;
+            event_->win32_keysym = NUX_VK_LSHIFT;
           }
           else if (HIWORD(GetAsyncKeyState(VK_RSHIFT)))
           {
-            event_->e_keysym = NUX_VK_RSHIFT;
+            event_->win32_keysym = NUX_VK_RSHIFT;
           }
         }
 
@@ -1485,7 +1485,7 @@
       {
         event_->type = NUX_KEYUP;
         event_->key_modifiers = GetModifierKeyState();
-        event_->e_keysym = wParam;
+        event_->win32_keysym = wParam;
 
         if ((uMsg == WM_KEYUP) || (uMsg == WM_SYSKEYUP))
         {

=== modified file 'NuxImage/ImageSurface.h'
--- NuxImage/ImageSurface.h	2012-01-17 00:32:06 +0000
+++ NuxImage/ImageSurface.h	2012-02-03 23:06:21 +0000
@@ -282,6 +282,9 @@
     int m_NumMipmap;
     std::vector<ImageSurface *> m_MipSurfaceArray;
     void ClearData();
+#if defined(NUX_OS_WINDOWS)
+    friend NBitmapData *read_tga_file(const TCHAR *file_name);
+#endif
   };
 
   class NCubemapData: public NBitmapData

=== modified file 'configure.ac'
--- configure.ac	2012-02-02 14:54:59 +0000
+++ configure.ac	2012-02-03 23:06:21 +0000
@@ -22,7 +22,7 @@
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205
 # To make more than one API change in a day, add a number to the date. Like 20111205.xx
-m4_define([nux_abi_version], [20120202.01])
+m4_define([nux_abi_version], [20120203.01])
 
 m4_define([nux_version],
           [nux_major_version.nux_minor_version.nux_micro_version])