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

Change-Id: If38951299ed9e878247ee3e38c0d5db166ccf473

[dali_1.2.15] Merge branch 'devel/master'
Change-Id: If38951299ed9e878247ee3e38c0d5db166ccf473
Umar
2 parents 0646a5db a4b20502
Showing 26 changed files with 178 additions and 41 deletions
demo/dali-table-view.cpp
examples/benchmark/benchmark.cpp
examples/blocks/blocks-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/builder/examples.cpp
examples/buttons/buttons-example.cpp
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
examples/image-view-svg/image-view-svg-example.cpp
examples/line-mesh/line-mesh-example.cpp
examples/logging/logging-example.cpp
examples/magnifier/magnifier-example.cpp
examples/metaball-explosion/metaball-explosion-example.cpp
examples/metaball-refrac/metaball-refrac-example.cpp
examples/model3d-view/model3d-view-example.cpp
examples/motion-blur/motion-blur-example.cpp
examples/motion-stretch/motion-stretch-example.cpp
examples/new-window/new-window-example.cpp
examples/perf-scroll/perf-scroll.cpp
examples/refraction-effect/refraction-effect-example.cpp
examples/shadows-and-lights/shadows-and-lights-example.cpp
@@ -226,6 +226,7 @@ DaliTableView::DaliTableView( Application&amp; application )
   mPages(),
   mBackgroundAnimations(),
   mExampleList(),
+  mPageWidth( 0.0f ),
   mTotalPages(),
   mScrolling( false ),
   mSortAlphabetically( false ),
@@ -351,7 +351,7 @@ public:
         float delay = 0.0f;
         float duration = 0.0f;
-        if( count < mRowsPerPage*mColumnsPerPage )
+        if( count < ( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage ) )
         {
           duration = durationPerActor;
           delay = delayBetweenActors * count;
@@ -385,7 +385,7 @@ public:
     Vector3 stageSize( stage.GetSize() );
     mScroll = Animation::New(10.0f);
-    size_t actorCount( mRowsPerPage*mColumnsPerPage*mPageCount);
+    size_t actorCount( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage * mPageCount );
     for( size_t i(0); i<actorCount; ++i )
     {
       if( gUseMesh )
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -214,7 +214,29 @@ public:
    */
   ExampleController( Application& application )
   : mApplication( application ),
-    mView()
+    mView(),
+    mContentLayer(),
+    mBall(),
+    mBallStartPosition(),
+    mBallVelocity(),
+    mBallAnimation(),
+    mPaddle(),
+    mPaddleImage(),
+    mPaddleHandle(),
+    mPaddleHitMargin(),
+    mWobbleAnimation(),
+    mWobbleProperty( Property::INVALID_INDEX ),
+    mLevelContainer(),
+    mBrickImageMap(),
+    mDragAnimation(),
+    mDragActor(),
+    mRelativeDragPoint(),
+    mDestroyAnimationMap(),
+    mPaddleFullSize(),
+    mLevel( 0 ),
+    mLives( TOTAL_LIVES ),
+    mBrickCount( 0 )
+
   {
     // Connect to the Application's Init and orientation changed signal
     mApplication.InitSignal().Connect(this, &ExampleController::Create);
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -62,7 +62,18 @@ class BubbleEffectExample : public ConnectionTracker
 public:
   BubbleEffectExample(Application &app)
   : mApp(app),
+    mBackgroundImage(),
+    mBackground(),
+    mBubbleEmitter(),
+    mEmitAnimation(),
+    mChangeBackgroundButton(),
+    mChangeBubbleShapeButton(),
+    mTimerForBubbleEmission(),
     mHSVDelta( Vector3( 0.f, 0.f, 0.5f ) ),
+    mCurrentTouchPosition(),
+    mEmitPosition(),
+    mAnimateComponentCount( 0 ),
+    mNonMovementCount( 0 ),
     mTimerInterval( 16 ),
     mCurrentBackgroundImageId( 0 ),
     mCurrentBubbleShapeImageId( 0 ),
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -558,15 +558,12 @@ private:
   Toolkit::NavigationView mNavigationView;
   Toolkit::Control mView;
-  unsigned int mOrientation;
   Toolkit::ToolBar mToolBar;
   TextLabel mTitleActor;
   Layer mBuilderLayer;
-  Toolkit::Popup mMenu;
-
   TapGestureDetector mTapDetector;
   // builder
@@ -576,8 +573,6 @@ private:
   FileWatcher mFileWatcher;
   Timer mTimer;
-
-
 };
 //------------------------------------------------------------------------------
@@ -497,7 +497,6 @@ private:
   Toolkit::CheckBoxButton mCheckboxButton3;
   Animation      mAnimation;
-  float          mLastPoint;
   Toolkit::ImageView mImage;
 };
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -152,6 +152,7 @@ public:
   ImageScalingAndFilteringController( Application& application )
   : mApplication( application ),
+    mLastPinchScale( 1.0f ),
     mImageStageScale( 0.5f, 0.5f ),
     mCurrentPath( 0 ),
     mFittingMode( FittingMode::FIT_WIDTH ),
@@ -47,6 +47,7 @@ public:
   ImageSvgController( Application& application )
   : mApplication( application ),
     mScale( 1.f ),
+    mScaleAtPinchStart( 1.0f ),
     mIndex( 0 )
   {
     // Connect to the Application's Init signal
@@ -119,7 +119,19 @@ public:
    * @param[in] application The application instance
    */
   ExampleController( Application& application )
-  : mApplication( application )
+  : mApplication( application ),
+    mStageSize(),
+    mShader(),
+    mGeometry(),
+    mRenderer(),
+    mMeshActor(),
+    mButtons(),
+    mMinusButton(),
+    mPlusButton(),
+    mIndicesCountLabel(),
+    mPrimitiveType( Geometry::LINES ),
+    mCurrentIndexCount( 0 ),
+    mMaxIndexCount( 0 )
   {
     // Connect to the Application's Init signal
     mApplication.InitSignal().Connect( this, &ExampleController::Create );
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -125,7 +125,17 @@ class LoggingController: public ConnectionTracker
  public:
   LoggingController( Application& application )
-    : mApplication( application )
+  : mApplication( application ),
+    mView(),
+    mToolBar(),
+    mContentLayer(),
+    mAnimation(),
+    mPerformanceLoggerNames(),
+    mPerformanceLoggers(),
+    mCurrentLogger( 0 ),
+    mLoggerStates(),
+    mLogRadioButtons(),
+    mFrequencyRadioButtons()
   {
     // Connect to the Application's Init signal
     mApplication.InitSignal().Connect( this, &LoggingController::Create );
@@ -655,7 +665,6 @@ private:
   Layer             mContentLayer;           ///< Content layer
   Animation      mAnimation;
-  float          mLastPoint;
   typedef std::vector< std::string > Strings;
   Strings mPerformanceLoggerNames;
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -173,6 +173,7 @@ public:
   : mApplication( application ),
     mView(),
     mAnimationTime(0.0f),
+    mAnimationTimeProperty( Property::INVALID_INDEX ),
     mMagnifierShown(false)
   {
     // Connect to the Application's Init signal
@@ -306,7 +306,25 @@ private:
 //----------------
 MetaballExplosionController::MetaballExplosionController( Application& application )
-  : mApplication( application )
+: mApplication( application ),
+  mScreenSize(),
+  mContentLayer(),
+  mBackImage(),
+  mMetaballFBO(),
+  mMetaballRoot(),
+  mMetaballs(),
+  mPositionIndex(),
+  mCompositionActor(),
+  mCurrentTouchPosition(),
+  mMetaballPosVariation(),
+  mMetaballPosVariationFrom(),
+  mMetaballPosVariationTo(),
+  mMetaballCenter(),
+  mPositionVarAnimation(),
+  mDispersion( 0 ),
+  mDispersionAnimation(),
+  mTimerDispersion(),
+  mTimeMult( 1.0f )
 {
   // Connect to the Application's Init signal
   mApplication.InitSignal().Connect( this, &MetaballExplosionController::Create );
@@ -187,7 +187,6 @@ private:
   Actor             mCompositionActor;
   //Motion
-  bool              mExitClick;
   Vector2           mCurrentTouchPosition;
   Vector2           mMetaballPosVariation;
   Vector2           mMetaballPosVariationFrom;
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -57,7 +57,16 @@ class Model3dViewController : public ConnectionTracker
 public:
   Model3dViewController( Application& application )
-  : mApplication( application )
+  : mApplication( application ),
+    mModelCounter( 0 ),
+    mModel3dView(),
+    mButtonLayer(),
+    mTapDetector(),
+    mIlluminationShader( Model3dView::DIFFUSE ),
+    mRotationAnimation(),
+    mLightAnimation(),
+    mPlaying( false ),
+    mScaled( false )
   {
     // Connect to the Application's Init signal
     mApplication.InitSignal().Connect( this, &Model3dViewController::Create );
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -143,7 +143,8 @@ public:
   : mApplication(app),
     mActorEffectsEnabled(false),
     mCurrentActorAnimation(0),
-    mCurrentImage(0)
+    mCurrentImage(0),
+    mOrientation( PORTRAIT )
   {
     // Connect to the Application's Init signal
     app.InitSignal().Connect(this, &MotionBlurExampleApp::OnInit);
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -110,7 +110,8 @@ public:
   : mApplication(app),
     mActorEffectsEnabled(false),
     mCurrentActorAnimation(0),
-    mCurrentImage(0)
+    mCurrentImage(0),
+    mOrientation( PORTRAIT )
   {
     // Connect to the Application's Init signal
     app.InitSignal().Connect(this, &MotionStretchExampleApp::OnInit);
@@ -164,7 +164,8 @@ private:
 NewWindowController::NewWindowController( Application& application )
 : mApplication(application),
-  mNeedNewAnimation(true)
+  mNeedNewAnimation(true),
+  mAnimateComponentCount( 0 )
 {
   mApplication.InitSignal().Connect(this, &NewWindowController::Create);
   mApplication.TerminateSignal().Connect(this, &NewWindowController::Destroy);
@@ -354,7 +354,7 @@ public:
         float delay = 0.0f;
         float duration = 0.0f;
-        if( count < mRowsPerPage*mColumnsPerPage )
+        if( count < ( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage ) )
         {
           duration = durationPerActor;
           delay = delayBetweenActors * count;
@@ -211,6 +211,21 @@ class RefractionEffectExample : public ConnectionTracker
 public:
   RefractionEffectExample( Application &application )
   : mApplication( application ),
+    mContent(),
+    mTextureSet(),
+    mGeometry(),
+    mRenderer(),
+    mMeshActor(),
+    mShaderFlat(),
+    mShaderRefraction(),
+    mLightAnimation(),
+    mStrenghAnimation(),
+    mLightXYOffsetIndex( Property::INVALID_INDEX ),
+    mSpinAngleIndex( Property::INVALID_INDEX ),
+    mLightIntensityIndex( Property::INVALID_INDEX ),
+    mEffectStrengthIndex( Property::INVALID_INDEX ),
+    mChangeTextureButton(),
+    mChangeMeshButton(),
     mCurrentTextureId( 1 ),
     mCurrentMeshId( 0 )
   {
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -80,8 +80,24 @@ public:
    */
   TestApp(Application &app)
   : mApp(app),
-    mPaused(false),
-    mTranslation(22.0f, -1.0f, 0.0f),
+    mView(),
+    mContents(),
+    mSceneActor(),
+    mAnimation(),
+    mSceneAnimation(),
+    mPaused( false ),
+    mShadowView(),
+    mShadowPlaneBg(),
+    mShadowPlane(),
+    mCastingLight(),
+    mLightAnchor(),
+    mImageActor1(),
+    mImageActor2(),
+    mImageActor3(),
+    mPanGestureDetector(),
+    mPinchGestureDetector(),
+    mTapGestureDetector(),
+    mTranslation( 22.0f, -1.0f, 0.0f ),
     mSceneXRotation( Degree(-6.0f) ), // Initial values give a reasonable off-straight view.
     mSceneYRotation( Degree(20.0f) ),
     mLightXRotation( Degree(-1.5f) ),
@@ -90,7 +106,10 @@ public:
     mObjectYRotation(0.0f),
     mPinchScale(0.6f),
     mScaleAtPinchStart(0.6f),
-    mPanState(PAN_LIGHT)
+    mAngle1Index( Property::INVALID_INDEX ),
+    mAngle3Index( Property::INVALID_INDEX ),
+    mTitleActor(),
+    mPanState( PAN_LIGHT )
   {
     app.InitSignal().Connect(this, &TestApp::Create);
     app.TerminateSignal().Connect(this, &TestApp::Terminate);
@@ -17,7 +17,10 @@
 #include "image-channel-control-impl.h"
 #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/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
+
 #include <cstdio>
 using namespace Dali; // Needed for macros
@@ -67,6 +70,7 @@ DALI_TYPE_REGISTRATION_END();
 Internal::ImageChannelControl::ImageChannelControl()
 : Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
   mChannels( 1.0f, 1.0f, 1.0f ),
+  mChannelIndex( Property::INVALID_INDEX ),
   mVisibility(true),
   mTargetVisibility(true)
 {
@@ -175,7 +179,15 @@ void ImageChannelControl::OnSizeSet( const Vector3&amp; targetSize )
   if( mVisual )
   {
     Vector2 size( targetSize );
-    mVisual.SetSize( size );
+    Property::Map transformMap;
+    transformMap
+      .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
+      .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
+      .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
+      .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
+      .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO );
+
+    mVisual.SetTransformAndSize( transformMap, size );
   }
 }
@@ -92,7 +92,8 @@ Property::Index GetChannelProperty( int index )
 StylingApplication::StylingApplication( Application& application )
-: mApplication( application )
+: mApplication( application ),
+  mCurrentTheme( 0 )
 {
   application.InitSignal().Connect( this, &StylingApplication::Create );
 }
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -38,7 +38,8 @@ public:
   typedef uint32_t SizeType;
   EmojiExample( Application& application )
-  : mApplication( application )
+  : mApplication( application ),
+    mLastPoint( 0.0f )
   {
     std::cout << "EmoticonController::EmoticonController" << std::endl;
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -107,8 +107,15 @@ public:
   TextLabelExample( Application& application )
   : mApplication( application ),
+    mLabel(),
+    mContainer(),
+    mGrabCorner(),
+    mPanGestureDetector(),
+    mLayoutSize(),
     mLanguageId( 0u ),
-    mAlignment( 0u )
+    mAlignment( 0u ),
+    mHueAngleIndex( Property::INVALID_INDEX ),
+    mOverrideMixColorIndex( Property::INVALID_INDEX )
   {
     // Connect to the Application's Init signal
     mApplication.InitSignal().Connect( this, &TextLabelExample::Create );
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -47,7 +47,8 @@ class VideoViewController: public ConnectionTracker
       mIsPlay( false ),
       mIsStop( false ),
       mIsFullScreen( false ),
-      mScale( 1.f )
+      mScale( 1.f ),
+      mPinchStartScale( 1.0f )
   {
     // Connect to the Application's Init signal
     mApplication.InitSignal().Connect( this, &VideoViewController::Create );
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.2.14
+Version:    1.2.15
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0