X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Ftextured-mesh%2Ftextured-mesh-example.cpp;h=32a1c765adcfdb43e0076b30d82bace479f20e19;hb=6c3ce4efbe8f7cd80fd86fd007af6c14c5689ef5;hp=a0ca65527442c166ed278f63f04c6f4610582b6e;hpb=312470da17142a335f5f743630b7fc19c0061ead;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp
index a0ca655..32a1c76 100644
--- a/examples/textured-mesh/textured-mesh-example.cpp
+++ b/examples/textured-mesh/textured-mesh-example.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.
@@ -104,13 +104,10 @@ public:
   {
     // The Init signal is received once (only) during the Application lifetime
 
-    Stage stage = Stage::GetCurrent();
-    stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
+    Window window = application.GetWindow();
+    window.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
 
-    mStageSize = stage.GetSize();
-
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+    mWindowSize = window.GetSize();
 
     Texture texture1 = DemoHelper::LoadTexture( MATERIAL_SAMPLE );
     Texture texture2 = DemoHelper::LoadTexture( MATERIAL_SAMPLE2 );
@@ -129,21 +126,21 @@ public:
 
     mMeshActor = Actor::New();
     mMeshActor.AddRenderer( mRenderer );
-    mMeshActor.SetSize(400, 400);
+    mMeshActor.SetProperty( Actor::Property::SIZE, Vector2(400, 400) );
 
     Property::Index fadeColorIndex = mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA );
     mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
 
-    mMeshActor.SetParentOrigin( ParentOrigin::TOP_CENTER );
-    mMeshActor.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-    stage.Add( mMeshActor );
+    mMeshActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
+    mMeshActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
+    window.Add( mMeshActor );
 
     mRenderer2 = Renderer::New( mGeometry, mShader );
     mRenderer2.SetTextures( mTextureSet2 );
 
     mMeshActor2 = Actor::New();
     mMeshActor2.AddRenderer( mRenderer2 );
-    mMeshActor2.SetSize(400, 400);
+    mMeshActor2.SetProperty( Actor::Property::SIZE, Vector2(400, 400) );
 
     mMeshActor2.RegisterProperty( "anotherProperty",    Color::GREEN );
 
@@ -152,9 +149,9 @@ public:
     Property::Index fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE );
     mRenderer2.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
 
-    mMeshActor2.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-    mMeshActor2.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
-    stage.Add( mMeshActor2 );
+    mMeshActor2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
+    mMeshActor2.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
+    window.Add( mMeshActor2 );
 
     Animation  animation = Animation::New(5);
     KeyFrames keyFrames = KeyFrames::New();
@@ -170,37 +167,7 @@ public:
     animation.SetLooping(true);
     animation.Play();
 
-    stage.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));
-  }
-
-  BufferImage CreateBufferImage()
-  {
-    BufferImage image = BufferImage::New( 200, 200, Pixel::RGB888 );
-    PixelBuffer* pixelBuffer = image.GetBuffer();
-    unsigned int stride = image.GetBufferStride();
-    for( unsigned int x=0; x<200; x++ )
-    {
-      for( unsigned int y=0; y<200; y++ )
-      {
-        PixelBuffer* pixel = pixelBuffer + y*stride + x*3;
-        if( ((int)(x/20.0f))%2 + ((int)(y/20.0f)%2) == 1 )
-        {
-          pixel[0]=255;
-          pixel[1]=0;
-          pixel[2]=0;
-          pixel[3]=255;
-        }
-        else
-        {
-          pixel[0]=0;
-          pixel[1]=0;
-          pixel[2]=255;
-          pixel[3]=255;
-        }
-      }
-    }
-    image.Update();
-    return image;
+    window.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));
   }
 
   /**
@@ -216,7 +183,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.state == KeyEvent::Down)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
@@ -228,7 +195,7 @@ public:
 private:
 
   Application&  mApplication;                             ///< Application instance
-  Vector3 mStageSize;                                     ///< The size of the stage
+  Vector3 mWindowSize;                                     ///< The size of the window
 
   Shader   mShader;
   TextureSet mTextureSet1;