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

more cleanups

Browse source
This commit is contained in:
Sam Gateau 2017-10-02 21:46:52 -07:00
parent 316156db46
commit 895e3d0430
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application_render.cpp
View file

@ -103,7 +103,6 @@ void Application::paintGL() {
_applicationOverlay.renderOverlay(&renderArgs); _applicationOverlay.renderOverlay(&renderArgs);
} }
// updateCamera(renderArgs);
{ {
PROFILE_RANGE(render, "/updateCompositor"); PROFILE_RANGE(render, "/updateCompositor");
getApplicationCompositor().setFrameInfo(_frameCount, eyeToWorld, sensorToWorld); getApplicationCompositor().setFrameInfo(_frameCount, eyeToWorld, sensorToWorld);

2
interface/src/ui/overlays/Overlays.cpp
View file

@ -152,7 +152,7 @@ void Overlays::render3DHUDOverlays(RenderArgs* renderArgs) {
foreach(Overlay::Pointer thisOverlay, _overlays3DHUD) { foreach(Overlay::Pointer thisOverlay, _overlays3DHUD) {
// Reset necessary batch pipeline settings between overlays // Reset necessary batch pipeline settings between overlays
batch.setResourceTexture(0, textureCache->getWhiteTexture()); // FIXME - do we really need to do this?? batch.setResourceTexture(0, textureCache->getWhiteTexture()); // FIXME - do we really need to do this??
// batch.setModelTransform(Transform()); batch.setModelTransform(Transform());
renderArgs->_shapePipeline = _shapePlumber->pickPipeline(renderArgs, thisOverlay->getShapeKey()); renderArgs->_shapePipeline = _shapePlumber->pickPipeline(renderArgs, thisOverlay->getShapeKey());
thisOverlay->render(renderArgs); thisOverlay->render(renderArgs);