Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove more unnecessary additions.

Browse source
This commit is contained in:
Mark Peng 2013-07-19 01:00:55 -07:00
parent ceb743a65d
commit a14768bb29
3 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.h
View file

@ -42,7 +42,6 @@
#include "ViewFrustum.h" #include "ViewFrustum.h"
#include "VoxelSystem.h" #include "VoxelSystem.h"
#include "Webcam.h" #include "Webcam.h"
#include "Plane.h"
class QAction; class QAction;

5
libraries/voxels/src/ViewFrustum.cpp
View file

@ -364,11 +364,6 @@ bool ViewFrustum::matches(const ViewFrustum& compareTo, bool debug) const {
return result; 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 { void ViewFrustum::computePickRay(float x, float y, glm::vec3& origin, glm::vec3& direction) const {
origin = _nearTopLeft + x*(_nearTopRight - _nearTopLeft) + y*(_nearBottomLeft - _nearTopLeft); origin = _nearTopLeft + x*(_nearTopRight - _nearTopLeft) + y*(_nearBottomLeft - _nearTopLeft);
direction = glm::normalize(origin - _position); direction = glm::normalize(origin - _position);

2
libraries/voxels/src/ViewFrustum.h
View file

@ -83,8 +83,6 @@ public:
bool matches(const ViewFrustum& compareTo, bool debug = false) const; bool matches(const ViewFrustum& compareTo, bool debug = false) const;
bool matches(const ViewFrustum* compareTo, bool debug = false) const { return matches(*compareTo, debug); }; 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 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, void computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& near, float& far,