mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 03:37:49 +02:00
Remove more unnecessary additions.
This commit is contained in:
parent
ceb743a65d
commit
a14768bb29
3 changed files with 0 additions and 8 deletions
|
@ -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;
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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,
|
||||||
|
|
Loading…
Reference in a new issue