Merge pull request #6834 from ZappoMan/hmdFixes

fix issues with HMD lookout 2D, and cleanup

Brad Davis committed 10 years ago

Commit d924e042 parents 5c1eef6 6b76cf47 files · +15 −140Browse files

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

Unified · Split

@@ -3521,7 +3521,7 @@ int Application::getBoundaryLevelAdjust() const { · 3520 unmodified lines
3521	}	3521	}
3522		3522
3523	PickRay Application::computePickRay(float x, float y) const {	3523	PickRay Application::computePickRay(float x, float y) const {
3524	vec2 pickPoint{ x, y };	3524	vec2 pickPoint { x, y };
3525	PickRay result;	3525	PickRay result;
3526	if (isHMDMode()) {	3526	if (isHMDMode()) {
3527	getApplicationCompositor().computeHmdPickRay(pickPoint, result.origin, result.direction);	3527	getApplicationCompositor().computeHmdPickRay(pickPoint, result.origin, result.direction);