Peter M. Groen / dali-demo

Commit 972f918dc8f8eac6ea2741b809bb4650b10a9373

Authored by thothamon
2 parents 07fe2670 d9acc7fa

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

Change-Id: If8a918599fe083be548df9943798e6e98a71750e
Inline Side-by-side
Showing 2 changed files with 29 additions and 4 deletions
examples/bezier-curve/bezier-curve-example.cpp
  View file @972f918
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2018 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.
@@ -106,8 +106,33 @@ public: @@ -106,8 +106,33 @@ public:
106 106
107 BezierCurveExample( Application& application ) 107 BezierCurveExample( Application& application )
108 : mApplication( application ), 108 : mApplication( application ),
109 - mDuration(2.0f),  
110 - mGoingRight(true) 109 + mControlPoint1(),
  110 + mControlPoint2(),
  111 + mControlLine1(),
  112 + mControlLine2(),
  113 + mAnimIcon1(),
  114 + mAnimIcon2(),
  115 + mDragActor(),
  116 + mCurve(),
  117 + mCoefficientLabel(),
  118 + mContentLayer(),
  119 + mGrid(),
  120 + mTimer(),
  121 + mDragAnimation(),
  122 + mBezierAnimation(),
  123 + mCurveVertices(),
  124 + mLine1Vertices(),
  125 + mLine2Vertices(),
  126 + mRelativeDragPoint(),
  127 + mLastControlPointPosition1(),
  128 + mLastControlPointPosition2(),
  129 + mPositionFactorIndex(),
  130 + mDuration( 2.0f ),
  131 + mControlPoint1Id( 0.0f ),
  132 + mControlPoint2Id( 0.0f ),
  133 + mControlPointScale( 0.5f ),
  134 + mControlPointZoomScale( mControlPointScale * 2.0 ),
  135 + mGoingRight( true )
111 { 136 {
112 // Connect to the Application's Init signal 137 // Connect to the Application's Init signal
113 mApplication.InitSignal().Connect( this, &BezierCurveExample::Create ); 138 mApplication.InitSignal().Connect( this, &BezierCurveExample::Create );
packaging/com.samsung.dali-demo.spec
  View file @972f918
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.3.25 5 +Version: 1.3.26
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0