X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fmanager%2Ftransform-manager.cpp;h=651d23036b90962827dda91130dd90dfb33cd8b4;hp=c2cc4bbd55cfad89803a4dc41d32dfaa9a82a951;hb=b43741a90b40ca9dfbd33d6a9d390d3c09230e89;hpb=75552e8d3b4e8db822723d0c177afe1becc4b4cc diff --git a/dali/internal/update/manager/transform-manager.cpp b/dali/internal/update/manager/transform-manager.cpp old mode 100644 new mode 100755 index c2cc4bb..651d230 --- a/dali/internal/update/manager/transform-manager.cpp +++ b/dali/internal/update/manager/transform-manager.cpp @@ -106,6 +106,10 @@ TransformId TransformManager::CreateTransform() mSizeBase.PushBack(Vector3(0.0f,0.0f,0.0f)); mComponentDirty.PushBack(false); mLocalMatrixDirty.PushBack(false); + mComponentChanged.PushBack(false); + mPrevWorld.PushBack(Matrix::IDENTITY); + mUpdateSizeHint.PushBack(Vector3(0.0f,0.0f,0.0f)); + mUpdateSizeHintBase.PushBack(Vector3(0.0f,0.0f,0.0f)); } else { @@ -123,6 +127,10 @@ TransformId TransformManager::CreateTransform() mSizeBase[mComponentCount] = Vector3(0.0f,0.0f,0.0f); mComponentDirty[mComponentCount] = false; mLocalMatrixDirty[mComponentCount] = false; + mComponentChanged[mComponentCount] = false; + mPrevWorld[mComponentCount].SetIdentity(); + mUpdateSizeHint[mComponentCount] = Vector3(0.0f,0.0f,0.0f); + mUpdateSizeHintBase[mComponentCount] = Vector3(0.0f,0.0f,0.0f); } mComponentCount++; @@ -146,6 +154,10 @@ void TransformManager::RemoveTransform(TransformId id) mComponentDirty[index] = mComponentDirty[mComponentCount]; mLocalMatrixDirty[index] = mLocalMatrixDirty[mComponentCount]; mBoundingSpheres[index] = mBoundingSpheres[mComponentCount]; + mComponentChanged[index] = mComponentChanged[mComponentCount]; + mPrevWorld[index] = mPrevWorld[mComponentCount]; + mUpdateSizeHint[index] = mUpdateSizeHint[mComponentCount]; + mUpdateSizeHintBase[index] = mUpdateSizeHintBase[mComponentCount]; TransformId lastItemId = mComponentId[mComponentCount]; mIds[ lastItemId ] = index; @@ -215,7 +227,6 @@ void TransformManager::SetInheritOrientation( TransformId id, bool inherit ) { mInheritanceMode[ index ] &= ~INHERIT_ORIENTATION; } - mComponentDirty[index] = true; } @@ -226,6 +237,7 @@ void TransformManager::ResetToBaseValue() memcpy( &mTxComponentAnimatable[0], &mTxComponentAnimatableBaseValue[0], sizeof(TransformComponentAnimatable)*mComponentCount ); memcpy( &mSize[0], &mSizeBase[0], sizeof(Vector3)*mComponentCount ); memset( &mLocalMatrixDirty[0], false, sizeof(bool)*mComponentCount ); + memcpy( &mUpdateSizeHint[0], &mUpdateSizeHintBase[0], sizeof(Vector3)*mComponentCount ); } } @@ -246,6 +258,8 @@ void TransformManager::Update() const Vector3 topLeft( 0.0f, 0.0f, 0.5f ); for( unsigned int i(0); i