projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "DALi Version 2.1.12" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
public-api
/
animation-definition.h
diff --git
a/dali-scene-loader/public-api/animation-definition.h
b/dali-scene-loader/public-api/animation-definition.h
index
41de471
..
ea0dcb9
100644
(file)
--- a/
dali-scene-loader/public-api/animation-definition.h
+++ b/
dali-scene-loader/public-api/animation-definition.h
@@
-1,7
+1,7
@@
#ifndef DALI_SCENE_LOADER_ANIMATION_DEFINITION_H
#define DALI_SCENE_LOADER_ANIMATION_DEFINITION_H
/*
#ifndef DALI_SCENE_LOADER_ANIMATION_DEFINITION_H
#define DALI_SCENE_LOADER_ANIMATION_DEFINITION_H
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,15
+17,14
@@
*
*/
*
*/
-#include "dali-scene-loader/public-api/api.h"
#include "dali-scene-loader/public-api/animated-property.h"
#include "dali-scene-loader/public-api/animated-property.h"
+#include "dali-scene-loader/public-api/api.h"
#include "dali/public-api/common/vector-wrapper.h"
namespace Dali
{
namespace SceneLoader
{
#include "dali/public-api/common/vector-wrapper.h"
namespace Dali
{
namespace SceneLoader
{
-
/**
* @brief Animation handle + name + definition of properties.
*/
/**
* @brief Animation handle + name + definition of properties.
*/
@@
-66,23
+65,23
@@
public: // METHODS
public: // DATA
std::string mName;
public: // DATA
std::string mName;
- float
mDuration
= DEFAULT_DURATION_SECONDS;
- int
mLoopCount
= 1;
+ float
mDuration
= DEFAULT_DURATION_SECONDS;
+ int
mLoopCount
= 1;
Animation::EndAction mDisconnectAction = Animation::BAKE_FINAL;
Animation::EndAction mDisconnectAction = Animation::BAKE_FINAL;
- Animation::EndAction mEndAction = Animation::BAKE;
- float
mSpeedFactor
= 1.f;
- Vector2
mPlayRange = Vector2{ 0.f, 1.f
};
+ Animation::EndAction mEndAction
= Animation::BAKE;
+ float
mSpeedFactor
= 1.f;
+ Vector2
mPlayRange = Vector2{0.f, 1.f
};
std::vector<AnimatedProperty> mProperties;
};
struct AnimationGroupDefinition
{
std::vector<AnimatedProperty> mProperties;
};
struct AnimationGroupDefinition
{
- std::string mName;
+ std::string
mName;
std::vector<std::string> mAnimations;
};
std::vector<std::string> mAnimations;
};
-}
-}
+}
// namespace SceneLoader
+}
// namespace Dali
#endif //DALI_SCENE_LOADER_ANIMATION_DEFINITION_H
#endif //DALI_SCENE_LOADER_ANIMATION_DEFINITION_H