From 58d399c7397a4574dfbfd74793c27ae0ffc1fb65 Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Fri, 29 Jul 2016 16:30:36 +0100 Subject: [PATCH] Stencil Renderer demo: Toolbar removed Change-Id: I0e61ab6668a28c000571b957e482f1845c3705be --- .../renderer-stencil/renderer-stencil-example.cpp | 27 +++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/examples/renderer-stencil/renderer-stencil-example.cpp b/examples/renderer-stencil/renderer-stencil-example.cpp index 994f551..5a92cd6 100644 --- a/examples/renderer-stencil/renderer-stencil-example.cpp +++ b/examples/renderer-stencil/renderer-stencil-example.cpp @@ -33,7 +33,6 @@ namespace // Application constants: const char * const APPLICATION_TITLE( "Renderer Stencil API Demo" ); -const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" ); // Texture filenames: @@ -52,6 +51,7 @@ const float ANIMATION_BOUNCE_DEFORMATION_PERCENT( 20.0f ); ///< Percentage (of t const float ANIMATION_BOUNCE_HEIGHT_PERCENT( 40.0f ); ///< Percentage (of the cube's size) to bounce up in to the air by. // Base colors for the objects: +const Vector4 TEXT_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); ///< White. const Vector4 CUBE_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); ///< White. const Vector4 FLOOR_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); ///< White. const Vector4 REFLECTION_COLOR( 0.6f, 0.6f, 0.6f, 0.6f ); ///< Note that alpha is not 1.0f, to make the blend more photo-realistic. @@ -116,11 +116,26 @@ private: { Stage stage = Stage::GetCurrent(); - // Creates a default view with a default tool-bar. - // The view is added to the stage. - Toolkit::ToolBar toolBar; - Layer toolBarLayer = DemoHelper::CreateView( application, mView, toolBar, BACKGROUND_IMAGE, TOOLBAR_IMAGE, APPLICATION_TITLE ); - stage.Add( toolBarLayer ); + // Creates the background image. + Toolkit::Control background = Dali::Toolkit::Control::New(); + background.SetAnchorPoint( Dali::AnchorPoint::CENTER ); + background.SetParentOrigin( Dali::ParentOrigin::CENTER ); + background.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS ); + Dali::Property::Map map; + map["rendererType"] = "IMAGE"; + map["url"] = BACKGROUND_IMAGE; + background.SetProperty( Dali::Toolkit::Control::Property::BACKGROUND, map ); + stage.Add( background ); + + // Create a TextLabel for the application title. + Toolkit::TextLabel label = Toolkit::TextLabel::New( APPLICATION_TITLE ); + label.SetAnchorPoint( AnchorPoint::TOP_CENTER ); + // Set the parent origin to a small percentage below the top (so the demo will scale for different resolutions). + label.SetParentOrigin( Vector3( 0.5f, 0.03f, 0.5f ) ); + label.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + label.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + label.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, TEXT_COLOR ); + stage.Add( label ); // Layer to hold the 3D scene. Layer layer = Layer::New(); -- 2.7.4