From: Heeyong Song Date: Mon, 3 Dec 2018 04:59:53 +0000 (+0900) Subject: Revert "[Tizen] Revert "Remove StereoMode"" X-Git-Tag: accepted/tizen/unified/20181204.063738~4 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=a2faa758ee9ac8ce0791662d9cbdd62516cb69ec Revert "[Tizen] Revert "Remove StereoMode"" This reverts commit 9697546f6395000a500259997c415d9ff3c2e337. Change-Id: Ib2f14d135aa8db1ab07eca36d3627ac224a95523 --- diff --git a/automated-tests/src/dali/utc-Dali-Core.cpp b/automated-tests/src/dali/utc-Dali-Core.cpp index 7a5eff9..88ba387 100644 --- a/automated-tests/src/dali/utc-Dali-Core.cpp +++ b/automated-tests/src/dali/utc-Dali-Core.cpp @@ -44,29 +44,3 @@ int UtcDaliCoreGetMaximumUpdateCount(void) END_TEST; } -int UtcDaliCoreSetStereoBase(void) -{ - TestApplication application; - tet_infoline("Testing Dali::GetMaximumUpdateCount"); - - application.GetCore().SetViewMode( STEREO_HORIZONTAL ); - DALI_TEST_EQUALS( application.GetCore().GetViewMode(), STEREO_HORIZONTAL, TEST_LOCATION ); - - application.SendNotification(); - application.Render(); - - application.GetCore().SetViewMode( STEREO_VERTICAL ); - DALI_TEST_EQUALS( application.GetCore().GetViewMode(), STEREO_VERTICAL, TEST_LOCATION ); - - application.SendNotification(); - application.Render(); - - application.GetCore().SetViewMode( MONO ); - DALI_TEST_EQUALS( application.GetCore().GetViewMode(), MONO, TEST_LOCATION ); - - application.SendNotification(); - application.Render(); - - END_TEST; -} - diff --git a/dali/integration-api/core-enumerations.h b/dali/integration-api/core-enumerations.h index 684be03..24299f4 100644 --- a/dali/integration-api/core-enumerations.h +++ b/dali/integration-api/core-enumerations.h @@ -2,7 +2,7 @@ #define DALI_INTEGRATION_CORE_ENUMERATIONS_H /* - * Copyright (c) 2017 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,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include #include #include diff --git a/dali/integration-api/core.cpp b/dali/integration-api/core.cpp index 4f2e5d2..cf6c17e 100644 --- a/dali/integration-api/core.cpp +++ b/dali/integration-api/core.cpp @@ -129,26 +129,6 @@ SystemOverlay& Core::GetSystemOverlay() return mImpl->GetSystemOverlay(); } -void Core::SetViewMode( ViewMode viewMode ) -{ - mImpl->SetViewMode( viewMode ); -} - -ViewMode Core::GetViewMode() const -{ - return mImpl->GetViewMode(); -} - -void Core::SetStereoBase( float stereoBase ) -{ - mImpl->SetStereoBase( stereoBase ); -} - -float Core::GetStereoBase() const -{ - return mImpl->GetStereoBase(); -} - void Core::RegisterProcessor( Processor& processor ) { mImpl->RegisterProcessor( processor ); diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h index 84ae5e6..d8ba428 100644 --- a/dali/integration-api/core.h +++ b/dali/integration-api/core.h @@ -23,7 +23,6 @@ // INTERNAL INCLUDES #include -#include #include #include #include @@ -402,31 +401,6 @@ public: SystemOverlay& GetSystemOverlay(); /** - * Set the stereoscopic 3D view mode - * @param[in] viewMode The new view mode - */ - void SetViewMode( ViewMode viewMode ); - - /** - * Get the current view mode - * @return The current view mode - * @see SetViewMode. - */ - ViewMode GetViewMode() const; - - /** - * Set the stereo base (eye seperation) for stereoscopic 3D - * @param[in] stereoBase The stereo base (eye seperation) for stereoscopic 3D (mm) - */ - void SetStereoBase( float stereoBase ); - - /** - * Get the stereo base (eye seperation) for stereoscopic 3D - * @return The stereo base (eye seperation) for stereoscopic 3D (mm) - */ - float GetStereoBase() const; - - /** * @brief Register a processor * * Note, Core does not take ownership of this processor. diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp index 12dbec6..6b59def 100644 --- a/dali/internal/common/core-impl.cpp +++ b/dali/internal/common/core-impl.cpp @@ -314,21 +314,6 @@ Integration::SystemOverlay& Core::GetSystemOverlay() return mStage->GetSystemOverlay(); } -void Core::SetViewMode( ViewMode viewMode ) -{ - mStage->SetViewMode( viewMode ); -} - -ViewMode Core::GetViewMode() const -{ - return mStage->GetViewMode(); -} - -void Core::SetStereoBase( float stereoBase ) -{ - mStage->SetStereoBase( stereoBase ); -} - void Core::RegisterProcessor( Integration::Processor& processor ) { mProcessors.PushBack(&processor); @@ -357,11 +342,6 @@ void Core::RunProcessors() } } -float Core::GetStereoBase() const -{ - return mStage->GetStereoBase(); -} - StagePtr Core::GetCurrentStage() { return mStage.Get(); diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h index 49d62ea..30395e5 100644 --- a/dali/internal/common/core-impl.h +++ b/dali/internal/common/core-impl.h @@ -26,7 +26,6 @@ #include #include #include -#include #include namespace Dali @@ -167,29 +166,6 @@ public: */ Integration::SystemOverlay& GetSystemOverlay(); - // 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; - - /** * @copydoc Dali::Integration::Core::RegisterProcessor */ diff --git a/dali/internal/event/actors/camera-actor-impl.cpp b/dali/internal/event/actors/camera-actor-impl.cpp index 3383f00..e1273d3 100644 --- a/dali/internal/event/actors/camera-actor-impl.cpp +++ b/dali/internal/event/actors/camera-actor-impl.cpp @@ -409,13 +409,12 @@ void CameraActor::SetPerspectiveProjection( const Size& size, const Vector2& ste const float aspectRatio = width / height; + // sceneObject is being used in a separate thread; queue a message to set SetProjectionMode(Dali::Camera::PERSPECTIVE_PROJECTION); SetFieldOfView( fieldOfView ); SetNearClippingPlane( nearClippingPlane ); SetFarClippingPlane( farClippingPlane ); SetAspectRatio( aspectRatio ); - // sceneObject is being used in a separate thread; queue a message to set - SetStereoBiasMessage( GetEventThreadServices(), *mSceneObject, stereoBias ); SetZ( cameraZ ); } diff --git a/dali/internal/event/common/stage-impl.cpp b/dali/internal/event/common/stage-impl.cpp index f1d7b01..f747bfd 100644 --- a/dali/internal/event/common/stage-impl.cpp +++ b/dali/internal/event/common/stage-impl.cpp @@ -120,8 +120,8 @@ void Stage::Initialize( bool renderToFbo ) // Create the list of render-tasks mRenderTaskList = RenderTaskList::New(); - // Create the default render-task - Dali::RenderTask defaultRenderTask = mRenderTaskList->CreateTask( mRootLayer.Get(), mDefaultCamera.Get() ); + // Create the default render-task (don't need the returned handle) + mRenderTaskList->CreateTask( mRootLayer.Get(), mDefaultCamera.Get() ); } void Stage::Uninitialize() @@ -357,169 +357,6 @@ SystemOverlay* Stage::GetSystemOverlayInternal() return overlay; } -void Stage::SetViewMode( ViewMode viewMode ) -{ - if( mViewMode != viewMode ) - { - DALI_LOG_INFO( Debug::Filter::gActor, Debug::Concise, "View mode changed from %d to %d\n", mViewMode, viewMode); - - if( mViewMode == MONO ) - { - mDefaultCamera->SetOrientation( Dali::ANGLE_180, Vector3::YAXIS ); - mRenderTaskList->GetTask(0).SetSourceActor( Dali::Actor() ); - - //Create camera and RenderTask for left eye - mLeftCamera = CameraActor::New( Size::ZERO ); - mLeftCamera->SetParentOrigin( ParentOrigin::CENTER ); - mDefaultCamera->Add( *mLeftCamera.Get() ); - mLeftRenderTask = mRenderTaskList->CreateTask(); - mLeftRenderTask.SetCameraActor( Dali::CameraActor( mLeftCamera.Get() ) ); - mLeftCamera->SetType( Dali::Camera::FREE_LOOK ); - - //Create camera and RenderTask for right eye - mRightCamera = CameraActor::New( Size::ZERO ); - mRightCamera->SetParentOrigin( ParentOrigin::CENTER ); - mDefaultCamera->Add( *mRightCamera.Get() ); - mRightRenderTask = mRenderTaskList->CreateTask(); - mRightRenderTask.SetClearColor( Vector4( 1.0f,0.0f,0.0f,1.0f)); - - mRightRenderTask.SetCameraActor( Dali::CameraActor( mRightCamera.Get() ) ); - mRightCamera->SetType( Dali::Camera::FREE_LOOK ); - } - - // save new mode - mViewMode = viewMode; - - switch( viewMode ) - { - case MONO: - { - // delete extra stereoscopic render tasks and cameras - mRenderTaskList->RemoveTask( mLeftRenderTask ); - mDefaultCamera->Remove( *mLeftCamera.Get() ); - mLeftRenderTask.Reset(); - mLeftCamera.Reset(); - mRenderTaskList->RemoveTask( mRightRenderTask ); - mDefaultCamera->Remove( *mRightCamera.Get() ); - mRightRenderTask.Reset(); - mRightCamera.Reset(); - mDefaultCamera->SetOrientation( Dali::ANGLE_0, Vector3::YAXIS ); - mDefaultCamera->SetType( Dali::Camera::LOOK_AT_TARGET ); - mRenderTaskList->GetTask(0).SetSourceActor( Dali::Layer(mRootLayer.Get()) ); - - break; - } - case STEREO_HORIZONTAL: - { - //Stereo mode with horizontal split is for landscape mode. That's the reason for the cameras being rotated - //Top camera renders the scene as seen from the right eye and bottom camera as seen from left. - - //Calculate separation in pixels along vertical axis ( mStereoBase is defined in millimetres ) - const float stereoBase( ( (mStereoBase / 25.4f) * GetDpi().y ) * 0.5f ); - - //Calculate aspect ratio - float aspect = mSize.width / (mSize.height * 0.5f); - - mLeftCamera->SetPerspectiveProjection( mSize, Vector2( 0.0f,stereoBase) ); - mLeftCamera->SetAspectRatio( aspect ); - - mLeftCamera->SetOrientation( -Dali::ANGLE_90, Vector3::ZAXIS ); - mLeftCamera->SetPosition( Vector3( stereoBase, 0.0f, 0.0f ) ); - mLeftRenderTask.SetViewport( Viewport(0, static_cast( mSize.height * 0.5f ), static_cast( mSize.width ), static_cast( mSize.height * 0.5f ) ) ); // truncated - - mRightCamera->SetPerspectiveProjection( mSize, Vector2( 0.0, -stereoBase ) ); - mRightCamera->SetAspectRatio( aspect ); - mRightCamera->SetOrientation( -Dali::ANGLE_90, Vector3::ZAXIS ); - mRightCamera->SetPosition( Vector3(-stereoBase, 0.0f, 0.0f ) ); - mRightRenderTask.SetViewport( Viewport(0, 0, static_cast( mSize.width ), static_cast( mSize.height * 0.5f ) ) ); // truncated - - break; - } - case STEREO_VERTICAL: - { - //Calculate separation in pixels along horizontal axis - const float stereoBase( ( (mStereoBase / 25.4f) * GetDpi().x ) * 0.5f ); - - //Recalculate fov based on viewport size - const float fov = 2.0f * std::atan( mSize.y / (2.0f * std::max( mSize.x*0.5f, mSize.y )) ); - - mLeftCamera->SetPerspectiveProjection( Size( mSize.x * 0.5f, mSize.y ), Vector2(stereoBase,0.0f) ); - mLeftCamera->SetFieldOfView( fov ); - mLeftCamera->SetOrientation( Dali::ANGLE_0, Vector3::ZAXIS ); - mLeftCamera->SetPosition( Vector3( stereoBase, 0.0f, 0.0f ) ); - mLeftRenderTask.SetViewport( Viewport(0, 0, static_cast( mSize.width * 0.5f ), static_cast( mSize.height ) ) ); // truncated - - mRightCamera->SetPerspectiveProjection( Size( mSize.x * 0.5f, mSize.y ), Vector2(-stereoBase,0.0f) ); - mRightCamera->SetFieldOfView( fov ); - mRightCamera->SetOrientation( Dali::ANGLE_0, Vector3::ZAXIS ); - mRightCamera->SetPosition( Vector3( -stereoBase, 0.0f, 0.0f ) ); - mRightRenderTask.SetViewport( Viewport( static_cast( mSize.width * 0.5f ), 0, static_cast( mSize.width * 0.5f ), static_cast( mSize.height ) ) ); // truncated - - break; - } - case STEREO_INTERLACED: - { - break; - } - } - } -} - -ViewMode Stage::GetViewMode() const -{ - return mViewMode; -} - -void Stage::SetStereoBase( float stereoBase ) -{ - if( ! Equals( mStereoBase, stereoBase ) ) - { - DALI_LOG_INFO( Debug::Filter::gActor, Debug::Concise, "old( %.2f) new(%.2f)\n", mStereoBase, stereoBase ); - mStereoBase = stereoBase; - - switch( mViewMode ) - { - case STEREO_HORIZONTAL: - { - stereoBase = mStereoBase / 25.4f * GetDpi().y * 0.5f; - float aspect = mSize.width / (mSize.height * 0.5f); - - mLeftCamera->SetPerspectiveProjection( mSize, Vector2( 0.0, stereoBase) ); - mLeftCamera->SetAspectRatio( aspect ); - mLeftCamera->SetPosition( Vector3( stereoBase, 0.0f, 0.0f ) ); - - mRightCamera->SetPerspectiveProjection( mSize, Vector2( 0.0, -stereoBase) ); - mRightCamera->SetAspectRatio( aspect ); - mRightCamera->SetPosition( Vector3(-stereoBase, 0.0f, 0.0f ) ); - - break; - } - case STEREO_VERTICAL: - { - stereoBase = mStereoBase / 25.4f * GetDpi().x * 0.5f; - const float fov = 2.0f * std::atan( mSize.y / (2.0f * std::max( mSize.x*0.5f, mSize.y )) ); - - mLeftCamera->SetPerspectiveProjection( Size( mSize.x * 0.5f, mSize.y ), Vector2(stereoBase,0.0f) ); - mLeftCamera->SetFieldOfView( fov ); - mLeftCamera->SetPosition( Vector3( stereoBase, 0.0f, 0.0f ) ); - - mRightCamera->SetPerspectiveProjection( Size( mSize.x * 0.5f, mSize.y ), Vector2(-stereoBase,0.0f) ); - mRightCamera->SetFieldOfView( fov ); - mRightCamera->SetPosition( Vector3(-stereoBase, 0.0f, 0.0f ) ); - - break; - } - default: - break; - } - } -} - -float Stage::GetStereoBase() const -{ - return mStereoBase; -} - void Stage::SetBackgroundColor(Vector4 color) { // Cache for public GetBackgroundColor() @@ -759,12 +596,8 @@ Stage::Stage( AnimationPlaylist& playlist, mSize( Vector2::ZERO ), mSurfaceSize( Vector2::ZERO ), mBackgroundColor( Dali::Stage::DEFAULT_BACKGROUND_COLOR ), - mViewMode( MONO ), - mStereoBase( DEFAULT_STEREO_BASE ), mTopMargin( 0 ), mDpi( Vector2::ZERO ), - mRightRenderTask(), - mLeftRenderTask(), mSystemOverlay( NULL ), mKeyEventSignal(), mKeyEventGeneratedSignal(), diff --git a/dali/internal/event/common/stage-impl.h b/dali/internal/event/common/stage-impl.h index a6aa52e..4e3246e 100644 --- a/dali/internal/event/common/stage-impl.h +++ b/dali/internal/event/common/stage-impl.h @@ -19,10 +19,13 @@ */ // INTERNAL INCLUDES -#include #include -#include +#include #include +#include +#include +#include +#include #include #include #include @@ -31,11 +34,7 @@ #include #include #include -#include -#include -#include -#include -#include +#include namespace Dali { @@ -229,28 +228,6 @@ public: */ SystemOverlay* GetSystemOverlayInternal(); - // 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; - // Keyboard stuff /** @@ -527,9 +504,6 @@ private: IntrusivePtr mDefaultCamera; - ViewMode mViewMode; - float mStereoBase; - uint32_t mTopMargin; Vector2 mDpi; @@ -539,11 +513,6 @@ private: // The list of render-tasks IntrusivePtr mRenderTaskList; - Dali::RenderTask mRightRenderTask; - IntrusivePtr mRightCamera; - Dali::RenderTask mLeftRenderTask; - IntrusivePtr mLeftCamera; - Integration::SystemOverlay* mSystemOverlay; ///< SystemOverlay stage access // The key event signal diff --git a/dali/internal/update/render-tasks/scene-graph-camera.cpp b/dali/internal/update/render-tasks/scene-graph-camera.cpp index d59ec48..f6ecce5 100644 --- a/dali/internal/update/render-tasks/scene-graph-camera.cpp +++ b/dali/internal/update/render-tasks/scene-graph-camera.cpp @@ -96,13 +96,12 @@ void Frustum(Matrix& result, float left, float right, float bottom, float top, f m[12] = m[13] = m[15] = 0.0f; } -void Perspective(Matrix& result, float fovy, float aspect, float near, float far, bool invertYAxis, const Vector2& stereoBias ) +void Perspective(Matrix& result, float fovy, float aspect, float near, float far, bool invertYAxis ) { float frustumH = tanf( fovy * 0.5f ) * near; float frustumW = frustumH * aspect; - Vector2 bias = stereoBias * 0.5f; - Frustum(result, -(frustumW + bias.x), frustumW - bias.x, -(frustumH + bias.y), frustumH - bias.y, near, far, invertYAxis); + Frustum(result, -frustumW, frustumW, -frustumH, frustumH, near, far, invertYAxis); } void Orthographic(Matrix& result, float left, float right, float bottom, float top, float near, float far, bool invertYAxis) @@ -152,7 +151,6 @@ const float Camera::DEFAULT_TOP_CLIPPING_PLANE(-400.0f); const float Camera::DEFAULT_BOTTOM_CLIPPING_PLANE(400.0f); const float Camera::DEFAULT_NEAR_CLIPPING_PLANE( 800.0f ); // default height of the screen const float Camera::DEFAULT_FAR_CLIPPING_PLANE( DEFAULT_NEAR_CLIPPING_PLANE + 2.f * DEFAULT_NEAR_CLIPPING_PLANE ); -const Vector2 Camera::DEFAULT_STEREO_BIAS( 0.0f, 0.0f ); const Vector3 Camera::DEFAULT_TARGET_POSITION( 0.0f, 0.0f, 0.0f ); @@ -171,7 +169,6 @@ Camera::Camera() mBottomClippingPlane( DEFAULT_BOTTOM_CLIPPING_PLANE ), mNearClippingPlane( DEFAULT_NEAR_CLIPPING_PLANE ), mFarClippingPlane( DEFAULT_FAR_CLIPPING_PLANE ), - mStereoBias( DEFAULT_STEREO_BIAS ), mTargetPosition( DEFAULT_TARGET_POSITION ), mViewMatrix(), mProjectionMatrix(), @@ -222,12 +219,6 @@ void Camera::SetAspectRatio( float aspectRatio ) mUpdateProjectionFlag = UPDATE_COUNT; } -void Camera::SetStereoBias( const Vector2& stereoBias ) -{ - mStereoBias = stereoBias; - mUpdateProjectionFlag = UPDATE_COUNT; -} - void Camera::SetLeftClippingPlane( float leftClippingPlane ) { mLeftClippingPlane = leftClippingPlane; @@ -501,8 +492,7 @@ uint32_t Camera::UpdateProjection( BufferIndex updateBufferIndex ) mAspectRatio, mNearClippingPlane, mFarClippingPlane, - mInvertYAxis, - mStereoBias ); + mInvertYAxis ); break; } case Dali::Camera::ORTHOGRAPHIC_PROJECTION: diff --git a/dali/internal/update/render-tasks/scene-graph-camera.h b/dali/internal/update/render-tasks/scene-graph-camera.h index 2cea7f6..d17120f 100644 --- a/dali/internal/update/render-tasks/scene-graph-camera.h +++ b/dali/internal/update/render-tasks/scene-graph-camera.h @@ -124,11 +124,6 @@ public: */ void SetAspectRatio( float aspectRatio ); - /** - * @copydoc Dali::Internal::CameraActor::SetStereoBias - */ - void SetStereoBias(const Vector2& stereoBias); - /** * @copydoc Dali::Internal::CameraActor::SetLeftClippingPlane */ @@ -287,7 +282,6 @@ public: // PROPERTIES float mBottomClippingPlane; float mNearClippingPlane; float mFarClippingPlane; - Vector2 mStereoBias; Vector3 mTargetPosition; InheritedMatrix mViewMatrix; ///< The viewMatrix; this is double buffered for input handling. @@ -344,17 +338,6 @@ inline void SetAspectRatioMessage( EventThreadServices& eventThreadServices, con new (slot) LocalType( &camera, &Camera::SetAspectRatio, parameter ); } -inline void SetStereoBiasMessage( EventThreadServices& eventThreadServices, const Camera& camera, const Vector2& parameter ) -{ - typedef MessageValue1< Camera, Vector2 > LocalType; - - // Reserve some memory inside the message queue - uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) ); - - // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &camera, &Camera::SetStereoBias, parameter ); -} - inline void SetLeftClippingPlaneMessage( EventThreadServices& eventThreadServices, const Camera& camera, float parameter ) { typedef MessageValue1< Camera, float > LocalType; diff --git a/dali/public-api/common/view-mode.h b/dali/public-api/common/view-mode.h index 2a0c452..88ffafe 100644 --- a/dali/public-api/common/view-mode.h +++ b/dali/public-api/common/view-mode.h @@ -2,7 +2,7 @@ #define __DALI_VIEW_MODE_H__ /* - * Copyright (c) 2015 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. @@ -32,8 +32,8 @@ namespace Dali enum ViewMode { MONO, ///< Monoscopic (single camera). This is the default @SINCE_1_0.0 - STEREO_HORIZONTAL, ///< Stereoscopic. Frame buffer is split horizontally with the left and right camera views in their respective sides. @SINCE_1_0.0 - STEREO_VERTICAL, ///< Stereoscopic. Frame buffer is split vertically with the left camera view at the top and the right camera view at the bottom. @SINCE_1_0.0 + STEREO_HORIZONTAL, ///< @DEPRECATED_1_3.39 Stereoscopic. Frame buffer is split horizontally with the left and right camera views in their respective sides. @SINCE_1_0.0 + STEREO_VERTICAL, ///< @DEPRECATED_1_3.39 Stereoscopic. Frame buffer is split vertically with the left camera view at the top and the right camera view at the bottom. @SINCE_1_0.0 STEREO_INTERLACED ///< @DEPRECATED_1_1.19 @brief Stereoscopic. Left/Right camera views are rendered into the framebuffer on alternate frames. @SINCE_1_0.0 }; diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h index ccbb290..66c5f80 100644 --- a/dali/public-api/dali-core.h +++ b/dali/public-api/dali-core.h @@ -2,7 +2,7 @@ #define __DALI_CORE_H__ /* - * Copyright (c) 2017 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. @@ -46,7 +46,6 @@ #include #include #include -#include #include #include