Remove some ancient dead code, Vertex3d

Change-Id: I9fb9c9ca87969863e2521488446507b0424aaa46

diff --git a/dali/internal/render/common/vertex.h b/dali/internal/render/common/vertex.h
index c4c408a..290aa5b 100644 (file)
--- a/dali/internal/render/common/vertex.h
+++ b/dali/internal/render/common/vertex.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_VERTEX_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,15 +32,6 @@ struct Vertex2D
   float mV;
 };
 
-struct Vertex3D
-{
-  float mX;
-  float mY;
-  float mZ;
-  float mU;
-  float mV;
-};
-
 } // namespace Internal
 
 } // namespace Dali

diff --git a/dali/internal/render/gl-resources/texture.cpp b/dali/internal/render/gl-resources/texture.cpp
index 8a30fb2..7059c9a 100644 (file)
--- a/dali/internal/render/gl-resources/texture.cpp
+++ b/dali/internal/render/gl-resources/texture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,7 +107,6 @@ GLint WrapModeToGL( WrapMode::Type wrapMode, GLint defaultWrapMode )
 }
 
 using Dali::Internal::Vertex2D;
-using Dali::Internal::Vertex3D;
 
 using namespace Dali::Pixel;
 
@@ -208,11 +207,6 @@ void Texture::MapUV(unsigned int numVerts,Vertex2D *verts, const PixelArea* pixe
   MapUV(numVerts, (float*)(&verts->mU), sizeof(Vertex2D)/sizeof(float), pixelArea);
 }
 
-void Texture::MapUV(unsigned int numVerts,Vertex3D *verts, const PixelArea* pixelArea)
-{
-  MapUV(numVerts, (float*)(&verts->mU), sizeof(Vertex3D)/sizeof(float), pixelArea);
-}
-
 void Texture::MapUV(unsigned int numVerts, float* verts, unsigned int stride, const PixelArea* pixelArea)
 {
   UvRect uv;

diff --git a/dali/internal/render/gl-resources/texture.h b/dali/internal/render/gl-resources/texture.h
index 4e9c56a..f356bd2 100644 (file)
--- a/dali/internal/render/gl-resources/texture.h
+++ b/dali/internal/render/gl-resources/texture.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_TEXTURE_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,6 @@ namespace Internal
 {
 
 class Context;
-struct Vertex3D;
 struct Vertex2D;
 
 /**
@@ -144,22 +143,17 @@ public:
 
   /**
    * When creating a texture mapped object, the developer can
-   * can assume the texture u,v coordinates have a range of 0 to 1.
+   * assume the texture u,v coordinates have a range of 0 to 1.
    * They then just call MapUV which will adjust uv values depending on
    * whether a pixel area is being used or not.
    *@param[in] numVerts number of vertices
    *@param[out] verts pointer to an array of vertex objects
    *@param[in] pixelArea the area of the texture to display, null = use default image area
    */
-  void MapUV(unsigned int numVerts, Dali::Internal::Vertex3D* verts,  const PixelArea* pixelArea = NULL);
-
-  /**
-   * @copydoc MapUV(unsigned int,Dali::Internal::Vertex3D*, const PixelArea* pixelArea)
-   */
   void MapUV(unsigned int numVerts, Dali::Internal::Vertex2D* verts, const PixelArea* pixelArea = NULL);
 
   /**
-   * @copydoc MapUV(unsigned int,Dali::Internal::Vertex3D*, const PixelArea* pixelArea)
+   * @copydoc MapUV(unsigned int,Dali::Internal::Vertex2D*, const PixelArea* pixelArea)
    * @param[in] stride The number of floats on each row of the vertex object table
    */
   void MapUV(unsigned int numVerts, float* verts, unsigned int stride, const PixelArea* pixelArea = NULL);