/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * 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.
#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>
-
-#ifdef DYNAMICS_SUPPORT
-#include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/internal/event/dynamics/dynamics-world-config-impl.h>
-#include <dali/internal/event/dynamics/dynamics-world-impl.h>
-#endif
-
namespace Dali
{
ObjectRegistry Stage::GetObjectRegistry() const
{
- Internal::ObjectRegistry& internal = Internal::Stage::GetCurrent()->GetObjectRegistry();
+ Internal::Stage* stage = Internal::Stage::GetCurrent();
+ DALI_ASSERT_ALWAYS( stage && "GetObjectRegistry() : Stage is null" );
+ Internal::ObjectRegistry& internal = stage->GetObjectRegistry();
return ObjectRegistry(&internal);
}
-DynamicsWorld Stage::InitializeDynamics(DynamicsWorldConfig config)
-{
-#ifdef DYNAMICS_SUPPORT
- Internal::DynamicsWorldConfigPtr configImpl( &(GetImplementation(config)) );
-
- return DynamicsWorld( GetImplementation(*this).InitializeDynamics(configImpl).Get() );
-#else
- return DynamicsWorld();
-#endif
-}
-
-DynamicsWorld Stage::GetDynamicsWorld()
-{
-#ifdef DYNAMICS_SUPPORT
- return DynamicsWorld( GetImplementation(*this).GetDynamicsWorld().Get() );
-#else
- return DynamicsWorld();
-#endif
-}
-
-void Stage::TerminateDynamics()
-{
-#ifdef DYNAMICS_SUPPORT
- GetImplementation(*this).TerminateDynamics();
-#endif
-}
-
void Stage::KeepRendering( float durationSeconds )
{
GetImplementation(*this).KeepRendering( durationSeconds );
Stage::TouchedSignalType& Stage::TouchedSignal()
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchedSignal() is deprecated and will be removed from next release. Use TouchSignal() instead.\n" );
+
return GetImplementation(*this).TouchedSignal();
}
+Stage::TouchSignalType& Stage::TouchSignal()
+{
+ return GetImplementation( *this ).TouchSignal();
+}
+
+Stage::WheelEventSignalType& Stage::WheelEventSignal()
+{
+ return GetImplementation(*this).WheelEventSignal();
+}
+
Stage::ContextStatusSignal& Stage::ContextLostSignal()
{
return GetImplementation(*this).ContextLostSignal();