Peter M. Groen / dali-demo

Commit 971b11c17515c2f052f778d2e432e062738a99d7

Authored by Umar
2 parents 0646a5db a4b20502

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

Change-Id: If38951299ed9e878247ee3e38c0d5db166ccf473
Inline Side-by-side
Showing 26 changed files with 178 additions and 41 deletions
demo/dali-table-view.cpp
  View file @971b11c
... ... @@ -226,6 +226,7 @@ DaliTableView::DaliTableView( Application& application )
226 226 mPages(),
227 227 mBackgroundAnimations(),
228 228 mExampleList(),
  229 + mPageWidth( 0.0f ),
229 230 mTotalPages(),
230 231 mScrolling( false ),
231 232 mSortAlphabetically( false ),
... ...
examples/benchmark/benchmark.cpp
  View file @971b11c
... ... @@ -351,7 +351,7 @@ public:
351 351  
352 352 float delay = 0.0f;
353 353 float duration = 0.0f;
354   - if( count < mRowsPerPage*mColumnsPerPage )
  354 + if( count < ( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage ) )
355 355 {
356 356 duration = durationPerActor;
357 357 delay = delayBetweenActors * count;
... ... @@ -385,7 +385,7 @@ public:
385 385 Vector3 stageSize( stage.GetSize() );
386 386  
387 387 mScroll = Animation::New(10.0f);
388   - size_t actorCount( mRowsPerPage*mColumnsPerPage*mPageCount);
  388 + size_t actorCount( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage * mPageCount );
389 389 for( size_t i(0); i<actorCount; ++i )
390 390 {
391 391 if( gUseMesh )
... ...
examples/blocks/blocks-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -214,7 +214,29 @@ public:
214 214 */
215 215 ExampleController( Application& application )
216 216 : mApplication( application ),
217   - mView()
  217 + mView(),
  218 + mContentLayer(),
  219 + mBall(),
  220 + mBallStartPosition(),
  221 + mBallVelocity(),
  222 + mBallAnimation(),
  223 + mPaddle(),
  224 + mPaddleImage(),
  225 + mPaddleHandle(),
  226 + mPaddleHitMargin(),
  227 + mWobbleAnimation(),
  228 + mWobbleProperty( Property::INVALID_INDEX ),
  229 + mLevelContainer(),
  230 + mBrickImageMap(),
  231 + mDragAnimation(),
  232 + mDragActor(),
  233 + mRelativeDragPoint(),
  234 + mDestroyAnimationMap(),
  235 + mPaddleFullSize(),
  236 + mLevel( 0 ),
  237 + mLives( TOTAL_LIVES ),
  238 + mBrickCount( 0 )
  239 +
218 240 {
219 241 // Connect to the Application's Init and orientation changed signal
220 242 mApplication.InitSignal().Connect(this, &ExampleController::Create);
... ...
examples/bubble-effect/bubble-effect-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -62,7 +62,18 @@ class BubbleEffectExample : public ConnectionTracker
62 62 public:
63 63 BubbleEffectExample(Application &app)
64 64 : mApp(app),
  65 + mBackgroundImage(),
  66 + mBackground(),
  67 + mBubbleEmitter(),
  68 + mEmitAnimation(),
  69 + mChangeBackgroundButton(),
  70 + mChangeBubbleShapeButton(),
  71 + mTimerForBubbleEmission(),
65 72 mHSVDelta( Vector3( 0.f, 0.f, 0.5f ) ),
  73 + mCurrentTouchPosition(),
  74 + mEmitPosition(),
  75 + mAnimateComponentCount( 0 ),
  76 + mNonMovementCount( 0 ),
66 77 mTimerInterval( 16 ),
67 78 mCurrentBackgroundImageId( 0 ),
68 79 mCurrentBubbleShapeImageId( 0 ),
... ...
examples/builder/examples.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -558,15 +558,12 @@ private:
558 558 Toolkit::NavigationView mNavigationView;
559 559  
560 560 Toolkit::Control mView;
561   - unsigned int mOrientation;
562 561  
563 562 Toolkit::ToolBar mToolBar;
564 563 TextLabel mTitleActor;
565 564  
566 565 Layer mBuilderLayer;
567 566  
568   - Toolkit::Popup mMenu;
569   -
570 567 TapGestureDetector mTapDetector;
571 568  
572 569 // builder
... ... @@ -576,8 +573,6 @@ private:
576 573  
577 574 FileWatcher mFileWatcher;
578 575 Timer mTimer;
579   -
580   -
581 576 };
582 577  
583 578 //------------------------------------------------------------------------------
... ...
examples/buttons/buttons-example.cpp
  View file @971b11c
... ... @@ -497,7 +497,6 @@ private:
497 497 Toolkit::CheckBoxButton mCheckboxButton3;
498 498  
499 499 Animation mAnimation;
500   - float mLastPoint;
501 500  
502 501 Toolkit::ImageView mImage;
503 502 };
... ...
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -152,6 +152,7 @@ public:
152 152  
153 153 ImageScalingAndFilteringController( Application& application )
154 154 : mApplication( application ),
  155 + mLastPinchScale( 1.0f ),
155 156 mImageStageScale( 0.5f, 0.5f ),
156 157 mCurrentPath( 0 ),
157 158 mFittingMode( FittingMode::FIT_WIDTH ),
... ...
examples/image-view-svg/image-view-svg-example.cpp
  View file @971b11c
... ... @@ -47,6 +47,7 @@ public:
47 47 ImageSvgController( Application& application )
48 48 : mApplication( application ),
49 49 mScale( 1.f ),
  50 + mScaleAtPinchStart( 1.0f ),
50 51 mIndex( 0 )
51 52 {
52 53 // Connect to the Application's Init signal
... ...
examples/line-mesh/line-mesh-example.cpp
  View file @971b11c
... ... @@ -119,7 +119,19 @@ public:
119 119 * @param[in] application The application instance
120 120 */
121 121 ExampleController( Application& application )
122   - : mApplication( application )
  122 + : mApplication( application ),
  123 + mStageSize(),
  124 + mShader(),
  125 + mGeometry(),
  126 + mRenderer(),
  127 + mMeshActor(),
  128 + mButtons(),
  129 + mMinusButton(),
  130 + mPlusButton(),
  131 + mIndicesCountLabel(),
  132 + mPrimitiveType( Geometry::LINES ),
  133 + mCurrentIndexCount( 0 ),
  134 + mMaxIndexCount( 0 )
123 135 {
124 136 // Connect to the Application's Init signal
125 137 mApplication.InitSignal().Connect( this, &ExampleController::Create );
... ...
examples/logging/logging-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -125,7 +125,17 @@ class LoggingController: public ConnectionTracker
125 125 public:
126 126  
127 127 LoggingController( Application& application )
128   - : mApplication( application )
  128 + : mApplication( application ),
  129 + mView(),
  130 + mToolBar(),
  131 + mContentLayer(),
  132 + mAnimation(),
  133 + mPerformanceLoggerNames(),
  134 + mPerformanceLoggers(),
  135 + mCurrentLogger( 0 ),
  136 + mLoggerStates(),
  137 + mLogRadioButtons(),
  138 + mFrequencyRadioButtons()
129 139 {
130 140 // Connect to the Application's Init signal
131 141 mApplication.InitSignal().Connect( this, &LoggingController::Create );
... ... @@ -655,7 +665,6 @@ private:
655 665 Layer mContentLayer; ///< Content layer
656 666  
657 667 Animation mAnimation;
658   - float mLastPoint;
659 668  
660 669 typedef std::vector< std::string > Strings;
661 670 Strings mPerformanceLoggerNames;
... ...
examples/magnifier/magnifier-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -173,6 +173,7 @@ public:
173 173 : mApplication( application ),
174 174 mView(),
175 175 mAnimationTime(0.0f),
  176 + mAnimationTimeProperty( Property::INVALID_INDEX ),
176 177 mMagnifierShown(false)
177 178 {
178 179 // Connect to the Application's Init signal
... ...
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @971b11c
... ... @@ -306,7 +306,25 @@ private:
306 306 //----------------
307 307  
308 308 MetaballExplosionController::MetaballExplosionController( Application& application )
309   - : mApplication( application )
  309 +: mApplication( application ),
  310 + mScreenSize(),
  311 + mContentLayer(),
  312 + mBackImage(),
  313 + mMetaballFBO(),
  314 + mMetaballRoot(),
  315 + mMetaballs(),
  316 + mPositionIndex(),
  317 + mCompositionActor(),
  318 + mCurrentTouchPosition(),
  319 + mMetaballPosVariation(),
  320 + mMetaballPosVariationFrom(),
  321 + mMetaballPosVariationTo(),
  322 + mMetaballCenter(),
  323 + mPositionVarAnimation(),
  324 + mDispersion( 0 ),
  325 + mDispersionAnimation(),
  326 + mTimerDispersion(),
  327 + mTimeMult( 1.0f )
310 328 {
311 329 // Connect to the Application's Init signal
312 330 mApplication.InitSignal().Connect( this, &MetaballExplosionController::Create );
... ...
examples/metaball-refrac/metaball-refrac-example.cpp
  View file @971b11c
... ... @@ -187,7 +187,6 @@ private:
187 187 Actor mCompositionActor;
188 188  
189 189 //Motion
190   - bool mExitClick;
191 190 Vector2 mCurrentTouchPosition;
192 191 Vector2 mMetaballPosVariation;
193 192 Vector2 mMetaballPosVariationFrom;
... ...
examples/model3d-view/model3d-view-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -57,7 +57,16 @@ class Model3dViewController : public ConnectionTracker
57 57 public:
58 58  
59 59 Model3dViewController( Application& application )
60   - : mApplication( application )
  60 + : mApplication( application ),
  61 + mModelCounter( 0 ),
  62 + mModel3dView(),
  63 + mButtonLayer(),
  64 + mTapDetector(),
  65 + mIlluminationShader( Model3dView::DIFFUSE ),
  66 + mRotationAnimation(),
  67 + mLightAnimation(),
  68 + mPlaying( false ),
  69 + mScaled( false )
61 70 {
62 71 // Connect to the Application's Init signal
63 72 mApplication.InitSignal().Connect( this, &Model3dViewController::Create );
... ...
examples/motion-blur/motion-blur-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -143,7 +143,8 @@ public:
143 143 : mApplication(app),
144 144 mActorEffectsEnabled(false),
145 145 mCurrentActorAnimation(0),
146   - mCurrentImage(0)
  146 + mCurrentImage(0),
  147 + mOrientation( PORTRAIT )
147 148 {
148 149 // Connect to the Application's Init signal
149 150 app.InitSignal().Connect(this, &MotionBlurExampleApp::OnInit);
... ...
examples/motion-stretch/motion-stretch-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -110,7 +110,8 @@ public:
110 110 : mApplication(app),
111 111 mActorEffectsEnabled(false),
112 112 mCurrentActorAnimation(0),
113   - mCurrentImage(0)
  113 + mCurrentImage(0),
  114 + mOrientation( PORTRAIT )
114 115 {
115 116 // Connect to the Application's Init signal
116 117 app.InitSignal().Connect(this, &MotionStretchExampleApp::OnInit);
... ...
examples/new-window/new-window-example.cpp
  View file @971b11c
... ... @@ -164,7 +164,8 @@ private:
164 164  
165 165 NewWindowController::NewWindowController( Application& application )
166 166 : mApplication(application),
167   - mNeedNewAnimation(true)
  167 + mNeedNewAnimation(true),
  168 + mAnimateComponentCount( 0 )
168 169 {
169 170 mApplication.InitSignal().Connect(this, &NewWindowController::Create);
170 171 mApplication.TerminateSignal().Connect(this, &NewWindowController::Destroy);
... ...
examples/perf-scroll/perf-scroll.cpp
  View file @971b11c
... ... @@ -354,7 +354,7 @@ public:
354 354  
355 355 float delay = 0.0f;
356 356 float duration = 0.0f;
357   - if( count < mRowsPerPage*mColumnsPerPage )
  357 + if( count < ( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage ) )
358 358 {
359 359 duration = durationPerActor;
360 360 delay = delayBetweenActors * count;
... ...
examples/refraction-effect/refraction-effect-example.cpp
  View file @971b11c
... ... @@ -211,6 +211,21 @@ class RefractionEffectExample : public ConnectionTracker
211 211 public:
212 212 RefractionEffectExample( Application &application )
213 213 : mApplication( application ),
  214 + mContent(),
  215 + mTextureSet(),
  216 + mGeometry(),
  217 + mRenderer(),
  218 + mMeshActor(),
  219 + mShaderFlat(),
  220 + mShaderRefraction(),
  221 + mLightAnimation(),
  222 + mStrenghAnimation(),
  223 + mLightXYOffsetIndex( Property::INVALID_INDEX ),
  224 + mSpinAngleIndex( Property::INVALID_INDEX ),
  225 + mLightIntensityIndex( Property::INVALID_INDEX ),
  226 + mEffectStrengthIndex( Property::INVALID_INDEX ),
  227 + mChangeTextureButton(),
  228 + mChangeMeshButton(),
214 229 mCurrentTextureId( 1 ),
215 230 mCurrentMeshId( 0 )
216 231 {
... ...
examples/shadows-and-lights/shadows-and-lights-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -80,8 +80,24 @@ public:
80 80 */
81 81 TestApp(Application &app)
82 82 : mApp(app),
83   - mPaused(false),
84   - mTranslation(22.0f, -1.0f, 0.0f),
  83 + mView(),
  84 + mContents(),
  85 + mSceneActor(),
  86 + mAnimation(),
  87 + mSceneAnimation(),
  88 + mPaused( false ),
  89 + mShadowView(),
  90 + mShadowPlaneBg(),
  91 + mShadowPlane(),
  92 + mCastingLight(),
  93 + mLightAnchor(),
  94 + mImageActor1(),
  95 + mImageActor2(),
  96 + mImageActor3(),
  97 + mPanGestureDetector(),
  98 + mPinchGestureDetector(),
  99 + mTapGestureDetector(),
  100 + mTranslation( 22.0f, -1.0f, 0.0f ),
85 101 mSceneXRotation( Degree(-6.0f) ), // Initial values give a reasonable off-straight view.
86 102 mSceneYRotation( Degree(20.0f) ),
87 103 mLightXRotation( Degree(-1.5f) ),
... ... @@ -90,7 +106,10 @@ public:
90 106 mObjectYRotation(0.0f),
91 107 mPinchScale(0.6f),
92 108 mScaleAtPinchStart(0.6f),
93   - mPanState(PAN_LIGHT)
  109 + mAngle1Index( Property::INVALID_INDEX ),
  110 + mAngle3Index( Property::INVALID_INDEX ),
  111 + mTitleActor(),
  112 + mPanState( PAN_LIGHT )
94 113 {
95 114 app.InitSignal().Connect(this, &TestApp::Create);
96 115 app.TerminateSignal().Connect(this, &TestApp::Terminate);
... ...
examples/styling/image-channel-control-impl.cpp
  View file @971b11c
... ... @@ -17,7 +17,10 @@
17 17 #include "image-channel-control-impl.h"
18 18 #include <dali-toolkit/dali-toolkit.h>
19 19 #include <dali/public-api/object/type-registry-helper.h>
  20 +#include <dali-toolkit/devel-api/align-enums.h>
20 21 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
  22 +#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
  23 +
21 24 #include <cstdio>
22 25  
23 26 using namespace Dali; // Needed for macros
... ... @@ -67,6 +70,7 @@ DALI_TYPE_REGISTRATION_END();
67 70 Internal::ImageChannelControl::ImageChannelControl()
68 71 : Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
69 72 mChannels( 1.0f, 1.0f, 1.0f ),
  73 + mChannelIndex( Property::INVALID_INDEX ),
70 74 mVisibility(true),
71 75 mTargetVisibility(true)
72 76 {
... ... @@ -175,7 +179,15 @@ void ImageChannelControl::OnSizeSet( const Vector3&amp; targetSize )
175 179 if( mVisual )
176 180 {
177 181 Vector2 size( targetSize );
178   - mVisual.SetSize( size );
  182 + Property::Map transformMap;
  183 + transformMap
  184 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
  185 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
  186 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
  187 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
  188 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO );
  189 +
  190 + mVisual.SetTransformAndSize( transformMap, size );
179 191 }
180 192 }
181 193  
... ...
examples/styling/styling-application.cpp
  View file @971b11c
... ... @@ -92,7 +92,8 @@ Property::Index GetChannelProperty( int index )
92 92  
93 93  
94 94 StylingApplication::StylingApplication( Application& application )
95   -: mApplication( application )
  95 +: mApplication( application ),
  96 + mCurrentTheme( 0 )
96 97 {
97 98 application.InitSignal().Connect( this, &StylingApplication::Create );
98 99 }
... ...
examples/text-label-emojis/text-label-emojis.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -38,7 +38,8 @@ public:
38 38 typedef uint32_t SizeType;
39 39  
40 40 EmojiExample( Application& application )
41   - : mApplication( application )
  41 + : mApplication( application ),
  42 + mLastPoint( 0.0f )
42 43 {
43 44 std::cout << "EmoticonController::EmoticonController" << std::endl;
44 45  
... ...
examples/text-label/text-label-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -107,8 +107,15 @@ public:
107 107  
108 108 TextLabelExample( Application& application )
109 109 : mApplication( application ),
  110 + mLabel(),
  111 + mContainer(),
  112 + mGrabCorner(),
  113 + mPanGestureDetector(),
  114 + mLayoutSize(),
110 115 mLanguageId( 0u ),
111   - mAlignment( 0u )
  116 + mAlignment( 0u ),
  117 + mHueAngleIndex( Property::INVALID_INDEX ),
  118 + mOverrideMixColorIndex( Property::INVALID_INDEX )
112 119 {
113 120 // Connect to the Application's Init signal
114 121 mApplication.InitSignal().Connect( this, &TextLabelExample::Create );
... ...
examples/video-view/video-view-example.cpp
  View file @971b11c
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -47,7 +47,8 @@ class VideoViewController: public ConnectionTracker
47 47 mIsPlay( false ),
48 48 mIsStop( false ),
49 49 mIsFullScreen( false ),
50   - mScale( 1.f )
  50 + mScale( 1.f ),
  51 + mPinchStartScale( 1.0f )
51 52 {
52 53 // Connect to the Application's Init signal
53 54 mApplication.InitSignal().Connect( this, &VideoViewController::Create );
... ...
packaging/com.samsung.dali-demo.spec
  View file @971b11c
... ... @@ -2,7 +2,7 @@
2 2  
3 3 Name: com.samsung.dali-demo
4 4 Summary: The OpenGLES Canvas Core Demo
5   -Version: 1.2.14
  5 +Version: 1.2.15
6 6 Release: 1
7 7 Group: System/Libraries
8 8 License: Apache-2.0
... ...