Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 14:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

dead code removal machine

Browse source
This commit is contained in:
ZappoMan 2015-06-08 14:30:31 -07:00
parent 24c8e7d0e6
commit 8fa31ec521
2 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/src/Application.cpp
View file

@ -3402,7 +3402,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
// Assuming nothing get's rendered through that // Assuming nothing get's rendered through that
// DependencyManager::get<DeferredLightingEffect>()->prepare();
if (!selfAvatarOnly) { if (!selfAvatarOnly) {
@ -3428,12 +3427,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
renderArgs->_renderMode = renderMode; renderArgs->_renderMode = renderMode;
renderArgs->_debugFlags = renderDebugFlags; renderArgs->_debugFlags = renderDebugFlags;
_entities.render(renderArgs); _entities.render(renderArgs);
// This shouldn't matter anymore
/* if (!Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) {
// Restaure polygon mode
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
}*/
} }
// render the ambient occlusion effect if enabled // render the ambient occlusion effect if enabled
@ -3458,8 +3451,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
pendingChanges.updateItem<WorldBoxRenderData>(WorldBoxRenderData::_item, pendingChanges.updateItem<WorldBoxRenderData>(WorldBoxRenderData::_item,
[](WorldBoxRenderData& payload) { [](WorldBoxRenderData& payload) {
payload._val++; payload._val++;
// A test Update to proof the concept is woking
// qCDebug(interfaceapp, "MyFirst update message!!!!! %u", payload._val);
}); });
} }
@ -3474,12 +3465,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
skybox = skyStage->getSkybox(); skybox = skyStage->getSkybox();
} }
DependencyManager::get<DeferredLightingEffect>()->setGlobalSkybox(skybox); DependencyManager::get<DeferredLightingEffect>()->setGlobalSkybox(skybox);
// Not needed anymore here, taken care off by the Engine
/*
PROFILE_RANGE("DeferredLighting");
PerformanceTimer perfTimer("lighting");
DependencyManager::get<DeferredLightingEffect>()->render();*/
} }
{ {
@ -3515,11 +3500,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
// Before the deferred pass, let's try to use the render engine // Before the deferred pass, let's try to use the render engine
_renderEngine->run(); _renderEngine->run();
/*
qDebug() << "renderArgs._materialSwitches:" << renderArgs->_materialSwitches;
qDebug() << "renderArgs._trianglesRendered:" << renderArgs->_trianglesRendered;
qDebug() << "renderArgs._quadsRendered:" << renderArgs->_quadsRendered;
*/
auto engineRC = _renderEngine->getRenderContext(); auto engineRC = _renderEngine->getRenderContext();
sceneInterface->setEngineFeedOpaqueItems(engineRC->_numFeedOpaqueItems); sceneInterface->setEngineFeedOpaqueItems(engineRC->_numFeedOpaqueItems);
sceneInterface->setEngineDrawnOpaqueItems(engineRC->_numDrawnOpaqueItems); sceneInterface->setEngineDrawnOpaqueItems(engineRC->_numDrawnOpaqueItems);
@ -3776,7 +3756,6 @@ void Application::updateWindowTitle(){
void Application::clearDomainOctreeDetails() { void Application::clearDomainOctreeDetails() {
qCDebug(interfaceapp) << "Clearing domain octree details..."; qCDebug(interfaceapp) << "Clearing domain octree details...";
// reset the environment so that we don't erroneously end up with multiple // reset the environment so that we don't erroneously end up with multiple
// _environment.resetToDefault();
// reset our node to stats and node to jurisdiction maps... since these must be changing... // reset our node to stats and node to jurisdiction maps... since these must be changing...
_entityServerJurisdictions.lockForWrite(); _entityServerJurisdictions.lockForWrite();

2
interface/src/Application.h
View file

@ -210,7 +210,6 @@ public:
ViewFrustum* getShadowViewFrustum() { return &_shadowViewFrustum; } ViewFrustum* getShadowViewFrustum() { return &_shadowViewFrustum; }
const OctreePacketProcessor& getOctreePacketProcessor() const { return _octreeProcessor; } const OctreePacketProcessor& getOctreePacketProcessor() const { return _octreeProcessor; }
EntityTreeRenderer* getEntities() { return &_entities; } EntityTreeRenderer* getEntities() { return &_entities; }
// Environment* getEnvironment() { return &_environment; }
QUndoStack* getUndoStack() { return &_undoStack; } QUndoStack* getUndoStack() { return &_undoStack; }
MainWindow* getWindow() { return _window; } MainWindow* getWindow() { return _window; }
OctreeQuery& getOctreeQuery() { return _octreeQuery; } OctreeQuery& getOctreeQuery() { return _octreeQuery; }
@ -535,7 +534,6 @@ private:
QElapsedTimer _timerStart; QElapsedTimer _timerStart;
QElapsedTimer _lastTimeUpdated; QElapsedTimer _lastTimeUpdated;
bool _justStarted; bool _justStarted;
// Stars _stars;
ShapeManager _shapeManager; ShapeManager _shapeManager;
PhysicalEntitySimulation _entitySimulation; PhysicalEntitySimulation _entitySimulation;