diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c5d913c65e..40f7de7e85 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1016,7 +1016,7 @@ static void sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail) { } } -const glm::vec3 Application::getMouseVoxelWorldCoordinates(VoxelDetail _mouseVoxel) { +const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) { return glm::vec3((_mouseVoxel.x + _mouseVoxel.s / 2.f) * TREE_SCALE, (_mouseVoxel.y + _mouseVoxel.s / 2.f) * TREE_SCALE, (_mouseVoxel.z + _mouseVoxel.s / 2.f) * TREE_SCALE); @@ -2206,7 +2206,7 @@ void Application::displayStats() { } } -void Application::renderThrustAtVoxel(glm::vec3 thrust) { +void Application::renderThrustAtVoxel(const glm::vec3& thrust) { if (_mousePressed) { glColor3f(1, 0, 0); glLineWidth(2.0f); diff --git a/interface/src/Application.h b/interface/src/Application.h index 655268024b..1d50b5065f 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -67,7 +67,7 @@ public: void wheelEvent(QWheelEvent* event); - const glm::vec3 getMouseVoxelWorldCoordinates(VoxelDetail _mouseVoxel); + const glm::vec3 getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel); Avatar* getAvatar() { return &_myAvatar; } Camera* getCamera() { return &_myCamera; } @@ -95,7 +95,7 @@ private slots: void setRenderFirstPerson(bool firstPerson); - void renderThrustAtVoxel(glm::vec3 thrust); + void renderThrustAtVoxel(const glm::vec3& thrust); void renderLineToTouchedVoxel(); void setFrustumOffset(bool frustumOffset); diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index c89a078f23..a2ff33ca52 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -617,7 +617,6 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) { // set head lookat position if (!_owningAgent) { - //if (_camera) if (_interactingOther) { _head.setLookAtPosition(_interactingOther->calculateAverageEyePosition()); } else {