[dali_1.2.42] Merge branch 'devel/master'

Change-Id: I96af28a60865083861d7723e9c7583274974513c

[dali_1.2.42] Merge branch 'devel/master'
Change-Id: I96af28a60865083861d7723e9c7583274974513c
Nick Holland
2 parents c5532e57 a223aecb
Showing 28 changed files with 853 additions and 25 deletions
com.samsung.dali-demo.xml
demo/dali-demo.cpp
examples/rendering-skybox/look-camera.cpp
examples/rendering-skybox/look-camera.h
examples/rendering-skybox/rendering-skybox.cpp
examples/simple-visuals-control/my-control-impl.cpp
examples/styling/image-channel-control-impl.cpp
examples/text-field/text-field-example.cpp
examples/transitions/shadow-button-impl.cpp
examples/visual-transitions/beat-control-impl.cpp
packaging/com.samsung.dali-demo.spec
resources/images/lake_back.jpg
resources/images/lake_bottom.jpg
resources/images/lake_front.jpg
resources/images/lake_left.jpg
resources/images/lake_right.jpg
resources/images/lake_top.jpg
resources/po/as.po
resources/po/de.po
resources/po/en_GB.po
@@ -221,4 +221,7 @@
 	<ui-application appid="rendering-basic-light.example" exec="/usr/apps/com.samsung.dali-demo/bin/rendering-basic-light.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Basic Light</label>
 	</ui-application>
+	<ui-application appid="rendering-skybox.example" exec="/usr/apps/com.samsung.dali-demo/bin/rendering-skybox.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+		<label>Skybox</label>
+	</ui-application>
 </manifest>
@@ -48,6 +48,7 @@ int DALI_EXPORT_API main(int argc, char **argv)
   demo.AddExample(Example("renderer-stencil.example", DALI_DEMO_STR_TITLE_RENDERER_STENCIL));
   demo.AddExample(Example("shadows-and-lights.example", DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS));
   demo.AddExample(Example("sparkle.example", DALI_DEMO_STR_TITLE_SPARKLE));
+  demo.AddExample(Example("rendering-skybox.example", DALI_DEMO_STR_TITLE_SKYBOX));
   demo.SortAlphabetically( true );
+/*
+ * Copyright (c) 2017 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "look-camera.h"
+
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
+
+using namespace Dali;
+
+namespace
+{
+// Input sensitivity, the larger value, the more sensitive input
+// Default value has been chosen empirically
+const float   CAMERA_SENSITIVITY        ( 90.0f );
+
+// Vertical angle limit of the camera
+const float   CAMERA_VERTICAL_LIMIT     ( 80.0f );
+
+// Position where camera is instantiated by default
+const Vector3 CAMERA_DEFAULT_POSITION   ( 0.0f, 0.0f, 3.0f );
+
+// Field-of-View in degrees
+const float   CAMERA_DEFAULT_FOV        ( 60.0f );
+
+// Near plane
+const float   CAMERA_DEFAULT_NEAR       ( 0.1f );
+
+// Far plane
+const float   CAMERA_DEFAULT_FAR        ( 100.0f );
+
+// Default forward vector
+const Vector3 CAMERA_FORWARD            ( 0.0f, 0.0f, 1.0f );
+
+// Default up vector
+const Vector3 CAMERA_UP                 ( Vector3::YAXIS );
+}
+
+LookCamera::LookCamera()
+: mCameraYawPitch( 0.0f, 180.0f ),
+  mFovY( CAMERA_DEFAULT_FOV ),
+  mNear( CAMERA_DEFAULT_NEAR ),
+  mFar( CAMERA_DEFAULT_FAR ),
+  mCameraPosition( CAMERA_DEFAULT_POSITION )
+{
+}
+
+LookCamera::~LookCamera()
+{
+  mTimer.Stop();
+  mCameraActor.Remove( mInterceptorActor );
+}
+
+void LookCamera::Initialise( const Vector3& position, float fovY, float near, float far )
+{
+  mFovY = fovY;
+  mNear = near;
+  mFar = far;
+
+  // Camera position is shadowed in order to avoid using GetCurrentPosition()
+  mCameraPosition = position;
+
+  // Initialise default camera
+  InitialiseDefaultCamera();
+
+  // Create input interceptor actor
+  CreateInterceptorActor();
+
+  // Start timer
+  mTimer = Timer::New( 16 );
+  mTimer.TickSignal().Connect( this, &LookCamera::OnTick );
+  mTimer.Start();
+}
+
+bool LookCamera::OnTick()
+{
+  Vector2 stageSize = Stage::GetCurrent().GetSize();
+
+  // ---------------------------------------------------------------------
+  // update rotation
+  Vector2 tmp( mScreenLookDelta );
+  mScreenLookDelta = Vector2::ZERO;
+
+  float yaw = ( (tmp.y / stageSize.x ) * CAMERA_SENSITIVITY );
+  float pitch = ( (tmp.x / stageSize.y ) * CAMERA_SENSITIVITY );
+  mCameraYawPitch.x -= yaw;
+  mCameraYawPitch.y -= pitch;
+  if( abs( mCameraYawPitch.x ) > CAMERA_VERTICAL_LIMIT )
+  {
+    mCameraYawPitch.x = CAMERA_VERTICAL_LIMIT * ((mCameraYawPitch.x < 0) ? -1.0f : 1.0f );
+  }
+
+  Quaternion rotation;
+  Quaternion rotX( Degree( mCameraYawPitch.x), Vector3( 1.0f, 0.0f, 0.0f ) );
+  Quaternion rotY( Degree( mCameraYawPitch.y), Vector3( 0.0f, 1.0f, 0.0f ) );
+  rotation = ( rotY * rotX );
+
+  mCameraActor.SetOrientation( rotation );
+
+  return true;
+}
+
+void LookCamera::InitialiseDefaultCamera()
+{
+  Stage stage = Stage::GetCurrent();
+  mCameraActor = stage.GetRenderTaskList().GetTask(0).GetCameraActor();
+  mCameraActor.SetName( "LookCamera" );
+  mCameraActor.SetAnchorPoint( AnchorPoint::CENTER );
+  mCameraActor.SetParentOrigin( ParentOrigin::CENTER );
+  mCameraActor.SetFieldOfView( Radian( Degree( mFovY ) ) );
+
+  // should be read from file
+  mCameraActor.SetNearClippingPlane( mNear );
+  mCameraActor.SetFarClippingPlane( mFar );
+  mCameraActor.SetPosition( mCameraPosition );
+}
+
+void LookCamera::CreateInterceptorActor()
+{
+  Stage stage = Stage::GetCurrent();
+
+  mInterceptorActor = Actor::New();
+  mInterceptorActor.SetName( "InputInterceptor" );
+  mInterceptorActor.SetSize( Vector3( stage.GetSize().x, stage.GetSize().y, 1 ) );
+  mInterceptorActor.SetPosition( Vector3( 0.0, 0.0, 1.0  ) );
+  mInterceptorActor.SetAnchorPoint( AnchorPoint::CENTER );
+  mInterceptorActor.SetParentOrigin( ParentOrigin::CENTER );
+  mCameraActor.Add( mInterceptorActor );
+
+  // Connect TouchSignal to interceptor actor
+  mInterceptorActor.TouchSignal().Connect( this, &LookCamera::OnTouch );
+}
+
+bool LookCamera::OnTouch( Actor actor, const TouchData& touch )
+{
+  Stage stage = Stage::GetCurrent();
+
+  for( int i = 0; i < (int)touch.GetPointCount() && i < 3; ++i )
+  {
+    Vector2 position( touch.GetScreenPosition( i ) );
+
+    // touch started
+    if( touch.GetState( i ) == PointState::STARTED )
+    {
+      mOldTouchLookPosition = position;
+    }
+    else if( touch.GetState( i ) == PointState::FINISHED ||
+             touch.GetState( i ) == PointState::LEAVE ||
+             touch.GetState( i ) == PointState::INTERRUPTED
+             )
+    {
+      mScreenLookDelta = Vector2::ZERO;
+      mOldTouchLookPosition = Vector2::ZERO;
+    }
+    else // on motion
+    {
+      mScreenLookDelta.x += ( position.x - mOldTouchLookPosition.x );
+      mScreenLookDelta.y += ( position.y - mOldTouchLookPosition.y );
+      mOldTouchLookPosition = position;
+    }
+  }
+
+  return true;
+}
+#ifndef LOOK_CAMERA_H
+#define LOOK_CAMERA_H
+
+/*
+ * Copyright (c) 2017 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/math/vector2.h>
+
+/**
+ * @brief The LookCamera class
+ *
+ * LookCamera handles user input to change the orientation of the default camera.
+ */
+class LookCamera : public Dali::ConnectionTracker
+{
+public:
+
+  /**
+   * Creates an instance of LookCamera
+   */
+  LookCamera();
+
+  /**
+   * Destroys an instance of LookCamera
+   */
+  ~LookCamera();
+
+  /**
+   * Initialise with given position, fovY, near, far
+   * @param[in] position Position of the camera.
+   * @param[in] fovY Field of view in degrees
+   * @param[in] near Near plane
+   * @param[in] far Far Plane
+   */
+  void Initialise( const Dali::Vector3& position, float fov, float near, float far );
+
+  /**
+   * Retrieves actor associated with camera object
+   * @return Returns camera actor
+   */
+  Dali::CameraActor GetCameraActor();
+
+private:
+
+  /**
+   * Sets up a perspective camera using Dali default camera
+   */
+  void InitialiseDefaultCamera();
+
+  /**
+   * Creates 'interceptor' actor. Interceptor actor is always parallel
+   * to the camera and positioned little bit in front of it in order to
+   * intercept user input.
+   */
+  void CreateInterceptorActor();
+
+  /**
+   * Handles onTouch signal on the 'interceptor' actor
+   * @param[in] actor Actor receiving signal
+   * @param[in] touch Touch data
+   */
+  bool OnTouch( Dali::Actor actor, const Dali::TouchData& touch );
+
+  /**
+   * Handles camera tick() update
+   * @return true if continue running timer, false otherwise
+   */
+  bool OnTick();
+
+private:
+
+  Dali::CameraActor mCameraActor; /// Camera actor
+  Dali::Actor mInterceptorActor; /// Actor intercepting user input
+
+  Dali::Timer mTimer; /// Per-frame timer
+
+  Dali::Vector2 mScreenLookDelta; /// Look delta vector in screen space
+  Dali::Vector2 mOldTouchLookPosition; /// Previous look vector in screen space
+
+  Dali::Vector2 mCameraYawPitch; /// Camera yaw-pitch angles
+
+  float mFovY; /// Camera field-of-view
+  float mNear; /// Near plane
+  float mFar; /// Far plane
+
+  Dali::Vector3 mCameraPosition; /// Current camera position ( shadowing the actor position )
+};
+
+#endif
+/*
+ * Copyright (c) 2017 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali/dali.h>
+#include <dali-toolkit/dali-toolkit.h>
+
+#include "look-camera.h"
+
+using namespace Dali;
+using namespace Toolkit;
+
+namespace
+{
+
+/*
+ * Vertex shader for a textured cube
+ */
+const char* VERTEX_SHADER_CUBE = DALI_COMPOSE_SHADER(
+attribute mediump vec3 aPosition;\n // DALi shader builtin
+attribute mediump vec2 aTexCoord;\n // DALi shader builtin
+uniform   mediump mat4 uMvpMatrix;\n // DALi shader builtin
+uniform   mediump vec3 uSize;\n // DALi shader builtin
+\n
+varying mediump vec2 vTexCoord;\n
+void main()\n
+{\n
+  mediump vec4 vertexPosition = vec4(aPosition, 1.0);\n
+  vertexPosition.xyz *= uSize;\n
+  vTexCoord = aTexCoord;\n
+  gl_Position = uMvpMatrix * vertexPosition;\n
+}\n
+);
+
+/*
+ * Fragment shader for a textured cube
+ */
+const char* FRAGMENT_SHADER_CUBE = DALI_COMPOSE_SHADER(
+uniform sampler2D uTexture;\n
+\n
+varying mediump vec2 vTexCoord;\n
+void main()\n
+{\n
+  mediump vec4 texColor = texture2D( uTexture, vTexCoord );\n
+  gl_FragColor = texColor;\n
+}\n
+);
+
+/*
+ * Vertex shader for a skybox
+ */
+const char* VERTEX_SHADER_SKYBOX = DALI_COMPOSE_SHADER(
+attribute mediump vec3 aPosition;\n // DALi shader builtin
+uniform   mediump mat4 uMvpMatrix;\n // DALi shader builtin
+\n
+varying mediump vec3 vTexCoord;\n
+void main()\n
+{\n
+  vTexCoord.x =  aPosition.x;\n
+  vTexCoord.y = -aPosition.y;\n // convert to GL coords
+  vTexCoord.z =  aPosition.z;\n
+
+  mediump vec4 vertexPosition = vec4(aPosition, 1.0);\n
+  vec4 clipSpacePosition = uMvpMatrix * vertexPosition;\n
+  gl_Position = clipSpacePosition.xyww;\n // Writes 1.0, the maximum depth value, into the depth buffer.
+                                          // This is an optimization to avoid running the fragment shader
+                                          // for the pixels hidden by the scene's objects.
+}\n
+);
+
+/*
+ * Fragment shader for a skybox
+ */
+const char* FRAGMENT_SHADER_SKYBOX = DALI_COMPOSE_SHADER(
+uniform samplerCube uSkyBoxTexture;\n
+\n
+varying mediump vec3 vTexCoord;\n
+void main()\n
+{\n
+  mediump vec4 texColor = textureCube( uSkyBoxTexture, vTexCoord );\n
+  gl_FragColor = texColor;\n
+}\n
+);
+
+const float CAMERA_DEFAULT_FOV(    60.0f );
+const float CAMERA_DEFAULT_NEAR(    0.1f );
+const float CAMERA_DEFAULT_FAR(  1000.0f );
+const Vector3 CAMERA_DEFAULT_POSITION( 0.0f, 0.0f, 100.0f );
+
+const char* TEXTURE_URL = DEMO_IMAGE_DIR "wood.png";
+
+const unsigned int SKYBOX_FACE_COUNT = 6;
+const unsigned int SKYBOX_FACE_WIDTH  = 2048;
+const unsigned int SKYBOX_FACE_HEIGHT = 2048;
+
+/*
+ * Credit to Joey do Vries for the following cubemap images
+ * Take from git://github.com/JoeyDeVries/LearnOpenGL.git
+ * The images are licensed under the terms of the CC BY 4.0 license:
+ * https://creativecommons.org/licenses/by/4.0/
+ */
+const char* SKYBOX_FACES[ SKYBOX_FACE_COUNT ] =
+{
+  DEMO_IMAGE_DIR "lake_right.jpg",
+  DEMO_IMAGE_DIR "lake_left.jpg",
+  DEMO_IMAGE_DIR "lake_top.jpg",
+  DEMO_IMAGE_DIR "lake_bottom.jpg",
+  DEMO_IMAGE_DIR "lake_back.jpg",
+  DEMO_IMAGE_DIR "lake_front.jpg"
+};
+
+}
+
+// This example shows how to create a skybox
+//
+// Recommended screen size on desktop: 1280x720
+//
+class TexturedCubeController : public ConnectionTracker
+{
+public:
+
+  TexturedCubeController( Application& application )
+  : mApplication( application )
+  {
+    // Connect to the Application's Init signal
+    mApplication.InitSignal().Connect( this, &TexturedCubeController::Create );
+  }
+
+  ~TexturedCubeController()
+  {
+    // Nothing to do here;
+  }
+
+  // The Init signal is received once (only) during the Application lifetime
+  void Create( Application& application )
+  {
+    // Disable indicator.
+    // It avoids reposition the camera to fit with the indicator height.
+    Dali::Window winHandle = application.GetWindow();
+    winHandle.ShowIndicator( Dali::Window::INVISIBLE );
+
+    // Get a handle to the stage
+    Stage stage = Stage::GetCurrent();
+    stage.SetBackgroundColor( Color::WHITE );
+
+    // Step 1. Setup camera
+    SetupCamera();
+
+    // Step 2. Create shaders
+    CreateShaders();
+
+    // Step 3. Create geometry
+    CreateCubeGeometry();
+    CreateSkyboxGeometry();
+
+    // Step 4. Display first a cube at the world origin.
+    //         The write on the depth buffer is enabled.
+    DisplayCube();
+
+    // Step 5. Display last the skybox surrounding the camera.
+    //         The depth test is enabled, the shader sets 1.0, which is the maximum depth and
+    //         the depth function is set to LESS or EQUAL so the fragment shader will run only
+    //         in those pixels that any other object has written on them.
+    DisplaySkybox();
+
+    // Step 6. Play animation to rotate the cube
+    PlayAnimation();
+
+    // Respond to key events
+    stage.KeyEventSignal().Connect( this, &TexturedCubeController::OnKeyEvent );
+  }
+
+  /**
+   * @brief Called when any key event is received
+   *
+   * Will use this to quit the application if Back or the Escape key is received
+   * @param[in] event The key event information
+   */
+  void OnKeyEvent( const KeyEvent& event )
+  {
+    if( event.state == KeyEvent::Down )
+    {
+      if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
+      {
+        mApplication.Quit();
+      }
+    }
+  }
+
+  /**
+   * @brief Setup a perspective camera pointing in the negative Z direction
+   */
+  void SetupCamera()
+  {
+    Stage stage = Stage::GetCurrent();
+
+    RenderTask renderTask = stage.GetRenderTaskList().GetTask( 0 );
+    renderTask.SetCullMode( false ); // avoid frustum culling affecting the skybox
+
+    mCamera.Initialise( CAMERA_DEFAULT_POSITION, CAMERA_DEFAULT_FOV, CAMERA_DEFAULT_NEAR, CAMERA_DEFAULT_FAR );
+  }
+
+  /**
+   * Creates a shader using inlined variable VERTEX_SHADER and FRAGMENT_SHADER
+   *
+   * Shaders are very basic and all they do is transforming vertices and sampling
+   * a texture.
+   */
+  void CreateShaders()
+  {
+    mShaderCube   = Shader::New( VERTEX_SHADER_CUBE, FRAGMENT_SHADER_CUBE );
+    mShaderSkybox = Shader::New( VERTEX_SHADER_SKYBOX, FRAGMENT_SHADER_SKYBOX );
+  }
+
+  /**
+   * @brief CreateCubeGeometry
+   * This function creates a cube geometry including texture coordinates.
+   * Also it demonstrates using the indexed draw feature by setting an index array.
+   */
+  void CreateCubeGeometry()
+  {
+    struct Vertex
+    {
+      Vector3 aPosition;
+      Vector2 aTexCoord;
+    };
+
+    Vertex vertices[] = {
+      { Vector3(  1.0f,-1.0f,-1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3( -1.0f, 1.0f,-1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3(  1.0f, 1.0f,-1.0f ), Vector2( 0.0, 1.0 ) },
+      { Vector3( -1.0f, 1.0f, 1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3(  1.0f,-1.0f, 1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3(  1.0f, 1.0f, 1.0f ), Vector2( 0.0, 1.0 ) },
+      { Vector3(  1.0f, 1.0f, 1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3(  1.0f,-1.0f,-1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3(  1.0f, 1.0f,-1.0f ), Vector2( 0.0, 1.0 ) },
+      { Vector3(  1.0f,-1.0f, 1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3( -1.0f,-1.0f,-1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3(  1.0f,-1.0f,-1.0f ), Vector2( 0.0, 1.0 ) },
+      { Vector3( -1.0f,-1.0f,-1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3( -1.0f, 1.0f, 1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3( -1.0f, 1.0f,-1.0f ), Vector2( 0.0, 1.0 ) },
+      { Vector3(  1.0f, 1.0f,-1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3( -1.0f, 1.0f, 1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3(  1.0f, 1.0f, 1.0f ), Vector2( 0.0, 1.0 ) },
+      { Vector3(  1.0f,-1.0f,-1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3( -1.0f,-1.0f,-1.0f ), Vector2( 1.0, 0.0 ) },
+      { Vector3( -1.0f, 1.0f,-1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3( -1.0f, 1.0f, 1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3( -1.0f,-1.0f, 1.0f ), Vector2( 1.0, 0.0 ) },
+      { Vector3(  1.0f,-1.0f, 1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3(  1.0f, 1.0f, 1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3(  1.0f,-1.0f, 1.0f ), Vector2( 1.0, 0.0 ) },
+      { Vector3(  1.0f,-1.0f,-1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3(  1.0f,-1.0f, 1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3( -1.0f,-1.0f, 1.0f ), Vector2( 1.0, 0.0 ) },
+      { Vector3( -1.0f,-1.0f,-1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3( -1.0f,-1.0f,-1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3( -1.0f,-1.0f, 1.0f ), Vector2( 1.0, 0.0 ) },
+      { Vector3( -1.0f, 1.0f, 1.0f ), Vector2( 0.0, 0.0 ) },
+      { Vector3(  1.0f, 1.0f,-1.0f ), Vector2( 1.0, 1.0 ) },
+      { Vector3( -1.0f, 1.0f,-1.0f ), Vector2( 1.0, 0.0 ) },
+      { Vector3( -1.0f, 1.0f, 1.0f ), Vector2( 0.0, 0.0 ) },
+    };
+
+    PropertyBuffer vertexBuffer = PropertyBuffer::New( Property::Map()
+                                                       .Add( "aPosition", Property::VECTOR3 )
+                                                       .Add( "aTexCoord", Property::VECTOR2 ) );
+    vertexBuffer.SetData( vertices, sizeof(vertices) / sizeof(Vertex) );
+
+    // create indices
+    const unsigned short INDEX_CUBE[] = {
+      2, 1, 0,
+      5, 4, 3,
+      8, 7, 6,
+      11, 10, 9,
+      14, 13, 12,
+      17, 16, 15,
+      20, 19, 18,
+      23, 22, 21,
+      26, 25, 24,
+      29, 28, 27,
+      32, 31, 30,
+      35, 34, 33
+    };
+
+    mGeometry = Geometry::New();
+    mGeometry.AddVertexBuffer( vertexBuffer );
+    mGeometry.SetIndexBuffer( INDEX_CUBE,
+                              sizeof(INDEX_CUBE)/sizeof(INDEX_CUBE[0]) );
+    mGeometry.SetType( Geometry::TRIANGLES );
+  }
+
+  /**
+   * @brief CreateCubeGeometry
+   * This function creates a cube geometry including texture coordinates.
+   * Also it demonstrates using the indexed draw feature by setting an index array.
+   */
+  void CreateSkyboxGeometry()
+  {
+    struct Vertex
+    {
+      Vector3 aPosition;
+    };
+
+    Vertex skyboxVertices[] = {
+        // back
+        { Vector3(  -1.0f,  1.0f, -1.0f ) },
+        { Vector3(  -1.0f, -1.0f, -1.0f ) },
+        { Vector3(   1.0f, -1.0f, -1.0f ) },
+        { Vector3(   1.0f, -1.0f, -1.0f ) },
+        { Vector3(   1.0f,  1.0f, -1.0f ) },
+        { Vector3(  -1.0f,  1.0f, -1.0f ) },
+
+        // left
+        { Vector3(  -1.0f, -1.0f,  1.0f ) },
+        { Vector3(  -1.0f, -1.0f, -1.0f ) },
+        { Vector3(  -1.0f,  1.0f, -1.0f ) },
+        { Vector3(  -1.0f,  1.0f, -1.0f ) },
+        { Vector3(  -1.0f,  1.0f,  1.0f ) },
+        { Vector3(  -1.0f, -1.0f,  1.0f ) },
+
+        // right
+        { Vector3(   1.0f, -1.0f, -1.0f ) },
+        { Vector3(   1.0f, -1.0f,  1.0f ) },
+        { Vector3(   1.0f,  1.0f,  1.0f ) },
+        { Vector3(   1.0f,  1.0f,  1.0f ) },
+        { Vector3(   1.0f,  1.0f, -1.0f ) },
+        { Vector3(   1.0f, -1.0f, -1.0f ) },
+
+        // front
+        { Vector3(  -1.0f, -1.0f,  1.0f ) },
+        { Vector3(  -1.0f,  1.0f,  1.0f ) },
+        { Vector3(   1.0f,  1.0f,  1.0f ) },
+        { Vector3(   1.0f,  1.0f,  1.0f ) },
+        { Vector3(   1.0f, -1.0f,  1.0f ) },
+        { Vector3(  -1.0f, -1.0f,  1.0f ) },
+
+        // botton
+        { Vector3(  -1.0f,  1.0f, -1.0f ) },
+        { Vector3(   1.0f,  1.0f, -1.0f ) },
+        { Vector3(   1.0f,  1.0f,  1.0f ) },
+        { Vector3(   1.0f,  1.0f,  1.0f ) },
+        { Vector3(  -1.0f,  1.0f,  1.0f ) },
+        { Vector3(  -1.0f,  1.0f, -1.0f ) },
+
+        // top
+        { Vector3(  -1.0f, -1.0f, -1.0f ) },
+        { Vector3(  -1.0f, -1.0f,  1.0f ) },
+        { Vector3(   1.0f, -1.0f, -1.0f ) },
+        { Vector3(   1.0f, -1.0f, -1.0f ) },
+        { Vector3(  -1.0f, -1.0f,  1.0f ) },
+        { Vector3(   1.0f, -1.0f,  1.0f ) }
+    };
+
+    PropertyBuffer vertexBuffer = PropertyBuffer::New( Property::Map()
+                                                       .Add( "aPosition", Property::VECTOR3 ) );
+    vertexBuffer.SetData( skyboxVertices, sizeof(skyboxVertices) / sizeof(Vertex) );
+
+    mSkyboxGeometry = Geometry::New();
+    mSkyboxGeometry.AddVertexBuffer( vertexBuffer );
+    mSkyboxGeometry.SetType( Geometry::TRIANGLES );
+  }
+
+  /**
+   * Display a cube at the world origin
+   */
+  void DisplayCube()
+  {
+    // Load image from file
+    PixelData pixels = SyncImageLoader::Load( TEXTURE_URL );
+
+    Texture texture = Texture::New( TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight() );
+    texture.Upload( pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight() );
+
+    // create TextureSet
+    mTextureSet = TextureSet::New();
+    mTextureSet.SetTexture( 0, texture );
+
+    mRenderer = Renderer::New( mGeometry, mShaderCube );
+    mRenderer.SetTextures( mTextureSet );
+    mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 1.0f );
+
+    // A further optimization would be to enable debug testing instead
+    mRenderer.SetProperty( Renderer::Property::FACE_CULLING_MODE, FaceCullingMode::BACK );
+
+    // Enables the write on the depth buffer.
+    mRenderer.SetProperty( Renderer::Property::DEPTH_WRITE_MODE, DepthWriteMode::ON );
+
+    mActor = Actor::New();
+    mActor.SetName( "Cube" );
+    mActor.SetAnchorPoint( AnchorPoint::CENTER );
+    mActor.SetParentOrigin( ParentOrigin::CENTER );
+    mActor.AddRenderer( mRenderer );
+
+    mActor.SetSize( 10.f, 10.f, 10.f );
+
+    Stage stage = Stage::GetCurrent();
+    stage.Add( mActor );
+  }
+
+  /**
+   * Display a skybox surrounding the camera
+   */
+  void DisplaySkybox()
+  {
+    // Load skybox faces from file
+    Texture texture = Texture::New( TextureType::TEXTURE_CUBE, Pixel::RGBA8888, SKYBOX_FACE_WIDTH, SKYBOX_FACE_HEIGHT );
+    for (unsigned int i = 0; i < SKYBOX_FACE_COUNT; i++)
+    {
+      PixelData pixels = SyncImageLoader::Load( SKYBOX_FACES[i] );
+      texture.Upload( pixels, CubeMapLayer::POSITIVE_X + i, 0, 0, 0, SKYBOX_FACE_WIDTH, SKYBOX_FACE_HEIGHT );
+    }
+
+    // create TextureSet
+    mSkyboxTextures = TextureSet::New();
+    mSkyboxTextures.SetTexture( 0, texture );
+
+    mSkyboxRenderer = Renderer::New( mSkyboxGeometry, mShaderSkybox );
+    mSkyboxRenderer.SetTextures( mSkyboxTextures );
+    mSkyboxRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 2.0f );
+
+    // Enables the depth test.
+    mSkyboxRenderer.SetProperty( Renderer::Property::DEPTH_TEST_MODE, DepthTestMode::ON );
+
+    // The fragment shader will run only is those pixels that have the max depth value.
+    mSkyboxRenderer.SetProperty( Renderer::Property::DEPTH_FUNCTION, DepthFunction::LESS_EQUAL );
+
+    Stage stage = Stage::GetCurrent();
+
+    mSkyboxActor = Actor::New();
+    mSkyboxActor.SetName( "SkyBox" );
+    mSkyboxActor.SetAnchorPoint( AnchorPoint::CENTER );
+    mSkyboxActor.SetParentOrigin( ParentOrigin::CENTER );
+    mSkyboxActor.SetPosition( CAMERA_DEFAULT_POSITION );
+    mSkyboxActor.AddRenderer( mSkyboxRenderer );
+    stage.Add( mSkyboxActor );
+  }
+
+  /**
+   * Plays animation
+   */
+  void PlayAnimation()
+  {
+    mAnimation = Animation::New( 5.0f );
+    mAnimation.SetLooping( true );
+    mAnimation.AnimateBy( Property( mActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 )), Vector3::ZAXIS ) );
+    mAnimation.AnimateBy( Property( mActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 )), Vector3::YAXIS ) );
+    mAnimation.AnimateBy( Property( mActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 )), Vector3::XAXIS ) );
+    mAnimation.Play();
+  }
+
+private:
+  Application&  mApplication;
+
+  LookCamera mCamera;
+
+  Shader mShaderCube;
+  Shader mShaderSkybox;
+
+  Geometry mGeometry;
+  TextureSet mTextureSet;
+  Renderer mRenderer;
+  Actor mActor;
+  Animation mAnimation;
+
+  Geometry mSkyboxGeometry;
+  TextureSet mSkyboxTextures;
+  Renderer mSkyboxRenderer;
+  Actor mSkyboxActor;
+};
+
+void RunTest( Application& application )
+{
+  TexturedCubeController 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 );
+
+  return 0;
+}
@@ -26,6 +26,7 @@
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -102,7 +103,7 @@ void MyControl::SetProperty( BaseObject* object, Property::Index index, const Pr
         if ( iconVisual )
         {
-          impl.RegisterVisual( index, iconVisual );
+          DevelControl::RegisterVisual( impl, index, iconVisual );
         }
         break;
       }
@@ -123,7 +124,8 @@ Property::Value MyControl::GetProperty( BaseObject* object, Property::Index prop
       case Demo::MyControl::Property::ICON_VISUAL:
       {
         Property::Map map;
-        Toolkit::Visual::Base visual =  GetImpl( myControl ).GetVisual( propertyIndex );
+        MyControl& impl = GetImpl( myControl );
+        Toolkit::Visual::Base visual =  DevelControl::GetVisual( impl, propertyIndex );
         if ( visual )
         {
           visual.CreatePropertyMap( map ); // Creates a Property map containing the Visual that ICON_VISUAL currently is. Can change if state changes.
@@ -18,6 +18,7 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali-toolkit/devel-api/align-enums.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
@@ -104,7 +105,7 @@ void ImageChannelControl::SetImage( const std::string&amp; url )
   properties[Dali::Toolkit::ImageVisual::Property::URL] = url;
   mVisual = Toolkit::VisualFactory::Get().CreateVisual( properties );
-  RegisterVisual( Demo::ImageChannelControl::Property::IMAGE_VISUAL, mVisual );
+  Toolkit::DevelControl::RegisterVisual( *this, Demo::ImageChannelControl::Property::IMAGE_VISUAL, mVisual );
   mVisual.SetName("imageVisual");
   RelayoutRequest();
@@ -127,14 +128,14 @@ void ImageChannelControl::SetVisibility( bool visibility )
     {
       if( mDisableVisibilityTransition.Count() > 0 )
       {
-        mAnimation = CreateTransition( mDisableVisibilityTransition );
+        mAnimation = Toolkit::DevelControl::CreateTransition( *this, mDisableVisibilityTransition );
       }
     }
     else
     {
       if( mEnableVisibilityTransition.Count() > 0 )
       {
-        mAnimation = CreateTransition( mEnableVisibilityTransition );
+        mAnimation = Toolkit::DevelControl::CreateTransition( *this, mEnableVisibilityTransition );
       }
     }
   }
@@ -236,7 +237,7 @@ void ImageChannelControl::SetProperty( BaseObject* object, Property::Index index
         if( map )
         {
           impl.mVisual = Toolkit::VisualFactory::Get().CreateVisual( *map );
-          impl.RegisterVisual( Demo::ImageChannelControl::Property::IMAGE_VISUAL, impl.mVisual );
+          Toolkit::DevelControl::RegisterVisual( impl, Demo::ImageChannelControl::Property::IMAGE_VISUAL, impl.mVisual );
         }
         break;
       }
@@ -43,8 +43,6 @@ namespace
   const float BORDER_WIDTH = 4.0f;
-  const Vector3 POPUP_SIZE_FACTOR_TO_PARENT = Vector3( 0.8, 0.25, 0.0 );
-
 } // unnamed namespace
 /**
@@ -133,8 +131,8 @@ public:
     Popup popup = Popup::New();
     popup.SetParentOrigin( ParentOrigin::CENTER );
     popup.SetAnchorPoint( AnchorPoint::CENTER );
-    popup.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    popup.SetSizeModeFactor( POPUP_SIZE_FACTOR_TO_PARENT );
+    popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH );
+    popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT );
     popup.TouchSignal().Connect( this, &TextFieldExample::OnPopupTouched );
     return popup;
@@ -21,6 +21,7 @@
 #include <dali-toolkit/devel-api/align-enums.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <cstdio>
@@ -124,7 +125,7 @@ bool ShadowButton::GetActiveState()
 void ShadowButton::SetCheckState( bool checkState )
 {
   mCheckState = checkState;
-  EnableVisual( Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, true );
+  DevelControl::EnableVisual( *this, Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, true );
   if( Self().OnStage() )
   {
     if( checkState )
@@ -157,7 +158,7 @@ void ShadowButton::StartTransition( Property::Index transitionId )
       iter->mAnimation.FinishedSignal().Disconnect( this, &ShadowButton::OnTransitionFinished );
     }
-    iter->mAnimation = CreateTransition( iter->mTransitionData );
+    iter->mAnimation = DevelControl::CreateTransition( *this, iter->mTransitionData );
     StoreTargetLayouts( iter->mTransitionData );
     iter->mAnimation.FinishedSignal().Connect( this, &ShadowButton::OnTransitionFinished );
@@ -189,7 +190,7 @@ void ShadowButton::OnTransitionFinished( Animation&amp; src )
         }
         case Demo::ShadowButton::Property::UNCHECK_TRANSITION:
         {
-          EnableVisual( Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, false );
+          DevelControl::EnableVisual( *this, Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, false );
           break;
         }
       }
@@ -352,25 +353,25 @@ void ShadowButton::ResetVisual(
     {
       case Demo::ShadowButton::Property::BACKGROUND_VISUAL:
       {
-        RegisterVisual( index, visual );
+        DevelControl::RegisterVisual( *this, index, visual );
         visual.SetDepthIndex(0.0f);
         break;
       }
       case Demo::ShadowButton::Property::CHECKBOX_BG_VISUAL:
       {
-        RegisterVisual( index, visual );
+        DevelControl::RegisterVisual( *this, index, visual );
         visual.SetDepthIndex(1.0f);
         break;
       }
       case Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL:
       {
-        RegisterVisual( index, visual, mCheckState );
+        DevelControl::RegisterVisual( *this, index, visual, mCheckState );
         visual.SetDepthIndex(2.0f);
         break;
       }
       case Demo::ShadowButton::Property::LABEL_VISUAL:
       {
-        RegisterVisual( index, visual );
+        DevelControl::RegisterVisual( *this, index, visual );
         visual.SetDepthIndex(1.0f);
         break;
       }
@@ -496,7 +497,7 @@ void ShadowButton::SetProperty( BaseObject* object, Property::Index index, const
       case Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL:
       {
         impl.ResetVisual( index, impl.mCheckboxFgVisual, value );
-        impl.EnableVisual( Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, impl.mCheckState );
+        DevelControl::EnableVisual( impl, Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, impl.mCheckState );
         break;
       }
       case Demo::ShadowButton::Property::LABEL_VISUAL:
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -18,6 +18,7 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali-toolkit/devel-api/align-enums.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
@@ -102,7 +103,7 @@ void BeatControl::StartBounceAnimation()
     OnBounceAnimationFinished(mAnimation);
   }
-  mAnimation = CreateTransition( mBounceTransition );
+  mAnimation = DevelControl::CreateTransition( *this, mBounceTransition );
   mAnimation.FinishedSignal().Connect( this, &BeatControl::OnBounceAnimationFinished );
   mAnimation.Play();
   mAnimationPlaying |= BOUNCE_ANIMATION_RUNNING;
@@ -118,7 +119,7 @@ void BeatControl::StartXAnimation()
     OnXAnimationFinished(mXAnimation);
   }
-  mXAnimation = CreateTransition( mLeftTransition );
+  mXAnimation = DevelControl::CreateTransition( *this, mLeftTransition );
   mXAnimation.FinishedSignal().Connect( this, &BeatControl::OnXAnimationFinished );
   mXAnimation.Play();
   mAnimationPlaying |= X_ANIMATION_RUNNING;
@@ -133,7 +134,7 @@ void BeatControl::StartYAnimation()
     OnYAnimationFinished(mYAnimation);
   }
-  mYAnimation = CreateTransition( mUpTransition );
+  mYAnimation = DevelControl::CreateTransition( *this, mUpTransition );
   mYAnimation.FinishedSignal().Connect( this, &BeatControl::OnYAnimationFinished );
   mYAnimation.Play();
   mAnimationPlaying |= Y_ANIMATION_RUNNING;
@@ -148,7 +149,7 @@ void BeatControl::StartFadeAnimation()
     OnFadeAnimationFinished(mFadeAnimation);
   }
-  mFadeAnimation = CreateTransition( mFadeTransition );
+  mFadeAnimation = DevelControl::CreateTransition( *this, mFadeTransition );
   mFadeAnimation.FinishedSignal().Connect( this, &BeatControl::OnFadeAnimationFinished );
   mFadeAnimation.Play();
   mAnimationPlaying |= FADE_ANIMATION_RUNNING;
@@ -276,7 +277,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const 
           {
             // Only register a visual if there is more than just a size setting
             impl.mVisual = Toolkit::VisualFactory::Get().CreateVisual( *map );
-            impl.RegisterVisual( Demo::BeatControl::Property::BEAT_VISUAL, impl.mVisual );
+            DevelControl::RegisterVisual( impl, Demo::BeatControl::Property::BEAT_VISUAL, impl.mVisual );
             // We have registered a new visual: must trigger size negotiation
             // in order to call SetTransformAndSize on the visual with the right size:
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.2.41
+Version:    1.2.42
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -168,3 +168,6 @@ msgstr &quot;রশ্মীয় অগ্রগতি অঙ্কন&quot;
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "রে মার্চিং"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -168,3 +168,6 @@ msgstr &quot;Radialer Fortschritt zeichnen&quot;
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "Ray marschieren"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -180,3 +180,6 @@ msgstr &quot;Draw radial progress&quot;
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "Ray Marching"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -180,3 +180,6 @@ msgstr &quot;Draw radial progress&quot;
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "Ray Marching"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -168,3 +168,6 @@ msgstr &quot;Dibujo progreso radial&quot;
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "trazado de rayos"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -168,3 +168,6 @@ msgstr &quot;Piirustus radial edistyminen&quot;
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "Ray marssi"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -168,3 +168,6 @@ msgstr &quot;방사형 진행 상황 그리기&quot;
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "레이 마칭"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -168,3 +168,6 @@ msgstr &quot;à´±àµ‡à´¡à´¿à´¯àµ½ à´ªàµà´°àµ‡à´¾à´—à´¤à´¿ à´¡àµà´°àµ‡à´¾à´¯à´¿à´‚à´—à
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "à´²àµˆà´±àµà´±àµ à´®à´¾àµ¼à´šàµà´šà´¿à´‚à´—àµ"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -168,3 +168,6 @@ msgstr &quot;ریڈیل پیش رفت ڈرائنگ&quot;
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "رے چلتے"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -168,3 +168,6 @@ msgstr &quot;绘制径向进度&quot;
 msgid "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING"
 msgstr "射线行军"
+
+msgid "DALI_DEMO_STR_TITLE_SKYBOX"
+msgstr "Skybox"
@@ -81,6 +81,7 @@ extern &quot;C&quot;
 #define DALI_DEMO_STR_TITLE_SIMPLE_VISUALS_CONTROL      dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SIMPLE_VISUALS")
 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI             dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")
 #define DALI_DEMO_STR_TITLE_SCROLL_VIEW                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCROLL_VIEW")
+#define DALI_DEMO_STR_TITLE_SKYBOX                      dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SKYBOX")
 #define DALI_DEMO_STR_TITLE_SPARKLE                     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SPARKLE")
 #define DALI_DEMO_STR_TITLE_STYLING                     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_STYLING")
 #define DALI_DEMO_STR_TITLE_TEXTURED_MESH               dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXTURED_MESH")
@@ -144,6 +145,7 @@ extern &quot;C&quot;
 #define DALI_DEMO_STR_TITLE_SIMPLE_VISUALS_CONTROL      "Simple Visuals Control"
 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI             "Script Based UI"
 #define DALI_DEMO_STR_TITLE_SCROLL_VIEW                 "Scroll View"
+#define DALI_DEMO_STR_TITLE_SKYBOX                      "Skybox"
 #define DALI_DEMO_STR_TITLE_SPARKLE                     "Sparkle"
 #define DALI_DEMO_STR_TITLE_STYLING                     "Styling"
 #define DALI_DEMO_STR_TITLE_TEXTURED_MESH               "Mesh Texture"