Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-13 21:27:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Review fixes

Browse source
This commit is contained in:
Atlante45 2014-03-04 10:48:53 -08:00
parent de679b20ad
commit 66b0590509
5 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ClipboardScriptingInterface.cpp
View file

@ -5,8 +5,6 @@
// Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
//
#include <LocalVoxelsList.h>
#include "Application.h"
#include "ClipboardScriptingInterface.h"

1
interface/src/ui/LocalVoxelsOverlay.cpp
View file

@ -23,7 +23,6 @@ LocalVoxelsOverlay::LocalVoxelsOverlay() :
Volume3DOverlay(),
_voxelCount(0)
{
_wantDeleteOnRenderThread = true;
}
LocalVoxelsOverlay::~LocalVoxelsOverlay() {

1
interface/src/ui/Overlay.cpp
View file

@ -18,7 +18,6 @@
Overlay::Overlay() :
_parent(NULL),
_wantDeleteOnRenderThread(false),
_alpha(DEFAULT_ALPHA),
_color(DEFAULT_BACKGROUND_COLOR),
_visible(true)

3
interface/src/ui/Overlay.h
View file

@ -32,7 +32,6 @@ public:
virtual void render() = 0;
// getters
bool deleteOnRenderThread() { return _wantDeleteOnRenderThread; }
bool getVisible() const { return _visible; }
const xColor& getColor() const { return _color; }
float getAlpha() const { return _alpha; }
@ -46,8 +45,6 @@ public:
protected:
QGLWidget* _parent;
bool _wantDeleteOnRenderThread;
float _alpha;
xColor _color;
bool _visible; // should the overlay be drawn at all

7
interface/src/ui/Overlays.cpp
View file

@ -141,12 +141,7 @@ void Overlays::deleteOverlay(unsigned int id) {
return;
}
if (overlayToDelete->deleteOnRenderThread()) {
_overlaysToDelete.push_back(overlayToDelete);
} else {
delete overlayToDelete;
}
_overlaysToDelete.push_back(overlayToDelete);
}
unsigned int Overlays::getOverlayAtPoint(const glm::vec2& point) {