(Application) Restore setting a view mode to preserve compatibility

Change-Id: Iebe8c6c7de53af0c98c44e08ba86220dafc3fa31

diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp
index fe29875..1e67df8 100644 (file)
--- a/dali/internal/adaptor/common/application-impl.cpp
+++ b/dali/internal/adaptor/common/application-impl.cpp
@@ -48,6 +48,13 @@ namespace Internal
 namespace Adaptor
 {
 
+namespace
+{
+
+const float DEFAULT_STEREO_BASE( 65.0f );
+
+} // unnamed namespace
+
 ApplicationPtr Application::gPreInitializedApplication( NULL );
 
 ApplicationPtr Application::New(
@@ -101,7 +108,9 @@ Application::Application( int* argc, char** argv[], const std::string& styleshee
   mEnvironmentOptions(),
   mWindowPositionSize( positionSize ),
   mLaunchpadState( Launchpad::NONE ),
-  mSlotDelegate( this )
+  mSlotDelegate( this ),
+  mViewMode( MONO ),
+  mStereoBase( DEFAULT_STEREO_BASE )
 {
   // Get mName from environment options
   mMainWindowName = mEnvironmentOptions.GetWindowName();
@@ -396,6 +405,28 @@ Dali::Window Application::GetWindow()
   return mMainWindow;
 }
 
+// Stereoscopy
+
+void Application::SetViewMode( ViewMode viewMode )
+{
+  mViewMode = viewMode;
+}
+
+ViewMode Application::GetViewMode() const
+{
+  return mViewMode;
+}
+
+void Application::SetStereoBase( float stereoBase )
+{
+  mStereoBase = stereoBase;
+}
+
+float Application::GetStereoBase() const
+{
+  return mStereoBase;
+}
+
 void Application::ReplaceWindow( const PositionSize& positionSize, const std::string& name )
 {
   Dali::Window newWindow = Dali::Window::New( positionSize, name, mMainWindowMode == Dali::Application::TRANSPARENT );

diff --git a/dali/internal/adaptor/common/application-impl.h b/dali/internal/adaptor/common/application-impl.h
index d8d1fce..8c8f726 100644 (file)
--- a/dali/internal/adaptor/common/application-impl.h
+++ b/dali/internal/adaptor/common/application-impl.h
@@ -154,6 +154,28 @@ public:
    */
   static ApplicationPtr GetPreInitializedApplication();
 
+public: // Stereoscopy
+
+  /**
+   * @copydoc Dali::Application::SetViewMode()
+   */
+  void SetViewMode( ViewMode viewMode );
+
+  /**
+   * @copydoc Dali::Application::GetViewMode()
+   */
+  ViewMode GetViewMode() const;
+
+  /**
+   * @copydoc Dali::Application::SetStereoBase()
+   */
+  void SetStereoBase( float stereoBase );
+
+  /**
+   * @copydoc Dali::Application::GetStereoBase()
+   */
+  float GetStereoBase() const;
+
 public: // Lifecycle functionality
 
   /**
@@ -402,9 +424,12 @@ private:
   Launchpad::State                         mLaunchpadState;
   bool                                     mUseRemoteSurface;
 
-  SlotDelegate< Application >           mSlotDelegate;
+  SlotDelegate< Application >              mSlotDelegate;
+
+  ViewMode                                 mViewMode;
+  float                                    mStereoBase;
 
-  static ApplicationPtr                 gPreInitializedApplication;
+  static ApplicationPtr                    gPreInitializedApplication;
 };
 
 inline Application& GetImplementation(Dali::Application& application)

diff --git a/dali/public-api/adaptor-framework/application.cpp b/dali/public-api/adaptor-framework/application.cpp
index 188e382..3405faf 100644 (file)
--- a/dali/public-api/adaptor-framework/application.cpp
+++ b/dali/public-api/adaptor-framework/application.cpp
@@ -192,22 +192,24 @@ std::string Application::GetLanguage() const
   return Internal::Adaptor::GetImplementation(*this).GetLanguage();
 }
 
-void Application::SetViewMode( ViewMode /*viewMode*/ )
+void Application::SetViewMode( ViewMode viewMode )
 {
+  Internal::Adaptor::GetImplementation(*this).SetViewMode( viewMode );
 }
 
 ViewMode Application::GetViewMode() const
 {
-  return ViewMode::MONO;
+  return Internal::Adaptor::GetImplementation(*this).GetViewMode();
 }
 
-void Application::SetStereoBase( float /*stereoBase*/ )
+void Application::SetStereoBase( float stereoBase )
 {
+  Internal::Adaptor::GetImplementation(*this).SetStereoBase( stereoBase );
 }
 
 float Application::GetStereoBase() const
 {
-  return 0.f;
+  return Internal::Adaptor::GetImplementation(*this).GetStereoBase();
 }
 
 Application::AppSignalType& Application::InitSignal()

diff --git a/dali/public-api/adaptor-framework/application.h b/dali/public-api/adaptor-framework/application.h
index e9449ad..96eaedf 100644 (file)
--- a/dali/public-api/adaptor-framework/application.h
+++ b/dali/public-api/adaptor-framework/application.h
@@ -324,7 +324,7 @@ public: // Stereoscopy
    * @brief Sets the viewing mode for the application.
    * @SINCE_1_0.0
    * @param[in] viewMode The new viewing mode
-   * @DEPRECATED_1_3.39
+   * @DEPRECATED_1_3.51
    */
   void SetViewMode( ViewMode viewMode );
 
@@ -332,7 +332,7 @@ public: // Stereoscopy
    * @brief Gets the current viewing mode.
    * @SINCE_1_0.0
    * @return The current viewing mode
-   * @DEPRECATED_1_3.39
+   * @DEPRECATED_1_3.51
    */
   ViewMode GetViewMode() const;
 
@@ -343,7 +343,7 @@ public: // Stereoscopy
    * between 50mm and 70mm. The default value is 65mm.
    * @SINCE_1_0.0
    * @param[in] stereoBase The stereo base (eye separation) for Stereoscopic 3D
-   * @DEPRECATED_1_3.39
+   * @DEPRECATED_1_3.51
    */
   void SetStereoBase( float stereoBase );
 
@@ -352,7 +352,7 @@ public: // Stereoscopy
    *
    * @SINCE_1_0.0
    * @return The stereo base (eye separation) for Stereoscopic 3D
-   * @DEPRECATED_1_3.39
+   * @DEPRECATED_1_3.51
    */
   float GetStereoBase() const;