X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fbubble-emitter-impl.cpp;h=9e95a7609a390ad583520feca3241d5c86c651af;hb=refs%2Fchanges%2F49%2F88249%2F1;hp=0661494b521f031d4e1cb8911835417fc43e804a;hpb=a6f34ab2df1f2418c037366030a4dcfbcda29847;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp index 0661494..9e95a76 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.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. @@ -19,13 +19,50 @@ #include "bubble-emitter-impl.h" // EXTERNAL INCLUDES -#include #include #include #include +#include // INTERNAL INCLUDES -#include +#include +#include +#include +#include + + +namespace +{ +struct Vertex +{ + Vertex() + : index( 0.0f ), position(), textureCoord() + { + } + + Vertex( float index, const Dali::Vector2& position, const Dali::Vector2& textureCoord ) + : index( index ), position( position ), textureCoord( textureCoord ) + { + } + + float index; + Dali::Vector2 position; + Dali::Vector2 textureCoord; +}; + +/** + * Return a random value between the given interval. + * @param[in] f0 The low bound + * @param[in] f1 The up bound + * @param[in] seed The seed to genergate random number + * @return A random value between the given interval + */ +float RandomRange(float f0, float f1, unsigned int& seed) +{ + return f0 + (rand_r( &seed ) & 0xfff) * (f1-f0) * (1.0f/4095.0f); +} + +} namespace Dali { @@ -39,26 +76,35 @@ BubbleEmitter::BubbleEmitter( const Vector2& movementArea, Image shapeImage, unsigned int maximumNumberOfBubble, const Vector2& bubbleSizeRange ) -: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ), - mMovementArea( movementArea ), +: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mShapeImage( shapeImage ), - mTotalNumOfBubble( maximumNumberOfBubble ), - mRenderTaskRunning(false), + mMovementArea( movementArea ), mBubbleSizeRange( bubbleSizeRange ), - mCurrentUniform( 0 ), - mDensity( 5 ) + mDensity( 5 ), + mTotalNumOfBubble( maximumNumberOfBubble ), + mCurrentBubble( 0 ), + mRandomSeed( 0 ), + mRenderTaskRunning(false) { - // Calculate how many BubbleEffect shaders are required + // Calculate how many shaders are required if( mTotalNumOfBubble>100 ) { - mNumBubblePerShader = 100; - mNumShader = mTotalNumOfBubble / 100; + mNumBubblePerActor = 100; + mNumActor = mTotalNumOfBubble / 100; + if( mNumActor*mNumBubblePerActor < mTotalNumOfBubble ) + { + mNumActor++; + mNumBubblePerActor = mTotalNumOfBubble / mNumActor+1; + mTotalNumOfBubble = mNumActor * mNumBubblePerActor; + } } else { - mNumBubblePerShader = mTotalNumOfBubble; - mNumShader = 1; + mNumBubblePerActor = mTotalNumOfBubble; + mNumActor = 1; } + + mRandomSeed = time( NULL ); } BubbleEmitter::~BubbleEmitter() @@ -90,41 +136,27 @@ void BubbleEmitter::OnInitialize() mBubbleRoot.SetSize(mMovementArea); // Prepare the frame buffer to store the color adjusted background image - mEffectImage = FrameBufferImage::New( mMovementArea.width/4.f, mMovementArea.height/4.f, Pixel::RGBA8888, Dali::Image::UNUSED ); + mEffectImage = FrameBufferImage::New( mMovementArea.width/4.f, mMovementArea.height/4.f, Pixel::RGBA8888 ); + + // Generate the geometry, which is used by all bubbleActors + mMeshGeometry = CreateGeometry( mNumBubblePerActor*mDensity ); - // Generate the material object, which is used by all meshActors - GenMaterial(); + Shader bubbleShader = CreateBubbleShader (mNumBubblePerActor ); - mMesh.resize( mNumShader ); - mMeshActor.resize( mNumShader ); - mEffect.resize( mNumShader ); + mTextureSet = TextureSet::New(); + TextureSetImage( mTextureSet, 0u, mEffectImage ); + TextureSetImage( mTextureSet, 1u, mShapeImage ); + + mBubbleActors.resize( mNumActor ); // Create the meshActor group and bubbleEffect group to emit bubbles following the given track, such as finger touch track. - MeshData meshData; - ConstructBubbleMesh( meshData, mNumBubblePerShader*mDensity); - for(unsigned int i=0; i < mNumShader; i++ ) + for(unsigned int i=0; i < mNumActor; i++ ) { - mMesh[i] = Mesh::New( meshData ); - mMeshActor[i] = MeshActor::New( mMesh[i] ); - mMeshActor[i].SetParentOrigin(ParentOrigin::TOP_LEFT); - mEffect[i] = BubbleEffect::New( mNumBubblePerShader ); - mEffect[i].SetEffectImage( mEffectImage ); - mEffect[i].SetMovementArea( mMovementArea ); - mMeshActor[i].SetShaderEffect( mEffect[i] ); - mBubbleRoot.Add( mMeshActor[i] ); + mBubbleActors[i] = new BubbleActor( mNumBubblePerActor, mMovementArea ); + (mBubbleActors[i])->MakeRenderable( mMeshGeometry, mTextureSet, bubbleShader ); + mBubbleRoot.Add( (mBubbleActors[i])->GetMeshActor() ); } - // Create the extra meshActor and bubbleEffect to emit bubbles in totally random angle. - MeshData meshDataForNoise; - ConstructBubbleMesh( meshDataForNoise, mNumBubblePerShader); - mMeshActorForNoise = MeshActor::New( Mesh::New(meshDataForNoise) ); - mMeshActorForNoise.SetParentOrigin(ParentOrigin::TOP_LEFT); - mEffectForNoise = BubbleEffect::New( mNumBubblePerShader ); - mEffectForNoise.SetMovementArea( mMovementArea ); - mEffectForNoise.SetEffectImage( mEffectImage ); - mMeshActorForNoise.SetShaderEffect( mEffectForNoise ); - mBubbleRoot.Add( mMeshActorForNoise ); - // Create a cameraActor for the off screen render task. mCameraActor = CameraActor::New(mMovementArea); mCameraActor.SetParentOrigin(ParentOrigin::CENTER); @@ -145,13 +177,15 @@ void BubbleEmitter::SetBackground( Image bgImage, const Vector3& hsvDelta ) mBackgroundImage = bgImage; mHSVDelta = hsvDelta; - ImageActor sourceActor = ImageActor::New( bgImage ); + Toolkit::ImageView sourceActor = Toolkit::ImageView::New(bgImage); sourceActor.SetSize( mMovementArea ); sourceActor.SetParentOrigin(ParentOrigin::CENTER); - Stage::GetCurrent().Add( sourceActor ); - ColorAdjuster colorAdjuster = ColorAdjuster::New( hsvDelta, true /*ignore alpha to make bubble color always*/ ); - sourceActor.SetShaderEffect( colorAdjuster ); + Property::Map colorAdjuster = CreateColorAdjuster(); + sourceActor.SetProperty( Toolkit::ImageView::Property::IMAGE, colorAdjuster); + SetColorAdjusterProperties( sourceActor, hsvDelta, true /*ignore alpha to make bubble color always*/ ); + + Stage::GetCurrent().Add( sourceActor ); RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); RenderTask task = taskList.CreateTask(); @@ -167,16 +201,15 @@ void BubbleEmitter::SetBackground( Image bgImage, const Vector3& hsvDelta ) void BubbleEmitter::SetShapeImage( Image shapeImage ) { - mCustomMaterial.SetDiffuseTexture( shapeImage ); + TextureSetImage( mTextureSet, 1, shapeImage ); } void BubbleEmitter::SetBubbleScale( float scale ) { - for(unsigned int i=0; i < mNumShader; i++ ) + for(unsigned int i=0; i < mNumActor; i++ ) { - mEffect[i].SetDynamicScale( scale ); + (mBubbleActors[i])->SetDynamicScale( scale ); } - mEffectForNoise.SetDynamicScale( scale ); } void BubbleEmitter::SetBubbleDensity( unsigned int density ) @@ -190,11 +223,10 @@ void BubbleEmitter::SetBubbleDensity( unsigned int density ) else { mDensity = density; - MeshData meshData; - ConstructBubbleMesh( meshData, mNumBubblePerShader*mDensity); - for(unsigned int i=0; i < mNumShader; i++ ) + mMeshGeometry = CreateGeometry( mNumBubblePerActor*mDensity ); + for(unsigned int i=0; i < mNumActor; i++ ) { - mMesh[i].UpdateMeshData(meshData); + (mBubbleActors[i])->SetGeometry( mMeshGeometry ); } } } @@ -204,15 +236,6 @@ void BubbleEmitter::OnRenderFinished(RenderTask& source) { mRenderTaskRunning = false; Actor sourceActor = source.GetSourceActor(); - if( sourceActor ) - { - RenderableActor renderable = RenderableActor::DownCast( sourceActor ); - if( renderable ) - { - renderable.RemoveShaderEffect(); - } - } - Stage stage = Stage::GetCurrent(); stage.Remove(sourceActor); stage.GetRenderTaskList().RemoveTask(source); @@ -228,159 +251,76 @@ void BubbleEmitter::OnContextRegained() } } -void BubbleEmitter::SetBlendMode( bool enable ) -{ - if(enable) - { - for(unsigned int i=0; i < mNumShader; i++ ) - { - // linear overlay - // TODO: if BlendColor would be public api from renderable actor, then can optimize the constant color - mMeshActor[i].SetBlendFunc(BlendingFactor::SRC_ALPHA, BlendingFactor::ONE, - BlendingFactor::ZERO, BlendingFactor::ONE); - } - mMeshActorForNoise.SetBlendFunc(BlendingFactor::SRC_ALPHA, BlendingFactor::ONE, - BlendingFactor::ZERO, BlendingFactor::ONE); - } - else - { - for(unsigned int i=0; i < mNumShader; i++ ) - { - // using default blend func - mMeshActor[i].SetBlendFunc( BlendingFactor::SRC_ALPHA, BlendingFactor::ONE_MINUS_SRC_ALPHA, - BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA ); - } - mMeshActorForNoise.SetBlendFunc( BlendingFactor::SRC_ALPHA, BlendingFactor::ONE_MINUS_SRC_ALPHA, - BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA ); - } -} - void BubbleEmitter::EmitBubble( Animation& animation, const Vector2& emitPosition, const Vector2& direction, const Vector2& displacement ) { - unsigned int curUniform = mCurrentUniform % mNumBubblePerShader; - unsigned int groupIdx = mCurrentUniform / mNumBubblePerShader; - SetBubbleParameter( mEffect[groupIdx], curUniform, emitPosition, direction, displacement); - animation.AnimateTo( Property( mEffect[groupIdx], mEffect[groupIdx].GetPercentagePropertyName(curUniform) ), - 1.f, AlphaFunctions::Linear ); - - if( mCurrentUniform % mNumShader == 0 ) - { - unsigned int uniform = mCurrentUniform / mNumShader; - SetBubbleParameter(mEffectForNoise, uniform, emitPosition, displacement); - animation.AnimateTo( Property( mEffectForNoise, mEffectForNoise.GetPercentagePropertyName(uniform) ), - 1.f, AlphaFunctions::Linear ); - } - - mCurrentUniform = (mCurrentUniform + 1) % mTotalNumOfBubble; -} - -void BubbleEmitter::StartExplosion( float duration, float multiple ) -{ - Animation animation = Animation::New( duration ); - for(unsigned int i=0; i < mNumShader; i++ ) - { - animation.AnimateTo( Property( mEffect[i], mEffect[i].GetMagnificationPropertyName() ), - multiple, AlphaFunctions::EaseOut); - } - animation.AnimateTo( Property( mEffectForNoise, mEffectForNoise.GetMagnificationPropertyName() ), - multiple, AlphaFunctions::EaseOut); - animation.Play(); + unsigned int curUniform = mCurrentBubble % mNumBubblePerActor; + unsigned int groupIdx = mCurrentBubble / mNumBubblePerActor; + SetBubbleParameter( mBubbleActors[groupIdx], curUniform, emitPosition, direction, displacement); + animation.AnimateTo( (mBubbleActors[groupIdx])->GetPercentageProperty(curUniform), + 1.f, AlphaFunction::LINEAR ); - animation.FinishedSignal().Connect(this, &BubbleEmitter::OnExplosionFinished); + mCurrentBubble = (mCurrentBubble + 1) % mTotalNumOfBubble; } void BubbleEmitter::Restore() { - for(unsigned int i=0; i < mNumShader; i++ ) + for(unsigned int i=0; i < mNumActor; i++ ) { - mEffect[i].ResetParameters(); + (mBubbleActors[i])->ResetProperties(); } - mEffectForNoise.ResetParameters(); -} - -void BubbleEmitter::GenMaterial() -{ - mCustomMaterial = Material::New("CustomMaterial"); - mCustomMaterial.SetOpacity(1.0f); - mCustomMaterial.SetDiffuseColor(Color::WHITE); - mCustomMaterial.SetAmbientColor(Vector4(0.0, 0.1, 0.1, 1.0)); - mCustomMaterial.SetMapU( Material::MAPPING_MODE_WRAP ); - mCustomMaterial.SetMapV( Material::MAPPING_MODE_WRAP ); - mCustomMaterial.SetDiffuseTexture( mShapeImage ); } -void BubbleEmitter::AddVertex(MeshData::VertexContainer& vertices, Vector3 XYZ, Vector2 UV) +Geometry BubbleEmitter::CreateGeometry( unsigned int numOfPatch ) { - MeshData::Vertex meshVertex; - meshVertex.x = XYZ.x; - meshVertex.y = XYZ.y; - meshVertex.z = XYZ.z; - meshVertex.u = UV.x; - meshVertex.v = UV.y; - vertices.push_back(meshVertex); -} + unsigned int numVertex = numOfPatch*4u; + std::vector vertexData; + vertexData.reserve( numVertex ); -void BubbleEmitter::AddTriangle(MeshData::FaceIndices& faces, -size_t v0, size_t v1, size_t v2) -{ - faces.push_back(v0); - faces.push_back(v1); - faces.push_back(v2); -} + unsigned int numIndex = numOfPatch*6u; + Vector indexData; + indexData.Reserve( numIndex ); -void BubbleEmitter::ConstructBubbleMesh( MeshData& meshData, unsigned int numOfBubble) -{ - MeshData::VertexContainer vertices; - MeshData::FaceIndices faces; - BoneContainer bones(0); - - for(unsigned int index = 0; index < numOfBubble; index ++) + for(unsigned int i = 0; i < numOfPatch; i++) { - float curSize = RandomRange(mBubbleSizeRange.x, mBubbleSizeRange.y); - if(rand()%100 < 1) - { - curSize *= 2.f; - } - float depth = static_cast( index ); - AddVertex( vertices, Vector3(0.f,0.f,depth), Vector2(0.f,0.f) ); - AddVertex( vertices, Vector3(0.f,curSize,depth), Vector2( 0.f,1.f )); - AddVertex( vertices, Vector3(curSize,curSize,depth), Vector2(1.f,1.f) ); - AddVertex( vertices, Vector3(curSize,0.f,depth), Vector2(1.f,0.f) ); - - unsigned int idx = index * 4; - AddTriangle( faces, idx, idx+1, idx+2); - AddTriangle( faces, idx, idx+2, idx+3); + float curSize = RandomRange(mBubbleSizeRange.x, mBubbleSizeRange.y, mRandomSeed); + + float index = static_cast( i ); + vertexData.push_back( Vertex( index, Vector2(0.f,0.f), Vector2(0.f,0.f) ) ); + vertexData.push_back( Vertex( index, Vector2(0.f,curSize), Vector2(0.f,1.f) ) ); + vertexData.push_back( Vertex( index, Vector2(curSize,curSize), Vector2(1.f,1.f) ) ); + vertexData.push_back( Vertex( index, Vector2(curSize,0.f), Vector2(1.f,0.f) ) ); + + unsigned short idx = index * 4; + indexData.PushBack( idx ); + indexData.PushBack( idx+1 ); + indexData.PushBack( idx+2 ); + indexData.PushBack( idx ); + indexData.PushBack( idx+2 ); + indexData.PushBack( idx+3 ); } - meshData.SetData(vertices, faces, bones, mCustomMaterial); - meshData.SetHasColor(false); - meshData.SetHasTextureCoords(true); -} + Property::Map vertexFormat; + vertexFormat["aIndex"] = Property::FLOAT; + vertexFormat["aPosition"] = Property::VECTOR2; + vertexFormat["aTexCoord"] = Property::VECTOR2; + PropertyBuffer vertices = PropertyBuffer::New( vertexFormat ); + vertices.SetData( &vertexData[0], numVertex ); -void BubbleEmitter::SetBubbleParameter( BubbleEffect& effect, unsigned int curUniform, - const Vector2& emitPosition, const Vector2& displacement ) -{ - int halfRange = displacement.x / 2; - Vector2 randomVec(rand()%static_cast(displacement.x) - halfRange, rand()%static_cast(displacement.y) - halfRange); - if(randomVec.y > 0.0f) - { - randomVec.y *= 0.33f; - } - - Vector4 startAndEndPos( emitPosition.x, emitPosition.y, emitPosition.x+randomVec.x, emitPosition.y+randomVec.y ); - effect.SetStartAndEndPosition( curUniform, startAndEndPos ); + Geometry geometry = Geometry::New(); + geometry.AddVertexBuffer( vertices ); + geometry.SetIndexBuffer( &indexData[0], numIndex ); - effect.SetPercentage( curUniform, 0.f); + return geometry; } -void BubbleEmitter::SetBubbleParameter( BubbleEffect& effect, unsigned int curUniform, +void BubbleEmitter::SetBubbleParameter( BubbleActorPtr bubbleActor, unsigned int curUniform, const Vector2& emitPosition, const Vector2& direction, const Vector2& displacement ) { Vector2 dir(direction); int halfRange = displacement.x / 2; // for the y coordinate, always negative, so bubbles always go upwards - Vector2 randomVec(rand()%static_cast(displacement.x) - halfRange, -rand()%static_cast(displacement.y)); + Vector2 randomVec( rand_r( &mRandomSeed ) % static_cast(displacement.x) - halfRange, -rand_r( &mRandomSeed ) % static_cast(displacement.y) ); dir.Normalize(); randomVec.x -= dir.x*halfRange; randomVec.y *= 1.0f - fabsf(dir.x)*0.33f; @@ -390,19 +330,9 @@ void BubbleEmitter::SetBubbleParameter( BubbleEffect& effect, unsigned int curUn randomVec.y *= 0.33f; } Vector4 startAndEndPos( emitPosition.x, emitPosition.y, emitPosition.x+randomVec.x, emitPosition.y+randomVec.y ); - effect.SetStartAndEndPosition( curUniform, startAndEndPos ); - - effect.SetPercentage( curUniform, 0.f); -} + bubbleActor->SetStartAndEndPosition( curUniform, startAndEndPos ); -void BubbleEmitter::OnExplosionFinished( Animation& source ) -{ - Restore(); -} - -float BubbleEmitter::RandomRange(float f0, float f1) -{ - return f0 + (rand() & 0xfff) * (f1-f0) * (1.0f/4095.0f); + bubbleActor->SetPercentage( curUniform, 0.f); } } // namespace Internal