X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fbubble-effect.h;h=65b485f73115b41943c365d897fdfa05f7a91d7b;hp=9fc065a0e5d96e473be99e7393402565ae21e6e5;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=726e147d14bb18ef193b102a36d8068b62db89ed diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h b/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h index 9fc065a..65b485f 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_BUBBLE_EFFECT_H_ -#define __DALI_TOOLKIT_INTERNAL_BUBBLE_EFFECT_H_ +#ifndef DALI_TOOLKIT_INTERNAL_BUBBLE_EFFECT_H +#define DALI_TOOLKIT_INTERNAL_BUBBLE_EFFECT_H /* - * Copyright (c) 2015 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. @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -92,7 +92,7 @@ inline Shader CreateBubbleShader( unsigned int numBubble ) vTexCoord = aTexCoord;\n vPercentage = percentage;\n // Use the emit position color for the bubble - vEffectTexCoord = startAndEnd.xy * uInvertedMovementArea;\n + vEffectTexCoord = startAndEnd.xy * uInvertedMovementArea + vec2(0.5);\n }\n ); @@ -128,4 +128,4 @@ inline Shader CreateBubbleShader( unsigned int numBubble ) } // namespace Toolkit } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_BUBBLE_EFFECT_H_ */ +#endif // DALI_TOOLKIT_INTERNAL_BUBBLE_EFFECT_H