diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index 1de6db9..09a0343 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -226,6 +226,7 @@ DaliTableView::DaliTableView( Application& application ) mPages(), mBackgroundAnimations(), mExampleList(), + mPageWidth( 0.0f ), mTotalPages(), mScrolling( false ), mSortAlphabetically( false ), diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp index 6d137ff..546e8e5 100644 --- a/examples/benchmark/benchmark.cpp +++ b/examples/benchmark/benchmark.cpp @@ -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 Strings; Strings mPerformanceLoggerNames; diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp index fb461b5..2221bf1 100644 --- a/examples/magnifier/magnifier-example.cpp +++ b/examples/magnifier/magnifier-example.cpp @@ -1,5 +1,5 @@ /* - * 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 diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp index 71a0106..fa701cc 100644 --- a/examples/metaball-explosion/metaball-explosion-example.cpp +++ b/examples/metaball-explosion/metaball-explosion-example.cpp @@ -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 ); diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp index 2c86504..d2f95f8 100644 --- a/examples/metaball-refrac/metaball-refrac-example.cpp +++ b/examples/metaball-refrac/metaball-refrac-example.cpp @@ -187,7 +187,6 @@ private: Actor mCompositionActor; //Motion - bool mExitClick; Vector2 mCurrentTouchPosition; Vector2 mMetaballPosVariation; Vector2 mMetaballPosVariationFrom; diff --git a/examples/model3d-view/model3d-view-example.cpp b/examples/model3d-view/model3d-view-example.cpp index 40cf6eb..21e7553 100644 --- a/examples/model3d-view/model3d-view-example.cpp +++ b/examples/model3d-view/model3d-view-example.cpp @@ -1,5 +1,5 @@ /* - * 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 ); diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp index 74c11fc..55605ba 100644 --- a/examples/motion-blur/motion-blur-example.cpp +++ b/examples/motion-blur/motion-blur-example.cpp @@ -1,5 +1,5 @@ /* - * 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); diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp index cdb631f..4389907 100644 --- a/examples/motion-stretch/motion-stretch-example.cpp +++ b/examples/motion-stretch/motion-stretch-example.cpp @@ -1,5 +1,5 @@ /* - * 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); diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp index 56b74f3..08dff10 100644 --- a/examples/new-window/new-window-example.cpp +++ b/examples/new-window/new-window-example.cpp @@ -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); diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp index ddfd9b8..3bfdda5 100644 --- a/examples/perf-scroll/perf-scroll.cpp +++ b/examples/perf-scroll/perf-scroll.cpp @@ -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; diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp index c9930fe..4d67a27 100644 --- a/examples/refraction-effect/refraction-effect-example.cpp +++ b/examples/refraction-effect/refraction-effect-example.cpp @@ -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 ) { diff --git a/examples/shadows-and-lights/shadows-and-lights-example.cpp b/examples/shadows-and-lights/shadows-and-lights-example.cpp index 4ae5877..7a8714b 100644 --- a/examples/shadows-and-lights/shadows-and-lights-example.cpp +++ b/examples/shadows-and-lights/shadows-and-lights-example.cpp @@ -1,5 +1,5 @@ /* - * 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); diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp index 4672d7d..63a0935 100644 --- a/examples/styling/image-channel-control-impl.cpp +++ b/examples/styling/image-channel-control-impl.cpp @@ -17,7 +17,10 @@ #include "image-channel-control-impl.h" #include #include +#include #include +#include + #include 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& 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 ); } } diff --git a/examples/styling/styling-application.cpp b/examples/styling/styling-application.cpp index a80a97b..ffd0aaa 100644 --- a/examples/styling/styling-application.cpp +++ b/examples/styling/styling-application.cpp @@ -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 ); } diff --git a/examples/text-label-emojis/text-label-emojis.cpp b/examples/text-label-emojis/text-label-emojis.cpp index f5415b2..8e13fff 100644 --- a/examples/text-label-emojis/text-label-emojis.cpp +++ b/examples/text-label-emojis/text-label-emojis.cpp @@ -1,5 +1,5 @@ /* - * 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; diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index c035ed6..fd11c0b 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-example.cpp @@ -1,5 +1,5 @@ /* - * 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 ); diff --git a/examples/video-view/video-view-example.cpp b/examples/video-view/video-view-example.cpp index c20b8f8..cb29b8d 100644 --- a/examples/video-view/video-view-example.cpp +++ b/examples/video-view/video-view-example.cpp @@ -1,5 +1,5 @@ /* - * 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 ); diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 76a23f7..39a3bf5 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -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