From a38310eae5990fae285513f81a552c6e3e6cb7b5 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Mon, 12 Nov 2018 18:42:50 +0000 Subject: [PATCH] Remove StereoMode Change-Id: Ice08a11991875d5d4f3b98c85f6ce10f92fb2673 --- .../src/dali-adaptor/utc-Dali-Application.cpp | 68 ---------------------- dali/integration-api/adaptor.h | 10 ---- dali/integration-api/render-surface.h | 6 -- dali/internal/adaptor/common/adaptor-impl.cpp | 25 -------- dali/internal/adaptor/common/adaptor-impl.h | 22 ------- dali/internal/adaptor/common/adaptor.cpp | 10 ---- dali/internal/adaptor/common/application-impl.cpp | 33 ----------- dali/internal/adaptor/common/application-impl.h | 22 ------- .../system/common/command-line-options.cpp | 48 ++++----------- dali/internal/system/common/command-line-options.h | 17 +++--- dali/internal/window-system/common/window-base.h | 6 -- .../window-system/common/window-render-surface.cpp | 5 -- .../window-system/common/window-render-surface.h | 5 -- .../ecore-wl/window-base-ecore-wl.cpp | 4 -- .../tizen-wayland/ecore-wl/window-base-ecore-wl.h | 5 -- .../ecore-wl2/window-base-ecore-wl2.cpp | 4 -- .../ecore-wl2/window-base-ecore-wl2.h | 5 -- .../native-render-surface-ecore-wl.cpp | 4 -- .../tizen-wayland/native-render-surface-ecore-wl.h | 5 -- .../ubuntu-x11/pixmap-render-surface-ecore-x.h | 5 -- .../ubuntu-x11/window-base-ecore-x.cpp | 11 ---- .../window-system/ubuntu-x11/window-base-ecore-x.h | 5 -- dali/public-api/adaptor-framework/application.cpp | 10 ++-- dali/public-api/adaptor-framework/application.h | 4 ++ 24 files changed, 25 insertions(+), 314 deletions(-) diff --git a/automated-tests/src/dali-adaptor/utc-Dali-Application.cpp b/automated-tests/src/dali-adaptor/utc-Dali-Application.cpp index a237f50..75175ff 100644 --- a/automated-tests/src/dali-adaptor/utc-Dali-Application.cpp +++ b/automated-tests/src/dali-adaptor/utc-Dali-Application.cpp @@ -265,74 +265,6 @@ int UtcDaliApplicationReplaceWindowN(void) END_TEST; } -int UtcDaliApplicationSetViewModeN(void) -{ - Application application; - - try - { - application.SetViewMode( STEREO_VERTICAL ); - DALI_TEST_CHECK( false ); // Should not get here - } - catch( ... ) - { - DALI_TEST_CHECK( true ); - } - - END_TEST; -} - -int UtcDaliApplicationGetViewModeN(void) -{ - Application application; - - try - { - (void) application.GetViewMode(); - DALI_TEST_CHECK( false ); // Should not get here - } - catch( ... ) - { - DALI_TEST_CHECK( true ); - } - - END_TEST; -} - -int UtcDaliApplicationSetStereoBaseN(void) -{ - Application application; - - try - { - application.SetStereoBase( 1.0f ); - DALI_TEST_CHECK( false ); // Should not get here - } - catch( ... ) - { - DALI_TEST_CHECK( true ); - } - - END_TEST; -} - -int UtcDaliApplicationGetStereoBaseN(void) -{ - Application application; - - try - { - (void) application.GetStereoBase(); - DALI_TEST_CHECK( false ); // Should not get here - } - catch( ... ) - { - DALI_TEST_CHECK( true ); - } - - END_TEST; -} - int UtcDaliApplicationInitSignalP(void) { Application application = Application::New(); diff --git a/dali/integration-api/adaptor.h b/dali/integration-api/adaptor.h index f7a47ea..3b996b8 100755 --- a/dali/integration-api/adaptor.h +++ b/dali/integration-api/adaptor.h @@ -359,16 +359,6 @@ public: void SceneCreated(); /** - * @copydoc Dali::Application::SetViewMode(); - */ - void SetViewMode( ViewMode viewMode ); - - /** - * @copydoc Dali::Application::SetStereoBase(); - */ - void SetStereoBase( float stereoBase ); - - /** * @brief Renders once more even if we're paused * @note Will not work if the window is hidden. */ diff --git a/dali/integration-api/render-surface.h b/dali/integration-api/render-surface.h index e9e8921..edb9022 100644 --- a/dali/integration-api/render-surface.h +++ b/dali/integration-api/render-surface.h @@ -136,12 +136,6 @@ public: virtual void MoveResize( Dali::PositionSize positionSize ) = 0; /** - * @brief Set the stereoscopic 3D view mode - * @param[in] viewMode The new view mode - */ - virtual void SetViewMode( ViewMode viewMode ) = 0; - - /** * @brief Called when Render thread has started */ virtual void StartRender() = 0; diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index ee1b447..629a30e 100755 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -1007,31 +1007,6 @@ Adaptor::Adaptor(Any nativeWindow, Dali::Adaptor& adaptor, RenderSurface* surfac gThreadLocalAdaptor = this; } -// Stereoscopy - -void Adaptor::SetViewMode( ViewMode viewMode ) -{ - WindowPane defaultWindow = mWindowFrame.front(); - defaultWindow.surface->SetViewMode( viewMode ); - - mCore->SetViewMode( viewMode ); -} - -ViewMode Adaptor::GetViewMode() const -{ - return mCore->GetViewMode(); -} - -void Adaptor::SetStereoBase( float stereoBase ) -{ - mCore->SetStereoBase( stereoBase ); -} - -float Adaptor::GetStereoBase() const -{ - return mCore->GetStereoBase(); -} - void Adaptor::SetRootLayoutDirection( std::string locale ) { Dali::Stage stage = Dali::Stage::GetCurrent(); diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h index 26c3bb7..d014622 100755 --- a/dali/internal/adaptor/common/adaptor-impl.h +++ b/dali/internal/adaptor/common/adaptor-impl.h @@ -481,28 +481,6 @@ public: //AdaptorInternalServices */ virtual TraceInterface& GetSystemTraceInterface(); -public: // Stereoscopy - - /** - * @copydoc Dali::Integration::Core::SetViewMode() - */ - void SetViewMode( ViewMode viewMode ); - - /** - * @copydoc Dali::Integration::Core::GetViewMode() - */ - ViewMode GetViewMode() const; - - /** - * @copydoc Dali::Integration::Core::SetStereoBase() - */ - void SetStereoBase( float stereoBase ); - - /** - * @copydoc Dali::Integration::Core::GetStereoBase() - */ - float GetStereoBase() const; - public: // Signals /** diff --git a/dali/internal/adaptor/common/adaptor.cpp b/dali/internal/adaptor/common/adaptor.cpp index be113a7..a0747df 100755 --- a/dali/internal/adaptor/common/adaptor.cpp +++ b/dali/internal/adaptor/common/adaptor.cpp @@ -183,16 +183,6 @@ void Adaptor::SceneCreated() mImpl->SceneCreated(); } -void Adaptor::SetViewMode( ViewMode mode ) -{ - mImpl->SetViewMode( mode ); -} - -void Adaptor::SetStereoBase( float stereoBase ) -{ - mImpl->SetStereoBase( stereoBase ); -} - void Adaptor::RenderOnce() { mImpl->RenderOnce(); diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp index 47c42d5..fe29875 100644 --- a/dali/internal/adaptor/common/application-impl.cpp +++ b/dali/internal/adaptor/common/application-impl.cpp @@ -226,17 +226,6 @@ void Application::DoInit() mAdaptor->SetUseHardwareVSync(false); } - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetStereoBase( mCommandLineOptions->stereoBase ); - if( mCommandLineOptions->viewMode != 0 ) - { - ViewMode viewMode = MONO; - if( mCommandLineOptions->viewMode <= STEREO_INTERLACED ) - { - viewMode = static_cast( mCommandLineOptions->viewMode ); - } - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetViewMode( viewMode ); - } - if( ! mStylesheet.empty() ) { Dali::StyleMonitor::Get().SetTheme( mStylesheet ); @@ -407,28 +396,6 @@ Dali::Window Application::GetWindow() return mMainWindow; } -// Stereoscopy - -void Application::SetViewMode( ViewMode viewMode ) -{ - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetViewMode( viewMode ); -} - -ViewMode Application::GetViewMode() const -{ - return Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).GetViewMode(); -} - -void Application::SetStereoBase( float stereoBase ) -{ - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetStereoBase( stereoBase ); -} - -float Application::GetStereoBase() const -{ - return Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).GetStereoBase(); -} - 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 e906520..d8d1fce 100644 --- a/dali/internal/adaptor/common/application-impl.h +++ b/dali/internal/adaptor/common/application-impl.h @@ -154,28 +154,6 @@ 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 /** diff --git a/dali/internal/system/common/command-line-options.cpp b/dali/internal/system/common/command-line-options.cpp index 8ea2f8a..806e787 100644 --- a/dali/internal/system/common/command-line-options.cpp +++ b/dali/internal/system/common/command-line-options.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -60,8 +60,6 @@ Argument EXPECTED_ARGS[] = { "width", "Stage Width" }, { "height", "Stage Height" }, { "dpi", "Emulated DPI" }, - { "view", "Stereocopic 3D view mode ([0]=MONO, 1=STEREO_HORIZONTAL, 2=STEREO_VERTICAL, 3=STEREO_INTERLACED)" }, - { "stereo-base", "Distance in millimeters between left/right cameras [65.0]" }, { "help", "Help" }, { NULL, NULL } }; @@ -72,12 +70,10 @@ enum Option OPTION_STAGE_WIDTH, OPTION_STAGE_HEIGHT, OPTION_DPI, - OPTION_STEREO_MODE, - OPTION_STEREO_BASE, OPTION_HELP }; -typedef Dali::Vector< int > UnhandledContainer; +typedef Dali::Vector< int32_t > UnhandledContainer; void ShowHelp() { @@ -92,11 +88,9 @@ void ShowHelp() } // unnamed namespace -CommandLineOptions::CommandLineOptions(int *argc, char **argv[]) +CommandLineOptions::CommandLineOptions(int32_t *argc, char **argv[]) : noVSyncOnRender(0), - stageWidth(0), stageHeight(0), - viewMode(0), - stereoBase(65) + stageWidth(0), stageHeight(0) { // Exit gracefully if no arguments provided if ( !argc || !argv ) @@ -107,10 +101,10 @@ CommandLineOptions::CommandLineOptions(int *argc, char **argv[]) if ( *argc > 1 ) { // We do not want to print out errors. - int origOptErrValue( opterr ); + int32_t origOptErrValue( opterr ); opterr = 0; - int help( 0 ); + int32_t help( 0 ); const struct option options[]= { @@ -118,16 +112,14 @@ CommandLineOptions::CommandLineOptions(int *argc, char **argv[]) { EXPECTED_ARGS[OPTION_STAGE_WIDTH].opt, required_argument, NULL, 'w' }, // "--width" { EXPECTED_ARGS[OPTION_STAGE_HEIGHT].opt, required_argument, NULL, 'h' }, // "--height" { EXPECTED_ARGS[OPTION_DPI].opt, required_argument, NULL, 'd' }, // "--dpi" - { EXPECTED_ARGS[OPTION_STEREO_MODE].opt, required_argument, NULL, 'v' }, // "--view" - { EXPECTED_ARGS[OPTION_STEREO_BASE].opt, required_argument, NULL, 's' }, // "--stereo-base" { EXPECTED_ARGS[OPTION_HELP].opt, no_argument, &help, '?' }, // "--help" { 0, 0, 0, 0 } // end of options }; - int shortOption( 0 ); - int optionIndex( 0 ); + int32_t shortOption( 0 ); + int32_t optionIndex( 0 ); - const char* optString = "-w:h:d:v:s:"; // The '-' ensures that argv is NOT permuted + const char* optString = "-w:h:d:"; // The '-' ensures that argv is NOT permuted bool optionProcessed( false ); UnhandledContainer unhandledOptions; // We store indices of options we do not handle here @@ -179,26 +171,6 @@ CommandLineOptions::CommandLineOptions(int *argc, char **argv[]) break; } - case 'v': - { - if ( optarg ) - { - viewMode = atoi(optarg); - optionProcessed = true; - } - break; - } - - case 's': - { - if ( optarg ) - { - stereoBase = atoi(optarg); - optionProcessed = true; - } - break; - } - case -1: { // All command-line options have been parsed. @@ -218,7 +190,7 @@ CommandLineOptions::CommandLineOptions(int *argc, char **argv[]) { if ( unhandledOptions.Count() > 0 ) { - int index( 1 ); + int32_t index( 1 ); // Overwrite the argv with the values from the unhandled indices const UnhandledContainer::ConstIterator endIter = unhandledOptions.End(); diff --git a/dali/internal/system/common/command-line-options.h b/dali/internal/system/common/command-line-options.h index d87781e..75fab25 100644 --- a/dali/internal/system/common/command-line-options.h +++ b/dali/internal/system/common/command-line-options.h @@ -2,7 +2,7 @@ #define __DALI_INTERNAL_COMMAND_LINE_OPTIONS_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include // int32_t namespace Dali { @@ -41,8 +42,6 @@ namespace Adaptor * -w|--width Stage Width * -h|--height Stage Height * -d|--dpi Emulated DPI - * -v|--view Viewing mode - * -s|--stereo-base Eye separation for stereoscopic rendering (in mm) * --help Help * @endcode * @@ -58,7 +57,7 @@ public: * @param[in,out] argv The argument list * @note Supported options are stripped from argv, and argc is updated appropriately. */ - CommandLineOptions(int *argc, char **argv[]); + CommandLineOptions( int32_t *argc, char **argv[] ); /** * Destructor @@ -67,12 +66,10 @@ public: public: // Command line parsed values - int noVSyncOnRender; ///< If 1, then the user does not want VSync on Render - int stageWidth; ///< The width of the stage required. 0 if not set. - int stageHeight; ///< The height of the stage required. 0 if not set. - int viewMode; ///< Stereocopic 3D view mode (0=MONO, 1=STEREO_HORIZONTAL, 2=STEREO_VERTICAL, 3=STEREO_INTERLACED) - int stereoBase; ///< The distance in millimeters between left/right cameras - std::string stageDPI; ///< DPI stored as hxv, where h is horizontal DPI and v is vertical DPI + int32_t noVSyncOnRender; ///< If 1, then the user does not want VSync on Render + int32_t stageWidth; ///< The width of the stage required. 0 if not set. + int32_t stageHeight; ///< The height of the stage required. 0 if not set. + std::string stageDPI; ///< DPI stored as hxv, where h is horizontal DPI and v is vertical DPI }; } // namespace Adaptor diff --git a/dali/internal/window-system/common/window-base.h b/dali/internal/window-system/common/window-base.h index 91a958c..b2b1af5 100644 --- a/dali/internal/window-system/common/window-base.h +++ b/dali/internal/window-system/common/window-base.h @@ -327,12 +327,6 @@ public: virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) = 0; /** - * @brief Set the stereoscopic 3D view mode - * @param[in] viewMode The new view mode - */ - virtual void SetViewMode( ViewMode viewMode ) = 0; - - /** * @brief Get the screen rotation angle of the window */ virtual int GetScreenRotationAngle() = 0; diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp index d97ffd2..c29c861 100644 --- a/dali/internal/window-system/common/window-render-surface.cpp +++ b/dali/internal/window-system/common/window-render-surface.cpp @@ -319,11 +319,6 @@ void WindowRenderSurface::MoveResize( Dali::PositionSize positionSize ) DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::MoveResize: %d, %d, %d, %d\n", mPositionSize.x, mPositionSize.y, mPositionSize.width, mPositionSize.height ); } -void WindowRenderSurface::SetViewMode( ViewMode viewMode ) -{ - mWindowBase->SetViewMode( viewMode ); -} - void WindowRenderSurface::StartRender() { } diff --git a/dali/internal/window-system/common/window-render-surface.h b/dali/internal/window-system/common/window-render-surface.h index 6f93259..a1ba715 100644 --- a/dali/internal/window-system/common/window-render-surface.h +++ b/dali/internal/window-system/common/window-render-surface.h @@ -149,11 +149,6 @@ public: // from Dali::RenderSurface virtual void MoveResize( Dali::PositionSize positionSize) override; /** - * @copydoc Dali::RenderSurface::SetViewMode() - */ - virtual void SetViewMode( ViewMode viewMode ) override; - - /** * @copydoc Dali::RenderSurface::StartRender() */ virtual void StartRender() override; diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp index 6af5474..c4574fd 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp @@ -2139,10 +2139,6 @@ void WindowBaseEcoreWl::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVe dpiVertical = int( yres + 0.5f ); } -void WindowBaseEcoreWl::SetViewMode( ViewMode viewMode ) -{ -} - int WindowBaseEcoreWl::GetScreenRotationAngle() { int transform = 0; diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h index da8e8b3..210d1aa 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h +++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h @@ -415,11 +415,6 @@ public: virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** - * @copydoc Dali::Internal::Adaptor::WindowBase::SetViewMode() - */ - virtual void SetViewMode( ViewMode viewMode ) override; - - /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle() */ virtual int GetScreenRotationAngle() override; diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp index c1b4534..3b09f00 100755 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp @@ -2148,10 +2148,6 @@ void WindowBaseEcoreWl2::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiV dpiVertical = int( yres + 0.5f ); } -void WindowBaseEcoreWl2::SetViewMode( ViewMode viewMode ) -{ -} - int WindowBaseEcoreWl2::GetScreenRotationAngle() { int transform = 0; diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h index 246bd3a..57cb617 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h @@ -415,11 +415,6 @@ public: virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** - * @copydoc Dali::Internal::Adaptor::WindowBase::SetViewMode() - */ - virtual void SetViewMode( ViewMode viewMode ) override; - - /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle() */ virtual int GetScreenRotationAngle() override; diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp index a39f707..dd454f4 100644 --- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp +++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp @@ -197,10 +197,6 @@ void NativeRenderSurfaceEcoreWl::MoveResize( Dali::PositionSize positionSize ) { } -void NativeRenderSurfaceEcoreWl::SetViewMode( ViewMode viewMode ) -{ -} - void NativeRenderSurfaceEcoreWl::StartRender() { } diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h index 6978b0f..1199b3e 100644 --- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h +++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h @@ -107,11 +107,6 @@ public: // from Dali::RenderSurface virtual void MoveResize( Dali::PositionSize positionSize) override; /** - * @copydoc Dali::RenderSurface::SetViewMode() - */ - virtual void SetViewMode( ViewMode viewMode ) override; - - /** * @copydoc Dali::RenderSurface::StartRender() */ virtual void StartRender() override; diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h index 48868cc..873e7f4 100644 --- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h +++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h @@ -108,11 +108,6 @@ public: // from Dali::RenderSurface virtual void MoveResize( Dali::PositionSize positionSize) override {} /** - * @copydoc Dali::RenderSurface::SetViewMode() - */ - void SetViewMode( ViewMode viewMode ) override {} - - /** * @copydoc Dali::RenderSurface::StartRender() */ virtual void StartRender() override; diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp index 639a334..4ff9d56 100755 --- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp +++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp @@ -866,17 +866,6 @@ void WindowBaseEcoreX::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVer dpiVertical = int( yres + 0.5f ); } -void WindowBaseEcoreX::SetViewMode( ViewMode viewMode ) -{ - Ecore_X_Atom viewModeAtom( ecore_x_atom_get( "_E_COMP_3D_APP_WIN" ) ); - - if( viewModeAtom != None ) - { - unsigned int value( static_cast< unsigned int >( viewMode ) ); - ecore_x_window_prop_card32_set( mEcoreWindow, viewModeAtom, &value, 1 ); - } -} - int WindowBaseEcoreX::GetScreenRotationAngle() { return 0; diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h index 2873bbc..6cb0513 100644 --- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h +++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h @@ -344,11 +344,6 @@ public: virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** - * @copydoc Dali::Internal::Adaptor::WindowBase::SetViewMode() - */ - virtual void SetViewMode( ViewMode viewMode ) override; - - /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle() */ virtual int GetScreenRotationAngle() override; diff --git a/dali/public-api/adaptor-framework/application.cpp b/dali/public-api/adaptor-framework/application.cpp index 3405faf..188e382 100644 --- a/dali/public-api/adaptor-framework/application.cpp +++ b/dali/public-api/adaptor-framework/application.cpp @@ -192,24 +192,22 @@ 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 Internal::Adaptor::GetImplementation(*this).GetViewMode(); + return ViewMode::MONO; } -void Application::SetStereoBase( float stereoBase ) +void Application::SetStereoBase( float /*stereoBase*/ ) { - Internal::Adaptor::GetImplementation(*this).SetStereoBase( stereoBase ); } float Application::GetStereoBase() const { - return Internal::Adaptor::GetImplementation(*this).GetStereoBase(); + return 0.f; } Application::AppSignalType& Application::InitSignal() diff --git a/dali/public-api/adaptor-framework/application.h b/dali/public-api/adaptor-framework/application.h index e6d8ccd..e9449ad 100644 --- a/dali/public-api/adaptor-framework/application.h +++ b/dali/public-api/adaptor-framework/application.h @@ -324,6 +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 */ void SetViewMode( ViewMode viewMode ); @@ -331,6 +332,7 @@ public: // Stereoscopy * @brief Gets the current viewing mode. * @SINCE_1_0.0 * @return The current viewing mode + * @DEPRECATED_1_3.39 */ ViewMode GetViewMode() const; @@ -341,6 +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 */ void SetStereoBase( float stereoBase ); @@ -349,6 +352,7 @@ public: // Stereoscopy * * @SINCE_1_0.0 * @return The stereo base (eye separation) for Stereoscopic 3D + * @DEPRECATED_1_3.39 */ float GetStereoBase() const; -- 2.7.4