Commit 8b9c89c6455da22660eb69436a3539b138fd0594
1 parent
56fcceb4
More SVACE fixes
Change-Id: I340686abda4cca205187157feb2571c86b0878c2
Showing
9 changed files
with
138 additions
and
16 deletions
examples/blocks/blocks-example.cpp
| 1 | /* | 1 | /* |
| 2 | - * Copyright (c) 2014 Samsung Electronics Co., Ltd. | 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| @@ -214,7 +214,29 @@ public: | @@ -214,7 +214,29 @@ public: | ||
| 214 | */ | 214 | */ |
| 215 | ExampleController( Application& application ) | 215 | ExampleController( Application& application ) |
| 216 | : mApplication( application ), | 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 | // Connect to the Application's Init and orientation changed signal | 241 | // Connect to the Application's Init and orientation changed signal |
| 220 | mApplication.InitSignal().Connect(this, &ExampleController::Create); | 242 | mApplication.InitSignal().Connect(this, &ExampleController::Create); |
examples/bubble-effect/bubble-effect-example.cpp
| 1 | /* | 1 | /* |
| 2 | - * Copyright (c) 2014 Samsung Electronics Co., Ltd. | 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| @@ -62,7 +62,18 @@ class BubbleEffectExample : public ConnectionTracker | @@ -62,7 +62,18 @@ class BubbleEffectExample : public ConnectionTracker | ||
| 62 | public: | 62 | public: |
| 63 | BubbleEffectExample(Application &app) | 63 | BubbleEffectExample(Application &app) |
| 64 | : mApp(app), | 64 | : mApp(app), |
| 65 | + mBackgroundImage(), | ||
| 66 | + mBackground(), | ||
| 67 | + mBubbleEmitter(), | ||
| 68 | + mEmitAnimation(), | ||
| 69 | + mChangeBackgroundButton(), | ||
| 70 | + mChangeBubbleShapeButton(), | ||
| 71 | + mTimerForBubbleEmission(), | ||
| 65 | mHSVDelta( Vector3( 0.f, 0.f, 0.5f ) ), | 72 | mHSVDelta( Vector3( 0.f, 0.f, 0.5f ) ), |
| 73 | + mCurrentTouchPosition(), | ||
| 74 | + mEmitPosition(), | ||
| 75 | + mAnimateComponentCount( 0 ), | ||
| 76 | + mNonMovementCount( 0 ), | ||
| 66 | mTimerInterval( 16 ), | 77 | mTimerInterval( 16 ), |
| 67 | mCurrentBackgroundImageId( 0 ), | 78 | mCurrentBackgroundImageId( 0 ), |
| 68 | mCurrentBubbleShapeImageId( 0 ), | 79 | mCurrentBubbleShapeImageId( 0 ), |
examples/line-mesh/line-mesh-example.cpp
| @@ -119,7 +119,19 @@ public: | @@ -119,7 +119,19 @@ public: | ||
| 119 | * @param[in] application The application instance | 119 | * @param[in] application The application instance |
| 120 | */ | 120 | */ |
| 121 | ExampleController( Application& application ) | 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 | // Connect to the Application's Init signal | 136 | // Connect to the Application's Init signal |
| 125 | mApplication.InitSignal().Connect( this, &ExampleController::Create ); | 137 | mApplication.InitSignal().Connect( this, &ExampleController::Create ); |
examples/logging/logging-example.cpp
| 1 | /* | 1 | /* |
| 2 | - * Copyright (c) 2014 Samsung Electronics Co., Ltd. | 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| @@ -125,7 +125,17 @@ class LoggingController: public ConnectionTracker | @@ -125,7 +125,17 @@ class LoggingController: public ConnectionTracker | ||
| 125 | public: | 125 | public: |
| 126 | 126 | ||
| 127 | LoggingController( Application& application ) | 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 | // Connect to the Application's Init signal | 140 | // Connect to the Application's Init signal |
| 131 | mApplication.InitSignal().Connect( this, &LoggingController::Create ); | 141 | mApplication.InitSignal().Connect( this, &LoggingController::Create ); |
| @@ -655,7 +665,6 @@ private: | @@ -655,7 +665,6 @@ private: | ||
| 655 | Layer mContentLayer; ///< Content layer | 665 | Layer mContentLayer; ///< Content layer |
| 656 | 666 | ||
| 657 | Animation mAnimation; | 667 | Animation mAnimation; |
| 658 | - float mLastPoint; | ||
| 659 | 668 | ||
| 660 | typedef std::vector< std::string > Strings; | 669 | typedef std::vector< std::string > Strings; |
| 661 | Strings mPerformanceLoggerNames; | 670 | Strings mPerformanceLoggerNames; |
examples/metaball-explosion/metaball-explosion-example.cpp
| @@ -306,7 +306,25 @@ private: | @@ -306,7 +306,25 @@ private: | ||
| 306 | //---------------- | 306 | //---------------- |
| 307 | 307 | ||
| 308 | MetaballExplosionController::MetaballExplosionController( Application& application ) | 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 | // Connect to the Application's Init signal | 329 | // Connect to the Application's Init signal |
| 312 | mApplication.InitSignal().Connect( this, &MetaballExplosionController::Create ); | 330 | mApplication.InitSignal().Connect( this, &MetaballExplosionController::Create ); |
examples/model3d-view/model3d-view-example.cpp
| 1 | /* | 1 | /* |
| 2 | - * Copyright (c) 2015 Samsung Electronics Co., Ltd. | 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| @@ -57,7 +57,16 @@ class Model3dViewController : public ConnectionTracker | @@ -57,7 +57,16 @@ class Model3dViewController : public ConnectionTracker | ||
| 57 | public: | 57 | public: |
| 58 | 58 | ||
| 59 | Model3dViewController( Application& application ) | 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 | // Connect to the Application's Init signal | 71 | // Connect to the Application's Init signal |
| 63 | mApplication.InitSignal().Connect( this, &Model3dViewController::Create ); | 72 | mApplication.InitSignal().Connect( this, &Model3dViewController::Create ); |
examples/refraction-effect/refraction-effect-example.cpp
| @@ -211,6 +211,21 @@ class RefractionEffectExample : public ConnectionTracker | @@ -211,6 +211,21 @@ class RefractionEffectExample : public ConnectionTracker | ||
| 211 | public: | 211 | public: |
| 212 | RefractionEffectExample( Application &application ) | 212 | RefractionEffectExample( Application &application ) |
| 213 | : mApplication( application ), | 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 | mCurrentTextureId( 1 ), | 229 | mCurrentTextureId( 1 ), |
| 215 | mCurrentMeshId( 0 ) | 230 | mCurrentMeshId( 0 ) |
| 216 | { | 231 | { |
examples/shadows-and-lights/shadows-and-lights-example.cpp
| 1 | /* | 1 | /* |
| 2 | - * Copyright (c) 2014 Samsung Electronics Co., Ltd. | 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| @@ -80,8 +80,24 @@ public: | @@ -80,8 +80,24 @@ public: | ||
| 80 | */ | 80 | */ |
| 81 | TestApp(Application &app) | 81 | TestApp(Application &app) |
| 82 | : mApp(app), | 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 | mSceneXRotation( Degree(-6.0f) ), // Initial values give a reasonable off-straight view. | 101 | mSceneXRotation( Degree(-6.0f) ), // Initial values give a reasonable off-straight view. |
| 86 | mSceneYRotation( Degree(20.0f) ), | 102 | mSceneYRotation( Degree(20.0f) ), |
| 87 | mLightXRotation( Degree(-1.5f) ), | 103 | mLightXRotation( Degree(-1.5f) ), |
| @@ -90,7 +106,10 @@ public: | @@ -90,7 +106,10 @@ public: | ||
| 90 | mObjectYRotation(0.0f), | 106 | mObjectYRotation(0.0f), |
| 91 | mPinchScale(0.6f), | 107 | mPinchScale(0.6f), |
| 92 | mScaleAtPinchStart(0.6f), | 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 | app.InitSignal().Connect(this, &TestApp::Create); | 114 | app.InitSignal().Connect(this, &TestApp::Create); |
| 96 | app.TerminateSignal().Connect(this, &TestApp::Terminate); | 115 | app.TerminateSignal().Connect(this, &TestApp::Terminate); |
examples/text-label/text-label-example.cpp
| 1 | /* | 1 | /* |
| 2 | - * Copyright (c) 2015 Samsung Electronics Co., Ltd. | 2 | + * Copyright (c) 2016 Samsung Electronics Co., Ltd. |
| 3 | * | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
| @@ -107,8 +107,15 @@ public: | @@ -107,8 +107,15 @@ public: | ||
| 107 | 107 | ||
| 108 | TextLabelExample( Application& application ) | 108 | TextLabelExample( Application& application ) |
| 109 | : mApplication( application ), | 109 | : mApplication( application ), |
| 110 | + mLabel(), | ||
| 111 | + mContainer(), | ||
| 112 | + mGrabCorner(), | ||
| 113 | + mPanGestureDetector(), | ||
| 114 | + mLayoutSize(), | ||
| 110 | mLanguageId( 0u ), | 115 | mLanguageId( 0u ), |
| 111 | - mAlignment( 0u ) | 116 | + mAlignment( 0u ), |
| 117 | + mHueAngleIndex( Property::INVALID_INDEX ), | ||
| 118 | + mOverrideMixColorIndex( Property::INVALID_INDEX ) | ||
| 112 | { | 119 | { |
| 113 | // Connect to the Application's Init signal | 120 | // Connect to the Application's Init signal |
| 114 | mApplication.InitSignal().Connect( this, &TextLabelExample::Create ); | 121 | mApplication.InitSignal().Connect( this, &TextLabelExample::Create ); |