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

Merge remote-tracking branch 'upstream/master' into overlay

Browse source
This commit is contained in:
Brad Davis 2015-06-20 22:54:45 -07:00
commit e66b2d4141
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/ui/overlays/Line3DOverlay.cpp
View file

@ -32,6 +32,16 @@ Line3DOverlay::Line3DOverlay(const Line3DOverlay* line3DOverlay) :
Line3DOverlay::~Line3DOverlay() { Line3DOverlay::~Line3DOverlay() {
} }
AABox Line3DOverlay::getBounds() const {
auto start = _position + _start;
auto end = _position + _end;
auto min = glm::min(start, end);
auto max = glm::max(start, end);
return AABox(min, max - min);
}
void Line3DOverlay::render(RenderArgs* args) { void Line3DOverlay::render(RenderArgs* args) {
if (!_visible) { if (!_visible) {
return; // do nothing if we're not visible return; // do nothing if we're not visible

1
interface/src/ui/overlays/Line3DOverlay.h
View file

@ -21,6 +21,7 @@ public:
Line3DOverlay(const Line3DOverlay* line3DOverlay); Line3DOverlay(const Line3DOverlay* line3DOverlay);
~Line3DOverlay(); ~Line3DOverlay();
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args);
virtual AABox getBounds() const override;
// getters // getters
const glm::vec3& getStart() const { return _start; } const glm::vec3& getStart() const { return _start; }