remove more unnecessary typedefs

Change-Id: I62968f11220da31febdbdff2d057607696ea6271

chart2/source/view/inc/GL3DRenderer.hxx

@@ -42,7 +42,7 @@ typedef std::vector <glm::vec3> Vertices3D;
 typedef std::vector <glm::vec2> UVs3D;
 typedef std::vector <glm::vec3> Normals3D;
 
-typedef struct MaterialParameters
+struct MaterialParameters
 {
     glm::vec4 ambient;
     glm::vec4 diffuse;
@@ -53,9 +53,9 @@ typedef struct MaterialParameters
     float shininess;
     float pad;
     float pad1;
-}Material;
+};
 
-typedef struct LightSource
+struct LightSource
 {
     glm::vec4   lightColor;
     glm::vec4   positionWorldspace;
@@ -63,16 +63,16 @@ typedef struct LightSource
     float  pad1;
     float  pad2;
     float  pad3;
-}LightSource;
+};
 
-typedef struct GlobalLights
+struct GlobalLights
 {
     int lightNum;
     glm::vec4 ambient;
     LightSource light[MAX_LIGHT_NUM];
-}Lights;
+};
 
-typedef struct Polygon3DInfo
+struct Polygon3DInfo
 {
     bool lineOnly;
     float lineWidth;
@@ -85,10 +85,10 @@ typedef struct Polygon3DInfo
     std::list <Vertices3D *> verticesList;
     std::list <UVs3D *> uvsList;
     std::list <Normals3D *> normalsList;
-    Material material;
-}Polygon3DInfo;
+    MaterialParameters material;
+};
 
-typedef struct Extrude3DInfo
+struct Extrude3DInfo
 {
     int pickingFlg;
     bool rounded;
@@ -104,11 +104,11 @@ typedef struct Extrude3DInfo
     float yTransform;
     float zTransform;
     glm::mat4 rotation;
-    Material material;
+    MaterialParameters material;
     int startIndex[5];
     int size[5];
     int reverse;
-}Extrude3DInfo;
+};
 
 
 struct CameraInfo
@@ -268,7 +268,7 @@ private:
 
     float m_fZmax;
 
-    Lights m_LightsInfo;
+    GlobalLights m_LightsInfo;
 
     CameraInfo m_CameraInfo;
 

chart2/source/view/main/GL3DRenderer.cxx

@@ -742,7 +742,7 @@ void OpenGL3DRenderer::RenderPolygon3D(Polygon3DInfo &polygon)
     //update ubo
     Update3DUniformBlock();
     glBindBuffer(GL_UNIFORM_BUFFER, m_3DUBOBuffer);
-    glBufferSubData(GL_UNIFORM_BUFFER, m_3DActualSizeLight, sizeof(Material), &polygon.material);
+    glBufferSubData(GL_UNIFORM_BUFFER, m_3DActualSizeLight, sizeof(MaterialParameters), &polygon.material);
     CHECK_GL_ERROR();
     glBindBuffer(GL_UNIFORM_BUFFER, 0);
     glUseProgram(m_3DProID);
@@ -1269,7 +1269,7 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
         extrude3DInfo.yTransform *= m_fHeightWeight;
         extrude3DInfo.yScale *= m_fHeightWeight;
         glBindBuffer(GL_UNIFORM_BUFFER, m_3DUBOBuffer);
-        glBufferSubData(GL_UNIFORM_BUFFER, m_3DActualSizeLight, sizeof(Material), &extrude3DInfo.material);
+        glBufferSubData(GL_UNIFORM_BUFFER, m_3DActualSizeLight, sizeof(MaterialParameters), &extrude3DInfo.material);
         CHECK_GL_ERROR();
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
         extrude3DInfo.reverse = 0;