From 4811defca2eeea69e40346be6b1647f276db8c76 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Fri, 14 Dec 2012 21:30:35 +0100
Subject: Static objects using OpenGL VBOs and display lists

---
 src/graphics/core/device.h | 17 ++++++++++++++++-
 src/graphics/core/vertex.h | 20 ++++----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'src/graphics/core')

diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h
index 8e7d446..a0e44e4 100644
--- a/src/graphics/core/device.h
+++ b/src/graphics/core/device.h
@@ -313,9 +313,24 @@ public:
     //! Renders primitive composed of vertices with multitexturing (2 textures)
     virtual void DrawPrimitive(PrimitiveType type, const VertexTex2 *vertices, int vertexCount,
                                Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)) = 0;
-    //! Renders primitive composed of vertices with color information
+    //! Renders primitive composed of vertices with solid color
     virtual void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount) = 0;
 
+    //! Creates a static buffer composed of given primitives with single texture vertices
+    virtual unsigned int CreateStaticObject(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) = 0;
+
+    //! Creates a static buffer composed of given primitives with multitexturing (2 textures)
+    virtual unsigned int CreateStaticObject(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) = 0;
+
+    //! Creates a static buffer composed of given primitives with solid color
+    virtual unsigned int CreateStaticObject(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) = 0;
+
+    //! Draws a static buffer
+    virtual void DrawStaticObject(unsigned int objectId) = 0;
+
+    //! Deletes a static buffer
+    virtual void DestroyStaticObject(unsigned int objectId) = 0;
+
     //! Tests whether a sphere is (partially) within the frustum volume
     //! Returns a mask of frustum planes for which the test is positive
     virtual int ComputeSphereVisibility(const Math::Vector &center, float radius) = 0;
diff --git a/src/graphics/core/vertex.h b/src/graphics/core/vertex.h
index 2ee6be4..66e1503 100644
--- a/src/graphics/core/vertex.h
+++ b/src/graphics/core/vertex.h
@@ -44,23 +44,18 @@ namespace Gfx {
  *  - vertex coordinates (x,y,z) as Math::Vector,
  *  - normal coordinates (nx,ny,nz) as Math::Vector
  *  - texture coordinates (u,v) as Math::Point.
- *
- * Additional padding is provided to align to even multiplies of 4 floats for faster access.
  */
 struct Vertex
 {
     Math::Vector coord;
-    float pad1;
     Math::Vector normal;
-    float pad2;
     Math::Point texCoord;
-    float pad3, pad4;
 
     explicit Vertex(Math::Vector aCoord = Math::Vector(),
                     Math::Vector aNormal = Math::Vector(),
                     Math::Point aTexCoord = Math::Point())
-        : coord(aCoord), pad1(0.0f), normal(aNormal),
-          pad2(0.0f),texCoord(aTexCoord), pad3(0.0f), pad4(0.0f) {}
+        : coord(aCoord), normal(aNormal),
+          texCoord(aTexCoord) {}
 
 
     //! Returns a string "(c: [...], n: [...], tc: [...])"
@@ -81,18 +76,15 @@ struct Vertex
  * It contains:
  *  - vertex coordinates (x,y,z) as Math::Vector,
  *  - RGBA color as Color
- *
- * Additional padding is provided to align to even multiplies of 4 floats for faster access.
  */
 struct VertexCol
 {
     Math::Vector coord;
-    float pad;
     Color color;
 
     explicit VertexCol(Math::Vector aCoord = Math::Vector(),
                        Color aColor = Color())
-        : coord(aCoord), pad(0.0f), color(aColor) {}
+        : coord(aCoord), color(aColor) {}
 
     //! Returns a string "(c: [...], col: [...])"
     inline std::string ToString() const
@@ -111,15 +103,11 @@ struct VertexCol
  *
  * In addition to fields from Vector, it contains
  * secondary texture coordinates (u2, v2) as Math::Point
- *
- * Additional padding is provided to align to even multiplies of 4 floats for faster access.
  */
 struct VertexTex2
 {
     Math::Vector coord;
-    float pad1;
     Math::Vector normal;
-    float pad2;
     Math::Point texCoord;
     Math::Point texCoord2;
 
@@ -127,7 +115,7 @@ struct VertexTex2
                         Math::Vector aNormal = Math::Vector(),
                         Math::Point aTexCoord = Math::Point(),
                         Math::Point aTexCoord2 = Math::Point())
-        : coord(aCoord), pad1(0.0f), normal(aNormal), pad2(0.0f),
+        : coord(aCoord), normal(aNormal),
           texCoord(aTexCoord), texCoord2(aTexCoord2) {}
 
     //! Sets the fields from Vertex with texCoord2 = (0,0)
-- 
cgit v1.2.3-1-g7c22