Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 02:16:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove call to _entities.render() in displaySide()

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-09-18 12:03:58 -07:00
parent 6edc817bf2
commit 416acb1d4a
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -1063,7 +1063,7 @@ void Application::paintGL() {
auto lodManager = DependencyManager::get<LODManager>(); auto lodManager = DependencyManager::get<LODManager>();
RenderArgs renderArgs(_gpuContext, nullptr, getViewFrustum(), lodManager->getOctreeSizeScale(), RenderArgs renderArgs(_gpuContext, getEntities(), getViewFrustum(), lodManager->getOctreeSizeScale(),
lodManager->getBoundaryLevelAdjust(), RenderArgs::DEFAULT_RENDER_MODE, lodManager->getBoundaryLevelAdjust(), RenderArgs::DEFAULT_RENDER_MODE,
RenderArgs::MONO, RenderArgs::RENDER_DEBUG_NONE); RenderArgs::MONO, RenderArgs::RENDER_DEBUG_NONE);
@ -3562,7 +3562,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
(RenderArgs::DebugFlags) (renderDebugFlags | (int)RenderArgs::RENDER_DEBUG_SIMULATION_OWNERSHIP); (RenderArgs::DebugFlags) (renderDebugFlags | (int)RenderArgs::RENDER_DEBUG_SIMULATION_OWNERSHIP);
} }
renderArgs->_debugFlags = renderDebugFlags; renderArgs->_debugFlags = renderDebugFlags;
_entities.render(renderArgs);
//ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, pendingChanges); //ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, pendingChanges);
} }
} }

8
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -149,6 +149,7 @@ void EntityTreeRenderer::update() {
} }
} }
deleteReleasedModels();
} }
void EntityTreeRenderer::checkEnterLeaveEntities() { void EntityTreeRenderer::checkEnterLeaveEntities() {
@ -334,13 +335,6 @@ void EntityTreeRenderer::applyZonePropertiesToScene(std::shared_ptr<ZoneEntityIt
} }
} }
void EntityTreeRenderer::render(RenderArgs* renderArgs) {
// FIXME - currently the EntityItem rendering code still depends on knowing about the EntityTreeRenderer
// because it uses it as a model loading service. We don't actually do anything in rendering other than this.
renderArgs->_renderer = this;
deleteReleasedModels(); // seems like as good as any other place to do some memory cleanup
}
const FBXGeometry* EntityTreeRenderer::getGeometryForEntity(EntityItemPointer entityItem) { const FBXGeometry* EntityTreeRenderer::getGeometryForEntity(EntityItemPointer entityItem) {
const FBXGeometry* result = NULL; const FBXGeometry* result = NULL;

2
libraries/entities-renderer/src/EntityTreeRenderer.h
View file

@ -53,7 +53,7 @@ public:
void processEraseMessage(NLPacket& packet, const SharedNodePointer& sourceNode); void processEraseMessage(NLPacket& packet, const SharedNodePointer& sourceNode);
virtual void init(); virtual void init();
virtual void render(RenderArgs* renderArgs) override; virtual void render(RenderArgs* renderArgs) override { }
virtual const FBXGeometry* getGeometryForEntity(EntityItemPointer entityItem); virtual const FBXGeometry* getGeometryForEntity(EntityItemPointer entityItem);
virtual const Model* getModelForEntityItem(EntityItemPointer entityItem); virtual const Model* getModelForEntityItem(EntityItemPointer entityItem);