-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.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://floralicense.org/license/
-//
-// 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.
-//
+/*
+ * Copyright (c) 2014 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 <sstream>
#include <iomanip>
-#include "../shared/view.h"
+#include "shared/view.h"
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
using namespace Dali;
using namespace Dali::Toolkit;
-using namespace std;
const char* BACKGROUND_IMAGE_PATH = DALI_IMAGE_DIR "background-default.png";
const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );
-const char* LAYOUT_IMAGE( DALI_IMAGE_DIR "icon_mode.png" );
+const char* LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-change.png" );
const char* APPLICATION_TITLE( "Motion Stretch" );
-const char* ANIM_START_ICON( DALI_IMAGE_DIR "icon_play_small.png" );
-const char* ANIM_STOP_ICON( DALI_IMAGE_DIR "icon_stop_small.png" );
+const char* EFFECTS_OFF_ICON( DALI_IMAGE_DIR "icon-effects-off.png" );
+const char* EFFECTS_ON_ICON( DALI_IMAGE_DIR "icon-effects-on.png" );
// These values depend on the button background image
const Vector4 BUTTON_IMAGE_BORDER( Vector4::ONE * 3.0f );
*/
MotionStretchExampleApp(Application &app)
: mApplication(app),
- mActorAnimationsEnabled(false),
+ mActorEffectsEnabled(false),
mCurrentActorAnimation(0),
mCurrentImage(0)
{
mToolBar,
BACKGROUND_IMAGE_PATH,
TOOLBAR_IMAGE,
- APPLICATION_TITLE);
+ APPLICATION_TITLE );
//Add an slideshow icon on the right of the title
- mIconAnimsStart = Image::New( ANIM_START_ICON );
- mIconAnimsStop = Image::New( ANIM_STOP_ICON );
- mActorAnimsButton = Toolkit::PushButton::New();
- mActorAnimsButton.SetBackgroundImage( mIconAnimsStart );
- mActorAnimsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnAnimationButtonClicked );
- mToolBar.AddControl( mActorAnimsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
+ mIconEffectsOff = ResourceImage::New( EFFECTS_OFF_ICON );
+ mIconEffectsOn = ResourceImage::New( EFFECTS_ON_ICON );
+ mActorEffectsButton = Toolkit::PushButton::New();
+ mActorEffectsButton.SetBackgroundImage( mIconEffectsOff );
+ mActorEffectsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnEffectButtonClicked );
+ mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
// Creates a mode button.
// Create a effect toggle button. (right of toolbar)
- Image imageLayout = Image::New( LAYOUT_IMAGE );
+ Image imageLayout = ResourceImage::New( LAYOUT_IMAGE );
Toolkit::PushButton layoutButton = Toolkit::PushButton::New();
layoutButton.SetBackgroundImage(imageLayout);
layoutButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnLayoutButtonClicked);
// Motion stretched actor
//
- Image image = Image::New( MOTION_STRETCH_ACTOR_IMAGE1 );
+ Image image = ResourceImage::New( MOTION_STRETCH_ACTOR_IMAGE1 );
mMotionStretchImageActor = ImageActor::New(image);
mMotionStretchImageActor.SetParentOrigin( ParentOrigin::CENTER );
mMotionStretchImageActor.SetAnchorPoint( AnchorPoint::CENTER );
{
// has parent so we expect it to be on stage, start animation
mRotateAnimation = Animation::New( ORIENTATION_DURATION );
- mRotateAnimation.SetDestroyAction( Animation::Bake );
mRotateAnimation.RotateTo( mView, Degree( -orientation ), Vector3::ZAXIS, AlphaFunctions::EaseOut );
mRotateAnimation.Resize( mView, targetSize.width, targetSize.height );
mRotateAnimation.Play();
//
// move to point on screen that was tapped
- void OnTap( Actor actor, TapGesture tapGesture )
+ void OnTap( Actor actor, const TapGesture& tapGesture )
{
Vector3 destPos;
float originOffsetX, originOffsetY;
mActorTapMovementAnimation = Animation::New( animDuration );
if ( mMotionStretchImageActor )
{
- mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
+ mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
}
mActorTapMovementAnimation.SetEndAction( Animation::Bake );
mActorTapMovementAnimation.Play();
// perform some spinning etc
- if(mActorAnimationsEnabled)
+ if(mActorEffectsEnabled)
{
switch(mCurrentActorAnimation)
{
}
}
- void ToggleActorAnimations()
+ void ToggleActorEffects()
{
- if(!mActorAnimationsEnabled)
+ if(!mActorEffectsEnabled)
{
- mActorAnimationsEnabled = true;
- mActorAnimsButton.SetBackgroundImage( mIconAnimsStop );
+ mActorEffectsEnabled = true;
+ mActorEffectsButton.SetBackgroundImage( mIconEffectsOn );
}
else
{
- mActorAnimationsEnabled = false;
- mActorAnimsButton.SetBackgroundImage( mIconAnimsStart );
+ mActorEffectsEnabled = false;
+ mActorEffectsButton.SetBackgroundImage( mIconEffectsOff );
}
}
return true;
}
+ bool OnEffectButtonClicked( Toolkit::Button button )
+ {
+ ToggleActorEffects();
+ return true;
+ }
+
/**
* Main key event handler
*/
}
}
- bool OnAnimationButtonClicked( Toolkit::Button button )
- {
- ToggleActorAnimations();
- return true;
- }
-
//////////////////////////////////////////////////////////////
//
// Misc
mCurrentImage = 0;
}
- Image stretchImage = Image::New( MOTION_STRETCH_ACTOR_IMAGES[mCurrentImage] );
+ Image stretchImage = ResourceImage::New( MOTION_STRETCH_ACTOR_IMAGES[mCurrentImage] );
mMotionStretchImageActor.SetImage(stretchImage);
}
Toolkit::View mView;
Toolkit::ToolBar mToolBar;
TextView mTitleActor; ///< The Toolbar's Title.
- Image mIconAnimsStart;
- Image mIconAnimsStop;
+ Image mIconEffectsOff;
+ Image mIconEffectsOn;
Layer mContentLayer; ///< Content layer (contains actor for this stretch demo)
- PushButton mActorAnimsButton; ///< The actor animation toggling Button.
+ PushButton mActorEffectsButton; ///< The actor effects toggling Button.
// Motion stretch
MotionStretchEffect mMotionStretchEffect;
Animation mActorTapMovementAnimation;
// show different animations to demonstrate stretch effect working on an object only movement basis
- bool mActorAnimationsEnabled;
+ bool mActorEffectsEnabled;
Animation mActorAnimation;
int mCurrentActorAnimation;
projects / platform / core / uifw / dali-demo.git / blobdiff