changed composite view logic

Change-Id: I5bfa6a3c79037642f17b1085760e3091739cba67
Signed-off-by: Dae Young Ryu <karzia@samsung.com>

diff --git a/inc/FUiAnimCamera.h b/inc/FUiAnimCamera.h
index 82808ab..c4eca29 100644 (file)
--- a/inc/FUiAnimCamera.h
+++ b/inc/FUiAnimCamera.h
@@ -30,7 +30,8 @@
 namespace Tizen { namespace Base { class String; }}
 
 namespace Tizen { namespace Graphics{
-       class FloatPoint3; class FloatMatrix4;
+       class FloatPoint3;
+       class FloatMatrix4;
 }}
 
 namespace Tizen { namespace Ui { namespace Animations {

diff --git a/src/ui/animations/FUiAnim_GlRenderManager.cpp b/src/ui/animations/FUiAnim_GlRenderManager.cpp
index bce5fec..858f058 100644 (file)
--- a/src/ui/animations/FUiAnim_GlRenderManager.cpp
+++ b/src/ui/animations/FUiAnim_GlRenderManager.cpp
@@ -1194,82 +1194,21 @@ _GlRenderManager::CompositeLayer(_GlLayer* pLayer)
                                _RootVisualElement* pRoot = _SceneVisualElementImpl::GetInstance(*pScene);
                                _View* pView = pRoot->GetView();
 
-                               //temp code
-                               //<--
-                               //                              if( i == 0)
-                               //                              {
-                               //#ifdef VE_USE_GL_MULTI_CONTEXT
-                               //                                      __pGlContext = (_GlContext*)pLayer->GetContext();
-                               //                                      __pGlContext->MakeCurrent();
-                               //#else
-                               //                                      __pGlContext->MakeCurrent(pLayer->GetNativeSurface());
-                               //#endif
-                               //                                      __needClear = true;
-                               //                              }
-                               //-->
-
                                if(pView)
                                {
                                        CompositeView(pLayer, pRoot, pView);
 
-//                                     if( i != 0) // temp code
-//                                     {
-//                                             VisualElementSurface* pSurface = pView->GetRenderTarget();
-//                                             if(pSurface)
-//                                             {
-//                                                     _VisualElementSurfaceImpl* pSurfaceImpl = _VisualElementSurfaceImpl::GetInstance(*pSurface);
-//                                                     __pGlContext->MakeCurrent(pSurfaceImpl->GetNativeHandle());
-//                                                     __needClear = true;
-//                                             }
-//                                     }
-
-//                                     Tizen::Graphics::FloatRectangle* pViewport = pView->GetViewport();
-//                                     if(pViewport)
-//                                     {
-//                                             glViewport(pViewport->x, pViewport->y, pViewport->width, pViewport->height);
-//                                     }
-//                                     __needClear = true;
-//                                     Camera* pCamera = pView->GetCamera();
-//                                     if(pCamera)
-//                                     {
-//                                             _CameraImpl* pCameraImpl = _CameraImpl::GetInstance(*pCamera);
-//                                             __view = pCameraImpl->GetMatrix();
-//                                     }
-//                                     FloatMatrix4* pProjection = pView->GetProjection();
-//                                     if(pProjection)
-//                                     {
-//                                             __viewProjection.CopyFrom(*pProjection);
-//                                     }
-//                                     __viewProjection.MultiplyMatrix(__view);
-//                                     __viewProjection.Translate(0.0f, pViewport->height, 0.0f);
-//                                     __viewProjection.Scale(1.0f, -1.0f, 1.0f);
-
-
-//                                     __globalLightCount = 0;
-
-//                                     VisualElement* pRootRender = _VisualElementImpl::GetInstance(*pRoot)->GetRenderObject()->GetPublic();
-
-//                                     CompositeNode(pRootRender, clearColorArray, false, 0);
-//                                     clearColorArray.RemoveAll();
-//                                     FlushRenderQueue();
-
-
+                                       // Todo: render sub view
+                                       int count = pView->GetSubViewCount();
+                                       for(int i = 0 ;i <count; i++)
                                        {
-                                               // Todo: render sub view
-                                               int count = pView->GetSubViewCount();
-                                               for(int i = 0 ;i <count; i++)
+                                               _View* pSubView = pView->GetSubView(i);
+                                               if(pSubView)
                                                {
-                                                       _View* pSubView = pView->GetSubView(i);
-                                                       if(pSubView)
-                                                       {
-                                                               CompositeView(pLayer, pRoot, pSubView);
-                                                       }
+                                                       CompositeView(pLayer, pRoot, pSubView);
                                                }
-
                                        }
-
                                }
-                               //                      VisualElement* pVeRoot = _VisualElementImpl::GetInstance(*pRoot)->GetRenderObject()->GetPublic();
                        }
                }
                __pGlContext->SwapBuffers();