X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Frendering-cube%2Frendering-cube.cpp;h=9b4260f81cc86991f77b5d547354a896caeb35dd;hb=708a5e016f973900a20a885914d3b70741fa80d9;hp=9d745bd71cefc323fe44b140ca4e8f33078ee3d5;hpb=0fb488b9861d0539e9ea6d8dbc1cee05faedf508;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/rendering-cube/rendering-cube.cpp b/examples/rendering-cube/rendering-cube.cpp index 9d745bd..9b4260f 100644 --- a/examples/rendering-cube/rendering-cube.cpp +++ b/examples/rendering-cube/rendering-cube.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -79,9 +79,9 @@ public: // The Init signal is received once (only) during the Application lifetime void Create( Application& application ) { - // Get a handle to the stage - Stage stage = Stage::GetCurrent(); - stage.SetBackgroundColor( Color::WHITE ); + // Get a handle to the window + Window window = application.GetWindow(); + window.SetBackgroundColor( Color::WHITE ); // Step 1. Create shader CreateCubeShader(); @@ -98,14 +98,14 @@ public: // Step 5. Play animation to rotate the cube PlayAnimation(); - // Respond to a click anywhere on the stage - stage.GetRootLayer().TouchSignal().Connect( this, &DrawCubeController::OnTouch ); + // Respond to a click anywhere on the window + window.GetRootLayer().TouchSignal().Connect( this, &DrawCubeController::OnTouch ); // Respond to key events - stage.KeyEventSignal().Connect( this, &DrawCubeController::OnKeyEvent ); + window.KeyEventSignal().Connect( this, &DrawCubeController::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); @@ -243,16 +243,16 @@ public: */ void CreateActor() { - Stage stage = Stage::GetCurrent(); + Window window = mApplication.GetWindow(); - float quarterStageWidth = stage.GetSize().x * 0.25f; + float quarterWindowWidth = window.GetSize().GetWidth() * 0.25f; mActor = Actor::New(); - mActor.SetAnchorPoint( AnchorPoint::CENTER ); - mActor.SetParentOrigin( ParentOrigin::CENTER ); - mActor.SetPosition( Vector3( 0.0f, 0.0f, 0.0f ) ); - mActor.SetSize( Vector3( quarterStageWidth, quarterStageWidth, quarterStageWidth ) ); + mActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mActor.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ) ); + mActor.SetProperty( Actor::Property::SIZE, Vector3( quarterWindowWidth, quarterWindowWidth, quarterWindowWidth ) ); mActor.AddRenderer( mRenderer ); - stage.Add( mActor ); + window.Add( mActor ); } /** @@ -278,20 +278,10 @@ private: Animation mAnimation; }; -void RunTest( Application& application ) -{ - DrawCubeController test( application ); - - application.MainLoop(); -} - -// Entry point for Linux & Tizen applications -// int DALI_EXPORT_API main( int argc, char **argv ) { Application application = Application::New( &argc, &argv ); - - RunTest( application ); - + DrawCubeController test( application ); + application.MainLoop(); return 0; }