Move new mesh API to devel-api.

Change-Id: Ifaf619a6098d6f76c26cfd74eccb6c28eb345e4f

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
index bd4ae02..ca864c2 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
@@ -23,6 +23,7 @@
 #include <dali-toolkit-test-suite-utils.h>
 
 #include <dali.h>
 #include <dali-toolkit-test-suite-utils.h>
 
 #include <dali.h>

+#include <dali/devel-api/rendering/renderer.h>

 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
 
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
 

diff --git a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
index d58daa9..d1e2a6d 100644 (file)
--- a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
+++ b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
@@ -20,8 +20,8 @@
 // EXTERNAL INCLUDE
 #include <iostream>
 #include <string.h>
 // EXTERNAL INCLUDE
 #include <iostream>
 #include <string.h>

-#include <dali/public-api/shader-effects/sampler.h>
-#include <dali/public-api/shader-effects/shader.h>
+#include <dali/devel-api/rendering/sampler.h>
+#include <dali/devel-api/rendering/shader.h>

 #include <dali/integration-api/debug.h>
 
 namespace Dali
 #include <dali/integration-api/debug.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/atlas-manager/atlas-manager.h b/dali-toolkit/internal/atlas-manager/atlas-manager.h
index 2b8a122..f0ecc22 100644 (file)
--- a/dali-toolkit/internal/atlas-manager/atlas-manager.h
+++ b/dali-toolkit/internal/atlas-manager/atlas-manager.h
@@ -20,9 +20,9 @@
 // EXTERNAL INCLUDES
 #include <stdint.h>
 #include <dali/public-api/common/dali-vector.h>
 // EXTERNAL INCLUDES
 #include <stdint.h>
 #include <dali/public-api/common/dali-vector.h>

-#include <dali/devel-api/images/atlas.h>

 #include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/images/buffer-image.h>

-#include <dali/public-api/shader-effects/material.h>
+#include <dali/devel-api/images/atlas.h>
+#include <dali/devel-api/rendering/material.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
index 39f6156..a0938f0 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
@@ -19,10 +19,8 @@
  */
 
 #include <dali/public-api/actors/actor.h>
  */
 
 #include <dali/public-api/actors/actor.h>

-#include <dali/public-api/actors/renderer.h>
-#include <dali/public-api/object/property-buffer.h>

 #include <dali/public-api/object/property-map.h>
 #include <dali/public-api/object/property-map.h>

-#include <dali/public-api/shader-effects/material.h>
+#include <dali/devel-api/rendering/renderer.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h b/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h
index c1cc9ae..9d0e24f 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <sstream>
 
 // EXTERNAL INCLUDES
 #include <sstream>

-#include <dali/public-api/shader-effects/shader.h>
+#include <dali/devel-api/rendering/shader.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
index c016920..91158b2 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
@@ -22,11 +22,13 @@
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/common/stage.h>

-#include <dali/public-api/geometry/geometry.h>

 #include <dali/public-api/images/frame-buffer-image.h>
 #include <dali/public-api/render-tasks/render-task.h>
 #include <dali/public-api/images/frame-buffer-image.h>
 #include <dali/public-api/render-tasks/render-task.h>

-#include <dali/public-api/shader-effects/sampler.h>
-#include <dali/public-api/shader-effects/material.h>
+#include <dali/devel-api/object/property-buffer.h>
+#include <dali/devel-api/rendering/geometry.h>
+#include <dali/devel-api/rendering/renderer.h>
+#include <dali/devel-api/rendering/sampler.h>
+#include <dali/devel-api/rendering/shader.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>

diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
index fcaaac3..177f927 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
+++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
@@ -19,13 +19,13 @@
 #include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
 
 // EXTERNAL INCLUDES

-#include <dali/public-api/actors/renderer.h>
-#include <dali/public-api/geometry/geometry.h>

 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/math/vector3.h>

-#include <dali/public-api/object/property-buffer.h>

 #include <dali/public-api/object/property-map.h>
 #include <dali/public-api/object/property-map.h>

-#include <dali/public-api/shader-effects/material.h>
-#include <dali/public-api/shader-effects/shader.h>
+#include <dali/devel-api/object/property-buffer.h>
+#include <dali/devel-api/rendering/geometry.h>
+#include <dali/devel-api/rendering/material.h>
+#include <dali/devel-api/rendering/renderer.h>
+#include <dali/devel-api/rendering/shader.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
index 2f7677a..ae12df1 100644 (file)
--- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
@@ -20,9 +20,13 @@
 
 // EXTERNAL INCLUDES
 #include <dali/dali.h>
 
 // EXTERNAL INCLUDES
 #include <dali/dali.h>

-#include <dali/integration-api/debug.h>
+#include <dali/devel-api/object/property-buffer.h>
+#include <dali/devel-api/rendering/geometry.h>
+#include <dali/devel-api/rendering/renderer.h>
+#include <dali/devel-api/rendering/sampler.h>
+#include <dali/devel-api/rendering/shader.h>

 #include <dali/devel-api/text-abstraction/font-client.h>
 #include <dali/devel-api/text-abstraction/font-client.h>

-
+#include <dali/integration-api/debug.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-depth-index-ranges.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-depth-index-ranges.h>

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 5d9880b..7bcaad4 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -23,16 +23,13 @@
 #include <limits>
 #include <stack>
 #include <dali/public-api/actors/image-actor.h>
 #include <limits>
 #include <stack>
 #include <dali/public-api/actors/image-actor.h>

-#include <dali/public-api/actors/renderer.h>

 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/constraints.h>

-#include <dali/public-api/geometry/geometry.h>

 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry.h>

+#include <dali/public-api/size-negotiation/relayout-container.h>

 #include <dali/devel-api/object/type-registry-helper.h>
 #include <dali/devel-api/object/type-registry-helper.h>

+#include <dali/devel-api/rendering/renderer.h>

 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/devel-api/scripting/scripting.h>

-#include <dali/public-api/shader-effects/shader.h>
-#include <dali/public-api/shader-effects/material.h>
-#include <dali/public-api/size-negotiation/relayout-container.h>

 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES