X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fcommon%2Fstage.cpp;h=8a87625cb7f8939a39ecd4abb696b56676a8cbce;hb=54d2f2aa984fe6efe00a52a9f4e097b845cc59e9;hp=0a1d842320988e2fa7ae5e3b5793ef3e0bf9b644;hpb=337560e080de3951f07a64da841a86d66ff3355b;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/common/stage.cpp b/dali/public-api/common/stage.cpp
index 0a1d842..8a87625 100644
--- a/dali/public-api/common/stage.cpp
+++ b/dali/public-api/common/stage.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -26,29 +26,14 @@
 #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
-
-using namespace std;
-
 namespace Dali
 {
 
 using Internal::Core;
 
-const Vector4 Stage::DEFAULT_BACKGROUND_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
+const Vector4 Stage::DEFAULT_BACKGROUND_COLOR(0.0f, 0.0f, 0.0f, 0.0f);
 const Vector4 Stage::DEBUG_BACKGROUND_COLOR(0.2f, 0.5f, 0.2f, 1.0f);
 
-const char* const Stage::SIGNAL_KEY_EVENT = "key-event";
-const char* const Stage::SIGNAL_EVENT_PROCESSING_FINISHED = "event-processing-finished";
-const char* const Stage::SIGNAL_TOUCHED = "touched";
-
 Stage::Stage()
 {
 }
@@ -68,13 +53,6 @@ Stage& Stage::operator=(const Stage& rhs)
   return *this;
 }
 
-Stage& Stage::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
 Stage::Stage(Internal::Stage* internal)
 : BaseHandle(internal)
 {
@@ -82,7 +60,9 @@ Stage::Stage(Internal::Stage* internal)
 
 Stage Stage::GetCurrent()
 {
-  return Stage(Internal::Stage::GetCurrent());
+  Internal::Stage* stage = Internal::Stage::GetCurrent();
+  DALI_ASSERT_ALWAYS( stage && "Stage doesn't exist" );
+  return Stage( stage );
 }
 
 bool Stage::IsInstalled()
@@ -142,56 +122,58 @@ Vector2 Stage::GetDpi() const
 
 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)
+void Stage::KeepRendering( float durationSeconds )
+{
+  GetImplementation(*this).KeepRendering( durationSeconds );
+}
+
+Stage::KeyEventSignalType& Stage::KeyEventSignal()
 {
-#ifdef DYNAMICS_SUPPORT
-  Internal::DynamicsWorldConfigPtr configImpl( &(GetImplementation(config)) );
+  return GetImplementation(*this).KeyEventSignal();
+}
 
-  return DynamicsWorld( GetImplementation(*this).InitializeDynamics(configImpl).Get() );
-#else
-  return DynamicsWorld();
-#endif
+Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSignal()
+{
+  return GetImplementation(*this).EventProcessingFinishedSignal();
 }
 
-DynamicsWorld Stage::GetDynamicsWorld()
+Stage::TouchedSignalType& Stage::TouchedSignal()
 {
-#ifdef DYNAMICS_SUPPORT
-  return DynamicsWorld( GetImplementation(*this).GetDynamicsWorld().Get() );
-#else
-  return DynamicsWorld();
-#endif
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchedSignal() is deprecated and will be removed from next release. Use TouchSignal() instead.\n" );
+
+  return GetImplementation(*this).TouchedSignal();
 }
 
-void Stage::TerminateDynamics()
+Stage::TouchSignalType& Stage::TouchSignal()
 {
-#ifdef DYNAMICS_SUPPORT
-  GetImplementation(*this).TerminateDynamics();
-#endif
+  return GetImplementation( *this ).TouchSignal();
 }
 
-void Stage::KeepRendering( float durationSeconds )
+Stage::WheelEventSignalType& Stage::WheelEventSignal()
 {
-  GetImplementation(*this).KeepRendering( durationSeconds );
+  return GetImplementation(*this).WheelEventSignal();
 }
 
-Stage::KeyEventSignalV2& Stage::KeyEventSignal()
+Stage::ContextStatusSignal& Stage::ContextLostSignal()
 {
-  return GetImplementation(*this).KeyEventSignal();
+  return GetImplementation(*this).ContextLostSignal();
 }
 
-Stage::EventProcessingFinishedSignalV2& Stage::EventProcessingFinishedSignal()
+Stage::ContextStatusSignal& Stage::ContextRegainedSignal()
 {
-  return GetImplementation(*this).EventProcessingFinishedSignal();
+  return GetImplementation(*this).ContextRegainedSignal();
 }
 
-Stage::TouchedSignalV2& Stage::TouchedSignal()
+Stage::SceneCreatedSignalType& Stage::SceneCreatedSignal()
 {
-  return GetImplementation(*this).TouchedSignal();
+  return GetImplementation(*this).SceneCreatedSignal();
 }
 
 } // namespace Dali