/*
- * 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.
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/render-tasks/render-task-list.h>
#include <dali/public-api/images/resource-image.h>
+#include <dali/devel-api/images/texture-set-image.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/bubble-effect/bubble-actor.h>
Image shapeImage,
unsigned int maximumNumberOfBubble,
const Vector2& bubbleSizeRange )
-: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),
+: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),
mShapeImage( shapeImage ),
mMovementArea( movementArea ),
mBubbleSizeRange( bubbleSizeRange ),
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 );
Shader bubbleShader = CreateBubbleShader (mNumBubblePerActor );
mTextureSet = TextureSet::New();
- mTextureSet.SetImage( 0u, mEffectImage );
- mTextureSet.SetImage( 1u, mShapeImage );
+ TextureSetImage( mTextureSet, 0u, mEffectImage );
+ TextureSetImage( mTextureSet, 1u, mShapeImage );
mBubbleActors.resize( mNumActor );
mBackgroundImage = bgImage;
mHSVDelta = hsvDelta;
- Toolkit::ImageView sourceActor = Toolkit::ImageView::New( bgImage );
+ Toolkit::ImageView sourceActor = Toolkit::ImageView::New(bgImage);
sourceActor.SetSize( mMovementArea );
sourceActor.SetParentOrigin(ParentOrigin::CENTER);
void BubbleEmitter::SetShapeImage( Image shapeImage )
{
- mTextureSet.SetImage( 1, shapeImage );
+ TextureSetImage( mTextureSet, 1, shapeImage );
}
void BubbleEmitter::SetBubbleScale( float scale )
vertexData.reserve( numVertex );
unsigned int numIndex = numOfPatch*6u;
- Vector<unsigned int> indexData;
+ Vector<unsigned short> indexData;
indexData.Reserve( numIndex );
for(unsigned int i = 0; i < numOfPatch; i++)
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 int idx = index * 4;
+ unsigned short idx = index * 4;
indexData.PushBack( idx );
indexData.PushBack( idx+1 );
indexData.PushBack( idx+2 );
PropertyBuffer vertices = PropertyBuffer::New( vertexFormat );
vertices.SetData( &vertexData[0], numVertex );
- Property::Map indexFormat;
- indexFormat["indices"] = Property::INTEGER;
- PropertyBuffer indices = PropertyBuffer::New( indexFormat );
- indices.SetData( &indexData[0], numIndex );
-
Geometry geometry = Geometry::New();
geometry.AddVertexBuffer( vertices );
- geometry.SetIndexBuffer( indices );
+ geometry.SetIndexBuffer( &indexData[0], numIndex );
return geometry;
}