Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines"

Browse source 
This reverts commit 8a2fd01e81.
This commit is contained in:
Olivier Prat 2017-07-31 18:06:51 +02:00
parent 8a2fd01e81
commit 5f1d45d4de
3 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -32,7 +32,7 @@
#include "RenderableModelEntityItem.h" #include "RenderableModelEntityItem.h"
#include "RenderableEntityItem.h" #include "RenderableEntityItem.h"
#define USE_FADE_EFFECT //#define USE_FADE_EFFECT
static CollisionRenderMeshCache collisionMeshCache; static CollisionRenderMeshCache collisionMeshCache;
@ -248,9 +248,7 @@ bool RenderableModelEntityItem::addToScene(const EntityItemPointer& self, const
_model->addToScene(scene, transaction, statusGetters); _model->addToScene(scene, transaction, statusGetters);
#ifdef USE_FADE_EFFECT #ifdef USE_FADE_EFFECT
if (!_hasTransitioned) { if (!_hasTransitioned) {
if (EntityItem::getEntitiesShouldFadeFunction()()) { transaction.addTransitionToItem(_myMetaItem, render::Transition::ELEMENT_ENTER_DOMAIN);
transaction.addTransitionToItem(_myMetaItem, render::Transition::ELEMENT_ENTER_DOMAIN);
}
_hasTransitioned = true; _hasTransitioned = true;
} }
#endif #endif
@ -490,9 +488,7 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
#ifdef USE_FADE_EFFECT #ifdef USE_FADE_EFFECT
if (!_hasTransitioned) { if (!_hasTransitioned) {
if (EntityItem::getEntitiesShouldFadeFunction()()) { transaction.addTransitionToItem(_myMetaItem, render::Transition::ELEMENT_ENTER_DOMAIN);
transaction.addTransitionToItem(_myMetaItem, render::Transition::ELEMENT_ENTER_DOMAIN);
}
_hasTransitioned = true; _hasTransitioned = true;
} }
#endif #endif

6
libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
View file

@ -17,7 +17,7 @@
#include <PathUtils.h> #include <PathUtils.h>
#include <PerfStat.h> #include <PerfStat.h>
#define USE_FADE_EFFECT //#define USE_FADE_EFFECT
#ifdef USE_FADE_EFFECT #ifdef USE_FADE_EFFECT
# include <FadeEffect.h> # include <FadeEffect.h>
#endif #endif
@ -249,9 +249,7 @@ bool RenderablePolyLineEntityItem::addToScene(const EntityItemPointer& self,
transaction.resetItem(_myItem, renderPayload); transaction.resetItem(_myItem, renderPayload);
#ifdef USE_FADE_EFFECT #ifdef USE_FADE_EFFECT
if (EntityItem::getEntitiesShouldFadeFunction()()) { transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
}
#endif #endif
updateMesh(); updateMesh();

10
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -20,7 +20,7 @@
#include <model-networking/SimpleMeshProxy.h> #include <model-networking/SimpleMeshProxy.h>
#include "ModelScriptingInterface.h" #include "ModelScriptingInterface.h"
#define USE_FADE_EFFECT //#define USE_FADE_EFFECT
#ifdef USE_FADE_EFFECT #ifdef USE_FADE_EFFECT
# include <FadeEffect.h> # include <FadeEffect.h>
#endif #endif
@ -814,9 +814,7 @@ bool RenderablePolyVoxEntityItem::addToScene(const EntityItemPointer& self,
transaction.resetItem(_myItem, renderPayload); transaction.resetItem(_myItem, renderPayload);
#ifdef USE_FADE_EFFECT #ifdef USE_FADE_EFFECT
if (_mesh && _mesh->getIndexBuffer()._buffer) { if (_mesh && _mesh->getIndexBuffer()._buffer) {
if (EntityItem::getEntitiesShouldFadeFunction()()) { transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
}
_hasTransitioned = true; _hasTransitioned = true;
} }
#endif #endif
@ -1410,9 +1408,7 @@ void RenderablePolyVoxEntityItem::setMesh(model::MeshPointer mesh) {
if (!_hasTransitioned) { if (!_hasTransitioned) {
render::Transaction transaction; render::Transaction transaction;
render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene(); render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
if (EntityItem::getEntitiesShouldFadeFunction()()) { transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
}
scene->enqueueTransaction(transaction); scene->enqueueTransaction(transaction);
_hasTransitioned = true; _hasTransitioned = true;
} }