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

Change-Id: I2249d61b7cba27d69643444eb8e2e9dbef4a11a6

[dali_1.1.25] Merge branch 'devel/master'
Change-Id: I2249d61b7cba27d69643444eb8e2e9dbef4a11a6
Nick Holland
2 parents bb392e18 141836ef
Showing 6 changed files with 21 additions and 21 deletions
demo/dali-table-view.cpp
examples/cube-transition-effect/cube-transition-effect-example.cpp
examples/dissolve-effect/dissolve-effect-example.cpp
examples/radial-menu/radial-menu-example.cpp
examples/radial-menu/radial-sweep-view-impl.cpp
packaging/com.samsung.dali-demo.spec
@@ -116,11 +116,10 @@ public:
     const Vector3& parentSize = inputs[1]->GetVector3();
     const Vector3& childSize = inputs[2]->GetVector3();
-    // Wrap bubbles verically.
-    if( position.y + childSize.y * 0.5f < -parentSize.y * 0.5f )
-    {
-      position.y = parentSize.y * 0.5f + childSize.y * 0.5f;
-    }
+    // Wrap bubbles vertically.
+    float range = parentSize.y + childSize.y;
+    // This performs a float mod (we don't use fmod as we want the arithmetic modulus as opposed to the remainder).
+    position.y -= range * ( floor( position.y / range ) + 0.5f );
     // Bubbles X position moves parallax to horizontal
     // panning by a scale factor unique to each bubble.
@@ -698,11 +697,12 @@ void DaliTableView::InitialiseBackgroundActors( Actor actor )
     animConstraint.AddSource( Source( mScrollView, ScrollView::Property::SCROLL_POSITION ) );
     animConstraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) );
     animConstraint.AddSource( Dali::LocalSource( Dali::Actor::Property::SIZE ) );
+    animConstraint.SetRemoveAction( Constraint::Discard );
     animConstraint.Apply();
     // Kickoff animation
-    Animation animation = Animation::New( Random::Range( 40.0f, 80.0f ) );
-    animation.AnimateBy( Property( child, Actor::Property::POSITION ), Vector3( 0.0f, -1.0f, 0.0f ), AlphaFunction::LINEAR );
+    Animation animation = Animation::New( Random::Range( 30.0f, 160.0f ) );
+    animation.AnimateBy( Property( child, Actor::Property::POSITION ), Vector3( 0.0f, -2000.0f, 0.0f ), AlphaFunction::LINEAR );
     animation.SetLooping( true );
     animation.Play();
     mBackgroundAnimations.push_back( animation );
@@ -260,7 +260,7 @@ void CubeTransitionApp::OnInit( Application&amp; application )
   mCubeWaveEffect.TransitionCompletedSignal().Connect(this, &CubeTransitionApp::OnTransitionCompleted);
   mCubeWaveEffect.SetSize( mViewSize );
-  mCubeWaveEffect.SetPositionInheritanceMode( USE_PARENT_POSITION );
+  mCubeWaveEffect.SetParentOrigin( ParentOrigin::CENTER );
   mCubeWaveEffect.SetCurrentImage( mCurrentImage );
   // use big cubes
@@ -270,7 +270,7 @@ void CubeTransitionApp::OnInit( Application&amp; application )
   mCubeCrossEffect.TransitionCompletedSignal().Connect(this, &CubeTransitionApp::OnTransitionCompleted);
   mCubeCrossEffect.SetSize( mViewSize );
-  mCubeCrossEffect.SetPositionInheritanceMode( USE_PARENT_POSITION );
+  mCubeCrossEffect.SetParentOrigin( ParentOrigin::CENTER );
   mCubeCrossEffect.SetCurrentImage( mCurrentImage );
   mCubeFoldEffect = Toolkit::CubeTransitionFoldEffect::New( NUM_ROWS_FOLD, NUM_COLUMNS_FOLD );
@@ -278,7 +278,7 @@ void CubeTransitionApp::OnInit( Application&amp; application )
   mCubeFoldEffect.TransitionCompletedSignal().Connect(this, &CubeTransitionApp::OnTransitionCompleted);
   mCubeFoldEffect.SetSize( mViewSize );
-  mCubeFoldEffect.SetPositionInheritanceMode( USE_PARENT_POSITION );
+  mCubeFoldEffect.SetParentOrigin( ParentOrigin::CENTER );
   mCubeFoldEffect.SetCurrentImage( mCurrentImage );
   mViewTimer = Timer::New( VIEWINGTIME );
@@ -255,12 +255,12 @@ void DissolveEffectApp::OnInit( Application&amp; application )
   // Set size to stage size to avoid seeing a black border on transition
   mParent = Actor::New();
   mParent.SetSize( Stage::GetCurrent().GetSize() );
-  mParent.SetPositionInheritanceMode( USE_PARENT_POSITION );
+  mParent.SetParentOrigin( ParentOrigin::CENTER );
   mContent.Add( mParent );
   // show the first image
   mCurrentImage = Toolkit::ImageView::New( LoadStageFillingImage( IMAGES[mIndex] ) );
-  mCurrentImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION);
+  mCurrentImage.SetParentOrigin( ParentOrigin::CENTER );
   mCurrentImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
   mCurrentImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
   mParent.Add( mCurrentImage );
@@ -293,7 +293,7 @@ void DissolveEffectApp::OnPanGesture( Actor actor, const PanGesture&amp; gesture )
     Image image = LoadStageFillingImage( IMAGES[ mIndex ] );
     mNextImage = Toolkit::ImageView::New( image );
-    mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION);
+    mNextImage.SetParentOrigin( ParentOrigin::CENTER );
     mNextImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
     mNextImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
     mNextImage.SetZ(INITIAL_DEPTH);
@@ -406,7 +406,7 @@ bool DissolveEffectApp::OnTimerTick()
     mIndex = (mIndex + 1)%NUM_IMAGES;
     Image image = LoadStageFillingImage( IMAGES[ mIndex ] );
     mNextImage = Toolkit::ImageView::New( image );
-    mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION);
+    mNextImage.SetParentOrigin( ParentOrigin::CENTER );
     mNextImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
     mNextImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
     mNextImage.SetZ(INITIAL_DEPTH);
@@ -175,12 +175,12 @@ void RadialMenuExample::OnInit(Application&amp; app)
   Image dial = ResourceImage::New( TEST_DIAL_FILENAME );
   mDialView = ImageView::New( dial );
   mDialView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  mDialView.SetPositionInheritanceMode(USE_PARENT_POSITION);
+  mDialView.SetParentOrigin( ParentOrigin::CENTER );
   mDialView.SetScale(scale);
   Layer dialLayer = Layer::New();
   dialLayer.Add( mDialView );
-  dialLayer.SetPositionInheritanceMode(USE_PARENT_POSITION);
+  dialLayer.SetParentOrigin( ParentOrigin::CENTER );
   dialLayer.SetSize(stage.GetSize());
   mContents.Add(dialLayer);
@@ -271,10 +271,10 @@ RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName,
   radialSweepView.SetFinalSector( Degree(359.999f) );
   radialSweepView.SetSize( Stage::GetCurrent().GetSize());
   radialSweepView.SetEasingFunction( Dali::AlphaFunction::EASE_IN_OUT );
-  radialSweepView.SetPositionInheritanceMode(USE_PARENT_POSITION);
+  radialSweepView.SetParentOrigin( ParentOrigin::CENTER );
   mContents.Add(radialSweepView);
   radialSweepView.Add( mImageView );
-  mImageView.SetPositionInheritanceMode(USE_PARENT_POSITION);
+  mImageView.SetParentOrigin( ParentOrigin::CENTER );
   return radialSweepView;
 }
@@ -223,7 +223,7 @@ void RadialSweepViewImpl::Add(Actor actor)
     mLayer = Layer::New();
     Self().Add(mLayer);
     mLayer.SetSize( Stage::GetCurrent().GetSize() );
-    mLayer.SetPositionInheritanceMode(USE_PARENT_POSITION);
+    mLayer.SetParentOrigin( ParentOrigin::CENTER );
   }
   mLayer.Add(actor);
@@ -362,5 +362,5 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector )
   mRotationAngleIndex = mStencilActor.RegisterProperty("uRotationAngle", initialSector.radian);
   mStencilActor.SetDrawMode( DrawMode::STENCIL );
-  mStencilActor.SetPositionInheritanceMode(USE_PARENT_POSITION);
+  mStencilActor.SetParentOrigin( ParentOrigin::CENTER );
 }
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.1.24
+Version:    1.1.25
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0