History

Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import

Atlante45 committed 12 years ago

Commit b69bdcc2 parents af3e19e 3f5727610 files · +264 −32Browse files

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

Unified · Split

interface/src/Application.cpp+12−0
@@ -653,6 +653,9 @@ void Application::updateProjectionMatrix(Camera& camera, bool updateViewFrustum) · 652 unmodified lines
653 }653 }
654 glFrustum(left, right, bottom, top, nearVal, farVal);654 glFrustum(left, right, bottom, top, nearVal, farVal);
655 655
656 // save matrix
657 glGetFloatv(GL_PROJECTION_MATRIX, (GLfloat*)&_projectionMatrix);
658
656 glMatrixMode(GL_MODELVIEW);659 glMatrixMode(GL_MODELVIEW);
657}660}
658 661
@@ -2961,6 +2964,15 @@ void Application::loadTranslatedViewMatrix(const glm::vec3& translation) { · 2302 unmodified lines
2961 translation.z + _viewMatrixTranslation.z);2964 translation.z + _viewMatrixTranslation.z);
2962}2965}
2963 2966
2967void Application::getModelViewMatrix(glm::dmat4* modelViewMatrix) {
2968 (*modelViewMatrix) =_untranslatedViewMatrix;
2969 (*modelViewMatrix)[3] = _untranslatedViewMatrix * glm::vec4(_viewMatrixTranslation, 1);
2970}
2971
2972void Application::getProjectionMatrix(glm::dmat4* projectionMatrix) {
2973 *projectionMatrix = _projectionMatrix;
2974}
2975
2964void Application::computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal,2976void Application::computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal,
2965 float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const {2977 float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const {
2966 2978

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