From 86c6555e62b74a50ec0c8acf01ef11b956f072cd Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Tue, 18 Aug 2020 16:05:54 +0900 Subject: [PATCH] Revert "[Tizen] Add screen and client rotation itself function" This reverts commit 18f6fcf69cf3d80dc045c1201b9668e8a1a99227. --- automated-tests/src/dali/utc-Dali-Scene.cpp | 10 ++- dali/integration-api/scene.cpp | 4 +- dali/integration-api/scene.h | 4 +- dali/internal/event/actors/camera-actor-impl.cpp | 6 -- dali/internal/event/actors/camera-actor-impl.h | 7 -- dali/internal/event/common/scene-impl.cpp | 11 +-- dali/internal/event/common/scene-impl.h | 7 +- dali/internal/render/common/render-algorithms.cpp | 78 +++------------------- dali/internal/render/common/render-algorithms.h | 11 ++- dali/internal/render/common/render-instruction.h | 2 +- dali/internal/render/common/render-manager.cpp | 21 +----- dali/internal/render/common/render-manager.h | 6 -- dali/internal/update/manager/update-manager.cpp | 11 --- dali/internal/update/manager/update-manager.h | 17 ----- .../update/render-tasks/scene-graph-camera.cpp | 49 +------------- .../update/render-tasks/scene-graph-camera.h | 25 ------- 16 files changed, 31 insertions(+), 238 deletions(-) diff --git a/automated-tests/src/dali/utc-Dali-Scene.cpp b/automated-tests/src/dali/utc-Dali-Scene.cpp index 7734414..a808711 100644 --- a/automated-tests/src/dali/utc-Dali-Scene.cpp +++ b/automated-tests/src/dali/utc-Dali-Scene.cpp @@ -896,8 +896,7 @@ int UtcDaliSceneSurfaceResizedDefaultScene(void) // Resize the scene Vector2 newSize( 1000.0f, 2000.0f ); DALI_TEST_CHECK( stage.GetSize() != newSize ); - - defaultScene.SurfaceResized( newSize.width, newSize.height, 0, false ); + defaultScene.SurfaceResized( newSize.width, newSize.height ); DALI_TEST_EQUALS( stage.GetSize(), newSize, TEST_LOCATION ); DALI_TEST_EQUALS( defaultScene.GetSize(), newSize, TEST_LOCATION ); @@ -940,7 +939,7 @@ int UtcDaliSceneSurfaceResizedDefaultSceneViewport(void) Vector2 newSize( 1000.0f, 2000.0f ); std::string viewportParams( "0, 0, 1000, 2000" ); // to match newSize DALI_TEST_CHECK( stage.GetSize() != newSize ); - defaultScene.SurfaceResized( newSize.width, newSize.height, 0, false ); + defaultScene.SurfaceResized( newSize.width, newSize.height ); DALI_TEST_EQUALS( stage.GetSize(), newSize, TEST_LOCATION ); DALI_TEST_EQUALS( defaultScene.GetSize(), newSize, TEST_LOCATION ); @@ -1012,7 +1011,7 @@ int UtcDaliSceneSurfaceResizedMultipleRenderTasks(void) Vector2 newSize( 1000.0f, 2000.0f ); std::string viewportParams( "0, 0, 1000, 2000" ); // to match newSize DALI_TEST_CHECK( stage.GetSize() != newSize ); - defaultScene.SurfaceResized( newSize.width, newSize.height, 0, false ); + defaultScene.SurfaceResized( newSize.width, newSize.height ); DALI_TEST_EQUALS( stage.GetSize(), newSize, TEST_LOCATION ); DALI_TEST_EQUALS( defaultScene.GetSize(), newSize, TEST_LOCATION ); @@ -1052,8 +1051,7 @@ int UtcDaliSceneSurfaceResizedAdditionalScene(void) // Resize the surface and inform the scene accordingly Vector2 newSize( 1000.0f, 2000.0f ); DALI_TEST_CHECK( stage.GetSize() != newSize ); - - scene.SurfaceResized( newSize.width, newSize.height, 0, false ); + scene.SurfaceResized( newSize.width, newSize.height ); // Ensure the stage hasn't been resized DALI_TEST_EQUALS( stage.GetSize(), stageSize, TEST_LOCATION ); diff --git a/dali/integration-api/scene.cpp b/dali/integration-api/scene.cpp index a5fc5a2..4ab7dbf 100644 --- a/dali/integration-api/scene.cpp +++ b/dali/integration-api/scene.cpp @@ -119,9 +119,9 @@ Layer Scene::GetLayer( uint32_t depth ) const return GetImplementation(*this).GetLayer( depth ); } -void Scene::SurfaceResized( float width, float height, int orientation, bool forceUpdate ) +void Scene::SurfaceResized( float width, float height ) { - GetImplementation( *this ).SurfaceResized( width, height, orientation, forceUpdate ); + GetImplementation( *this ).SurfaceResized( width, height ); } void Scene::SurfaceReplaced() diff --git a/dali/integration-api/scene.h b/dali/integration-api/scene.h index 5ec8cc3..7d54eb9 100755 --- a/dali/integration-api/scene.h +++ b/dali/integration-api/scene.h @@ -205,10 +205,8 @@ public: * * @param[in] width The new width of the set surface * @param[in] height The new height of the set surface - * @param[in] orientation The orientation of the surface - * @param[in] forceUpdate The flag to update force */ - void SurfaceResized( float width, float height, int orientation, bool forceUpdate ); + void SurfaceResized( float width, float height ); /** * @brief Informs the scene that the surface has been replaced. diff --git a/dali/internal/event/actors/camera-actor-impl.cpp b/dali/internal/event/actors/camera-actor-impl.cpp index 22ef5e5..f73497a 100644 --- a/dali/internal/event/actors/camera-actor-impl.cpp +++ b/dali/internal/event/actors/camera-actor-impl.cpp @@ -524,12 +524,6 @@ const SceneGraph::Camera* CameraActor::GetCamera() const return mSceneObject; } -void CameraActor::RotateProjection( int rotationAngle ) -{ - // sceneObject is being used in a separate thread; queue a message to set - RotateProjectionMessage( GetEventThreadServices(), *mSceneObject, rotationAngle ); -} - void CameraActor::SetDefaultProperty( Property::Index index, const Property::Value& propertyValue ) { if(index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT) diff --git a/dali/internal/event/actors/camera-actor-impl.h b/dali/internal/event/actors/camera-actor-impl.h index 1cccb00..da9ea71 100644 --- a/dali/internal/event/actors/camera-actor-impl.h +++ b/dali/internal/event/actors/camera-actor-impl.h @@ -204,13 +204,6 @@ public: */ const SceneGraph::Camera* GetCamera() const; - /** - * Rotate the projection. - * It is used in case that the target buffer direction is different from the window direction. - * @param [in] rotationAngle The rotation angle - */ - void RotateProjection( int rotationAngle ); - public: // properties /** diff --git a/dali/internal/event/common/scene-impl.cpp b/dali/internal/event/common/scene-impl.cpp index b2516d8..acb362d 100644 --- a/dali/internal/event/common/scene-impl.cpp +++ b/dali/internal/event/common/scene-impl.cpp @@ -64,7 +64,6 @@ Scene::Scene() mSize(), // Don't set the proper value here, this will be set when the surface is set later mDpi(), mBackgroundColor( DEFAULT_BACKGROUND_COLOR ), - mSurfaceOrientation( 0 ), mDepthTreeDirty( false ), mEventProcessor( *this, ThreadLocalStorage::GetInternal()->GetGestureEventProcessor() ) { @@ -138,7 +137,7 @@ void Scene::Initialize( Size size ) RenderTaskPtr renderTask = mRenderTaskList->CreateTask( mRootLayer.Get(), mDefaultCamera.Get() ); renderTask->SetClearEnabled(true); - SurfaceResized( size.width, size.height, mSurfaceOrientation, false ); + SurfaceResized( size.width, size.height ); // Create scene graph object mSceneObject = new SceneGraph::Scene(); @@ -206,27 +205,23 @@ Actor& Scene::GetDefaultRootActor() return *mRootLayer; } -void Scene::SurfaceResized( float width, float height, int orientation, bool forceUpdate ) +void Scene::SurfaceResized( float width, float height ) { - if( ( fabsf( mSize.width - width ) > Math::MACHINE_EPSILON_1 ) || ( fabsf( mSize.height - height ) > Math::MACHINE_EPSILON_1 ) - || ( orientation != mSurfaceOrientation ) || ( forceUpdate ) ) + if( ( fabsf( mSize.width - width ) > Math::MACHINE_EPSILON_1 ) || ( fabsf( mSize.height - height ) > Math::MACHINE_EPSILON_1 ) ) { Rect< int32_t > newSize( 0, 0, static_cast< int32_t >( width ), static_cast< int32_t >( height ) ); // truncated mSize.width = width; mSize.height = height; - mSurfaceOrientation = orientation; // Calculates the aspect ratio, near and far clipping planes, field of view and camera Z position. mDefaultCamera->SetPerspectiveProjection( mSize ); - mDefaultCamera->RotateProjection( mSurfaceOrientation ); mRootLayer->SetSize( mSize.width, mSize.height ); ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal(); SceneGraph::UpdateManager& updateManager = tls->GetUpdateManager(); SetDefaultSurfaceRectMessage( updateManager, newSize ); - SetDefaultSurfaceOrientationMessage( updateManager, mSurfaceOrientation ); // set default render-task viewport parameters RenderTaskPtr defaultRenderTask = mRenderTaskList->GetTask( 0u ); diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h index 007a18a..fbf22b2 100644 --- a/dali/internal/event/common/scene-impl.h +++ b/dali/internal/event/common/scene-impl.h @@ -123,10 +123,8 @@ public: * * @param[in] width The new width of the set surface * @param[in] height The new height of the set surface - * @param[in] orientation The orientation of the surface - * @param[in] forceUpdate The flag to update force */ - void SurfaceResized( float width, float height, int orientation, bool forceUpdate ); + void SurfaceResized( float width, float height ); /** * @copydoc Dali::Integration::Scene::SurfaceReplaced @@ -312,9 +310,6 @@ private: Vector4 mBackgroundColor; - // The SurfaceOrientation - int mSurfaceOrientation; - LayerPtr mRootLayer; // Ordered list of currently on-stage layers diff --git a/dali/internal/render/common/render-algorithms.cpp b/dali/internal/render/common/render-algorithms.cpp index e00a96c..744ae86 100644 --- a/dali/internal/render/common/render-algorithms.cpp +++ b/dali/internal/render/common/render-algorithms.cpp @@ -231,7 +231,7 @@ inline void SetupDepthBuffer( const RenderItem& item, Context& context, bool dep * @param[in] item The current RenderItem about to be rendered * @param[in] context The context */ -inline void RenderAlgorithms::SetupScissorClipping( const RenderItem& item, Context& context, int orientation ) +inline void RenderAlgorithms::SetupScissorClipping( const RenderItem& item, Context& context ) { // Get the number of child scissors in the stack (do not include layer or root box). size_t childStackDepth = mScissorStack.size() - 1u; @@ -292,30 +292,7 @@ inline void RenderAlgorithms::SetupScissorClipping( const RenderItem& item, Cont if( scissorEnabled ) { ClippingBox useScissorBox( mScissorStack.back() ); - GLint x = useScissorBox.x; - GLint y = useScissorBox.y; - if( orientation == 90 ) - { - x = mViewportRectangle.height - (useScissorBox.y + useScissorBox.height); - y = useScissorBox.x; - context.Scissor( x, y, useScissorBox.height, useScissorBox.width ); - } - else if( orientation == 180 ) - { - x = mViewportRectangle.width - (useScissorBox.x + useScissorBox.width); - y = mViewportRectangle.height - (useScissorBox.y + useScissorBox.height); - context.Scissor( x, y, useScissorBox.width, useScissorBox.height ); - } - else if( orientation == 270 ) - { - x = useScissorBox.y; - y = mViewportRectangle.width - (useScissorBox.x + useScissorBox.width); - context.Scissor( x, y, useScissorBox.height, useScissorBox.width ); - } - else - { - context.Scissor( x, y, useScissorBox.width, useScissorBox.height ); - } + context.Scissor( useScissorBox.x, useScissorBox.y, useScissorBox.width, useScissorBox.height ); } } } @@ -325,8 +302,7 @@ inline void RenderAlgorithms::SetupClipping( const RenderItem& item, bool& usedStencilBuffer, uint32_t& lastClippingDepth, uint32_t& lastClippingId, - Integration::StencilBufferAvailable stencilBufferAvailable, - int orientation ) + Integration::StencilBufferAvailable stencilBufferAvailable ) { RenderMode::Type renderMode = RenderMode::AUTO; const Renderer *renderer = item.mRenderer; @@ -348,7 +324,7 @@ inline void RenderAlgorithms::SetupClipping( const RenderItem& item, // As both scissor and stencil clips can be nested, we may be simultaneously traversing up the scissor tree, requiring a scissor to be un-done. Whilst simultaneously adding a new stencil clip. // We process both based on our current and old clipping depths for each mode. // Both methods with return rapidly if there is nothing to be done for that type of clipping. - SetupScissorClipping( item, context, orientation ); + SetupScissorClipping( item, context ); if( stencilBufferAvailable == Integration::StencilBufferAvailable::TRUE ) { @@ -416,8 +392,8 @@ inline void RenderAlgorithms::ProcessRenderList( const RenderList& renderList, Integration::StencilBufferAvailable stencilBufferAvailable, Vector& boundTextures, const RenderInstruction& instruction, - const Rect& rootClippingRect, - int orientation ) + const Rect& rootClippingRect + ) { DALI_PRINT_RENDER_LIST( renderList ); @@ -434,13 +410,6 @@ inline void RenderAlgorithms::ProcessRenderList( const RenderList& renderList, mViewportRectangle = context.GetViewport(); mHasLayerScissor = false; - if( orientation == 90 || orientation == 270 ) - { - int temp = mViewportRectangle.width; - mViewportRectangle.width = mViewportRectangle.height; - mViewportRectangle.height = temp; - } - // Setup Scissor testing (for both viewport and per-node scissor) mScissorStack.clear(); @@ -462,32 +431,7 @@ inline void RenderAlgorithms::ProcessRenderList( const RenderList& renderList, { context.SetScissorTest( true ); const ClippingBox& layerScissorBox = renderList.GetClippingBox(); - GLint x = layerScissorBox.x; - GLint y = layerScissorBox.y; - - if( orientation == 90 ) - { - x = mViewportRectangle.height - (layerScissorBox.y + layerScissorBox.height); - y = layerScissorBox.x; - context.Scissor( x, y, layerScissorBox.height, layerScissorBox.width ); - } - else if( orientation == 180 ) - { - x = mViewportRectangle.width - (layerScissorBox.x + layerScissorBox.width); - y = mViewportRectangle.height - (layerScissorBox.y + layerScissorBox.height); - context.Scissor( x, y, layerScissorBox.width, layerScissorBox.height ); - } - else if( orientation == 270 ) - { - x = layerScissorBox.y; - y = mViewportRectangle.width - (layerScissorBox.x + layerScissorBox.width); - context.Scissor( x, y, layerScissorBox.height, layerScissorBox.width ); - } - else - { - context.Scissor( x, y, layerScissorBox.width, layerScissorBox.height ); - } - + context.Scissor( layerScissorBox.x, layerScissorBox.y, layerScissorBox.width, layerScissorBox.height ); mScissorStack.push_back( layerScissorBox ); mHasLayerScissor = true; } @@ -501,7 +445,7 @@ inline void RenderAlgorithms::ProcessRenderList( const RenderList& renderList, // Set up clipping based on both the Renderer and Actor APIs. // The Renderer API will be used if specified. If AUTO, the Actors automatic clipping feature will be used. - SetupClipping( item, context, usedStencilBuffer, lastClippingDepth, lastClippingId, stencilBufferAvailable, orientation ); + SetupClipping( item, context, usedStencilBuffer, lastClippingDepth, lastClippingId, stencilBufferAvailable ); if( DALI_LIKELY( item.mRenderer ) ) { @@ -543,8 +487,7 @@ void RenderAlgorithms::ProcessRenderInstruction( const RenderInstruction& instru Integration::DepthBufferAvailable depthBufferAvailable, Integration::StencilBufferAvailable stencilBufferAvailable, Vector& boundTextures, - const Rect& rootClippingRect, - int orientation ) + const Rect& rootClippingRect ) { DALI_PRINT_RENDER_INSTRUCTION( instruction, bufferIndex ); @@ -575,8 +518,7 @@ void RenderAlgorithms::ProcessRenderInstruction( const RenderInstruction& instru stencilBufferAvailable, boundTextures, instruction, //added for reflection effect - rootClippingRect, - orientation ); + rootClippingRect ); } } } diff --git a/dali/internal/render/common/render-algorithms.h b/dali/internal/render/common/render-algorithms.h index ee5fd12..9d359b4 100644 --- a/dali/internal/render/common/render-algorithms.h +++ b/dali/internal/render/common/render-algorithms.h @@ -66,8 +66,7 @@ class RenderAlgorithms Integration::DepthBufferAvailable depthBufferAvailable, Integration::StencilBufferAvailable stencilBufferAvailable, Vector& boundTextures, - const Rect& rootClippingRect, - int orientation); + const Rect& rootClippingRect ); private: @@ -90,7 +89,7 @@ class RenderAlgorithms * @param[in] item The current RenderItem (about to be rendered) * @param[in] context The current Context */ - inline void SetupScissorClipping( const Dali::Internal::SceneGraph::RenderItem& item, Context& context, int orientation ); + inline void SetupScissorClipping( const Dali::Internal::SceneGraph::RenderItem& item, Context& context ); /** * @brief Set up the clipping based on the specified clipping settings. @@ -106,8 +105,7 @@ class RenderAlgorithms bool& usedStencilBuffer, uint32_t& lastClippingDepth, uint32_t& lastClippingId, - Integration::StencilBufferAvailable stencilBufferAvailable, - int orientation ); + Integration::StencilBufferAvailable stencilBufferAvailable ); /** * @brief Process a render-list. @@ -129,8 +127,7 @@ class RenderAlgorithms Integration::StencilBufferAvailable stencilBufferAvailable, Vector& boundTextures, const Dali::Internal::SceneGraph::RenderInstruction& instruction, // in the case of reflection, things like CullFace need to be adjusted for reflection world - const Rect& rootClippingRect, - int orientation ); + const Rect& rootClippingRect ); // Prevent copying: RenderAlgorithms( RenderAlgorithms& rhs ); diff --git a/dali/internal/render/common/render-instruction.h b/dali/internal/render/common/render-instruction.h index 91a48f4..8f59b13 100644 --- a/dali/internal/render/common/render-instruction.h +++ b/dali/internal/render/common/render-instruction.h @@ -122,7 +122,7 @@ public: const Matrix* GetProjectionMatrix( BufferIndex index ) const { // inlined as this is called once per frame per render instruction - return &mCamera->GetFinalProjectionMatrix( index ); + return &mCamera->GetProjectionMatrix( index ); } // for reflection effect const Camera* GetCamera() const diff --git a/dali/internal/render/common/render-manager.cpp b/dali/internal/render/common/render-manager.cpp index 3114f55..3ec8755 100644 --- a/dali/internal/render/common/render-manager.cpp +++ b/dali/internal/render/common/render-manager.cpp @@ -125,8 +125,7 @@ struct RenderManager::Impl depthBufferAvailable( depthBufferAvailableParam ), stencilBufferAvailable( stencilBufferAvailableParam ), partialUpdateAvailable( partialUpdateAvailableParam ), - itemsCheckSum(0), - defaultSurfaceOrientation( 0 ) + itemsCheckSum(0) { // Create thread pool with just one thread ( there may be a need to create more threads in the future ). threadPool = std::unique_ptr( new Dali::ThreadPool() ); @@ -225,7 +224,6 @@ struct RenderManager::Impl Vector textureDependencyList; ///< The dependency list of binded textures std::size_t itemsCheckSum; ///< The damaged render items checksum from previous prerender phase. std::vector itemsDirtyRects; - int defaultSurfaceOrientation; ///< defaultSurfaceOrientation for the default surface we are rendering to }; RenderManager* RenderManager::New( Integration::GlAbstraction& glAbstraction, @@ -309,11 +307,6 @@ void RenderManager::SetDefaultSurfaceRect(const Rect& rect) mImpl->defaultSurfaceRect = rect; } -void RenderManager::SetDefaultSurfaceOrientation( int orientation ) -{ - mImpl->defaultSurfaceOrientation = orientation; -} - void RenderManager::AddRenderer( OwnerPointer< Render::Renderer >& renderer ) { // Initialize the renderer as we are now in render thread @@ -875,7 +868,6 @@ void RenderManager::RenderScene( Integration::RenderStatus& status, Integration: Rect surfaceRect = mImpl->defaultSurfaceRect; Integration::DepthBufferAvailable depthBufferAvailable = mImpl->depthBufferAvailable; Integration::StencilBufferAvailable stencilBufferAvailable = mImpl->stencilBufferAvailable; - int surfaceOrientation = mImpl->defaultSurfaceOrientation; if ( instruction.mFrameBuffer ) { @@ -975,7 +967,6 @@ void RenderManager::RenderScene( Integration::RenderStatus& status, Integration: { viewportRect.Set( 0, 0, instruction.mFrameBuffer->GetWidth(), instruction.mFrameBuffer->GetHeight() ); } - surfaceOrientation = 0; } else // No Offscreen frame buffer rendering { @@ -992,13 +983,6 @@ void RenderManager::RenderScene( Integration::RenderStatus& status, Integration: } } - if( surfaceOrientation == 90 || surfaceOrientation == 270 ) - { - int temp = viewportRect.width; - viewportRect.width = viewportRect.height; - viewportRect.height = temp; - } - bool clearFullFrameRect = true; if( instruction.mFrameBuffer != 0 ) { @@ -1062,8 +1046,7 @@ void RenderManager::RenderScene( Integration::RenderStatus& status, Integration: depthBufferAvailable, stencilBufferAvailable, mImpl->boundTextures, - clippingRect, - surfaceOrientation ); + clippingRect ); // Synchronise the FBO/Texture access when there are multiple contexts if ( mImpl->currentContext->IsSurfacelessContextSupported() ) diff --git a/dali/internal/render/common/render-manager.h b/dali/internal/render/common/render-manager.h index 57b25f6..abc3c12 100644 --- a/dali/internal/render/common/render-manager.h +++ b/dali/internal/render/common/render-manager.h @@ -132,12 +132,6 @@ public: void SetDefaultSurfaceRect( const Rect& rect ); /** - * Returns the orintation for the default surface (probably the application window). - * @return Orientation for the surface. - */ - void SetDefaultSurfaceOrientation( int orientation ); - - /** * Add a Renderer to the render manager. * @param[in] renderer The renderer to add. * @post renderer is owned by RenderManager diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp index a3e4534..4272e48 100644 --- a/dali/internal/update/manager/update-manager.cpp +++ b/dali/internal/update/manager/update-manager.cpp @@ -1129,17 +1129,6 @@ void UpdateManager::SurfaceReplaced( Scene* scene ) new (slot) DerivedType( &mImpl->renderManager, &RenderManager::SurfaceReplaced, scene ); } -void UpdateManager::SetDefaultSurfaceOrientation( int orientation ) -{ - typedef MessageValue1< RenderManager, int > DerivedType; - - // Reserve some memory inside the render queue - unsigned int* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) ); - - // Construct message in the render queue memory; note that delete should not be called on the return value - new (slot) DerivedType( &mImpl->renderManager, &RenderManager::SetDefaultSurfaceOrientation, orientation ); -} - void UpdateManager::KeepRendering( float durationSeconds ) { mImpl->keepRenderingSeconds = std::max( mImpl->keepRenderingSeconds, durationSeconds ); diff --git a/dali/internal/update/manager/update-manager.h b/dali/internal/update/manager/update-manager.h index fdadd69..f07a3be 100644 --- a/dali/internal/update/manager/update-manager.h +++ b/dali/internal/update/manager/update-manager.h @@ -636,12 +636,6 @@ public: void SetDefaultSurfaceRect( const Rect& rect ); /** - * Set the default surface orientation. - * @param[in] orientation The orientation value representing the surface. - */ - void SetDefaultSurfaceOrientation( int orientation ); - - /** * @copydoc Dali::Stage::KeepRendering() */ void KeepRendering( float durationSeconds ); @@ -1094,17 +1088,6 @@ inline void SurfaceReplacedMessage( UpdateManager& manager, const SceneGraph::Sc new (slot) LocalType( &manager, &UpdateManager::SurfaceReplaced, &scene ); } -inline void SetDefaultSurfaceOrientationMessage( UpdateManager& manager, int orientation ) -{ - typedef MessageValue1< UpdateManager, int > LocalType; - - // Reserve some memory inside the message queue - unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); - - // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::SetDefaultSurfaceOrientation, orientation ); -} - inline void KeepRenderingMessage( UpdateManager& manager, float durationSeconds ) { typedef MessageValue1< UpdateManager, float > LocalType; diff --git a/dali/internal/update/render-tasks/scene-graph-camera.cpp b/dali/internal/update/render-tasks/scene-graph-camera.cpp index 3873193..aa44bd3 100644 --- a/dali/internal/update/render-tasks/scene-graph-camera.cpp +++ b/dali/internal/update/render-tasks/scene-graph-camera.cpp @@ -161,7 +161,6 @@ const Vector3 Camera::DEFAULT_TARGET_POSITION( 0.0f, 0.0f, 0.0f ); Camera::Camera() : mUpdateViewFlag( UPDATE_COUNT ), mUpdateProjectionFlag( UPDATE_COUNT ), - mProjectionRotation( 0 ), mNode( NULL ), mType( DEFAULT_TYPE ), mProjectionMode( DEFAULT_MODE ), @@ -177,8 +176,7 @@ Camera::Camera() mTargetPosition( DEFAULT_TARGET_POSITION ), mViewMatrix(), mProjectionMatrix(), - mInverseViewProjection( Matrix::IDENTITY ), - mFinalProjection( Matrix::IDENTITY ) + mInverseViewProjection( Matrix::IDENTITY ) { } @@ -272,6 +270,8 @@ void Camera::SetTargetPosition( const Vector3& targetPosition ) mUpdateViewFlag = UPDATE_COUNT; } + + void VectorReflectedByPlane(Vector4 &out, Vector4 &in, Vector4 &plane) { float d = float(2.0) * plane.Dot(in); @@ -333,12 +333,6 @@ void Camera::SetReflectByPlane( const Vector4& plane ) mUpdateViewFlag = UPDATE_COUNT; } -void Camera::RotateProjection( int rotationAngle ) -{ - mProjectionRotation = rotationAngle; - mUpdateViewFlag = UPDATE_COUNT; -} - const Matrix& Camera::GetProjectionMatrix( BufferIndex bufferIndex ) const { return mProjectionMatrix[ bufferIndex ]; @@ -354,11 +348,6 @@ const Matrix& Camera::GetInverseViewProjectionMatrix( BufferIndex bufferIndex ) return mInverseViewProjection[ bufferIndex ]; } -const Matrix& Camera::GetFinalProjectionMatrix( BufferIndex bufferIndex ) const -{ - return mFinalProjection[ bufferIndex ]; -} - const PropertyInputImpl* Camera::GetProjectionMatrix() const { return &mProjectionMatrix; @@ -668,38 +657,6 @@ uint32_t Camera::UpdateProjection( BufferIndex updateBufferIndex ) } mProjectionMatrix.SetDirty( updateBufferIndex ); - - Matrix &finalProjection = mFinalProjection[ updateBufferIndex ]; - finalProjection.SetIdentity(); - - Quaternion rotationAngle; - switch( mProjectionRotation ) - { - case 90: - { - rotationAngle = Quaternion( Dali::ANGLE_90, Vector3::ZAXIS ); - break; - } - case 180: - { - rotationAngle = Quaternion( Dali::ANGLE_180, Vector3::ZAXIS ); - break; - } - case 270: - { - rotationAngle = Quaternion( Dali::ANGLE_270, Vector3::ZAXIS ); - break; - } - default: - rotationAngle = Quaternion( Dali::ANGLE_0, Vector3::ZAXIS ); - break; - } - - Matrix rotation; - rotation.SetIdentity(); - rotation.SetTransformComponents( Vector3( 1.0f, 1.0f, 1.0f ), rotationAngle, Vector3( 0.0f, 0.0f, 0.0f ) ); - - Matrix::Multiply( finalProjection, mProjectionMatrix.Get( updateBufferIndex ), rotation ); } --mUpdateProjectionFlag; } diff --git a/dali/internal/update/render-tasks/scene-graph-camera.h b/dali/internal/update/render-tasks/scene-graph-camera.h index 7d0912d..f75f81b 100644 --- a/dali/internal/update/render-tasks/scene-graph-camera.h +++ b/dali/internal/update/render-tasks/scene-graph-camera.h @@ -161,11 +161,6 @@ public: void SetFarClippingPlane( float farClippingPlane ); /** - * @copydoc Dali::Internal::CameraActor::RotateProjection - */ - void RotateProjection( int rotationAngle ); - - /** * @copydoc Dali::Internal::CameraActor::SetTarget */ void SetTargetPosition( const Vector3& targetPosition ); @@ -229,13 +224,6 @@ public: const Matrix& GetInverseViewProjectionMatrix( BufferIndex bufferIndex ) const; /** - * Retrieve the final projection-matrix; this is double buffered for input handling. - * @param[in] bufferIndex The buffer to read from. - * @return The projection-matrix that should be used to render. - */ - const Matrix& GetFinalProjectionMatrix( BufferIndex bufferIndex ) const; - - /** * Retrieve the projection-matrix property querying interface. * @pre The camera is on-stage. * @return The projection-matrix property querying interface. @@ -307,7 +295,6 @@ private: uint32_t mUpdateViewFlag; ///< This is non-zero if the view matrix requires an update uint32_t mUpdateProjectionFlag; ///< This is non-zero if the projection matrix requires an update - int mProjectionRotation; ///< The rotaion angle of the projection const Node* mNode; ///< The node this scene graph camera belongs to public: // PROPERTIES @@ -336,7 +323,6 @@ public: // PROPERTIES DoubleBuffered< FrustumPlanes > mFrustum; ///< Clipping frustum; double buffered for input handling DoubleBuffered< Matrix > mInverseViewProjection; ///< Inverted viewprojection; double buffered for input handling - DoubleBuffered< Matrix > mFinalProjection; ///< Final projection matrix; double buffered for input handling }; @@ -474,17 +460,6 @@ inline void SetInvertYAxisMessage( EventThreadServices& eventThreadServices, con new (slot) LocalType( &camera, &Camera::SetInvertYAxis, parameter ); } -inline void RotateProjectionMessage( EventThreadServices& eventThreadServices, const Camera& camera, int parameter ) -{ - typedef MessageValue1< Camera, int > LocalType; - - // Reserve some memory inside the message queue - unsigned int* 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::RotateProjection, parameter ); -} - } // namespace SceneGraph } // namespace Internal -- 2.7.4