From 33c61937abd66227ceaba6778b75245e327190fd Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 4 Nov 2013 11:31:05 -0800 Subject: [PATCH] Remove unused parameters. --- interface/src/Application.cpp | 10 ++++------ interface/src/Application.h | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 47391d1f15..c0950f235f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1946,8 +1946,7 @@ void Application::updateMouseRay(float deltaTime, glm::vec3& mouseRayOrigin, glm _myAvatar.setMouseRay(mouseRayOrigin, mouseRayDirection); } -void Application::updateFaceshift(float deltaTime, glm::vec3& mouseRayOrigin, glm::vec3& mouseRayDirection, - glm::vec3& lookAtRayOrigin, glm::vec3& lookAtRayDirection) { +void Application::updateFaceshift() { bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); PerformanceWarning warn(showWarnings, "Application::updateFaceshift()"); @@ -2347,11 +2346,10 @@ void Application::update(float deltaTime) { // Set where I am looking based on my mouse ray (so that other people can see) glm::vec3 lookAtSpot; - glm::vec3 lookAtRayOrigin = mouseRayOrigin, lookAtRayDirection = mouseRayDirection; - - updateFaceshift(deltaTime, mouseRayOrigin, mouseRayDirection, lookAtRayOrigin, lookAtRayDirection); + + updateFaceshift(); updateLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, lookAtSpot); - updateMyAvatarLookAtPosition(lookAtSpot, lookAtRayOrigin, lookAtRayDirection); + updateMyAvatarLookAtPosition(lookAtSpot, mouseRayOrigin, mouseRayDirection); // Find the voxel we are hovering over, and respond if clicked float distance; diff --git a/interface/src/Application.h b/interface/src/Application.h index ff8ae2f882..84625d8b8c 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -226,8 +226,7 @@ private: // Various helper functions called during update() void updateMouseRay(float deltaTime, glm::vec3& mouseRayOrigin, glm::vec3& mouseRayDirection); - void updateFaceshift(float deltaTime, glm::vec3& mouseRayOrigin, glm::vec3& mouseRayDirection, - glm::vec3& lookAtRayOrigin, glm::vec3& lookAtRayDirection); + void updateFaceshift(); void updateMyAvatarLookAtPosition(glm::vec3& lookAtSpot, glm::vec3& lookAtRayOrigin, glm::vec3& lookAtRayDirection); void updateHoverVoxels(float deltaTime, glm::vec3& mouseRayOrigin, glm::vec3& mouseRayDirection, float& distance, BoxFace& face);