History

Fixing issues with the review process

Sam Gateau committed 11 years ago

Commit a424ff91 parent a0025604 files · +8 −6Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+2−5
@@ -962,10 +962,6 @@ void Application::paintGL() { · 961 unmodified lines
962 _myCamera.update(1.0f / _fps);962 _myCamera.update(1.0f / _fps);
963 }963 }
964 964
965 // Sync up the View Furstum with the camera
966 // loadViewFrustum(_myCamera, _viewFrustum);
967
968
969 renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE;965 renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE;
970 966
971 if (OculusManager::isConnected()) {967 if (OculusManager::isConnected()) {
@@ -3010,7 +3006,8 @@ QImage Application::renderAvatarBillboard(RenderArgs* renderArgs) { · 2038 unmodified lines
3010 batch.setFramebuffer(primaryFbo);3006 batch.setFramebuffer(primaryFbo);
3011 renderArgs->_context->render(batch);3007 renderArgs->_context->render(batch);
3012 }3008 }
3013 renderArgs->_renderMode = RenderArgs::NORMAL_RENDER_MODE;3009 renderArgs->_renderMode = RenderArgs::DEFAULT_RENDER_MODE;
3010
3014 renderRearViewMirror(renderArgs, QRect(0, 0, BILLBOARD_SIZE, BILLBOARD_SIZE), true);3011 renderRearViewMirror(renderArgs, QRect(0, 0, BILLBOARD_SIZE, BILLBOARD_SIZE), true);
3015 3012
3016 {3013 {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t