fix Klocwork warning of unintialized data members, unneeded assignment & unreachable...

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / internal / controls / bubble-effect / bubble-emitter-impl.cpp

diff --git a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
index 90223ee..2723382 100644 (file)
--- a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
@@ -1,29 +1,31 @@
-//
-// 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.
-//
-
-//CLASS HEADER
+/*
+ * 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.
+ *
+ */
+
+// CLASS HEADER
 #include "bubble-emitter-impl.h"
 
-//EXTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <cmath>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
 
-//INTERNAL INCLUDES
+// INTERNAL INCLUDES
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h>
 
-
 namespace Dali
 {
 
@@ -36,7 +38,7 @@ BubbleEmitter::BubbleEmitter( const Vector2& movementArea,
                               Image shapeImage,
                               unsigned int maximumNumberOfBubble,
                               const Vector2& bubbleSizeRange )
-: ControlImpl( true ),
+: Control( REQUIRES_TOUCH_EVENTS ),
   mMovementArea( movementArea ),
   mShapeImage( shapeImage ),
   mTotalNumOfBubble( maximumNumberOfBubble ),
@@ -44,6 +46,17 @@ BubbleEmitter::BubbleEmitter( const Vector2& movementArea,
   mCurrentUniform( 0 ),
   mDensity( 5 )
 {
+  // Calculate how many BubbleEffect shaders are required
+  if( mTotalNumOfBubble>100 )
+  {
+    mNumBubblePerShader = 100;
+    mNumShader = mTotalNumOfBubble / 100;
+  }
+  else
+  {
+    mNumBubblePerShader = mTotalNumOfBubble;
+    mNumShader = 1;
+  }
 }
 
 BubbleEmitter::~BubbleEmitter()
@@ -80,18 +93,6 @@ void BubbleEmitter::OnInitialize()
   // Generate the material object, which is used by all meshActors
   GenMaterial();
 
-  // Calculate how many BubbleEffect shaders are required
-  if( mTotalNumOfBubble>100 )
-  {
-    mNumBubblePerShader = 100;
-    mNumShader = mTotalNumOfBubble / 100;
-  }
-  else
-  {
-    mNumBubblePerShader = mTotalNumOfBubble;
-    mNumShader = 1;
-  }
-
   mMesh.resize( mNumShader );
   mMeshActor.resize( mNumShader );
   mEffect.resize( mNumShader );
@@ -202,10 +203,16 @@ void BubbleEmitter::SetBubbleDensity( unsigned int density )
 // clear the resources created for the off screen rendering
 void BubbleEmitter::OnRenderFinished(RenderTask& source)
 {
-  Actor sourceActor =  source.GetSourceActor();
-  sourceActor.RemoveShaderEffect();
+  Actor sourceActor = source.GetSourceActor();
+  if( sourceActor )
+  {
+    RenderableActor renderable = RenderableActor::DownCast( sourceActor );
+    if( renderable )
+    {
+      renderable.RemoveShaderEffect();
+    }
+  }
   Stage::GetCurrent().Remove(sourceActor);
-  sourceActor.Reset();
   Stage::GetCurrent().GetRenderTaskList().RemoveTask(source);
 }