Peter M. Groen / dali-demo

Commit b95d3a3ead5382e65c3dc6f695acfcf3a919f23c

Authored by Tom Robinson
1 parent b074eb75

Property enum name changes in dali-core: Demo changes for compiling 

Change-Id: I359790799ebf64ac5fd4e988e569dada337dd9f8
Inline Side-by-side
Showing 13 changed files with 57 additions and 59 deletions
demo/dali-table-view.cpp
  View file @b95d3a3
... ... @@ -262,7 +262,7 @@ void DaliTableView::Initialize( Application& application )
262 262 mScrollView.SetParentOrigin( ParentOrigin::CENTER );
263 263 // Note: Currently, changing mScrollView to use SizeMode RELATIVE_TO_PARENT
264 264 // will cause scroll ends to appear in the wrong position.
265   - mScrollView.ApplyConstraint( Dali::Constraint::New<Dali::Vector3>( Dali::Actor::Property::Size, Dali::ParentSource( Dali::Actor::Property::Size ), Dali::RelativeToConstraint( SCROLLVIEW_RELATIVE_SIZE ) ) );
  265 + mScrollView.ApplyConstraint( Dali::Constraint::New<Dali::Vector3>( Dali::Actor::Property::SIZE, Dali::ParentSource( Dali::Actor::Property::SIZE ), Dali::RelativeToConstraint( SCROLLVIEW_RELATIVE_SIZE ) ) );
266 266 mScrollView.SetAxisAutoLock( true );
267 267 mScrollView.ScrollCompletedSignal().Connect( this, &DaliTableView::OnScrollComplete );
268 268 mScrollView.ScrollStartedSignal().Connect( this, &DaliTableView::OnScrollStart );
... ... @@ -733,9 +733,9 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage dis
733 733 dfActor.SetPosition( actorPos );
734 734  
735 735 // Define bubble horizontal parallax and vertical wrapping
736   - Constraint animConstraint = Constraint::New < Vector3 > ( Actor::Property::Position,
  736 + Constraint animConstraint = Constraint::New < Vector3 > ( Actor::Property::POSITION,
737 737 Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
738   - Dali::ParentSource( Dali::Actor::Property::Size ),
  738 + Dali::ParentSource( Dali::Actor::Property::SIZE ),
739 739 AnimateBubbleConstraint( actorPos, Random::Range( -0.85f, 0.25f ), randSize ) );
740 740 dfActor.ApplyConstraint( animConstraint );
741 741  
... ... @@ -746,7 +746,7 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage dis
746 746 Vector3 toPos( actorPos );
747 747 toPos.y -= ( size.y + randSize );
748 748 keyframes.Add( 1.0f, toPos );
749   - animation.AnimateBetween( Property( dfActor, Actor::Property::Position ), keyframes );
  749 + animation.AnimateBetween( Property( dfActor, Actor::Property::POSITION ), keyframes );
750 750 animation.SetLooping( true );
751 751 animation.Play();
752 752 mBackgroundAnimations.push_back( animation );
... ... @@ -944,5 +944,3 @@ bool DaliTableView::OnTileHovered( Actor actor, const HoverEvent&amp; event )
944 944 KeyboardFocusManager::Get().SetCurrentFocusActor( actor );
945 945 return true;
946 946 }
947   -
948   -
... ...
examples/blocks/blocks-example.cpp
  View file @b95d3a3
... ... @@ -346,7 +346,7 @@ private:
346 346 mPaddleImage.SetSize( mPaddleFullSize );
347 347  
348 348 mWobbleProperty = mPaddle.RegisterProperty(WOBBLE_PROPERTY_NAME, 0.0f);
349   - Constraint wobbleConstraint = Constraint::New<Quaternion>( Actor::Property::Rotation,
  349 + Constraint wobbleConstraint = Constraint::New<Quaternion>( Actor::Property::ROTATION,
350 350 LocalSource(mWobbleProperty),
351 351 WobbleConstraint(10.0f));
352 352 mPaddle.ApplyConstraint(wobbleConstraint);
... ... @@ -359,16 +359,16 @@ private:
359 359 const float margin(BALL_SIZE.width * stageSize.width * 0.5f);
360 360  
361 361 // Set up notifications for ball's collisions against walls.
362   - PropertyNotification leftNotification = mBall.AddPropertyNotification( Actor::Property::PositionX, LessThanCondition(margin) );
  362 + PropertyNotification leftNotification = mBall.AddPropertyNotification( Actor::Property::POSITION_X, LessThanCondition(margin) );
363 363 leftNotification.NotifySignal().Connect( this, &ExampleController::OnHitLeftWall );
364 364  
365   - PropertyNotification rightNotification = mBall.AddPropertyNotification( Actor::Property::PositionX, GreaterThanCondition(stageSize.width - margin) );
  365 + PropertyNotification rightNotification = mBall.AddPropertyNotification( Actor::Property::POSITION_X, GreaterThanCondition(stageSize.width - margin) );
366 366 rightNotification.NotifySignal().Connect( this, &ExampleController::OnHitRightWall );
367 367  
368   - PropertyNotification topNotification = mBall.AddPropertyNotification( Actor::Property::PositionY, LessThanCondition(margin) );
  368 + PropertyNotification topNotification = mBall.AddPropertyNotification( Actor::Property::POSITION_Y, LessThanCondition(margin) );
369 369 topNotification.NotifySignal().Connect( this, &ExampleController::OnHitTopWall );
370 370  
371   - PropertyNotification bottomNotification = mBall.AddPropertyNotification( Actor::Property::PositionY, GreaterThanCondition(stageSize.height + margin) );
  371 + PropertyNotification bottomNotification = mBall.AddPropertyNotification( Actor::Property::POSITION_Y, GreaterThanCondition(stageSize.height + margin) );
372 372 bottomNotification.NotifySignal().Connect( this, &ExampleController::OnHitBottomWall );
373 373  
374 374 // Set up notification for ball colliding against paddle.
... ... @@ -376,10 +376,10 @@ private:
376 376 stage.Add(delegate);
377 377 Property::Index property = delegate.RegisterProperty(COLLISION_PROPERTY_NAME, Vector3::ZERO);
378 378 Constraint constraint = Constraint::New<Vector3>( property,
379   - Source(mBall, Actor::Property::Position),
380   - Source(mPaddle, Actor::Property::Position),
381   - Source(mBall, Actor::Property::Size),
382   - Source(mPaddle, Actor::Property::Size),
  379 + Source(mBall, Actor::Property::POSITION),
  380 + Source(mPaddle, Actor::Property::POSITION),
  381 + Source(mBall, Actor::Property::SIZE),
  382 + Source(mPaddle, Actor::Property::SIZE),
383 383 CollisionCircleRectangleConstraint( -Vector3(0.0f, mPaddleHitMargin.height * 0.575f, 0.0f),-Vector3(mPaddleHitMargin) ));
384 384 delegate.ApplyConstraint(constraint);
385 385  
... ... @@ -599,10 +599,10 @@ private:
599 599 // Add a constraint on the brick between it and the ball generating a collision-property
600 600 Property::Index property = brick.RegisterProperty(COLLISION_PROPERTY_NAME, Vector3::ZERO);
601 601 Constraint constraint = Constraint::New<Vector3>( property,
602   - Source(mBall, Actor::Property::Position),
603   - Source(brick, Actor::Property::Position),
604   - Source(mBall, Actor::Property::Size),
605   - Source(brick, Actor::Property::Size),
  602 + Source(mBall, Actor::Property::POSITION),
  603 + Source(brick, Actor::Property::POSITION),
  604 + Source(mBall, Actor::Property::SIZE),
  605 + Source(brick, Actor::Property::SIZE),
606 606 CollisionCircleRectangleConstraint(BRICK_COLLISION_MARGIN));
607 607 brick.ApplyConstraint(constraint);
608 608  
... ... @@ -639,7 +639,7 @@ private:
639 639 }
640 640  
641 641 mBallAnimation = Animation::New(MAX_ANIMATION_DURATION);
642   - mBallAnimation.AnimateBy( Property( mBall, Actor::Property::Position ), mBallVelocity * MAX_ANIMATION_DURATION);
  642 + mBallAnimation.AnimateBy( Property( mBall, Actor::Property::POSITION ), mBallVelocity * MAX_ANIMATION_DURATION);
643 643 mBallAnimation.Play();
644 644 }
645 645  
... ... @@ -661,8 +661,8 @@ private:
661 661  
662 662 mDragActor = actor;
663 663 mDragAnimation = Animation::New(0.25f);
664   - mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::Scale), Vector3(1.1f, 1.1f, 1.0f), AlphaFunctions::EaseOut);
665   - mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::Color), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunctions::EaseOut);
  664 + mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::SCALE), Vector3(1.1f, 1.1f, 1.0f), AlphaFunctions::EaseOut);
  665 + mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunctions::EaseOut);
666 666 mDragAnimation.Play();
667 667 }
668 668 }
... ... @@ -687,8 +687,8 @@ private:
687 687 if(point.state==TouchPoint::Up) // Stop dragging
688 688 {
689 689 mDragAnimation = Animation::New(0.25f);
690   - mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::Scale), Vector3(1.0f, 1.0f, 1.0f), AlphaFunctions::EaseIn);
691   - mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::Color), Vector4(1.0f, 1.0f, 1.0f, 1.0f), AlphaFunctions::EaseOut);
  690 + mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::SCALE), Vector3(1.0f, 1.0f, 1.0f), AlphaFunctions::EaseIn);
  691 + mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 1.0f), AlphaFunctions::EaseOut);
692 692 mDragAnimation.Play();
693 693 mDragActor.Reset();
694 694 }
... ... @@ -745,8 +745,8 @@ private:
745 745 mBallVelocity = Vector3::ZERO;
746 746  
747 747 Animation shrink = Animation::New(0.5f);
748   - shrink.AnimateTo( Property(mPaddle, Actor::Property::SizeWidth), mPaddleFullSize.x * f + mPaddleHitMargin.x);
749   - shrink.AnimateTo( Property(mPaddleImage, Actor::Property::SizeWidth), mPaddleFullSize.x * f );
  748 + shrink.AnimateTo( Property(mPaddle, Actor::Property::SIZE_WIDTH), mPaddleFullSize.x * f + mPaddleHitMargin.x);
  749 + shrink.AnimateTo( Property(mPaddleImage, Actor::Property::SIZE_WIDTH), mPaddleFullSize.x * f );
750 750  
751 751 shrink.FinishedSignal().Connect( this, &ExampleController::OnPaddleShrunk );
752 752 shrink.Play();
... ... @@ -763,7 +763,7 @@ private:
763 763 mBall.SetPosition( mBallStartPosition );
764 764 mBall.SetColor( Vector4(1.0f, 1.0f, 1.0f, 0.1f) );
765 765 Animation appear = Animation::New(0.5f);
766   - appear.AnimateTo( Property(mBall, Actor::Property::Color), Vector4(1.0f, 1.0f, 1.0f, 1.0f) );
  766 + appear.AnimateTo( Property(mBall, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 1.0f) );
767 767 appear.Play();
768 768  
769 769 if(!mLives)
... ... @@ -830,7 +830,7 @@ private:
830 830  
831 831 // fade brick (destroy)
832 832 Animation destroyAnimation = Animation::New(0.5f);
833   - destroyAnimation.AnimateTo( Property( brick, Actor::Property::ColorAlpha ), 0.0f, AlphaFunctions::EaseIn );
  833 + destroyAnimation.AnimateTo( Property( brick, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunctions::EaseIn );
834 834 destroyAnimation.Play();
835 835 destroyAnimation.FinishedSignal().Connect( this, &ExampleController::OnBrickDestroyed );
836 836 mDestroyAnimationMap[destroyAnimation] = brick;
... ...
examples/cluster/cluster-example.cpp
  View file @b95d3a3
... ... @@ -707,7 +707,7 @@ public:
707 707 Vector2 shearCenter( Vector2(position.x + size.width * shearAnchor.x, position.y + size.height * shearAnchor.y) );
708 708 Property::Index centerProperty = shaderEffect.GetPropertyIndex(shaderEffect.GetCenterPropertyName());
709 709 Constraint constraint = Constraint::New<Vector2>( centerProperty,
710   - Source(mView, Actor::Property::Size),
  710 + Source(mView, Actor::Property::SIZE),
711 711 ShearEffectCenterConstraint(stageSize, shearCenter) );
712 712 shaderEffect.ApplyConstraint(constraint);
713 713  
... ... @@ -720,12 +720,12 @@ public:
720 720  
721 721 constraint = Constraint::New<float>( angleXAxisProperty,
722 722 Source(mScrollView, scrollOvershootProperty),
723   - Source(mView, Actor::Property::Rotation),
  723 + Source(mView, Actor::Property::ROTATION),
724 724 ShearEffectConstraint(stageSize, SHEAR_EFFECT_MAX_OVERSHOOT, Vector2::XAXIS) );
725 725 shaderEffect.ApplyConstraint(constraint);
726 726 constraint = Constraint::New<float>( angleYAxisProperty,
727 727 Source(mScrollView, scrollOvershootProperty),
728   - Source(mView, Actor::Property::Rotation),
  728 + Source(mView, Actor::Property::ROTATION),
729 729 ShearEffectConstraint(stageSize, SHEAR_EFFECT_MAX_OVERSHOOT, Vector2::YAXIS) );
730 730 shaderEffect.ApplyConstraint(constraint);
731 731  
... ... @@ -752,7 +752,7 @@ public:
752 752  
753 753 Property::Index anglePerUnit = shaderEffect.GetPropertyIndex( shaderEffect.GetAnglePerUnitPropertyName() );
754 754 shaderEffect.ApplyConstraint( Constraint::New<Vector2>( anglePerUnit,
755   - Source(mView, Actor::Property::Rotation),
  755 + Source(mView, Actor::Property::ROTATION),
756 756 CarouselEffectOrientationConstraint( angleSweep ) ) );
757 757  
758 758 break;
... ... @@ -779,7 +779,7 @@ public:
779 779 // dont apply shader effect to scrollview as it might override internal shaders for bounce effect etc
780 780 for( std::vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
781 781 {
782   - Constraint constraint = Constraint::New<float>(Actor::Property::PositionZ, SphereEffectOffsetConstraint(SPHERE_EFFECT_POSITION_Z));
  782 + Constraint constraint = Constraint::New<float>(Actor::Property::POSITION_Z, SphereEffectOffsetConstraint(SPHERE_EFFECT_POSITION_Z));
783 783 constraint.SetRemoveAction(Constraint::Discard);
784 784 Cluster cluster = i->mCluster;
785 785 SetShaderEffectRecursively( cluster, shaderEffect );
... ...
examples/cube-transition-effect/cube-transition-effect-example.cpp
  View file @b95d3a3
... ... @@ -264,7 +264,7 @@ void CubeTransitionApp::OnInit( Application&amp; application )
264 264 mViewTimer.TickSignal().Connect( this, &CubeTransitionApp::OnTimerTick );
265 265  
266 266 // show the first image
267   - mImageConstraint = Constraint::New<Vector3>( Actor::Property::Scale, LocalSource( Actor::Property::Size ), ParentSource( Actor::Property::Size ), ScaleToFitKeepAspectRatioConstraint() );
  267 + mImageConstraint = Constraint::New<Vector3>( Actor::Property::SCALE, LocalSource( Actor::Property::SIZE ), ParentSource( Actor::Property::SIZE ), ScaleToFitKeepAspectRatioConstraint() );
268 268  
269 269 mCurrentImage = ImageActor::New( ResourceImage::New( IMAGES[mIndex] ) );
270 270 mCurrentImage.SetPositionInheritanceMode( USE_PARENT_POSITION );
... ...
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @b95d3a3
... ... @@ -232,7 +232,7 @@ void DissolveEffectApp::OnInit( Application&amp; application )
232 232 mParent.SetPositionInheritanceMode( USE_PARENT_POSITION );
233 233 mContent.Add( mParent );
234 234  
235   - mSizeConstraint= Constraint::New<Vector3>( Actor::Property::Scale, LocalSource( Actor::Property::Size ), ParentSource( Actor::Property::Size ), ScaleToFitKeepAspectRatioConstraint() );
  235 + mSizeConstraint= Constraint::New<Vector3>( Actor::Property::SCALE, LocalSource( Actor::Property::SIZE ), ParentSource( Actor::Property::SIZE ), ScaleToFitKeepAspectRatioConstraint() );
236 236  
237 237 // show the first image
238 238 mCurrentImage = ImageActor::New( ResourceImage::New( IMAGES[mIndex] ) );
... ...
examples/item-view/item-view-example.cpp
  View file @b95d3a3
... ... @@ -993,7 +993,7 @@ private:
993 993 text.SetTextAlignment( Dali::Toolkit::Alignment::HorizontalLeft );
994 994 text.SetStyleToCurrentText( defaultTextStyle );
995 995 text.SetSize( 0.0f, LABEL_TEXT_SIZE_Y );
996   - text.ApplyConstraint( Dali::Constraint::New<float>( Dali::Actor::Property::SizeWidth, Dali::ParentSource( Dali::Actor::Property::SizeWidth ), Dali::EqualToConstraint() ) );
  996 + text.ApplyConstraint( Dali::Constraint::New<float>( Dali::Actor::Property::SIZE_WIDTH, Dali::ParentSource( Dali::Actor::Property::SIZE_WIDTH ), Dali::EqualToConstraint() ) );
997 997 text.SetZ( -0.9f );
998 998 slider.Add( text );
999 999  
... ... @@ -1016,7 +1016,7 @@ private:
1016 1016 text.SetTextAlignment( Dali::Toolkit::Alignment::HorizontalLeft );
1017 1017 text.SetStyleToCurrentText( defaultTextStyle );
1018 1018 text.SetSize( 0.0f, LABEL_TEXT_SIZE_Y );
1019   - text.ApplyConstraint( Dali::Constraint::New<float>( Dali::Actor::Property::SizeWidth, Dali::ParentSource( Dali::Actor::Property::SizeWidth ), Dali::EqualToConstraint() ) );
  1019 + text.ApplyConstraint( Dali::Constraint::New<float>( Dali::Actor::Property::SIZE_WIDTH, Dali::ParentSource( Dali::Actor::Property::SIZE_WIDTH ), Dali::EqualToConstraint() ) );
1020 1020 textContainer.Add( text );
1021 1021  
1022 1022 mMenu.Show();
... ...
examples/magnifier/magnifier-example.cpp
  View file @b95d3a3
... ... @@ -240,11 +240,11 @@ public:
240 240 overlay.Add( mMagnifier );
241 241  
242 242 // Apply constraint to animate the position of the magnifier.
243   - Constraint constraint = Constraint::New<Vector3>(Actor::Property::Position,
244   - LocalSource(Actor::Property::Size),
245   - LocalSource(Actor::Property::ParentOrigin),
246   - LocalSource(Actor::Property::AnchorPoint),
247   - ParentSource(Actor::Property::Size),
  243 + Constraint constraint = Constraint::New<Vector3>(Actor::Property::POSITION,
  244 + LocalSource(Actor::Property::SIZE),
  245 + LocalSource(Actor::Property::PARENT_ORIGIN),
  246 + LocalSource(Actor::Property::ANCHOR_POINT),
  247 + ParentSource(Actor::Property::SIZE),
248 248 ConfinementConstraint(ParentOrigin::CENTER, Vector2::ONE * MAGNIFIER_INDENT, Vector2::ONE * MAGNIFIER_INDENT));
249 249 constraint.SetRemoveAction(Constraint::Discard);
250 250 mMagnifier.ApplyConstraint( constraint );
... ... @@ -260,15 +260,15 @@ public:
260 260 ContinueAnimation();
261 261  
262 262 // Apply constraint to animate the position of the magnifier.
263   - constraint = Constraint::New<Vector3>(Actor::Property::Position,
264   - LocalSource(Actor::Property::Size),
  263 + constraint = Constraint::New<Vector3>(Actor::Property::POSITION,
  264 + LocalSource(Actor::Property::SIZE),
265 265 LocalSource(mAnimationTimeProperty),
266 266 MagnifierPathConstraint(mStageSize, mStageSize * 0.5f));
267 267 mBouncingMagnifier.ApplyConstraint( constraint );
268 268  
269 269 // Apply constraint to animate the source of the magnifier.
270 270 constraint = Constraint::New<Vector3>(mBouncingMagnifier.GetPropertyIndex( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME ),
271   - LocalSource(Actor::Property::Size),
  271 + LocalSource(Actor::Property::SIZE),
272 272 LocalSource(mAnimationTimeProperty),
273 273 MagnifierPathConstraint(mStageSize));
274 274 mBouncingMagnifier.ApplyConstraint( constraint );
... ... @@ -355,7 +355,7 @@ public:
355 355 if(!mMagnifierShown)
356 356 {
357 357 Animation animation = Animation::New(MAGNIFIER_DISPLAY_DURATION);
358   - animation.AnimateTo(Property(mMagnifier, Actor::Property::Scale), Vector3::ONE, AlphaFunctions::EaseIn);
  358 + animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ONE, AlphaFunctions::EaseIn);
359 359 animation.Play();
360 360 mMagnifierShown = true;
361 361 }
... ... @@ -369,7 +369,7 @@ public:
369 369 if(mMagnifierShown)
370 370 {
371 371 Animation animation = Animation::New(MAGNIFIER_DISPLAY_DURATION);
372   - animation.AnimateTo(Property(mMagnifier, Actor::Property::Scale), Vector3::ZERO, AlphaFunctions::EaseOut);
  372 + animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ZERO, AlphaFunctions::EaseOut);
373 373 animation.Play();
374 374 mMagnifierShown = false;
375 375 }
... ...
examples/motion-blur/motion-blur-example.cpp
  View file @b95d3a3
... ... @@ -349,7 +349,7 @@ public:
349 349 mActorTapMovementAnimation = Animation::New( animDuration );
350 350 if ( mMotionBlurImageActor )
351 351 {
352   - mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageActor, Actor::Property::Position), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
  352 + mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
353 353 }
354 354 mActorTapMovementAnimation.SetEndAction( Animation::Bake );
355 355 mActorTapMovementAnimation.Play();
... ...
examples/motion-stretch/motion-stretch-example.cpp
  View file @b95d3a3
... ... @@ -261,7 +261,7 @@ public:
261 261 mActorTapMovementAnimation = Animation::New( animDuration );
262 262 if ( mMotionStretchImageActor )
263 263 {
264   - mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::Property::Position), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
  264 + mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
265 265 }
266 266 mActorTapMovementAnimation.SetEndAction( Animation::Bake );
267 267 mActorTapMovementAnimation.Play();
... ...
examples/radial-menu/radial-sweep-view-impl.cpp
  View file @b95d3a3
... ... @@ -362,17 +362,17 @@ void RadialSweepViewImpl::CreateStencil( Degree initialSector )
362 362  
363 363 // Constrain the vertices of the square mesh to sweep out a sector as the
364 364 // rotation angle is animated.
365   - mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(1, AnimatableVertex::Property::Position),
  365 + mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(1, AnimatableVertex::Property::POSITION),
366 366 srcStart, srcStart, SquareFanConstraint(0)));
367   - mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(2, AnimatableVertex::Property::Position),
  367 + mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(2, AnimatableVertex::Property::POSITION),
368 368 srcStart, srcRot, SquareFanConstraint(0)));
369   - mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(3, AnimatableVertex::Property::Position),
  369 + mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(3, AnimatableVertex::Property::POSITION),
370 370 srcStart, srcRot, SquareFanConstraint(1)));
371   - mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(4, AnimatableVertex::Property::Position),
  371 + mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(4, AnimatableVertex::Property::POSITION),
372 372 srcStart, srcRot, SquareFanConstraint(2)));
373   - mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(5, AnimatableVertex::Property::Position),
  373 + mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(5, AnimatableVertex::Property::POSITION),
374 374 srcStart, srcRot, SquareFanConstraint(3)));
375   - mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(6, AnimatableVertex::Property::Position),
  375 + mMesh.ApplyConstraint(Constraint::New<Vector3>( mMesh.GetPropertyIndex(6, AnimatableVertex::Property::POSITION),
376 376 srcStart, srcRot, SquareFanConstraint(4)));
377 377  
378 378 mStencilActor.SetDrawMode( DrawMode::STENCIL );
... ...
examples/scroll-view/scroll-view-example.cpp
  View file @b95d3a3
... ... @@ -210,7 +210,7 @@ public:
210 210  
211 211 // Hack to force screen refresh.
212 212 Animation animation = Animation::New(1.0f);
213   - animation.AnimateTo(Property(mContentLayer, Actor::Property::Position), Vector3::ZERO );
  213 + animation.AnimateTo(Property(mContentLayer, Actor::Property::POSITION), Vector3::ZERO );
214 214 animation.Play();
215 215 }
216 216  
... ...
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
  View file @b95d3a3
... ... @@ -286,9 +286,9 @@ public:
286 286  
287 287 Property::Index angleIndex = mImageActor2.RegisterProperty("angle", Property::Value(30.0f));
288 288 Source angleSrc( mImageActor2, angleIndex );
289   - mImageActor1.ApplyConstraint(Constraint::New<Quaternion>( Actor::Property::Rotation, angleSrc,
  289 + mImageActor1.ApplyConstraint(Constraint::New<Quaternion>( Actor::Property::ROTATION, angleSrc,
290 290 RotationConstraint(-1.0f)));
291   - mImageActor3.ApplyConstraint(Constraint::New<Quaternion>( Actor::Property::Rotation, angleSrc,
  291 + mImageActor3.ApplyConstraint(Constraint::New<Quaternion>( Actor::Property::ROTATION, angleSrc,
292 292 RotationConstraint(+1.0f)));
293 293  
294 294 mSceneAnimation = Animation::New(2.5f);
... ...
shared/view.h
  View file @b95d3a3
... ... @@ -86,7 +86,7 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar&amp; toolBar,
86 86 Dali::Layer toolBarLayer = Dali::Layer::New();
87 87 toolBarLayer.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
88 88 toolBarLayer.SetParentOrigin( Dali::ParentOrigin::TOP_CENTER );
89   - toolBarLayer.ApplyConstraint( Dali::Constraint::New<Dali::Vector3>( Dali::Actor::Property::Size, Dali::ParentSource( Dali::Actor::Property::Size ), Dali::SourceWidthFixedHeight( style.mToolBarHeight ) ) );
  89 + toolBarLayer.ApplyConstraint( Dali::Constraint::New<Dali::Vector3>( Dali::Actor::Property::SIZE, Dali::ParentSource( Dali::Actor::Property::SIZE ), Dali::SourceWidthFixedHeight( style.mToolBarHeight ) ) );
90 90 toolBarLayer.SetSize( 0.0f, style.mToolBarHeight );
91 91  
92 92 // Raise tool bar layer to the top.
... ...