From c4e42f46a920673293199eb0ac8eab96f49a8954 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Tue, 18 Jun 2013 17:53:12 +0200
Subject: [PATCH] Removed unnecessary functions from VBO_VERTEX.

---
 common/gal/opengl/opengl_gal.cpp | 22 +++++++++++-----------
 include/gal/opengl/opengl_gal.h  |  2 +-
 include/gal/opengl/vbo_item.h    | 16 ----------------
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp
index 33a36f1fb9..7d902b1d6e 100644
--- a/common/gal/opengl/opengl_gal.cpp
+++ b/common/gal/opengl/opengl_gal.cpp
@@ -1641,17 +1641,17 @@ void OPENGL_GAL::computeUnitCircle()
     // Insert in a display list and a vector
     for( int i = 0; i < CIRCLE_POINTS; i++ )
     {
-        VBO_VERTEX v0( 0.0f, 0.0f, 0.0f );
-        VBO_VERTEX v1(
+        VBO_VERTEX v0 = { 0.0f, 0.0f, 0.0f };
+        VBO_VERTEX v1 = {
             cos( 2.0 * M_PI / CIRCLE_POINTS * i ),          // x
             sin( 2.0 * M_PI / CIRCLE_POINTS * i ),          // y
             0.0f                                            // z
-        );
-        VBO_VERTEX v2(
+        };
+        VBO_VERTEX v2 = {
             cos( 2.0 * M_PI / CIRCLE_POINTS * ( i + 1 ) ),  // x
             sin( 2.0 * M_PI / CIRCLE_POINTS * ( i + 1 ) ),  // y
             0.0f                                            // z
-        );
+        };
 
         glVertex2d( 0, 0 );
         verticesCircle->PushVertex( &v0 );
@@ -1680,17 +1680,17 @@ void OPENGL_GAL::computeUnitSemiCircle()
 
     for( int i = 0; i < CIRCLE_POINTS / 2; ++i )
     {
-        VBO_VERTEX v0( 0.0f, 0.0f, 0.0f );
-        VBO_VERTEX v1(
+        VBO_VERTEX v0 = { 0.0f, 0.0f, 0.0f };
+        VBO_VERTEX v1 = {
             cos( 2.0 * M_PI / CIRCLE_POINTS * i ),          // x
             sin( 2.0 * M_PI / CIRCLE_POINTS * i ),          // y
             0.0f                                            // z
-        );
-        VBO_VERTEX v2(
+        };
+        VBO_VERTEX v2 = {
             cos( 2.0 * M_PI / CIRCLE_POINTS * ( i + 1 ) ),  // x
             sin( 2.0 * M_PI / CIRCLE_POINTS * ( i + 1 ) ),  // y
             0.0f                                            // z
-        );
+        };
 
         glVertex2d( 0, 0 );
         verticesSemiCircle->PushVertex( &v0 );
@@ -1749,7 +1749,7 @@ void CALLBACK VertexCallback( GLvoid* aVertexPtr, void* aData )
 
     if( vboItem )
     {
-        VBO_VERTEX newVertex( vertex[0], vertex[1], vertex[2] );
+        VBO_VERTEX newVertex = { vertex[0], vertex[1], vertex[2] };
         vboItem->PushVertex( &newVertex );
     }
     else
diff --git a/include/gal/opengl/opengl_gal.h b/include/gal/opengl/opengl_gal.h
index 1dca06f2a0..2f22078be0 100644
--- a/include/gal/opengl/opengl_gal.h
+++ b/include/gal/opengl/opengl_gal.h
@@ -557,7 +557,7 @@ private:
         if( isGrouping )
         {
             // New vertex coordinates for VBO
-            VBO_VERTEX vertex( aX, aY, aZ );
+            VBO_VERTEX vertex = { aX, aY, aZ };
             curVboItem->PushVertex( &vertex );
         }
         else
diff --git a/include/gal/opengl/vbo_item.h b/include/gal/opengl/vbo_item.h
index 8f1d875911..83011b92e4 100644
--- a/include/gal/opengl/vbo_item.h
+++ b/include/gal/opengl/vbo_item.h
@@ -44,22 +44,6 @@ typedef struct VBO_VERTEX
     GLfloat r, g, b, a;     // Color
     GLfloat shader[4];      // Shader type & params
     GLfloat _padding;
-
-    VBO_VERTEX()
-    {}
-
-    VBO_VERTEX( const GLfloat aX, const GLfloat aY, const GLfloat aZ ) :
-        x( aX ), y( aY ), z( aZ )
-    {}
-
-    VBO_VERTEX( const GLfloat *aData ) :
-        x( aData[0] ), y( aData[1] ), z( aData[2] )
-    {}
-
-    operator GLfloat*()
-    {
-        return &x;
-    }
 } VBO_VERTEX;
 
 class VBO_CONTAINER;