Merge branch 'tizen' of platform/core/uifw/dali-core into devel/new_mesh

[platform/core/uifw/dali-core.git] / dali / public-api / dali-core.h

diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h
index 032e4bc..fd6ec51 100644 (file)
--- a/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@ -27,8 +27,8 @@
 #include <dali/public-api/actors/draw-mode.h>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/actors/layer.h>
-#include <dali/public-api/actors/mesh-actor.h>
 #include <dali/public-api/actors/renderable-actor.h>
+#include <dali/public-api/actors/renderer.h>
 #include <dali/public-api/actors/text-actor.h>
 #include <dali/public-api/actors/sampling.h>
 
@@ -81,11 +81,7 @@
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/touch-point.h>
 
-#include <dali/public-api/geometry/animatable-mesh.h>
-#include <dali/public-api/geometry/animatable-vertex.h>
-#include <dali/public-api/geometry/cloth.h>
-#include <dali/public-api/geometry/mesh.h>
-#include <dali/public-api/geometry/mesh-factory.h>
+#include <dali/public-api/geometry/geometry.h>
 
 #include <dali/public-api/images/atlas.h>
 #include <dali/public-api/images/buffer-image.h>
@@ -113,9 +109,6 @@
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/math/vector4.h>
 
-#include <dali/public-api/modeling/bone.h>
-#include <dali/public-api/modeling/material.h>
-
 #include <dali/public-api/object/any.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/object/base-object.h>
@@ -149,8 +142,12 @@
 #include <dali/public-api/signals/signal-slot-observers.h>
 #include <dali/public-api/signals/slot-delegate.h>
 
+#include <dali/public-api/shader-effects/material.h>
+#include <dali/public-api/shader-effects/sampler.h>
+#include <dali/public-api/shader-effects/shader.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 
+
 #include <dali/public-api/size-negotiation/relayout-container.h>
 
 #include <dali/public-api/text/font-parameters.h>