#include <string>
// INTERNAL INCLUDES
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
#include <dali/integration-api/platform-abstraction.h>
#include "test-trace-call-stack.h"
#include <stdlib.h>
#include <dali/public-api/dali-core.h>
#include <dali-test-suite-utils.h>
-
+#include <dali/devel-api/dynamics/dynamics.h>
int UtcDaliDynamicsBodyConstructor(void)
{
#include <stdlib.h>
#include <dali/public-api/dali-core.h>
#include <dali-test-suite-utils.h>
-
+#include <dali/devel-api/dynamics/dynamics.h>
using namespace Dali;
#include <stdlib.h>
#include <dali/public-api/dali-core.h>
#include <dali-test-suite-utils.h>
-
+#include <dali/devel-api/dynamics/dynamics.h>
using namespace Dali;
#include <stdlib.h>
#include <dali/public-api/dali-core.h>
#include <dali-test-suite-utils.h>
+#include <dali/devel-api/dynamics/dynamics.h>
using namespace Dali;
#include <dali/public-api/dali-core.h>
#include <dali-test-suite-utils.h>
#include <test-dynamics.h>
+#include <dali/devel-api/dynamics/dynamics.h>
using namespace Dali;
#include <stdlib.h>
#include <dali/public-api/dali-core.h>
#include <dali-test-suite-utils.h>
-
+#include <dali/devel-api/dynamics/dynamics.h>
using namespace Dali;
public_api_src_dir = ../../../dali/public-api
include ../../../dali/public-api/file.list
+devel_api_src_dir = ../../../dali/devel-api
+include ../../../dali/devel-api/file.list
+
platform_abstraction_src_dir = ../../../dali/integration-api
include ../../../dali/integration-api/file.list
src_files = $(internal_src_files) \
$(effects_src_files) \
$(platform_abstraction_src_files) \
- $(public_api_src_files)
+ $(public_api_src_files) \
+ $(devel_api_src_files)
if DYNAMICS_SUPPORT
src_files += $(internal_dynamics_src_files)
platformabstractionevents_HEADERS = $(platform_abstraction_events_header_files)
platformabstractiondynamics_HEADERS = $(platform_abstraction_dynamics_header_files)
+#devel api (used by adaptor / toolkit
+develapidir = $(devincludepath)/dali/devel-api
+develapiactorsdir = $(develapidir)/actors
+develapicommondir = $(develapidir)/common
+develapidynamicsdir = $(develapidir)/dynamics
+
+develapi_HEADERS = $(devel_api_header_files)
+develapicommon_HEADERS = $(devel_api_core_common_header_files)
+develapidynamics_HEADERS = $(devel_api_core_dynamics_header_files)
+
+
+
+#public api
publicapidir = $(devincludepath)/dali/public-api
publicapiactorsdir = $(publicapidir)/actors
publicapianimationdir = $(publicapidir)/animation
publicapicommondir = $(publicapidir)/common
-publicapidynamicsdir = $(publicapidir)/dynamics
publicapieventsdir = $(publicapidir)/events
publicapigeometrydir = $(publicapidir)/geometry
publicapiimagesdir = $(publicapidir)/images
publicapiactors_HEADERS = $(public_api_core_actors_header_files)
publicapianimation_HEADERS = $(public_api_core_animation_header_files)
publicapicommon_HEADERS = $(public_api_core_common_header_files)
-publicapidynamics_HEADERS = $(public_api_core_dynamics_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)
*/
// CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-body-config.h>
+#include <dali/devel-api/dynamics/dynamics-body-config.h>
// INTERNAL HEADERS
#ifdef DYNAMICS_SUPPORT
#include <dali/public-api/object/base-handle.h>
// INTERNAL INCLUDES
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
namespace Dali
{
*/
// CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-body.h>
+#include <dali/devel-api/dynamics/dynamics-body.h>
// INTERNAL HEADERS
#include <dali/internal/event/actors/actor-impl.h>
*/
// CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-collision.h>
+#include <dali/devel-api/dynamics/dynamics-collision.h>
// INTERNAL HEADERS
#include <dali/internal/event/actors/actor-impl.h>
*/
// CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-joint.h>
+#include <dali/devel-api/dynamics/dynamics-joint.h>
// INTERNAL HEADERS
#include <dali/internal/event/actors/actor-impl.h>
*/
// CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
// INTERNAL HEADERS
#include <dali/internal/event/modeling/mesh-impl.h>
*/
// CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
// INTERNAL HEADERS
#ifdef DYNAMICS_SUPPORT
*/
// CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-world.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
// INTERNAL HEADERS
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
#include <dali/internal/event/actors/actor-impl.h>
#ifdef DYNAMICS_SUPPORT
--- /dev/null
+#ifndef __DALI_DYNAMICS_H__
+#define __DALI_DYNAMICS_H__
+
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali/devel-api/dynamics/dynamics-body.h>
+#include <dali/devel-api/dynamics/dynamics-body-config.h>
+#include <dali/devel-api/dynamics/dynamics-collision.h>
+#include <dali/devel-api/dynamics/dynamics-joint.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
+
+#endif //__DALI_DYNAMICS_H__
--- /dev/null
+# Add devel source files here for DALi internal developer files used by Adaptor & Toolkit
+
+devel_api_src_files = \
+ $(devel_api_src_dir)/dynamics/dynamics-body.cpp \
+ $(devel_api_src_dir)/dynamics/dynamics-body-config.cpp \
+ $(devel_api_src_dir)/dynamics/dynamics-collision.cpp \
+ $(devel_api_src_dir)/dynamics/dynamics-joint.cpp \
+ $(devel_api_src_dir)/dynamics/dynamics-shape.cpp \
+ $(devel_api_src_dir)/dynamics/dynamics-world.cpp \
+ $(devel_api_src_dir)/dynamics/dynamics-world-config.cpp
+
+# Add devel header files here DALi internal developer files used by Adaptor & Toolkit
+
+devel_api_core_common_header_files = \
+ $(devel_api_src_dir)/common/map-wrapper.h \
+ $(devel_api_src_dir)/common/set-wrapper.h
+
+devel_api_core_dynamics_header_files = \
+ $(devel_api_src_dir)/dynamics/dynamics.h \
+ $(devel_api_src_dir)/dynamics/dynamics-body.h \
+ $(devel_api_src_dir)/dynamics/dynamics-body-config.h \
+ $(devel_api_src_dir)/dynamics/dynamics-collision.h \
+ $(devel_api_src_dir)/dynamics/dynamics-joint.h \
+ $(devel_api_src_dir)/dynamics/dynamics-shape.h \
+ $(devel_api_src_dir)/dynamics/dynamics-world.h \
+ $(devel_api_src_dir)/dynamics/dynamics-world-config.h
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/dynamics/dynamics-body-config.h>
+#include <dali/devel-api/dynamics/dynamics-body-config.h>
namespace Dali
{
*/
// INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
#include <dali/integration-api/dynamics/dynamics-debug-vertex.h>
namespace Dali
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
#include <dali/public-api/math/vector3.h>
namespace Dali
// INTERNAL INCLUDES
#include <dali/public-api/common/vector-wrapper.h>
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
#include <dali/internal/event/animation/animation-impl.h>
*/
// INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/object/base-object.h>
// INTERNAL HEADERS
#include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-body-config.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-body-config.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
namespace Dali
{
// INTERNAL INCLUDES
#include <dali/internal/event/common/event-thread-services.h>
#include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-body.h>
+#include <dali/devel-api/dynamics/dynamics-body.h>
namespace Dali
// INTERNAL HEADERS
#include <dali/internal/event/actors/actor-declarations.h>
#include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-collision.h>
+#include <dali/devel-api/dynamics/dynamics-collision.h>
namespace Dali
{
// INTERNAL HEADERS
#include <dali/internal/event/actors/actor-declarations.h>
#include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-joint.h>
+#include <dali/devel-api/dynamics/dynamics-joint.h>
namespace Dali
{
// INTERNAL HEADERS
#include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
#include <dali/public-api/math/vector3.h>
namespace Dali
// INTERNAL HEADERS
#include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
namespace Dali
{
// INTERNAL HEADERS
#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
#include <dali/internal/common/message.h>
#include <dali/internal/event/actors/actor-declarations.h>
#include <dali/internal/event/dynamics/dynamics-declarations.h>
#include <dali/internal/event/effects/shader-declarations.h>
-#include <dali/public-api/dynamics/dynamics-world.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
#include <dali/public-api/signals/slot-delegate.h>
// INTERNAL INCLUDES
#include <dali/internal/event/resources/resource-client.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
#include <dali/integration-api/resource-request.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/vector-wrapper.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
#include <dali/public-api/common/loading-state.h>
#include <dali/public-api/object/ref-object.h>
#include <dali/internal/event/resources/resource-type-path.h>
*/
// INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
#include <dali/internal/event/resources/resource-type-path.h>
namespace Dali
#include <stdint.h>
// INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/images/native-image.h>
#include <dali/public-api/math/rect.h>
#include <dali/integration-api/dynamics/dynamics-factory-intf.h>
#include <dali/integration-api/dynamics/dynamics-shape-intf.h>
#include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
namespace Dali
{
// INTERNAL HEADERS
#include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-world.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
namespace Dali
{
#include <dali/integration-api/dynamics/dynamics-factory-intf.h>
#include <dali/integration-api/dynamics/dynamics-shape-intf.h>
#include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
namespace Dali
{
#include <dali/integration-api/dynamics/dynamics-shape-intf.h>
#include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
#include <dali/public-api/math/vector3.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
namespace Dali
{
#include <dali/integration-api/dynamics/dynamics-factory-intf.h>
#include <dali/integration-api/dynamics/dynamics-shape-intf.h>
#include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
namespace Dali
{
#include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
#include <dali/internal/update/modeling/scene-graph-mesh.h>
#include <dali/internal/update/modeling/internal-mesh-data.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
namespace Dali
{
#include <dali/integration-api/dynamics/dynamics-factory-intf.h>
#include <dali/integration-api/dynamics/dynamics-shape-intf.h>
#include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
namespace Dali
{
#include <dali/internal/event/common/event-thread-services.h>
#include <dali/internal/event/dynamics/dynamics-declarations.h>
#include <dali/internal/update/common/scene-graph-buffers.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
#include <dali/public-api/math/vector3.h>
namespace Dali
// INTERNAL INCLUDES
#include <dali/public-api/common/stage.h>
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
#include <dali/integration-api/core.h>
#include <dali/integration-api/render-controller.h>
// INTERNAL INCLUDES
#include <dali/public-api/actors/actor-enumerations.h>
#include <dali/public-api/actors/draw-mode.h>
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
#include <dali/public-api/math/quaternion.h>
#include <dali/public-api/math/math-utils.h>
#include <dali/public-api/math/vector3.h>
*
*/
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
#include <dali/integration-api/resource-declarations.h>
#include <dali/internal/update/common/scene-graph-buffers.h>
#include <typeinfo>
// INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
#include <dali/public-api/math/vector2.h>
#include <dali/integration-api/debug.h>
#include <limits>
// INTERNAL INCLUDES
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/math/vector2.h>
// CLASS HEADER
#include <dali/public-api/actors/custom-actor.h>
-#include <dali/public-api/object/type-registry.h>
-
// INTERNAL INCLUDES
#include <dali/internal/event/actors/custom-actor-internal.h>
+#include <dali/public-api/object/type-registry.h>
namespace Dali
{
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/object/object-registry.h>
-#include <dali/public-api/dynamics/dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
#ifdef DYNAMICS_SUPPORT
#include <dali/internal/event/dynamics/dynamics-declarations.h>
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/common/view-mode.h>
-#include <dali/public-api/dynamics/dynamics-body.h>
-#include <dali/public-api/dynamics/dynamics-body-config.h>
-#include <dali/public-api/dynamics/dynamics-collision.h>
-#include <dali/public-api/dynamics/dynamics-joint.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
-#include <dali/public-api/dynamics/dynamics-world-config.h>
-#include <dali/public-api/dynamics/dynamics-world.h>
-
#include <dali/public-api/events/gesture-detector.h>
#include <dali/public-api/events/gesture.h>
#include <dali/public-api/events/hit-test-algorithm.h>
-# Add local source files here
+#
+# Add public-api source files here
+#
public_api_src_files = \
$(public_api_src_dir)/actors/actor.cpp \
$(public_api_src_dir)/common/hash.cpp \
$(public_api_src_dir)/common/mutex.cpp \
$(public_api_src_dir)/common/stage.cpp \
- $(public_api_src_dir)/dynamics/dynamics-body.cpp \
- $(public_api_src_dir)/dynamics/dynamics-body-config.cpp \
- $(public_api_src_dir)/dynamics/dynamics-collision.cpp \
- $(public_api_src_dir)/dynamics/dynamics-joint.cpp \
- $(public_api_src_dir)/dynamics/dynamics-shape.cpp \
- $(public_api_src_dir)/dynamics/dynamics-world.cpp \
- $(public_api_src_dir)/dynamics/dynamics-world-config.cpp \
$(public_api_src_dir)/events/gesture.cpp \
$(public_api_src_dir)/events/gesture-detector.cpp \
$(public_api_src_dir)/events/hit-test-algorithm.cpp \
$(public_api_src_dir)/object/type-registry.cpp \
$(public_api_src_dir)/dali-core-version.cpp
+
+#
# Add public header files here
+#
public_api_header_files = \
$(public_api_src_dir)/dali-core.h \
$(public_api_src_dir)/common/intrusive-ptr.h \
$(public_api_src_dir)/common/loading-state.h \
$(public_api_src_dir)/common/mutex.h \
- $(public_api_src_dir)/common/map-wrapper.h \
$(public_api_src_dir)/common/ref-counted-dali-vector.h \
- $(public_api_src_dir)/common/set-wrapper.h \
$(public_api_src_dir)/common/scoped-pointer.h \
$(public_api_src_dir)/common/stage.h \
$(public_api_src_dir)/common/type-traits.h \
$(public_api_src_dir)/common/vector-wrapper.h \
$(public_api_src_dir)/common/view-mode.h
-public_api_core_dynamics_header_files = \
- $(public_api_src_dir)/dynamics/dynamics-body.h \
- $(public_api_src_dir)/dynamics/dynamics-body-config.h \
- $(public_api_src_dir)/dynamics/dynamics-collision.h \
- $(public_api_src_dir)/dynamics/dynamics-joint.h \
- $(public_api_src_dir)/dynamics/dynamics-shape.h \
- $(public_api_src_dir)/dynamics/dynamics-world.h \
- $(public_api_src_dir)/dynamics/dynamics-world-config.h
-
public_api_core_events_header_files = \
$(public_api_src_dir)/events/gesture.h \
$(public_api_src_dir)/events/gesture-detector.h \
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/*.pc
%{dev_include_path}/%{name}/public-api/*
+%{dev_include_path}/%{name}/devel-api/*
%files integration-devel
%defattr(-,root,root,-)