MCL/sf/mw/uiaccelerator: comparison uiacceltk/hitchcock/coretoolkit/src/HuiFxEngine.cpp

equal deleted inserted replaced

-:88b23e2e82e1
+:46927d61fef3
 * Description:
 *
 */
 #include "HuiFxEngine.h"
 #include "HuiFxEffectParser.h"
 #include "HuiFxEffect.h"
 #include "HuiFxEffectCache.h"
 #include <uiacceltk/HuiEnv.h>
 void CHuiFxEngine::NotifyEffectEndObservers()
 {
 for ( TInt i = iActiveEffects.Count() - 1; i >= 0; i-- )
 {
 CHuiFxEffect* effect = iActiveEffects[i];
-if (!effect->Changed())
+if (!(effect->EffectFlags() & KHuiFadeEffectFlag) && !effect->Changed())
 {
+#ifdef HUIFX_TRACE
+RDebug::Printf("void CHuiFxEngine::NotifyEffectEndObservers() calling NotifyEffectEndObserver");
+#endif
 effect->NotifyEffectEndObserver();
 }
 }
 }
 {
 // TODO: Can we do anything about all this polling?
 TInt i;
 TBool refreshRequired = EFalse;
 #ifdef HUIFX_TRACE
-RDebug::Print(_L("CHuiFxEngine::AdvanceTime - 0x%x "), this);
+RDebug::Print(_L("CHuiFxEngine::AdvanceTime - 0x%x, effect count: %d"), this, iActiveEffects.Count());
 #endif
 // Go through the list in reverse order.
 // If the effect has ended, and has the callback set,
 // the effect will be removed, and will no longer be part of iActiveEffects set.
 // We must check if the effect is still in our list, but the indices change
 if (effect->Changed())
 {
 refreshRequired = ETrue;
 }
 TInt flags = effect->EffectFlags();
 if ( !(flags & KHuiFxWaitGroupSyncronization)
-&& (skipGroup == KErrNotFound || skipGroup != effect->GroupId()))
+&& !(flags & KHuiFadeEffectFlag) // fade is not animated. Note, if animated effect would be used, remove this!
+&& (skipGroup == KErrNotFound || skipGroup != effect->GroupId())
+)
 {
 // The effect is still in its place, it did not go away yet
 TBool waitingGroupBefore = flags & KHuiFxWaitGroupToStartSyncronized;
 effect->AdvanceTime(aElapsedTime);
 #ifdef HUIFX_TRACE
 RDebug::Print(_L("CHuiFxEngine::AddEffectL - 0x%x "), aEffect);
 #endif // #ifdef HUIFX_TRACE
 iActiveEffects.AppendL(aEffect);
+if (iEffectObserver)
+{
+iEffectObserver->EffectAdded(aEffect);
+}
 }
 EXPORT_C void CHuiFxEngine::RemoveEffect(CHuiFxEffect* aEffect)
 {
 #ifdef HUIFX_TRACE
 #endif
 TInt i = iActiveEffects.Find(aEffect);
 if (i >= 0)
 {
 iActiveEffects.Remove(i);
+if (iEffectObserver)
+{
+iEffectObserver->EffectComplete(aEffect);
+}
 }
 }
 EXPORT_C TReal32 CHuiFxEngine::GetReferenceValue(THuiFxReferencePoint aPoint)
 {
 RDebug::Print(_L("CHuiFxEngine::ReleaseRenderbuffer - buffer: 0x%x "), aBuffer);
 #endif
 ASSERT((aBuffer) && (iBuffersInUse > 0));
 #ifdef HUIFX_RBCACHE_ENABLED
-if(iLowGraphicsMemoryMode || IsCacheFull())
+if(iLowGraphicsMemoryMode < EHuiMemoryLevelReduced || IsCacheFull())
 {
 #ifdef HUIFX_TRACE
 RDebug::Print(_L("CHuiFxEngine::ReleaseRenderbuffer() --- Renderbuffer cache full! Suspectible for memory fragmentation! Cache size is %d entries."), CACHE_SIZE);
 #endif
 #endif
 }
 EXPORT_C void  CHuiFxEngine::SetMemoryLevel(THuiMemoryLevel aLevel)
 {
 iLowGraphicsMemoryMode = aLevel;
-if(iLowGraphicsMemoryMode) // != Normal
+if(iLowGraphicsMemoryMode < EHuiMemoryLevelReduced)
 {
 ClearCache();
 }
 }
 // Default implementation does nothing
 }
 TInt CHuiFxEngine::LowMemoryState()
 {
-return iLowGraphicsMemoryMode;
+return iLowGraphicsMemoryMode < EHuiMemoryLevelReduced;
 }
 TBool CHuiFxEngine::HasActiveEffects() const
 {
 	// Don't report active effects if in SW-rendering mode
-if(iLowGraphicsMemoryMode) // != Normal
+if(iLowGraphicsMemoryMode < EHuiMemoryLevelReduced)
 {
 return EFalse;
 }
 return iActiveEffects.Count() > 0;
+}
+TBool CHuiFxEngine::HasActiveFadeEffect() const
+{
+// Don't report active effects if in SW-rendering mode
+if(iLowGraphicsMemoryMode < EHuiMemoryLevelReduced)
+{
+return EFalse;
+}
+TInt effectCount = iActiveEffects.Count();
+for (TInt count  = 0; count < effectCount; count++)
+{
+if (iActiveEffects[count]->EffectFlags() & KHuiFadeEffectFlag)
+{
+return ETrue;
+}
+}
+return EFalse;
 }
 void CHuiFxEngine::ClearCache()
 {
 // Release cached render targets from effects
 return KErrNotFound;
 }
 EXPORT_C void CHuiFxEngine::BeginGroupEffect(TInt aGroup)
 	{
+#ifdef HUIFX_TRACE
+	RDebug::Printf("CHuiFxEngine::BeginGroupEffect(TInt aGroup %d) >>", aGroup);
+#endif
 	// Multiple grouped effects at the same time are not supported.
 // Same visual might participate different groups, which will mess up the effect
 if (iActiveEffectGroups.Count()>0)
 {
 // delete previous groups
 if (index != KErrNotFound)
 {
 // keep count of effects in this group. All must draw atleast once, before
 // syncronized group effect may start
 iActiveEffectGroups[index].iWaiting++;
+#ifdef HUIFX_TRACE
+RDebug::Printf("CHuiFxEngine::AddEffectToGroup - %d, waiting in group: %d", aGroup, iActiveEffectGroups[index].iWaiting);
+#endif
 return ETrue;
 }
 return EFalse;
 }
 EXPORT_C void CHuiFxEngine::StartGroupEffect(TInt aGroup)
 	{
+#ifdef HUIFX_TRACE
+RDebug::Printf("CHuiFxEngine::StartGroupEffect(TInt aGroup %d) >>", aGroup);
+#endif
 	TInt index = FindEffectGroup(aGroup);
 	if (index != KErrNotFound)
 		{
 		iActiveEffectGroups[index].iEndCalled = ETrue; // this group will not take any more participants
 		for ( TInt i = iActiveEffects.Count() - 1; i >= 0; i-- )
 		}
 	}
 void CHuiFxEngine::NotifyEffectReady(TInt aGroupId)
 {
+#ifdef HUIFX_TRACE
+RDebug::Print(_L("CHuiFxEngine::NotifyEffectReady - %d"), aGroupId);
+#endif
 TInt index = FindEffectGroup(aGroupId);
 if (index != KErrNotFound)
 {
-if (--iActiveEffectGroups[iActiveEffectGroups.Count()-1].iWaiting == 0)
+iActiveEffectGroups[index].iWaiting--;
+#ifdef HUIFX_TRACE
+RDebug::Print(_L("CHuiFxEngine::NotifyEffectReady - waiting %d in group %d"), iActiveEffectGroups[index].iWaiting , aGroupId);
+#endif
+if (iActiveEffectGroups[index].iWaiting == 0)
 {
 // set in motion all effects in this group
 	        iActiveEffectGroups.Remove(index);
 for ( TInt i = iActiveEffects.Count() - 1; i >= 0; i-- )
 {
 CHuiFxEffect* effect = iActiveEffects[i];
 TInt flags = effect->EffectFlags();
+#ifdef HUIFX_TRACE
+RDebug::Print(_L("CHuiFxEngine::NotifyEffectReady - effect 0x%x, group: %d, flags 0x%x"), effect, effect->GroupId(), effect->EffectFlags());
+#endif
 if ((flags & KHuiFxReadyAndWaitingGroupToStartSyncronized) && (effect->GroupId() == aGroupId))
 {
 effect->ClearEffectFlag(KHuiFxReadyAndWaitingGroupToStartSyncronized);
 }
 }

branch	RCL_3
changeset 8	46927d61fef3
parent 7	88b23e2e82e1
child 9	3ac8bf5c5014