From a14768bb29b558250f66f79602d7607dbff5f320 Mon Sep 17 00:00:00 2001 From: Mark Peng Date: Fri, 19 Jul 2013 01:00:55 -0700 Subject: [PATCH] Remove more unnecessary additions. --- interface/src/Application.h | 1 - libraries/voxels/src/ViewFrustum.cpp | 5 ----- libraries/voxels/src/ViewFrustum.h | 2 -- 3 files changed, 8 deletions(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index d09290c66e..b577fa3af2 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -42,7 +42,6 @@ #include "ViewFrustum.h" #include "VoxelSystem.h" #include "Webcam.h" -#include "Plane.h" class QAction; diff --git a/libraries/voxels/src/ViewFrustum.cpp b/libraries/voxels/src/ViewFrustum.cpp index 1122f6476e..ae48dbbe7d 100644 --- a/libraries/voxels/src/ViewFrustum.cpp +++ b/libraries/voxels/src/ViewFrustum.cpp @@ -364,11 +364,6 @@ bool ViewFrustum::matches(const ViewFrustum& compareTo, bool debug) const { return result; } -void ViewFrustum::computeNormalToOffset(glm::vec3& normal) const { - Plane offsetPlane(_offsetPosition, _offsetRight, _offsetUp); - normal = offsetPlane.getNormal(); -} - void ViewFrustum::computePickRay(float x, float y, glm::vec3& origin, glm::vec3& direction) const { origin = _nearTopLeft + x*(_nearTopRight - _nearTopLeft) + y*(_nearBottomLeft - _nearTopLeft); direction = glm::normalize(origin - _position); diff --git a/libraries/voxels/src/ViewFrustum.h b/libraries/voxels/src/ViewFrustum.h index 9ecca573af..188b85c0de 100644 --- a/libraries/voxels/src/ViewFrustum.h +++ b/libraries/voxels/src/ViewFrustum.h @@ -83,8 +83,6 @@ public: bool matches(const ViewFrustum& compareTo, bool debug = false) const; bool matches(const ViewFrustum* compareTo, bool debug = false) const { return matches(*compareTo, debug); }; - void computeNormalToOffset(glm::vec3& normal) const; - void computePickRay(float x, float y, glm::vec3& origin, glm::vec3& direction) const; void computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& near, float& far,