mirror of
https://github.com/overte-org/overte.git
synced 2025-06-06 14:42:44 +02:00
Remove unused Overlays property, borderSize, and associated code
This commit is contained in:
parent
dd5cc8677d
commit
0c0734a255
7 changed files with 4 additions and 45 deletions
|
@ -4717,7 +4717,6 @@ void Application::setKeyboardFocusHighlight(const glm::vec3& position, const glm
|
||||||
if (_keyboardFocusHighlightID == UNKNOWN_OVERLAY_ID || !getOverlays().isAddedOverlay(_keyboardFocusHighlightID)) {
|
if (_keyboardFocusHighlightID == UNKNOWN_OVERLAY_ID || !getOverlays().isAddedOverlay(_keyboardFocusHighlightID)) {
|
||||||
_keyboardFocusHighlight = std::make_shared<Cube3DOverlay>();
|
_keyboardFocusHighlight = std::make_shared<Cube3DOverlay>();
|
||||||
_keyboardFocusHighlight->setAlpha(1.0f);
|
_keyboardFocusHighlight->setAlpha(1.0f);
|
||||||
_keyboardFocusHighlight->setBorderSize(1.0f);
|
|
||||||
_keyboardFocusHighlight->setColor({ 0xFF, 0xEF, 0x00 });
|
_keyboardFocusHighlight->setColor({ 0xFF, 0xEF, 0x00 });
|
||||||
_keyboardFocusHighlight->setIsSolid(false);
|
_keyboardFocusHighlight->setIsSolid(false);
|
||||||
_keyboardFocusHighlight->setPulseMin(0.5);
|
_keyboardFocusHighlight->setPulseMin(0.5);
|
||||||
|
|
|
@ -125,13 +125,6 @@ Cube3DOverlay* Cube3DOverlay::createClone() const {
|
||||||
|
|
||||||
void Cube3DOverlay::setProperties(const QVariantMap& properties) {
|
void Cube3DOverlay::setProperties(const QVariantMap& properties) {
|
||||||
Volume3DOverlay::setProperties(properties);
|
Volume3DOverlay::setProperties(properties);
|
||||||
|
|
||||||
auto borderSize = properties["borderSize"];
|
|
||||||
|
|
||||||
if (borderSize.isValid()) {
|
|
||||||
float value = borderSize.toFloat();
|
|
||||||
setBorderSize(value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**jsdoc
|
/**jsdoc
|
||||||
|
@ -177,14 +170,8 @@ void Cube3DOverlay::setProperties(const QVariantMap& properties) {
|
||||||
* <code>parentID</code> is an avatar skeleton. A value of <code>65535</code> means "no joint".
|
* <code>parentID</code> is an avatar skeleton. A value of <code>65535</code> means "no joint".
|
||||||
*
|
*
|
||||||
* @property {Vec3} dimensions - The dimensions of the overlay. Synonyms: <code>scale</code>, <code>size</code>.
|
* @property {Vec3} dimensions - The dimensions of the overlay. Synonyms: <code>scale</code>, <code>size</code>.
|
||||||
*
|
|
||||||
* @property {number} borderSize - Not used.
|
|
||||||
*/
|
*/
|
||||||
QVariant Cube3DOverlay::getProperty(const QString& property) {
|
QVariant Cube3DOverlay::getProperty(const QString& property) {
|
||||||
if (property == "borderSize") {
|
|
||||||
return _borderSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Volume3DOverlay::getProperty(property);
|
return Volume3DOverlay::getProperty(property);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,10 +29,6 @@ public:
|
||||||
|
|
||||||
virtual Cube3DOverlay* createClone() const override;
|
virtual Cube3DOverlay* createClone() const override;
|
||||||
|
|
||||||
float getBorderSize() const { return _borderSize; }
|
|
||||||
|
|
||||||
void setBorderSize(float value) { _borderSize = value; }
|
|
||||||
|
|
||||||
void setProperties(const QVariantMap& properties) override;
|
void setProperties(const QVariantMap& properties) override;
|
||||||
QVariant getProperty(const QString& property) override;
|
QVariant getProperty(const QString& property) override;
|
||||||
|
|
||||||
|
@ -40,7 +36,6 @@ protected:
|
||||||
Transform evalRenderTransform() override;
|
Transform evalRenderTransform() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
float _borderSize;
|
|
||||||
// edges on a cube
|
// edges on a cube
|
||||||
std::array<int, 12> _geometryIds;
|
std::array<int, 12> _geometryIds;
|
||||||
};
|
};
|
||||||
|
|
|
@ -99,13 +99,6 @@ void Shape3DOverlay::setProperties(const QVariantMap& properties) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
auto borderSize = properties["borderSize"];
|
|
||||||
|
|
||||||
if (borderSize.isValid()) {
|
|
||||||
float value = borderSize.toFloat();
|
|
||||||
setBorderSize(value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**jsdoc
|
/**jsdoc
|
||||||
|
@ -153,13 +146,8 @@ void Shape3DOverlay::setProperties(const QVariantMap& properties) {
|
||||||
* @property {Vec3} dimensions - The dimensions of the overlay. Synonyms: <code>scale</code>, <code>size</code>.
|
* @property {Vec3} dimensions - The dimensions of the overlay. Synonyms: <code>scale</code>, <code>size</code>.
|
||||||
*
|
*
|
||||||
* @property {Shape} shape=Hexagon - The geometrical shape of the overlay.
|
* @property {Shape} shape=Hexagon - The geometrical shape of the overlay.
|
||||||
* @property {number} borderSize - Not used.
|
|
||||||
*/
|
*/
|
||||||
QVariant Shape3DOverlay::getProperty(const QString& property) {
|
QVariant Shape3DOverlay::getProperty(const QString& property) {
|
||||||
if (property == "borderSize") {
|
|
||||||
return _borderSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (property == "shape") {
|
if (property == "shape") {
|
||||||
return shapeStrings[_shape];
|
return shapeStrings[_shape];
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,10 +30,6 @@ public:
|
||||||
|
|
||||||
virtual Shape3DOverlay* createClone() const override;
|
virtual Shape3DOverlay* createClone() const override;
|
||||||
|
|
||||||
float getBorderSize() const { return _borderSize; }
|
|
||||||
|
|
||||||
void setBorderSize(float value) { _borderSize = value; }
|
|
||||||
|
|
||||||
void setProperties(const QVariantMap& properties) override;
|
void setProperties(const QVariantMap& properties) override;
|
||||||
QVariant getProperty(const QString& property) override;
|
QVariant getProperty(const QString& property) override;
|
||||||
|
|
||||||
|
@ -41,7 +37,6 @@ protected:
|
||||||
Transform evalRenderTransform() override;
|
Transform evalRenderTransform() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
float _borderSize;
|
|
||||||
GeometryCache::Shape _shape { GeometryCache::Hexagon };
|
GeometryCache::Shape _shape { GeometryCache::Hexagon };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,6 @@ function updateOverlay(entityID, queryAACube) {
|
||||||
blue: 255
|
blue: 255
|
||||||
},
|
},
|
||||||
alpha: 1,
|
alpha: 1,
|
||||||
// borderSize: ...,
|
|
||||||
solid: false
|
solid: false
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -339,8 +339,7 @@ SelectionDisplay = (function() {
|
||||||
solid: grabberSolid,
|
solid: grabberSolid,
|
||||||
visible: false,
|
visible: false,
|
||||||
dashed: false,
|
dashed: false,
|
||||||
drawInFront: true,
|
drawInFront: true
|
||||||
borderSize: 1.4
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var grabberPropertiesEdge = {
|
var grabberPropertiesEdge = {
|
||||||
|
@ -351,8 +350,7 @@ SelectionDisplay = (function() {
|
||||||
solid: grabberSolid,
|
solid: grabberSolid,
|
||||||
visible: false,
|
visible: false,
|
||||||
dashed: false,
|
dashed: false,
|
||||||
drawInFront: true,
|
drawInFront: true
|
||||||
borderSize: 1.4
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var grabberPropertiesFace = {
|
var grabberPropertiesFace = {
|
||||||
|
@ -363,8 +361,7 @@ SelectionDisplay = (function() {
|
||||||
solid: grabberSolid,
|
solid: grabberSolid,
|
||||||
visible: false,
|
visible: false,
|
||||||
dashed: false,
|
dashed: false,
|
||||||
drawInFront: true,
|
drawInFront: true
|
||||||
borderSize: 1.4
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var grabberPropertiesCloner = {
|
var grabberPropertiesCloner = {
|
||||||
|
@ -375,8 +372,7 @@ SelectionDisplay = (function() {
|
||||||
solid: grabberSolid,
|
solid: grabberSolid,
|
||||||
visible: false,
|
visible: false,
|
||||||
dashed: false,
|
dashed: false,
|
||||||
drawInFront: true,
|
drawInFront: true
|
||||||
borderSize: 1.4
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var spotLightLineProperties = {
|
var spotLightLineProperties = {
|
||||||
|
|
Loading…
Reference in a new issue