X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition-effects%2Fcube-transition-cross-effect-impl.h;h=ded10ea6a395ba9eae9ae8034fa0158b0a97eae3;hb=refs%2Fchanges%2F46%2F265846%2F1;hp=8f6fda9d1f425846a48e454e78830479f53a479a;hpb=6da8438e9ac7350d9cc6f69b35cbcc4ab3987da1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h index 8f6fda9..ded10ea 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H__ -#define __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H +#define DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -26,50 +26,43 @@ namespace Dali { - namespace Toolkit { - class CubeTransitionCrossEffect; namespace Internal { - class CubeTransitionEffect; class CubeTransitionCrossEffect : public CubeTransitionEffect { - public: - /** * @copydoc Toolkit::CubeTransitionCrossEffect::New */ - static Toolkit::CubeTransitionCrossEffect New( unsigned int numRows, unsigned int numColumns ); + static Toolkit::CubeTransitionCrossEffect New(unsigned int numRows, unsigned int numColumns); protected: - - /** + /** * @copydoc Toolkit::Internal::CubeTransitionEffect::OnInitialize */ - virtual void OnInitialize(); + void OnInitialize() override; - /** + /** * @copydoc Toolkit::Internal::CubeTransitionEffect::OnStartTransition */ - virtual void OnStartTransition( Vector2 panPosition, Vector2 panDisplacement ); + void OnStartTransition(Vector2 panPosition, Vector2 panDisplacement) override; private: - - /** + /** * @brief Construct a new CubeTransitionCrossEffect object * * @param[in] numRows How many rows of cubes * @param[in] numColumns How many columns of cubes */ - CubeTransitionCrossEffect( unsigned int numRows, unsigned int numColumns ); + CubeTransitionCrossEffect(unsigned int numRows, unsigned int numColumns); - /** + /** * @brief Set up animation to an Actor * This will also displace the cubes in the z direction by mCubeDisplacement and spread them apart on the xy plane * given by the closeness of displacementCentre to the XY plane at 0. @@ -78,17 +71,16 @@ private: * @param[in] angle The angle of the rotation animation * @param[in] the centre to "explode" the tiles outwards from */ - void SetupAnimation( unsigned int actorIndex, unsigned int x, unsigned int y, float angle, const Vector3 axis, const Vector3& displacementCentre ); + void SetupAnimation(unsigned int actorIndex, unsigned int x, unsigned int y, float angle, const Vector3 axis, const Vector3& displacementCentre); private: - - /** + /** * The factor that determines how spread apart from each other the cubes will go * when they are displaced during the transition animation. * The larger the value the more the spread apart the cubes will be. * it should be in the range (0.0, +infinity) */ - float mDisplacementSpreadFactor; + float mDisplacementSpreadFactor; }; //class CubeTransitionCrossEffect @@ -96,26 +88,26 @@ private: // Helpers for public-api forwarding methods -inline Internal::CubeTransitionCrossEffect& GetImpl( Dali::Toolkit::CubeTransitionCrossEffect& obj ) +inline Internal::CubeTransitionCrossEffect& GetImpl(Dali::Toolkit::CubeTransitionCrossEffect& obj) { - DALI_ASSERT_ALWAYS( obj ); + DALI_ASSERT_ALWAYS(obj); Dali::RefObject& handle = obj.GetImplementation(); - return static_cast< Internal::CubeTransitionCrossEffect& >( handle ); + return static_cast(handle); } -inline const Internal::CubeTransitionCrossEffect& GetImpl( const Dali::Toolkit::CubeTransitionCrossEffect& obj ) +inline const Internal::CubeTransitionCrossEffect& GetImpl(const Dali::Toolkit::CubeTransitionCrossEffect& obj) { - DALI_ASSERT_ALWAYS( obj ); + DALI_ASSERT_ALWAYS(obj); const Dali::RefObject& handle = obj.GetImplementation(); - return static_cast< const Internal::CubeTransitionCrossEffect& >( handle ); + return static_cast(handle); } } // namespace Toolkit } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H_ */ +#endif // DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H