projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Revert "Skip rendering if no animation is currently active"
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
manager
/
transform-manager.cpp
diff --git
a/dali/internal/update/manager/transform-manager.cpp
b/dali/internal/update/manager/transform-manager.cpp
index
7951e32
..
a51b0d7
100644
(file)
--- a/
dali/internal/update/manager/transform-manager.cpp
+++ b/
dali/internal/update/manager/transform-manager.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
18
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.
@@
-82,8
+82,7
@@
TransformManager::TransformManager()
mReorder(false)
{}
mReorder(false)
{}
-TransformManager::~TransformManager()
-{}
+TransformManager::~TransformManager() = default;
TransformId TransformManager::CreateTransform()
{
TransformId TransformManager::CreateTransform()
{
@@
-229,10
+228,8
@@
void TransformManager::ResetToBaseValue()
}
}
}
}
-
bool
TransformManager::Update()
+
void
TransformManager::Update()
{
{
- bool componentsChanged = false;
-
if( mReorder )
{
//If some transform component has change its parent or has been removed since last update
if( mReorder )
{
//If some transform component has change its parent or has been removed since last update
@@
-324,11
+321,8
@@
bool TransformManager::Update()
mBoundingSpheres[i] = mWorld[i].GetTranslation();
mBoundingSpheres[i].w = Length( centerToEdgeWorldSpace );
mBoundingSpheres[i] = mWorld[i].GetTranslation();
mBoundingSpheres[i].w = Length( centerToEdgeWorldSpace );
- componentsChanged = componentsChanged || mComponentDirty[i];
mComponentDirty[i] = false;
}
mComponentDirty[i] = false;
}
-
- return componentsChanged;
}
void TransformManager::SwapComponents( unsigned int i, unsigned int j )
}
void TransformManager::SwapComponents( unsigned int i, unsigned int j )
@@
-387,26
+381,31
@@
Vector3& TransformManager::GetVector3PropertyValue( TransformId id, TransformMan
case TRANSFORM_PROPERTY_POSITION:
{
TransformId index( mIds[id] );
case TRANSFORM_PROPERTY_POSITION:
{
TransformId index( mIds[id] );
+ mComponentDirty[ index ] = true;
return mTxComponentAnimatable[ index ].mPosition;
}
case TRANSFORM_PROPERTY_SCALE:
{
TransformId index( mIds[id] );
return mTxComponentAnimatable[ index ].mPosition;
}
case TRANSFORM_PROPERTY_SCALE:
{
TransformId index( mIds[id] );
+ mComponentDirty[ index ] = true;
return mTxComponentAnimatable[ index ].mScale;
}
case TRANSFORM_PROPERTY_PARENT_ORIGIN:
{
TransformId index( mIds[id] );
return mTxComponentAnimatable[ index ].mScale;
}
case TRANSFORM_PROPERTY_PARENT_ORIGIN:
{
TransformId index( mIds[id] );
+ mComponentDirty[ index ] = true;
return mTxComponentStatic[ index ].mParentOrigin;
}
case TRANSFORM_PROPERTY_ANCHOR_POINT:
{
TransformId index( mIds[id] );
return mTxComponentStatic[ index ].mParentOrigin;
}
case TRANSFORM_PROPERTY_ANCHOR_POINT:
{
TransformId index( mIds[id] );
+ mComponentDirty[ index ] = true;
return mTxComponentStatic[ index ].mAnchorPoint;
}
case TRANSFORM_PROPERTY_SIZE:
{
TransformId index( mIds[id] );
return mTxComponentStatic[ index ].mAnchorPoint;
}
case TRANSFORM_PROPERTY_SIZE:
{
TransformId index( mIds[id] );
+ mComponentDirty[ index ] = true;
return mSize[ index ];
}
default:
return mSize[ index ];
}
default:
@@
-835,6
+834,7
@@
void TransformManager::BakeZVector3PropertyValue( TransformId id, TransformManag
Quaternion& TransformManager::GetQuaternionPropertyValue( TransformId id )
{
TransformId index( mIds[id] );
Quaternion& TransformManager::GetQuaternionPropertyValue( TransformId id )
{
TransformId index( mIds[id] );
+ mComponentDirty[ index ] = true;
return mTxComponentAnimatable[ index ].mOrientation;
}
return mTxComponentAnimatable[ index ].mOrientation;
}