don't fade after physics kick in

SamGondelman committed 10 years ago

Commit ccca6d91 parent 4c663b95 files · +26 −10Browse files

Showing the changes to libraries/render-utils/src/MeshPartPayload.cpp (1 of 5 files). Show all

Unified · Split

 #include "DeferredLightingEffect.h"
 #include "Model.h"
+#include "EntityItem.h"
 using namespace render;
 }
 void ModelMeshPartPayload::startFade() {
-    _fadeStartTime = usecTimestampNow();
+    bool shouldFade = EntityItem::getEntitiesShouldFadeFunction()();
-    _hasStartedFade = true;
+    if (shouldFade) {
-    _prevHasStartedFade = false;
+        _fadeStartTime = usecTimestampNow();
-    _hasFinishedFade = false;
+        _hasStartedFade = true;
+        _hasFinishedFade = false;
+    } else {
+        _isFading = true;
+        _hasStartedFade = true;
+        _hasFinishedFade = true;
+    }
 }
 void ModelMeshPartPayload::render(RenderArgs* args) const {
     // When an individual mesh parts like this finishes its fade, we will mark the Model as
     // having render items that need updating
     bool nextIsFading = _isFading ? isStillFading() : false;
-    if (_isFading != nextIsFading || _prevHasStartedFade != _hasStartedFade) {
+    bool startFading = !_isFading && !_hasFinishedFade && _hasStartedFade;
-        _isFading = nextIsFading || _prevHasStartedFade != _hasStartedFade;
+    bool endFading = _isFading && !nextIsFading;
-        _hasFinishedFade = _prevHasStartedFade == _hasStartedFade && !_isFading;
+    if (startFading || endFading) {
-        _prevHasStartedFade = _hasStartedFade;
+        _isFading = startFading;
+        _hasFinishedFade = endFading;
         _model->setRenderItemsNeedUpdate();
     }