Revert "Move new mesh API to devel-api"

This reverts commit 174599e5921a33ac4b457369d9d96cc204741970.

Change-Id: I443072220d03adf27f109b67b06749c999f2f36b

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp
index 77d63a0..5145f83 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp
@@ -20,12 +20,6 @@
 #include <stdlib.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.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/sampler.h>
-#include <dali/devel-api/rendering/shader.h>
 
 using namespace Dali;
 
@@ -380,4 +374,4 @@ int UtcFrustumCullDisabledP(void)
   // This should not be culled
   DALI_TEST_CHECK( drawTrace.FindMethod( "DrawElements" ) );
   END_TEST;
-}
+}
\ No newline at end of file

diff --git a/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.h b/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.h
index a123808..61ab8ac 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.h
@@ -18,11 +18,6 @@
  */
 
 #include <dali/public-api/dali-core.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/sampler.h>
-#include <dali/devel-api/rendering/renderer.h>
 
 namespace Dali
 {

diff --git a/automated-tests/src/dali/utc-Dali-Geometry.cpp b/automated-tests/src/dali/utc-Dali-Geometry.cpp
index 4574a29..2527a0b 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Geometry.cpp
+++ b/automated-tests/src/dali/utc-Dali-Geometry.cpp
@@ -17,8 +17,6 @@
 
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
-#include <dali/devel-api/rendering/geometry.h>
-#include <dali/devel-api/rendering/renderer.h>
 
 using namespace Dali;
 

diff --git a/automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp b/automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp
index 07b85c7..d925cfc 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp
+++ b/automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp
@@ -17,7 +17,6 @@
 
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
-#include <dali/devel-api/rendering/renderer.h>
 
 using namespace Dali;
 

diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am
index 7a5214c..5b8a395 100644 (file)
--- a/build/tizen/dali-core/Makefile.am
+++ b/build/tizen/dali-core/Makefile.am
@@ -93,7 +93,6 @@ develapigeometrydir = $(develapidir)/geometry
 develapiimagesdir = $(develapidir)/images
 develapimodelingdir = $(develapidir)/modeling
 develapiobjectdir = $(develapidir)/object
-develapirenderingdir = $(develapidir)/rendering
 develapiscriptingdir = $(develapidir)/scripting
 
 develapi_HEADERS = $(devel_api_header_files)
@@ -106,7 +105,6 @@ develapigeometry_HEADERS = $(devel_api_core_geometry_header_files)
 develapiimages_HEADERS = $(devel_api_core_images_header_files)
 develapimodeling_HEADERS = $(devel_api_core_modeling_header_files)
 develapiobject_HEADERS = $(devel_api_core_object_header_files)
-develapirendering_HEADERS = $(devel_api_core_rendering_header_files)
 develapiscripting_HEADERS = $(devel_api_core_scripting_header_files)
 
 
@@ -117,6 +115,7 @@ publicapiactorsdir = $(publicapidir)/actors
 publicapianimationdir = $(publicapidir)/animation
 publicapicommondir = $(publicapidir)/common
 publicapieventsdir = $(publicapidir)/events
+publicapigeometrydir = $(publicapidir)/geometry
 publicapiimagesdir = $(publicapidir)/images
 publicapimathdir = $(publicapidir)/math
 publicapiobjectdir = $(publicapidir)/object
@@ -131,6 +130,7 @@ publicapiactors_HEADERS = $(public_api_core_actors_header_files)
 publicapianimation_HEADERS = $(public_api_core_animation_header_files)
 publicapicommon_HEADERS = $(public_api_core_common_header_files)
 publicapievents_HEADERS = $(public_api_core_events_header_files)
+publicapigeometry_HEADERS = $(public_api_core_geometry_header_files)
 publicapiimages_HEADERS = $(public_api_core_images_header_files)
 publicapimath_HEADERS = $(public_api_core_math_header_files)
 publicapirendertasks_HEADERS = $(public_api_core_render_tasks_header_files)

diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list
index 91c57e2..4509701 100644 (file)
--- a/dali/devel-api/file.list
+++ b/dali/devel-api/file.list
@@ -15,12 +15,6 @@ devel_api_src_files = \
   $(devel_api_src_dir)/geometry/cloth.cpp \
   $(devel_api_src_dir)/images/atlas.cpp \
   $(devel_api_src_dir)/images/distance-field.cpp \
-  $(devel_api_src_dir)/object/property-buffer.cpp \
-  $(devel_api_src_dir)/rendering/geometry.cpp \
-  $(devel_api_src_dir)/rendering/material.cpp \
-  $(devel_api_src_dir)/rendering/renderer.cpp \
-  $(devel_api_src_dir)/rendering/sampler.cpp \
-  $(devel_api_src_dir)/rendering/shader.cpp \
   $(devel_api_src_dir)/scripting/scripting.cpp
 
 # Add devel header files here DALi internal developer files used by Adaptor & Toolkit
@@ -45,27 +39,22 @@ devel_api_core_dynamics_header_files = \
   $(devel_api_src_dir)/dynamics/dynamics-world.h \
   $(devel_api_src_dir)/dynamics/dynamics-world-config.h
 
+
 devel_api_core_events_header_files = \
   $(devel_api_src_dir)/events/hit-test-algorithm.h
 
+
 devel_api_core_geometry_header_files = \
   $(devel_api_src_dir)/geometry/cloth.h
 
+
 devel_api_core_images_header_files = \
   $(devel_api_src_dir)/images/atlas.h \
   $(devel_api_src_dir)/images/distance-field.h
 
 devel_api_core_object_header_files = \
-  $(devel_api_src_dir)/object/property-buffer.h \
   $(devel_api_src_dir)/object/type-registry-helper.h
 
-devel_api_core_rendering_header_files = \
-  $(devel_api_src_dir)/rendering/geometry.h \
-  $(devel_api_src_dir)/rendering/material.h \
-  $(devel_api_src_dir)/rendering/renderer.h \
-  $(devel_api_src_dir)/rendering/sampler.h \
-  $(devel_api_src_dir)/rendering/shader.h
-
 devel_api_core_scripting_header_files = \
   $(devel_api_src_dir)/scripting/scripting.h
 

diff --git a/dali/devel-api/geometry/cloth.h b/dali/devel-api/geometry/cloth.h
index 8e47da5..05558c2 100644 (file)
--- a/dali/devel-api/geometry/cloth.h
+++ b/dali/devel-api/geometry/cloth.h
@@ -23,6 +23,7 @@
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/math/vector4.h>
 #include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/object/property-buffer.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/dynamics/dynamics-body-intf.h b/dali/integration-api/dynamics/dynamics-body-intf.h
index c4cc943..aa14665 100644 (file)
--- a/dali/integration-api/dynamics/dynamics-body-intf.h
+++ b/dali/integration-api/dynamics/dynamics-body-intf.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
-#include <dali/devel-api/rendering/geometry.h>
+#include <dali/public-api/geometry/geometry.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/dynamics/dynamics-shape-intf.h b/dali/integration-api/dynamics/dynamics-shape-intf.h
index d0aebfa..1d93700 100644 (file)
--- a/dali/integration-api/dynamics/dynamics-shape-intf.h
+++ b/dali/integration-api/dynamics/dynamics-shape-intf.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
-#include <dali/devel-api/object/property-buffer.h>
+#include <dali/public-api/object/property-buffer.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/actor-attachments/renderer-attachment-impl.cpp b/dali/internal/event/actor-attachments/renderer-attachment-impl.cpp
index 56ee7ca..2007be7 100644 (file)
--- a/dali/internal/event/actor-attachments/renderer-attachment-impl.cpp
+++ b/dali/internal/event/actor-attachments/renderer-attachment-impl.cpp
@@ -20,8 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/common/event-thread-services.h>
-#include <dali/internal/update/manager/update-manager.h>
 #include <dali/internal/update/node-attachments/scene-graph-renderer-attachment.h>
+#include <dali/internal/update/manager/update-manager.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/actor-attachments/renderer-attachment-impl.h b/dali/internal/event/actor-attachments/renderer-attachment-impl.h
index a61be66..0fac85e 100644 (file)
--- a/dali/internal/event/actor-attachments/renderer-attachment-impl.h
+++ b/dali/internal/event/actor-attachments/renderer-attachment-impl.h
@@ -19,9 +19,9 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/actor-attachments/renderable-attachment-impl.h>
 #include <dali/internal/event/common/object-connector.h>
-#include <dali/internal/event/rendering/renderer-impl.h>
+#include <dali/internal/event/actors/renderer-impl.h>
+#include <dali/internal/event/actor-attachments/renderable-attachment-impl.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index d4dd6e8..301ea16 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -22,18 +22,18 @@
 #include <string>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/actors/actor.h>
 #include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/object/ref-object.h>
+#include <dali/public-api/actors/actor.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/viewport.h>
-#include <dali/public-api/object/ref-object.h>
+#include <dali/internal/event/common/object-impl.h>
 #include <dali/public-api/size-negotiation/relayout-container.h>
+#include <dali/internal/event/common/stage-def.h>
 #include <dali/internal/event/actors/actor-declarations.h>
+#include <dali/internal/event/actors/renderer-impl.h>
 #include <dali/internal/event/actor-attachments/actor-attachment-declarations.h>
-#include <dali/internal/event/common/object-impl.h>
-#include <dali/internal/event/common/stage-def.h>
-#include <dali/internal/event/rendering/renderer-impl.h>
 #include <dali/internal/update/nodes/node-declarations.h>
 
 #ifdef DYNAMICS_SUPPORT

diff --git a/dali/internal/event/rendering/renderer-impl.cpp b/dali/internal/event/actors/renderer-impl.cpp
similarity index 98%
rename from dali/internal/event/rendering/renderer-impl.cpp
rename to dali/internal/event/actors/renderer-impl.cpp
index 56f738e..f11870d 100644 (file)
--- a/dali/internal/event/rendering/renderer-impl.cpp
+++ b/dali/internal/event/actors/renderer-impl.cpp
@@ -16,11 +16,11 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/rendering/renderer-impl.h> // Dali::Internal::Renderer
+#include <dali/internal/event/actors/renderer-impl.h> // Dali::Internal::Renderer
 
 // INTERNAL INCLUDES
+#include <dali/public-api/actors/renderer.h> // Dali::Renderer
 #include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/rendering/renderer.h> // Dali::Renderer
 #include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
 #include <dali/internal/event/common/property-helper.h> // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END
 #include <dali/internal/event/common/property-input-impl.h>

diff --git a/dali/internal/event/rendering/renderer-impl.h b/dali/internal/event/actors/renderer-impl.h
similarity index 96%
rename from dali/internal/event/rendering/renderer-impl.h
rename to dali/internal/event/actors/renderer-impl.h
index 286069a..b7abd84 100644 (file)
--- a/dali/internal/event/rendering/renderer-impl.h
+++ b/dali/internal/event/actors/renderer-impl.h
@@ -19,14 +19,14 @@
  */
 
 // INTERNAL INCLUDES
+#include <dali/public-api/actors/renderer.h> // Dali::Renderer
 #include <dali/public-api/common/dali-common.h> // DALI_ASSERT_ALWAYS
 #include <dali/public-api/common/intrusive-ptr.h> // Dali::IntrusivePtr
-#include <dali/devel-api/rendering/renderer.h> // Dali::Renderer
 #include <dali/internal/event/common/connectable.h> // Dali::Internal::Connectable
 #include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object
-#include <dali/internal/event/rendering/material-impl.h> // Dali::Internal::Material
-#include <dali/internal/event/rendering/geometry-impl.h> // Dali::Internal::Geometry
+#include <dali/internal/event/effects/material-impl.h> // Dali::Internal::Material
+#include <dali/internal/event/geometry/geometry-impl.h> // Dali::Internal::Geometry
 
 namespace Dali
 {

diff --git a/dali/internal/event/common/property-buffer-impl.cpp b/dali/internal/event/common/property-buffer-impl.cpp
index ab98476..25536cf 100644 (file)
--- a/dali/internal/event/common/property-buffer-impl.cpp
+++ b/dali/internal/event/common/property-buffer-impl.cpp
@@ -22,8 +22,8 @@
 #include <algorithm> // std::sort
 
 // INTERNAL INCLUDES
+#include <dali/public-api/object/property-buffer.h> // Dali::Internal::PropertyBuffer
 #include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/object/property-buffer.h> // Dali::Internal::PropertyBuffer
 
 #include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
 #include <dali/internal/event/common/property-helper.h> // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END

diff --git a/dali/internal/event/common/property-buffer-impl.h b/dali/internal/event/common/property-buffer-impl.h
index 122ae7d..9723872 100644 (file)
--- a/dali/internal/event/common/property-buffer-impl.h
+++ b/dali/internal/event/common/property-buffer-impl.h
@@ -24,8 +24,8 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h> // DALI_ASSERT_ALWAYS
 #include <dali/public-api/common/intrusive-ptr.h> // Dali::IntrusivePtr
+#include <dali/public-api/object/property-buffer.h> // Dali::PropertyBuffer
 #include <dali/public-api/object/property-map.h> // Dali::Property::Map
-#include <dali/devel-api/object/property-buffer.h> // Dali::PropertyBuffer
 #include <dali/internal/event/common/connectable.h> // Dali::Internal::Connectable
 #include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object

diff --git a/dali/internal/event/rendering/material-impl.cpp b/dali/internal/event/effects/material-impl.cpp
similarity index 98%
rename from dali/internal/event/rendering/material-impl.cpp
rename to dali/internal/event/effects/material-impl.cpp
index 7220438..9e957fd 100644 (file)
--- a/dali/internal/event/rendering/material-impl.cpp
+++ b/dali/internal/event/effects/material-impl.cpp
@@ -16,16 +16,16 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/rendering/material-impl.h> // Dali::Internal::Material
+#include <dali/internal/event/effects/material-impl.h> // Dali::Internal::Material
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/rendering/material.h> // Dali::Internal::Material
+#include <dali/public-api/shader-effects/material.h> // Dali::Internal::Material
 #include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
 #include <dali/internal/event/common/property-helper.h> // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END
+#include <dali/internal/update/effects/scene-graph-material.h>
+#include <dali/internal/update/effects/scene-graph-sampler.h>
 #include <dali/internal/update/manager/update-manager.h>
-#include <dali/internal/update/rendering/scene-graph-material.h>
-#include <dali/internal/update/rendering/scene-graph-sampler.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/rendering/material-impl.h b/dali/internal/event/effects/material-impl.h
similarity index 97%
rename from dali/internal/event/rendering/material-impl.h
rename to dali/internal/event/effects/material-impl.h
index ec566d9..089d7e1 100644 (file)
--- a/dali/internal/event/rendering/material-impl.h
+++ b/dali/internal/event/effects/material-impl.h
@@ -24,14 +24,14 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h> // DALI_ASSERT_ALWAYS
 #include <dali/public-api/common/intrusive-ptr.h> // Dali::IntrusivePtr
-#include <dali/devel-api/rendering/material.h> // Dali::Material
-#include <dali/internal/common/blending-options.h>
+#include <dali/public-api/shader-effects/material.h> // Dali::Material
 #include <dali/internal/event/common/connectable.h> // Dali::Internal::Connectable
 #include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object
 #include <dali/internal/event/common/property-buffer-impl.h> // Dali::Internal::PropertyBuffer
-#include <dali/internal/event/rendering/sampler-impl.h> // Dali::Internal::Sampler
-#include <dali/internal/event/rendering/shader-impl.h> // Dali::Internal::Shader
+#include <dali/internal/event/effects/sampler-impl.h> // Dali::Internal::Sampler
+#include <dali/internal/event/effects/shader-impl.h> // Dali::Internal::Shader
+#include <dali/internal/common/blending-options.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/rendering/sampler-impl.cpp b/dali/internal/event/effects/sampler-impl.cpp
similarity index 97%
rename from dali/internal/event/rendering/sampler-impl.cpp
rename to dali/internal/event/effects/sampler-impl.cpp
index 9c61904..d6e2fa4 100644 (file)
--- a/dali/internal/event/rendering/sampler-impl.cpp
+++ b/dali/internal/event/effects/sampler-impl.cpp
@@ -16,14 +16,14 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/rendering/sampler-impl.h> // Dali::Internal::Sampler
+#include <dali/internal/event/effects/sampler-impl.h> // Dali::Internal::Sampler
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/rendering/sampler.h> // Dali::Internal::Sampler
+#include <dali/public-api/shader-effects/sampler.h> // Dali::Internal::Sampler
 #include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
 #include <dali/internal/event/common/property-helper.h> // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END
-#include <dali/internal/update/rendering/scene-graph-sampler.h> // Dali::Internal::SceneGraph::Sampler
+#include <dali/internal/update/effects/scene-graph-sampler.h> // Dali::Internal::SceneGraph::Sampler
 #include <dali/internal/update/manager/update-manager.h>
 
 namespace Dali

diff --git a/dali/internal/event/rendering/sampler-impl.h b/dali/internal/event/effects/sampler-impl.h
similarity index 98%
rename from dali/internal/event/rendering/sampler-impl.h
rename to dali/internal/event/effects/sampler-impl.h
index 340f140..3002a97 100644 (file)
--- a/dali/internal/event/rendering/sampler-impl.h
+++ b/dali/internal/event/effects/sampler-impl.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h> // DALI_ASSERT_ALWAYS
 #include <dali/public-api/common/intrusive-ptr.h> // Dali::IntrusivePtr
-#include <dali/devel-api/rendering/sampler.h> // Dali::Sampler
+#include <dali/public-api/shader-effects/sampler.h> // Dali::Sampler
 #include <dali/internal/event/common/connectable.h> // Dali::Internal::Connectable
 #include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object

diff --git a/dali/internal/event/rendering/shader-impl.cpp b/dali/internal/event/effects/shader-impl.cpp
similarity index 98%
rename from dali/internal/event/rendering/shader-impl.cpp
rename to dali/internal/event/effects/shader-impl.cpp
index 0d25764..3c784f7 100644 (file)
--- a/dali/internal/event/rendering/shader-impl.cpp
+++ b/dali/internal/event/effects/shader-impl.cpp
@@ -16,12 +16,12 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/rendering/shader-impl.h> // Dali::Internal::Shader
+#include <dali/internal/event/effects/shader-impl.h> // Dali::Internal::Shader
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/shader-effects/shader.h> // Dali::Shader
 #include <dali/public-api/shader-effects/shader-effect.h> // Dali::ShaderEffect::GeometryHints // TODO: MESH_REWORK REMOVE
-#include <dali/devel-api/rendering/shader.h> // Dali::Shader
 
 #include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
 #include <dali/internal/event/common/property-helper.h> // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END

diff --git a/dali/internal/event/rendering/shader-impl.h b/dali/internal/event/effects/shader-impl.h
similarity index 98%
rename from dali/internal/event/rendering/shader-impl.h
rename to dali/internal/event/effects/shader-impl.h
index d70992f..008238d 100644 (file)
--- a/dali/internal/event/rendering/shader-impl.h
+++ b/dali/internal/event/effects/shader-impl.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h> // DALI_ASSERT_ALWAYS
 #include <dali/public-api/common/intrusive-ptr.h> // Dali::IntrusivePtr
-#include <dali/devel-api/rendering/shader.h> // Dali::Shader
+#include <dali/public-api/shader-effects/shader.h> // Dali::Shader
 #include <dali/internal/event/common/connectable.h> // Dali::Internal::Connectable
 #include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object

diff --git a/dali/internal/event/rendering/geometry-impl.cpp b/dali/internal/event/geometry/geometry-impl.cpp
similarity index 99%
rename from dali/internal/event/rendering/geometry-impl.cpp
rename to dali/internal/event/geometry/geometry-impl.cpp
index bbed300..51f3a39 100644 (file)
--- a/dali/internal/event/rendering/geometry-impl.cpp
+++ b/dali/internal/event/geometry/geometry-impl.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/rendering/geometry-impl.h> // Dali::Internal::Geometry
+#include <dali/internal/event/geometry/geometry-impl.h> // Dali::Internal::Geometry
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>

diff --git a/dali/internal/event/rendering/geometry-impl.h b/dali/internal/event/geometry/geometry-impl.h
similarity index 99%
rename from dali/internal/event/rendering/geometry-impl.h
rename to dali/internal/event/geometry/geometry-impl.h
index 1ec3832..fc39a4d 100644 (file)
--- a/dali/internal/event/rendering/geometry-impl.h
+++ b/dali/internal/event/geometry/geometry-impl.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h> // DALI_ASSERT_ALWAYS
 #include <dali/public-api/common/intrusive-ptr.h> // Dali::IntrusivePtr
-#include <dali/devel-api/rendering/geometry.h> // Dali::Geometry
+#include <dali/public-api/geometry/geometry.h> // Dali::Geometry
 #include <dali/internal/event/common/connectable.h> // Dali::Internal::Connectable
 #include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object

diff --git a/dali/internal/event/modeling/cloth-impl.h b/dali/internal/event/modeling/cloth-impl.h
index da8389f..5d46bdc 100644 (file)
--- a/dali/internal/event/modeling/cloth-impl.h
+++ b/dali/internal/event/modeling/cloth-impl.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/devel-api/geometry/cloth.h>
 #include <dali/internal/event/common/object-impl.h>
-#include <dali/internal/event/rendering/geometry-impl.h>
+#include <dali/internal/event/geometry/geometry-impl.h>
 
 namespace Dali
 {

diff --git a/dali/internal/file.list b/dali/internal/file.list
index 8ef4669..1653fb5 100644 (file)
--- a/dali/internal/file.list
+++ b/dali/internal/file.list
@@ -19,6 +19,7 @@ internal_src_files = \
   $(internal_src_dir)/event/actors/image-actor-impl.cpp \
   $(internal_src_dir)/event/actors/layer-impl.cpp \
   $(internal_src_dir)/event/actors/layer-list.cpp \
+  $(internal_src_dir)/event/actors/renderer-impl.cpp \
   $(internal_src_dir)/event/actors/camera-actor-impl.cpp \
   $(internal_src_dir)/event/actors/renderable-actor-impl.cpp \
   $(internal_src_dir)/event/animation/animation-impl.cpp \
@@ -44,8 +45,11 @@ internal_src_files = \
   $(internal_src_dir)/event/common/thread-local-storage.cpp \
   $(internal_src_dir)/event/common/type-info-impl.cpp \
   $(internal_src_dir)/event/common/type-registry-impl.cpp \
+  $(internal_src_dir)/event/effects/material-impl.cpp \
+  $(internal_src_dir)/event/effects/sampler-impl.cpp \
   $(internal_src_dir)/event/effects/shader-effect-impl.cpp \
   $(internal_src_dir)/event/effects/shader-factory.cpp \
+  $(internal_src_dir)/event/effects/shader-impl.cpp \
   $(internal_src_dir)/event/events/actor-gesture-data.cpp \
   $(internal_src_dir)/event/events/actor-observer.cpp \
   $(internal_src_dir)/event/events/event-processor.cpp \
@@ -66,6 +70,7 @@ internal_src_files = \
   $(internal_src_dir)/event/events/tap-gesture-detector-impl.cpp \
   $(internal_src_dir)/event/events/tap-gesture-processor.cpp \
   $(internal_src_dir)/event/events/touch-event-processor.cpp \
+  $(internal_src_dir)/event/geometry/geometry-impl.cpp \
   $(internal_src_dir)/event/images/atlas-impl.cpp \
   $(internal_src_dir)/event/images/bitmap-external.cpp \
   $(internal_src_dir)/event/images/bitmap-packed-pixel.cpp \
@@ -84,11 +89,6 @@ internal_src_files = \
   $(internal_src_dir)/event/object/custom-object-internal.cpp \
   $(internal_src_dir)/event/render-tasks/render-task-impl.cpp \
   $(internal_src_dir)/event/render-tasks/render-task-list-impl.cpp \
-  $(internal_src_dir)/event/rendering/geometry-impl.cpp \
-  $(internal_src_dir)/event/rendering/material-impl.cpp \
-  $(internal_src_dir)/event/rendering/renderer-impl.cpp \
-  $(internal_src_dir)/event/rendering/sampler-impl.cpp \
-  $(internal_src_dir)/event/rendering/shader-impl.cpp \
   $(internal_src_dir)/event/resources/archive.cpp \
   $(internal_src_dir)/event/resources/image-ticket.cpp \
   $(internal_src_dir)/event/resources/resource-client.cpp \
@@ -147,6 +147,9 @@ internal_src_files = \
   $(internal_src_dir)/update/common/uniform-map.cpp \
   $(internal_src_dir)/update/controllers/render-message-dispatcher.cpp \
   $(internal_src_dir)/update/controllers/scene-controller-impl.cpp \
+  $(internal_src_dir)/update/effects/scene-graph-material.cpp \
+  $(internal_src_dir)/update/effects/scene-graph-sampler.cpp \
+  $(internal_src_dir)/update/geometry/scene-graph-geometry.cpp \
   $(internal_src_dir)/update/gestures/pan-gesture-profiling.cpp \
   $(internal_src_dir)/update/gestures/scene-graph-pan-gesture.cpp \
   $(internal_src_dir)/update/queue/update-message-queue.cpp \
@@ -167,9 +170,6 @@ internal_src_files = \
   $(internal_src_dir)/update/nodes/scene-graph-layer.cpp \
   $(internal_src_dir)/update/render-tasks/scene-graph-render-task.cpp \
   $(internal_src_dir)/update/render-tasks/scene-graph-render-task-list.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-geometry.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-material.cpp \
-  $(internal_src_dir)/update/rendering/scene-graph-sampler.cpp \
   $(internal_src_dir)/update/resources/bitmap-metadata.cpp \
   $(internal_src_dir)/update/resources/resource-manager.cpp \
   $(internal_src_dir)/update/resources/resource-tracker.cpp \

diff --git a/dali/internal/render/data-providers/geometry-data-provider.h b/dali/internal/render/data-providers/geometry-data-provider.h
index 8b58b33..56018c1 100644 (file)
--- a/dali/internal/render/data-providers/geometry-data-provider.h
+++ b/dali/internal/render/data-providers/geometry-data-provider.h
@@ -17,7 +17,7 @@
  *
  */
 
-#include <dali/devel-api/rendering/geometry.h>
+#include <dali/public-api/geometry/geometry.h>
 #include <dali/internal/common/buffer-index.h>
 #include <dali/internal/common/owner-container.h>
 #include <dali/internal/render/data-providers/property-buffer-data-provider.h>

diff --git a/dali/internal/render/data-providers/sampler-data-provider.h b/dali/internal/render/data-providers/sampler-data-provider.h
index ba00955..788c862 100644 (file)
--- a/dali/internal/render/data-providers/sampler-data-provider.h
+++ b/dali/internal/render/data-providers/sampler-data-provider.h
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-#include <dali/devel-api/rendering/sampler.h>
+#include <dali/public-api/shader-effects/sampler.h>
 #include <dali/integration-api/resource-declarations.h>
 #include <dali/internal/common/buffer-index.h>
 

diff --git a/dali/internal/render/renderers/render-geometry.cpp b/dali/internal/render/renderers/render-geometry.cpp
index 450be3b..4713775 100644 (file)
--- a/dali/internal/render/renderers/render-geometry.cpp
+++ b/dali/internal/render/renderers/render-geometry.cpp
@@ -17,8 +17,8 @@
 #include <dali/internal/render/renderers/render-geometry.h>
 
 #include <dali/internal/common/buffer-index.h>
+#include <dali/internal/update/geometry/scene-graph-geometry.h>
 #include <dali/internal/update/common/scene-graph-property-buffer.h>
-#include <dali/internal/update/rendering/scene-graph-geometry.h>
 #include <dali/internal/render/data-providers/render-data-provider.h>
 #include <dali/internal/render/gl-resources/context.h>
 #include <dali/internal/render/gl-resources/gpu-buffer.h>

diff --git a/dali/internal/update/common/discard-queue.h b/dali/internal/update/common/discard-queue.h
index d47f20c..c4c66d9 100644 (file)
--- a/dali/internal/update/common/discard-queue.h
+++ b/dali/internal/update/common/discard-queue.h
@@ -25,9 +25,9 @@
 #include <dali/internal/update/nodes/node-declarations.h>
 #include <dali/internal/update/node-attachments/node-attachment-declarations.h>
 #include <dali/internal/update/common/scene-graph-property-buffer.h>
-#include <dali/internal/update/rendering/scene-graph-geometry.h>
-#include <dali/internal/update/rendering/scene-graph-material.h>
-#include <dali/internal/update/rendering/scene-graph-sampler.h>
+#include <dali/internal/update/geometry/scene-graph-geometry.h>
+#include <dali/internal/update/effects/scene-graph-material.h>
+#include <dali/internal/update/effects/scene-graph-sampler.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/rendering/scene-graph-material.cpp b/dali/internal/update/effects/scene-graph-material.cpp
similarity index 98%
rename from dali/internal/update/rendering/scene-graph-material.cpp
rename to dali/internal/update/effects/scene-graph-material.cpp
index 021eb9c..242282a 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-material.cpp
+++ b/dali/internal/update/effects/scene-graph-material.cpp
@@ -18,13 +18,13 @@
 #include "scene-graph-material.h"
 
 // INTERNAL HEADERS
-#include <dali/public-api/actors/blending.h>
+#include <dali/public-api/shader-effects/material.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
-#include <dali/devel-api/rendering/material.h>
 #include <dali/internal/common/internal-constants.h>
-#include <dali/internal/update/rendering/scene-graph-sampler.h>
+#include <dali/internal/update/effects/scene-graph-sampler.h>
 #include <dali/internal/render/data-providers/sampler-data-provider.h>
 #include <dali/internal/render/shaders/scene-graph-shader.h>
+#include <dali/public-api/actors/blending.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/rendering/scene-graph-material.h b/dali/internal/update/effects/scene-graph-material.h
similarity index 100%
rename from dali/internal/update/rendering/scene-graph-material.h
rename to dali/internal/update/effects/scene-graph-material.h

diff --git a/dali/internal/update/rendering/scene-graph-sampler.cpp b/dali/internal/update/effects/scene-graph-sampler.cpp
similarity index 100%
rename from dali/internal/update/rendering/scene-graph-sampler.cpp
rename to dali/internal/update/effects/scene-graph-sampler.cpp

diff --git a/dali/internal/update/rendering/scene-graph-sampler.h b/dali/internal/update/effects/scene-graph-sampler.h
similarity index 99%
rename from dali/internal/update/rendering/scene-graph-sampler.h
rename to dali/internal/update/effects/scene-graph-sampler.h
index f45bafa..fa85734 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-sampler.h
+++ b/dali/internal/update/effects/scene-graph-sampler.h
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-#include <dali/devel-api/rendering/sampler.h>
+#include <dali/public-api/shader-effects/sampler.h>
 #include <dali/integration-api/resource-declarations.h>
 #include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/update/common/double-buffered.h>

diff --git a/dali/internal/update/rendering/scene-graph-geometry.cpp b/dali/internal/update/geometry/scene-graph-geometry.cpp
similarity index 100%
rename from dali/internal/update/rendering/scene-graph-geometry.cpp
rename to dali/internal/update/geometry/scene-graph-geometry.cpp

diff --git a/dali/internal/update/rendering/scene-graph-geometry.h b/dali/internal/update/geometry/scene-graph-geometry.h
similarity index 99%
rename from dali/internal/update/rendering/scene-graph-geometry.h
rename to dali/internal/update/geometry/scene-graph-geometry.h
index 6a7911c..fe613a4 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-geometry.h
+++ b/dali/internal/update/geometry/scene-graph-geometry.h
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-#include <dali/devel-api/rendering/geometry.h>
+#include <dali/public-api/geometry/geometry.h>
 #include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/update/common/animatable-property.h>
 #include <dali/internal/update/common/double-buffered.h>

diff --git a/dali/internal/update/manager/prepare-render-instructions.cpp b/dali/internal/update/manager/prepare-render-instructions.cpp
index 526fdb5..264cd4c 100644 (file)
--- a/dali/internal/update/manager/prepare-render-instructions.cpp
+++ b/dali/internal/update/manager/prepare-render-instructions.cpp
@@ -22,14 +22,14 @@
 #include <dali/public-api/shader-effects/shader-effect.h>
 #include <dali/integration-api/debug.h>
 #include <dali/internal/event/actors/layer-impl.h> // for the default sorting function
+#include <dali/internal/update/effects/scene-graph-material.h>
+#include <dali/internal/update/geometry/scene-graph-geometry.h>
 #include <dali/internal/update/node-attachments/scene-graph-renderer-attachment.h>
-#include <dali/internal/update/node-attachments/scene-graph-renderable-attachment.h>
-#include <dali/internal/update/nodes/scene-graph-layer.h>
+#include <dali/internal/update/resources/resource-manager-declarations.h>
 #include <dali/internal/update/manager/sorted-layers.h>
 #include <dali/internal/update/render-tasks/scene-graph-render-task.h>
-#include <dali/internal/update/rendering/scene-graph-material.h>
-#include <dali/internal/update/rendering/scene-graph-geometry.h>
-#include <dali/internal/update/resources/resource-manager-declarations.h>
+#include <dali/internal/update/node-attachments/scene-graph-renderable-attachment.h>
+#include <dali/internal/update/nodes/scene-graph-layer.h>
 #include <dali/internal/render/common/render-item.h>
 #include <dali/internal/render/common/render-tracker.h>
 #include <dali/internal/render/common/render-instruction.h>

diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp
index 0dfe309..2731ae8 100644 (file)
--- a/dali/internal/update/manager/update-manager.cpp
+++ b/dali/internal/update/manager/update-manager.cpp
@@ -42,6 +42,9 @@
 #include <dali/internal/update/common/scene-graph-property-buffer.h>
 #include <dali/internal/update/controllers/render-message-dispatcher.h>
 #include <dali/internal/update/controllers/scene-controller-impl.h>
+#include <dali/internal/update/effects/scene-graph-material.h>
+#include <dali/internal/update/effects/scene-graph-sampler.h>
+#include <dali/internal/update/geometry/scene-graph-geometry.h>
 #include <dali/internal/update/gestures/scene-graph-pan-gesture.h>
 #include <dali/internal/update/manager/object-owner-container.h>
 #include <dali/internal/update/manager/prepare-render-algorithms.h>
@@ -57,9 +60,6 @@
 #include <dali/internal/update/queue/update-message-queue.h>
 #include <dali/internal/update/render-tasks/scene-graph-render-task.h>
 #include <dali/internal/update/render-tasks/scene-graph-render-task-list.h>
-#include <dali/internal/update/rendering/scene-graph-material.h>
-#include <dali/internal/update/rendering/scene-graph-sampler.h>
-#include <dali/internal/update/rendering/scene-graph-geometry.h>
 #include <dali/internal/update/resources/resource-manager.h>
 #include <dali/internal/update/resources/complete-status-manager.h>
 #include <dali/internal/update/touch/touch-resampler.h>

diff --git a/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp b/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp
index 80f3c5b..33fc2e7 100644 (file)
--- a/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp
+++ b/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp
@@ -15,11 +15,11 @@
  */
 
 #include "scene-graph-renderer-attachment.h"
+#include <dali/internal/update/effects/scene-graph-material.h>
+#include <dali/internal/update/effects/scene-graph-sampler.h>
 #include <dali/internal/update/common/uniform-map.h>
 #include <dali/internal/update/manager/prepare-render-instructions.h>
-#include <dali/internal/update/rendering/scene-graph-geometry.h>
-#include <dali/internal/update/rendering/scene-graph-material.h>
-#include <dali/internal/update/rendering/scene-graph-sampler.h>
+#include <dali/internal/update/geometry/scene-graph-geometry.h>
 #include <dali/internal/update/resources/complete-status-manager.h>
 #include <dali/internal/update/resources/resource-manager.h>
 #include <dali/internal/render/data-providers/render-data-provider.h>

diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp
index 8364ac3..6941bcf 100644 (file)
--- a/dali/public-api/actors/actor.cpp
+++ b/dali/public-api/actors/actor.cpp
@@ -27,7 +27,7 @@
 
 #include <dali/internal/event/actors/actor-impl.h>
 #include <dali/internal/event/actors/layer-impl.h>
-#include <dali/internal/event/rendering/renderer-impl.h>
+#include <dali/internal/event/actors/renderer-impl.h>
 #include <dali/internal/event/actor-attachments/actor-attachment-impl.h>
 #include <dali/internal/event/animation/constraint-impl.h>
 #include <dali/internal/event/size-negotiation/relayout-controller-impl.h>

diff --git a/dali/devel-api/rendering/renderer.cpp b/dali/public-api/actors/renderer.cpp
similarity index 93%
rename from dali/devel-api/rendering/renderer.cpp
rename to dali/public-api/actors/renderer.cpp
index a3080e9..aaf2c75 100644 (file)
--- a/dali/devel-api/rendering/renderer.cpp
+++ b/dali/public-api/actors/renderer.cpp
@@ -16,10 +16,10 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/rendering/renderer.h>  // Dali::Renderer
+#include <dali/public-api/actors/renderer.h>  // Dali::Renderer
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/rendering/renderer-impl.h> // Dali::Internal::Renderer
+#include <dali/internal/event/actors/renderer-impl.h> // Dali::Internal::Renderer
 
 namespace Dali
 {

diff --git a/dali/devel-api/rendering/renderer.h b/dali/public-api/actors/renderer.h
similarity index 96%
rename from dali/devel-api/rendering/renderer.h
rename to dali/public-api/actors/renderer.h
index 42d541d..9963f05 100644 (file)
--- a/dali/devel-api/rendering/renderer.h
+++ b/dali/public-api/actors/renderer.h
@@ -22,10 +22,10 @@
 #include <string> // std::string
 
 // INTERNAL INCLUDES
+#include <dali/public-api/geometry/geometry.h> // Dali::Geometry
 #include <dali/public-api/object/handle.h> // Dali::Handle
 #include <dali/public-api/object/property-index-ranges.h> // DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX
-#include <dali/devel-api/rendering/geometry.h> // Dali::Geometry
-#include <dali/devel-api/rendering/material.h> // Dali::Material
+#include <dali/public-api/shader-effects/material.h> // Dali::Material
 
 namespace Dali
 {

diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h
index 8af7eac..6ee11b8 100644 (file)
--- a/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@ -28,6 +28,7 @@
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/actors/renderable-actor.h>
+#include <dali/public-api/actors/renderer.h>
 #include <dali/public-api/actors/sampling.h>
 
 #include <dali/public-api/animation/alpha-function.h>
@@ -66,6 +67,7 @@
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/touch-point.h>
 
+#include <dali/public-api/geometry/geometry.h>
 #include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/images/encoded-buffer-image.h>
 #include <dali/public-api/images/frame-buffer-image.h>
@@ -120,6 +122,9 @@
 #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>

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index c541bd2..effb2e1 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -10,6 +10,7 @@ public_api_src_files = \
   $(public_api_src_dir)/actors/custom-actor-impl.cpp \
   $(public_api_src_dir)/actors/image-actor.cpp \
   $(public_api_src_dir)/actors/layer.cpp \
+  $(public_api_src_dir)/actors/renderer.cpp \
   $(public_api_src_dir)/actors/renderable-actor.cpp \
   $(public_api_src_dir)/animation/animation.cpp \
   $(public_api_src_dir)/animation/alpha-function.cpp \
@@ -38,6 +39,7 @@ public_api_src_files = \
   $(public_api_src_dir)/events/tap-gesture-detector.cpp \
   $(public_api_src_dir)/events/touch-point.cpp \
   $(public_api_src_dir)/events/touch-event.cpp \
+  $(public_api_src_dir)/geometry/geometry.cpp \
   $(public_api_src_dir)/images/image.cpp \
   $(public_api_src_dir)/images/pixel.cpp \
   $(public_api_src_dir)/images/buffer-image.cpp \
@@ -61,6 +63,7 @@ public_api_src_files = \
   $(public_api_src_dir)/object/object-registry.cpp \
   $(public_api_src_dir)/object/property.cpp \
   $(public_api_src_dir)/object/property-array.cpp \
+  $(public_api_src_dir)/object/property-buffer.cpp \
   $(public_api_src_dir)/object/property-conditions.cpp \
   $(public_api_src_dir)/object/property-input.cpp \
   $(public_api_src_dir)/object/property-map.cpp \
@@ -70,6 +73,9 @@ public_api_src_files = \
   $(public_api_src_dir)/object/ref-object.cpp \
   $(public_api_src_dir)/render-tasks/render-task.cpp \
   $(public_api_src_dir)/render-tasks/render-task-list.cpp \
+  $(public_api_src_dir)/shader-effects/material.cpp \
+  $(public_api_src_dir)/shader-effects/sampler.cpp \
+  $(public_api_src_dir)/shader-effects/shader.cpp \
   $(public_api_src_dir)/shader-effects/shader-effect.cpp \
   $(public_api_src_dir)/signals/callback.cpp \
   $(public_api_src_dir)/signals/connection-tracker.cpp \
@@ -102,6 +108,7 @@ public_api_core_actors_header_files =  \
   $(public_api_src_dir)/actors/image-actor.h \
   $(public_api_src_dir)/actors/layer.h \
   $(public_api_src_dir)/actors/renderable-actor.h \
+  $(public_api_src_dir)/actors/renderer.h \
   $(public_api_src_dir)/actors/sampling.h
 
 public_api_core_animation_header_files = \
@@ -144,6 +151,9 @@ public_api_core_events_header_files = \
   $(public_api_src_dir)/events/touch-point.h \
   $(public_api_src_dir)/events/touch-event.h
 
+public_api_core_geometry_header_files = \
+  $(public_api_src_dir)/geometry/geometry.h
+
 public_api_core_images_header_files = \
   $(public_api_src_dir)/images/buffer-image.h \
   $(public_api_src_dir)/images/encoded-buffer-image.h \
@@ -180,6 +190,7 @@ public_api_core_object_header_files = \
   $(public_api_src_dir)/object/handle.h \
   $(public_api_src_dir)/object/object-registry.h \
   $(public_api_src_dir)/object/property-array.h \
+  $(public_api_src_dir)/object/property-buffer.h \
   $(public_api_src_dir)/object/property-conditions.h \
   $(public_api_src_dir)/object/property-index-ranges.h \
   $(public_api_src_dir)/object/property-input.h \
@@ -198,6 +209,9 @@ public_api_core_render_tasks_header_files = \
   $(public_api_src_dir)/render-tasks/render-task-list.h
 
 public_api_core_shader_effects_header_files = \
+  $(public_api_src_dir)/shader-effects/material.h \
+  $(public_api_src_dir)/shader-effects/sampler.h \
+  $(public_api_src_dir)/shader-effects/shader.h \
   $(public_api_src_dir)/shader-effects/shader-effect.h
 
 public_api_core_size_negotiation_header_files = \

diff --git a/dali/devel-api/rendering/geometry.cpp b/dali/public-api/geometry/geometry.cpp
similarity index 94%
rename from dali/devel-api/rendering/geometry.cpp
rename to dali/public-api/geometry/geometry.cpp
index 4b12f05..748c490 100644 (file)
--- a/dali/devel-api/rendering/geometry.cpp
+++ b/dali/public-api/geometry/geometry.cpp
@@ -16,10 +16,10 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/rendering/geometry.h>  // Dali::Geometry
+#include <dali/public-api/geometry/geometry.h>  // Dali::Geometry
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/rendering/geometry-impl.h> // Dali::Internal::Geometry
+#include <dali/internal/event/geometry/geometry-impl.h> // Dali::Internal::Geometry
 
 namespace Dali
 {

diff --git a/dali/devel-api/rendering/geometry.h b/dali/public-api/geometry/geometry.h
similarity index 98%
rename from dali/devel-api/rendering/geometry.h
rename to dali/public-api/geometry/geometry.h
index cb8986e..5f1efe9 100644 (file)
--- a/dali/devel-api/rendering/geometry.h
+++ b/dali/public-api/geometry/geometry.h
@@ -23,8 +23,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/handle.h> // Dali::Handle
+#include <dali/public-api/object/property-buffer.h> // Dali::PropertyBuffer
 #include <dali/public-api/object/property-index-ranges.h> // DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX
-#include <dali/devel-api/object/property-buffer.h> // Dali::PropertyBuffer
 
 namespace Dali
 {

diff --git a/dali/devel-api/object/property-buffer.cpp b/dali/public-api/object/property-buffer.cpp
similarity index 96%
rename from dali/devel-api/object/property-buffer.cpp
rename to dali/public-api/object/property-buffer.cpp
index 9eb3d39..779b862 100644 (file)
--- a/dali/devel-api/object/property-buffer.cpp
+++ b/dali/public-api/object/property-buffer.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/object/property-buffer.h> // Dali::PropertyBuffer
+#include <dali/public-api/object/property-buffer.h> // Dali::PropertyBuffer
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/property-map.h> // Dali::Property::Map

diff --git a/dali/devel-api/object/property-buffer.h b/dali/public-api/object/property-buffer.h
similarity index 100%
rename from dali/devel-api/object/property-buffer.h
rename to dali/public-api/object/property-buffer.h

diff --git a/dali/devel-api/rendering/material.cpp b/dali/public-api/shader-effects/material.cpp
similarity index 93%
rename from dali/devel-api/rendering/material.cpp
rename to dali/public-api/shader-effects/material.cpp
index af2fd92..5a946b7 100644 (file)
--- a/dali/devel-api/rendering/material.cpp
+++ b/dali/public-api/shader-effects/material.cpp
@@ -16,12 +16,12 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/rendering/material.h>  // Dali::Material
+#include <dali/public-api/shader-effects/material.h>  // Dali::Material
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/rendering/material-impl.h> // Dali::Internal::Material
-#include <dali/internal/event/rendering/sampler-impl.h> // Dali::Internal::Sampler
-#include <dali/internal/event/rendering/shader-impl.h> // Dali::Internal::Shader
+#include <dali/internal/event/effects/material-impl.h> // Dali::Internal::Material
+#include <dali/internal/event/effects/sampler-impl.h> // Dali::Internal::Sampler
+#include <dali/internal/event/effects/shader-impl.h> // Dali::Internal::Shader
 
 namespace Dali
 {

diff --git a/dali/devel-api/rendering/material.h b/dali/public-api/shader-effects/material.h
similarity index 98%
rename from dali/devel-api/rendering/material.h
rename to dali/public-api/shader-effects/material.h
index 5751fff..9896e02 100644 (file)
--- a/dali/devel-api/rendering/material.h
+++ b/dali/public-api/shader-effects/material.h
@@ -27,8 +27,8 @@
 #include <dali/public-api/images/image.h> // Dali::Image
 #include <dali/public-api/object/handle.h> // Dali::Handle
 #include <dali/public-api/object/property-index-ranges.h> // DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX
-#include <dali/devel-api/rendering/sampler.h> // Dali::Sampler
-#include <dali/devel-api/rendering/shader.h> // Dali::Shader
+#include <dali/public-api/shader-effects/sampler.h> // Dali::Sampler
+#include <dali/public-api/shader-effects/shader.h> // Dali::Shader
 
 namespace Dali
 {

diff --git a/dali/devel-api/rendering/sampler.cpp b/dali/public-api/shader-effects/sampler.cpp
similarity index 93%
rename from dali/devel-api/rendering/sampler.cpp
rename to dali/public-api/shader-effects/sampler.cpp
index d56ed24..82b694f 100644 (file)
--- a/dali/devel-api/rendering/sampler.cpp
+++ b/dali/public-api/shader-effects/sampler.cpp
@@ -16,10 +16,10 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/rendering/sampler.h>  // Dali::Sampler
+#include <dali/public-api/shader-effects/sampler.h>  // Dali::Sampler
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/rendering/sampler-impl.h> // Dali::Internal::Sampler
+#include <dali/internal/event/effects/sampler-impl.h> // Dali::Internal::Sampler
 
 namespace Dali
 {

diff --git a/dali/devel-api/rendering/sampler.h b/dali/public-api/shader-effects/sampler.h
similarity index 100%
rename from dali/devel-api/rendering/sampler.h
rename to dali/public-api/shader-effects/sampler.h

diff --git a/dali/devel-api/rendering/shader.cpp b/dali/public-api/shader-effects/shader.cpp
similarity index 90%
rename from dali/devel-api/rendering/shader.cpp
rename to dali/public-api/shader-effects/shader.cpp
index 6be2e63..c344929 100644 (file)
--- a/dali/devel-api/rendering/shader.cpp
+++ b/dali/public-api/shader-effects/shader.cpp
@@ -16,10 +16,10 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/rendering/shader.h>  // Dali::Shader
+#include <dali/public-api/shader-effects/shader.h>  // Dali::Shader
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/rendering/shader-impl.h>  // Dali::Internal::Shader
+#include <dali/internal/event/effects/shader-impl.h>  // Dali::Internal::Shader
 
 namespace Dali
 {

diff --git a/dali/devel-api/rendering/shader.h b/dali/public-api/shader-effects/shader.h
similarity index 100%
rename from dali/devel-api/rendering/shader.h
rename to dali/public-api/shader-effects/shader.h