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

Fixing merge

Browse source
This commit is contained in:
Niraj Venkat 2015-07-09 16:23:40 -07:00
parent 1dce5f80cc
commit 52095fd38d
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/Application.cpp
View file

@ -1014,6 +1014,7 @@ void Application::paintGL() {
void Application::runTests() { void Application::runTests() {
runTimingTests(); runTimingTests();
runUnitTests();
} }
void Application::audioMuteToggled() { void Application::audioMuteToggled() {
@ -1182,7 +1183,6 @@ bool Application::event(QEvent* event) {
} }
bool Application::eventFilter(QObject* object, QEvent* event) { bool Application::eventFilter(QObject* object, QEvent* event) {
if (event->type() == QEvent::ShortcutOverride) { if (event->type() == QEvent::ShortcutOverride) {
if (DependencyManager::get<OffscreenUi>()->shouldSwallowShortcut(event)) { if (DependencyManager::get<OffscreenUi>()->shouldSwallowShortcut(event)) {
event->accept(); event->accept();
@ -1787,6 +1787,7 @@ void Application::checkFPS() {
} }
void Application::idle() { void Application::idle() {
PROFILE_RANGE(__FUNCTION__);
static SimpleAverage<float> interIdleDurations; static SimpleAverage<float> interIdleDurations;
static uint64_t lastIdleEnd{ 0 }; static uint64_t lastIdleEnd{ 0 };
@ -3386,14 +3387,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
// load the view frustum // load the view frustum
loadViewFrustum(theCamera, _displayViewFrustum); loadViewFrustum(theCamera, _displayViewFrustum);
// flip x if in mirror mode (also requires reversing winding order for backface culling)
if (theCamera.getMode() == CAMERA_MODE_MIRROR) {
//glScalef(-1.0f, 1.0f, 1.0f);
//glFrontFace(GL_CW);
} else {
glFrontFace(GL_CCW);
}
// transform view according to theCamera // transform view according to theCamera
// could be myCamera (if in normal mode) // could be myCamera (if in normal mode)
// or could be viewFrustumOffsetCamera if in offset mode // or could be viewFrustumOffsetCamera if in offset mode
@ -3411,9 +3404,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
Transform viewTransform; Transform viewTransform;
viewTransform.setTranslation(theCamera.getPosition()); viewTransform.setTranslation(theCamera.getPosition());
viewTransform.setRotation(rotation); viewTransform.setRotation(rotation);
if (theCamera.getMode() == CAMERA_MODE_MIRROR) {
// viewTransform.setScale(Transform::Vec3(-1.0f, 1.0f, 1.0f));
}
if (renderArgs->_renderSide != RenderArgs::MONO) { if (renderArgs->_renderSide != RenderArgs::MONO) {
glm::mat4 invView = glm::inverse(_untranslatedViewMatrix); glm::mat4 invView = glm::inverse(_untranslatedViewMatrix);