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

Render circle in 3D space for lookatIndicator. Still not normal to the screen.

Browse source
This commit is contained in:
Mark Peng 2013-07-18 14:34:51 -07:00
parent 6006b8e96b
commit 7ee0d8da2e
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -1907,9 +1907,12 @@ void Application::renderLookatIndicator(glm::vec3 pointOfInterest, Camera& which
glColor3f(1.0f, 0.0f, 0.0f); glColor3f(1.0f, 0.0f, 0.0f);
// renderCircle(haloOrigin, 0.1f, glm::vec3(0.0f, 1.0f, 0.0f), 30); // renderCircle(haloOrigin, 0.1f, glm::vec3(0.0f, 1.0f, 0.0f), 30);
// glm::vec3 normal; loadViewFrustum(_myCamera, _viewFrustum);
// _viewFrustum.computeNormalToNearClipPlane(normal); glm::vec3 normal;
renderCircle(indicatorOrigin, 0.1f, _viewFrustum.getDirection(), 30); _viewFrustum.computeNormalToOffset(normal);
// Plane::Plane p(_viewFrustum.getOffsetPosition(), _viewFrustum.getOffsetUp(), _viewFrustum.getOffsetRight());
renderCircle(indicatorOrigin, 0.1f, normal, 30);
} }
void Application::update(float deltaTime) { void Application::update(float deltaTime) {

1
interface/src/Application.h
View file

@ -42,6 +42,7 @@
#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;

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

@ -364,9 +364,9 @@ bool ViewFrustum::matches(const ViewFrustum& compareTo, bool debug) const {
return result; return result;
} }
void ViewFrustum::computeNormalToNearClipPlane(glm::vec3& normal) const { void ViewFrustum::computeNormalToOffset(glm::vec3& normal) const {
Plane nearClipPlane(_nearTopLeft, _nearTopRight, _nearBottomLeft); Plane offsetPlane(_offsetPosition, _offsetRight, _offsetUp);
normal = nearClipPlane.getNormal(); 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 {

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

@ -83,7 +83,7 @@ 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 computeNormalToNearClipPlane(glm::vec3& normal) const; 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;