Changes following dali-core patch "Renamed enum Geometry::GeometryType to Geometry...

Change-Id: I602fb28e9a6e6bfba431cf8cbde05f47086d6630

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp
index 902599d..964eebe 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp
@@ -46,7 +46,7 @@ bool IsDebugVisual( Visual::Base& visual )
   Actor actor = Actor::New();
   visual.SetOnStage( actor );
   Geometry geometry = actor.GetRendererAt( 0 ).GetGeometry();
-  isGeometryLineType = ( geometry.GetGeometryType() == Geometry::LINES );
+  isGeometryLineType = ( geometry.GetType() == Geometry::LINES );
 
   return isDebugVisualType && isGeometryLineType;
 }

diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp
index feb19f3..5c32efa 100644 (file)
--- a/dali-toolkit/internal/visuals/border/border-visual.cpp
+++ b/dali-toolkit/internal/visuals/border/border-visual.cpp
@@ -301,7 +301,7 @@ Geometry BorderVisual::CreateBorderGeometry()
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( borderVertices );
   geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
-  geometry.SetGeometryType( Geometry::TRIANGLE_STRIP );
+  geometry.SetType( Geometry::TRIANGLE_STRIP );
 
   return geometry;
 }

diff --git a/dali-toolkit/internal/visuals/debug/debug-visual.cpp b/dali-toolkit/internal/visuals/debug/debug-visual.cpp
index cd8f8ef..2497493 100644 (file)
--- a/dali-toolkit/internal/visuals/debug/debug-visual.cpp
+++ b/dali-toolkit/internal/visuals/debug/debug-visual.cpp
@@ -121,7 +121,7 @@ Geometry DebugVisual::CreateQuadWireframeGeometry()
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( quadVertices );
   geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
-  geometry.SetGeometryType( Geometry::LINES );
+  geometry.SetType( Geometry::LINES );
 
   return geometry;
 }

diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.cpp b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
index 6a233cf..aef0fc8 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-cache.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
@@ -174,7 +174,7 @@ Geometry VisualFactoryCache::CreateQuadGeometry()
   // Create the geometry object
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( quadVertices );
-  geometry.SetGeometryType( Geometry::TRIANGLE_STRIP );
+  geometry.SetType( Geometry::TRIANGLE_STRIP );
 
   return geometry;
 }
@@ -261,7 +261,7 @@ Geometry VisualFactoryCache::CreateGridGeometry( Uint16Pair gridSize )
     geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() );
   }
 
-  geometry.SetGeometryType( Geometry::TRIANGLE_STRIP );
+  geometry.SetType( Geometry::TRIANGLE_STRIP );
 
   return geometry;
 }

diff --git a/node-addon/examples/line-mesh.js b/node-addon/examples/line-mesh.js
index bca516d..e26948f 100644 (file)
--- a/node-addon/examples/line-mesh.js
+++ b/node-addon/examples/line-mesh.js
@@ -100,7 +100,7 @@ daliApp.createMeshActor = function() {
       geometry.addVertexBuffer( pentagonVertices );
       geometry.addVertexBuffer( pentacleVertices );
       geometry.setIndexBuffer( indexDataArray, 10 );
-      geometry.setGeometryType( dali.GEOMETRY_LINES );
+      geometry.setType( dali.GEOMETRY_LINES );
 
       var renderer = new dali.Renderer(geometry, shader);
       renderer.depthIndex = 0;

diff --git a/node-addon/examples/point-mesh.js b/node-addon/examples/point-mesh.js
index f336561..0ae3bab 100644 (file)
--- a/node-addon/examples/point-mesh.js
+++ b/node-addon/examples/point-mesh.js
@@ -116,7 +116,7 @@ daliApp.createMeshActor = function() {
       // Create geometry
       var geometry = new dali.Geometry();
       geometry.addVertexBuffer( polyhedraVertices );
-      geometry.setGeometryType( dali.GEOMETRY_POINTS );
+      geometry.setType( dali.GEOMETRY_POINTS );
 
       var renderer = new dali.Renderer(geometry, shader);
       renderer.setTextures(textureSet);

diff --git a/plugins/dali-script-v8/src/rendering/geometry-api.cpp b/plugins/dali-script-v8/src/rendering/geometry-api.cpp
index af216bd..7011c20 100644 (file)
--- a/plugins/dali-script-v8/src/rendering/geometry-api.cpp
+++ b/plugins/dali-script-v8/src/rendering/geometry-api.cpp
@@ -236,7 +236,7 @@ void GeometryApi::SetIndexBuffer( const v8::FunctionCallbackInfo<v8::Value>& arg
 /**
  * Set the type of primitives this geometry contains
  *
- * @method setGeometryType
+ * @method setType
  * @for Geometry
  * @param {integer} geometryType Type of primitives this geometry contains
  * @example
@@ -249,9 +249,9 @@ void GeometryApi::SetIndexBuffer( const v8::FunctionCallbackInfo<v8::Value>& arg
  *      dali.GEOMETRY_TRIANGLE_FAN
  *      dali.GEOMETRY_TRIANGLE_STRIP
  *
- *      geometry.SetGeometryType( dali.GEOMETRY_LINES );
+ *      geometry.SetType( dali.GEOMETRY_LINES );
  */
-void GeometryApi::SetGeometryType( const v8::FunctionCallbackInfo< v8::Value >& args )
+void GeometryApi::SetType( const v8::FunctionCallbackInfo< v8::Value >& args )
 {
   v8::Isolate* isolate = args.GetIsolate();
   v8::HandleScope handleScope( isolate );
@@ -266,14 +266,14 @@ void GeometryApi::SetGeometryType( const v8::FunctionCallbackInfo< v8::Value >&
   }
   else
   {
-    geometry.SetGeometryType(static_cast<Geometry::GeometryType>(geometryType));
+    geometry.SetType(static_cast<Geometry::Type>(geometryType));
   }
 }
 
 /**
  * Get the type of primitives this geometry contains
  *
- * @method getGeometryType
+ * @method getType
  * @for Geometry
  * @return {integer} Type of primitives this geometry contains
  * @example
@@ -286,14 +286,14 @@ void GeometryApi::SetGeometryType( const v8::FunctionCallbackInfo< v8::Value >&
  *      dali.GEOMETRY_TRIANGLE_FAN
  *      dali.GEOMETRY_TRIANGLE_STRIP
  */
-void GeometryApi::GetGeometryType( const v8::FunctionCallbackInfo< v8::Value >& args )
+void GeometryApi::GetType( const v8::FunctionCallbackInfo< v8::Value >& args )
 {
   v8::Isolate* isolate = args.GetIsolate();
   v8::HandleScope handleScope( isolate );
 
   Geometry geometry = GetGeometry( isolate, args );
 
-  args.GetReturnValue().Set( v8::Integer::New( isolate, geometry.GetGeometryType() ) );
+  args.GetReturnValue().Set( v8::Integer::New( isolate, geometry.GetType() ) );
 }
 
 } // namespace V8Plugin

diff --git a/plugins/dali-script-v8/src/rendering/geometry-api.h b/plugins/dali-script-v8/src/rendering/geometry-api.h
index 6b994fb..a495942 100644 (file)
--- a/plugins/dali-script-v8/src/rendering/geometry-api.h
+++ b/plugins/dali-script-v8/src/rendering/geometry-api.h
@@ -61,8 +61,8 @@ namespace GeometryApi
    void GetNumberOfVertexBuffers( const v8::FunctionCallbackInfo< v8::Value >& args );
    void RemoveVertexBuffer( const v8::FunctionCallbackInfo< v8::Value >& args );
    void SetIndexBuffer( const v8::FunctionCallbackInfo< v8::Value >& args );
-   void SetGeometryType( const v8::FunctionCallbackInfo< v8::Value >& args );
-   void GetGeometryType( const v8::FunctionCallbackInfo< v8::Value >& args );
+   void SetType( const v8::FunctionCallbackInfo< v8::Value >& args );
+   void GetType( const v8::FunctionCallbackInfo< v8::Value >& args );
 
 }; // namespace GeometryApi
 

diff --git a/plugins/dali-script-v8/src/rendering/geometry-wrapper.cpp b/plugins/dali-script-v8/src/rendering/geometry-wrapper.cpp
index e4f6498..2a6c67c 100644 (file)
--- a/plugins/dali-script-v8/src/rendering/geometry-wrapper.cpp
+++ b/plugins/dali-script-v8/src/rendering/geometry-wrapper.cpp
@@ -49,8 +49,8 @@ const ApiFunction GeometryFunctionTable[]=
    { "GetNumberOfVertexBuffers"    , GeometryApi::GetNumberOfVertexBuffers },
    { "RemoveVertexBuffer"          , GeometryApi::RemoveVertexBuffer },
    { "SetIndexBuffer"              , GeometryApi::SetIndexBuffer },
-   { "SetGeometryType"             , GeometryApi::SetGeometryType },
-   { "GetGeometryType"             , GeometryApi::GetGeometryType },
+   { "SetType"                     , GeometryApi::SetType },
+   { "GetType"                     , GeometryApi::GetType },
 };
 
 const unsigned int GeometryFunctionTableCount = sizeof(GeometryFunctionTable)/sizeof(GeometryFunctionTable[0]);