From a5a0df09cb85a4278fca92eda24a037b35a0017d Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 12 Jun 2013 16:36:55 -0700 Subject: [PATCH] removed grab voxel rendering --- animation-server/src/main.cpp | 1 - interface/src/Application.cpp | 2 +- interface/src/Application.h | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/animation-server/src/main.cpp b/animation-server/src/main.cpp index c02e8e8383..37dd301d1c 100644 --- a/animation-server/src/main.cpp +++ b/animation-server/src/main.cpp @@ -244,7 +244,6 @@ static void renderMovingBug() { } - float intensity = 0.5f; float intensityIncrement = 0.1f; const float MAX_INTENSITY = 1.0f; diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8f78c2f770..925d629933 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1991,7 +1991,7 @@ void Application::displaySide(Camera& whichCamera) { // Enable to show line from me to the voxel I am touching //renderLineToTouchedVoxel(); - renderThrustAtVoxel(_voxelThrust); + //renderThrustAtVoxel(_voxelThrust); // draw a red sphere float sphereRadius = 0.25f; diff --git a/interface/src/Application.h b/interface/src/Application.h index ac45415d43..655268024b 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -95,6 +95,9 @@ private slots: void setRenderFirstPerson(bool firstPerson); + void renderThrustAtVoxel(glm::vec3 thrust); + void renderLineToTouchedVoxel(); + void setFrustumOffset(bool frustumOffset); void cycleFrustumRenderMode(); @@ -143,10 +146,7 @@ private: void displayStats(); void renderViewFrustum(ViewFrustum& viewFrustum); - - void renderLineToTouchedVoxel(); - void renderThrustAtVoxel(glm::vec3 thrust); - + void setupPaintingVoxel(); void shiftPaintingColor(); void maybeEditVoxelUnderCursor();