equal
deleted
inserted
replaced
134 CHuiFxEffect* tempEffect = iEffect; |
134 CHuiFxEffect* tempEffect = iEffect; |
135 #endif |
135 #endif |
136 iEffect = NULL; |
136 iEffect = NULL; |
137 if (iVisual) |
137 if (iVisual) |
138 { |
138 { |
139 iVisual->EffectSetOpacity(1.0f); |
139 iVisual->EffectSetOpacityAdditive(1.0f, ETrue); |
140 #ifndef HUIFX_EFFECTCACHE_ENABLED |
140 #ifndef HUIFX_EFFECTCACHE_ENABLED |
141 iVisual->SetEffect( tempEffect ); |
141 iVisual->SetEffect( tempEffect ); |
142 #endif |
142 #endif |
143 } |
143 } |
144 } |
144 } |
153 } |
153 } |
154 delete iEffect; |
154 delete iEffect; |
155 iEffect = NULL; |
155 iEffect = NULL; |
156 if (iVisual) |
156 if (iVisual) |
157 { |
157 { |
158 iVisual->EffectSetOpacity(1.0f); |
158 iVisual->EffectSetOpacityAdditive(1.0f, ETrue); |
159 iVisual->EffectSetEffect( NULL ); |
159 iVisual->EffectSetEffect( NULL ); |
160 } |
160 } |
161 } |
161 } |
162 else // We got cancelled |
162 else // We got cancelled |
163 { |
163 { |
727 case ENodeTypeKeyFrame: |
727 case ENodeTypeKeyFrame: |
728 { |
728 { |
729 TReal32 time = ParseFloatAttributeL(aNode, KLitAt); |
729 TReal32 time = ParseFloatAttributeL(aNode, KLitAt); |
730 TReal32 aux1 = ParseFloatAttributeL(aNode, KLitAux1, EFalse); |
730 TReal32 aux1 = ParseFloatAttributeL(aNode, KLitAux1, EFalse); |
731 TReal32 aux2 = ParseFloatAttributeL(aNode, KLitAux2, EFalse); |
731 TReal32 aux2 = ParseFloatAttributeL(aNode, KLitAux2, EFalse); |
732 VALUE_TYPE value = ParseAnimationKeyFrameValueL<PARAM_TYPE::ValueType, TIMELINE_TYPE>(aNode->FirstChild(), aTimeLine); |
732 VALUE_TYPE value = ParseAnimationKeyFrameValueL<typename PARAM_TYPE::ValueType, TIMELINE_TYPE>(aNode->FirstChild(), aTimeLine); |
733 TRAPD(err, aTimeLine.AppendKeyFrameL(time, value, aux1, aux2)); |
733 TRAPD(err, aTimeLine.AppendKeyFrameL(time, value, aux1, aux2)); |
734 if (err != KErrNone) |
734 if (err != KErrNone) |
735 { |
735 { |
736 FAIL(KErrGeneral, _L("Unable to append new key frame to timeline")); |
736 FAIL(KErrGeneral, _L("Unable to append new key frame to timeline")); |
737 } |
737 } |