From 38f74c184339267f33073ca31ead51a5c0038424 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 9 May 2016 17:45:30 -0700
Subject: [PATCH 1/3] Remove the last of the glow level
---
interface/resources/qml/hifi/MenuOption.qml | 1 -
interface/resources/shaders/glow_add.frag | 20 --------
.../resources/shaders/glow_add_separate.frag | 23 ---------
interface/src/Menu.h | 1 -
interface/src/ui/overlays/Overlay.cpp | 48 +++++--------------
interface/src/ui/overlays/Overlay.h | 7 ---
libraries/entities/src/BoxEntityItem.cpp | 3 --
libraries/entities/src/EntityItem.cpp | 3 --
libraries/entities/src/EntityItem.h | 4 --
.../entities/src/EntityItemProperties.cpp | 5 --
libraries/entities/src/EntityItemProperties.h | 5 --
.../src/EntityItemPropertiesDefaults.h | 1 -
libraries/entities/src/LineEntityItem.cpp | 4 --
libraries/entities/src/ModelEntityItem.cpp | 1 -
.../entities/src/ParticleEffectEntityItem.cpp | 2 -
libraries/entities/src/PolyLineEntityItem.cpp | 3 --
16 files changed, 11 insertions(+), 120 deletions(-)
delete mode 100644 interface/resources/shaders/glow_add.frag
delete mode 100644 interface/resources/shaders/glow_add_separate.frag
diff --git a/interface/resources/qml/hifi/MenuOption.qml b/interface/resources/qml/hifi/MenuOption.qml
index 9d18b56d57..46cf5d9662 100644
--- a/interface/resources/qml/hifi/MenuOption.qml
+++ b/interface/resources/qml/hifi/MenuOption.qml
@@ -76,7 +76,6 @@ QtObject {
readonly property string forward: "Forward";
readonly property string frameTimer: "Show Timer";
readonly property string fullscreenMirror: "Mirror";
- readonly property string glowWhenSpeaking: "Glow When Speaking";
readonly property string help: "Help...";
readonly property string increaseAvatarSize: "Increase Avatar Size";
readonly property string independentMode: "Independent Mode";
diff --git a/interface/resources/shaders/glow_add.frag b/interface/resources/shaders/glow_add.frag
deleted file mode 100644
index e8a1b504ea..0000000000
--- a/interface/resources/shaders/glow_add.frag
+++ /dev/null
@@ -1,20 +0,0 @@
-#version 120
-
-//
-// glow_add.frag
-// fragment shader
-//
-// Created by Andrzej Kapolka on 8/14/13.
-// Copyright 2013 High Fidelity, Inc.
-//
-// Distributed under the Apache License, Version 2.0.
-// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-// the texture containing the original color
-uniform sampler2D originalTexture;
-
-void main(void) {
- vec4 color = texture2D(originalTexture, gl_TexCoord[0].st);
- gl_FragColor = color * (1.0 + color.a);
-}
diff --git a/interface/resources/shaders/glow_add_separate.frag b/interface/resources/shaders/glow_add_separate.frag
deleted file mode 100644
index e798a3b11f..0000000000
--- a/interface/resources/shaders/glow_add_separate.frag
+++ /dev/null
@@ -1,23 +0,0 @@
-#version 120
-
-//
-// glow_add_separate.frag
-// fragment shader
-//
-// Created by Andrzej Kapolka on 8/14/13.
-// Copyright 2013 High Fidelity, Inc.
-//
-// Distributed under the Apache License, Version 2.0.
-// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-// the texture containing the original color
-uniform sampler2D originalTexture;
-
-// the texture containing the blurred color
-uniform sampler2D blurredTexture;
-
-void main(void) {
- vec4 blurred = texture2D(blurredTexture, gl_TexCoord[0].st);
- gl_FragColor = blurred * blurred.a + texture2D(originalTexture, gl_TexCoord[0].st) * (1.0 + blurred.a * 0.5);
-}
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index fdb136b900..adb3b41bed 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -111,7 +111,6 @@ namespace MenuOption {
const QString Forward = "Forward";
const QString FrameTimer = "Show Timer";
const QString FullscreenMirror = "Mirror";
- const QString GlowWhenSpeaking = "Glow When Speaking";
const QString Help = "Help...";
const QString IncreaseAvatarSize = "Increase Avatar Size";
const QString IndependentMode = "Independent Mode";
diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index a53daf7d14..5d2c315a92 100644
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@@ -20,14 +20,12 @@ Overlay::Overlay() :
_renderItemID(render::Item::INVALID_ITEM_ID),
_isLoaded(true),
_alpha(DEFAULT_ALPHA),
- _glowLevel(0.0f),
_pulse(0.0f),
_pulseMax(0.0f),
_pulseMin(0.0f),
_pulsePeriod(1.0f),
_pulseDirection(1.0f),
_lastPulseUpdate(usecTimestampNow()),
- _glowLevelPulse(0.0f),
_alphaPulse(0.0f),
_colorPulse(0.0f),
_color(DEFAULT_OVERLAY_COLOR),
@@ -40,14 +38,12 @@ Overlay::Overlay(const Overlay* overlay) :
_renderItemID(render::Item::INVALID_ITEM_ID),
_isLoaded(overlay->_isLoaded),
_alpha(overlay->_alpha),
- _glowLevel(overlay->_glowLevel),
_pulse(overlay->_pulse),
_pulseMax(overlay->_pulseMax),
_pulseMin(overlay->_pulseMin),
_pulsePeriod(overlay->_pulsePeriod),
_pulseDirection(overlay->_pulseDirection),
_lastPulseUpdate(usecTimestampNow()),
- _glowLevelPulse(overlay->_glowLevelPulse),
_alphaPulse(overlay->_alphaPulse),
_colorPulse(overlay->_colorPulse),
_color(overlay->_color),
@@ -69,10 +65,6 @@ void Overlay::setProperties(const QVariantMap& properties) {
if (properties["alpha"].isValid()) {
setAlpha(properties["alpha"].toFloat());
}
-
- if (properties["glowLevel"].isValid()) {
- setGlowLevel(properties["glowLevel"].toFloat());
- }
if (properties["pulseMax"].isValid()) {
setPulseMax(properties["pulseMax"].toFloat());
@@ -86,10 +78,6 @@ void Overlay::setProperties(const QVariantMap& properties) {
setPulsePeriod(properties["pulsePeriod"].toFloat());
}
- if (properties["glowLevelPulse"].isValid()) {
- setGlowLevelPulse(properties["glowLevelPulse"].toFloat());
- }
-
if (properties["alphaPulse"].isValid()) {
setAlphaPulse(properties["alphaPulse"].toFloat());
}
@@ -118,9 +106,6 @@ QVariant Overlay::getProperty(const QString& property) {
if (property == "alpha") {
return _alpha;
}
- if (property == "glowLevel") {
- return _glowLevel;
- }
if (property == "pulseMax") {
return _pulseMax;
}
@@ -130,9 +115,6 @@ QVariant Overlay::getProperty(const QString& property) {
if (property == "pulsePeriod") {
return _pulsePeriod;
}
- if (property == "glowLevelPulse") {
- return _glowLevelPulse;
- }
if (property == "alphaPulse") {
return _alphaPulse;
}
@@ -176,16 +158,8 @@ float Overlay::getAlpha() {
return (_alphaPulse >= 0.0f) ? _alpha * pulseLevel : _alpha * (1.0f - pulseLevel);
}
-float Overlay::getGlowLevel() {
- if (_glowLevelPulse == 0.0f) {
- return _glowLevel;
- }
- float pulseLevel = updatePulse();
- return (_glowLevelPulse >= 0.0f) ? _glowLevel * pulseLevel : _glowLevel * (1.0f - pulseLevel);
-}
-
-// glow level travels from min to max, then max to min in one period.
+// pulse travels from min to max, then max to min in one period.
float Overlay::updatePulse() {
if (_pulsePeriod <= 0.0f) {
return _pulse;
@@ -196,25 +170,25 @@ float Overlay::updatePulse() {
float elapsedPeriods = elapsedSeconds / _pulsePeriod;
// we can safely remove any "full" periods, since those just rotate us back
- // to our final glow level
+ // to our final pulse level
elapsedPeriods = fmod(elapsedPeriods, 1.0f);
_lastPulseUpdate = now;
- float glowDistance = (_pulseMax - _pulseMin);
- float glowDistancePerPeriod = glowDistance * 2.0f;
+ float pulseDistance = (_pulseMax - _pulseMin);
+ float pulseDistancePerPeriod = pulseDistance * 2.0f;
- float glowDelta = _pulseDirection * glowDistancePerPeriod * elapsedPeriods;
- float newGlow = _pulse + glowDelta;
+ float pulseDelta = _pulseDirection * pulseDistancePerPeriod * elapsedPeriods;
+ float newPulse = _pulse + pulseDelta;
float limit = (_pulseDirection > 0.0f) ? _pulseMax : _pulseMin;
- float passedLimit = (_pulseDirection > 0.0f) ? (newGlow >= limit) : (newGlow <= limit);
+ float passedLimit = (_pulseDirection > 0.0f) ? (newPulse >= limit) : (newPulse <= limit);
if (passedLimit) {
- float glowDeltaToLimit = newGlow - limit;
- float glowDeltaFromLimitBack = glowDelta - glowDeltaToLimit;
- glowDelta = -glowDeltaFromLimitBack;
+ float pulseDeltaToLimit = newPulse - limit;
+ float pulseDeltaFromLimitBack = pulseDelta - pulseDeltaToLimit;
+ pulseDelta = -pulseDeltaFromLimitBack;
_pulseDirection *= -1.0f;
}
- _pulse += glowDelta;
+ _pulse += pulseDelta;
return _pulse;
}
diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h
index a2cf7a30f2..466ec0e913 100644
--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@@ -49,7 +49,6 @@ public:
bool getVisible() const { return _visible; }
xColor getColor();
float getAlpha();
- float getGlowLevel();
Anchor getAnchor() const { return _anchor; }
float getPulseMax() const { return _pulseMax; }
@@ -57,7 +56,6 @@ public:
float getPulsePeriod() const { return _pulsePeriod; }
float getPulseDirection() const { return _pulseDirection; }
- float getGlowLevelPulse() const { return _glowLevelPulse; }
float getColorPulse() const { return _colorPulse; }
float getAlphaPulse() const { return _alphaPulse; }
@@ -65,7 +63,6 @@ public:
void setVisible(bool visible) { _visible = visible; }
void setColor(const xColor& color) { _color = color; }
void setAlpha(float alpha) { _alpha = alpha; }
- void setGlowLevel(float value) { _glowLevel = value; }
void setAnchor(Anchor anchor) { _anchor = anchor; }
void setPulseMax(float value) { _pulseMax = value; }
@@ -73,8 +70,6 @@ public:
void setPulsePeriod(float value) { _pulsePeriod = value; }
void setPulseDirection(float value) { _pulseDirection = value; }
-
- void setGlowLevelPulse(float value) { _glowLevelPulse = value; }
void setColorPulse(float value) { _colorPulse = value; }
void setAlphaPulse(float value) { _alphaPulse = value; }
@@ -92,7 +87,6 @@ protected:
bool _isLoaded;
float _alpha;
- float _glowLevel;
float _pulse;
float _pulseMax;
@@ -101,7 +95,6 @@ protected:
float _pulseDirection;
quint64 _lastPulseUpdate;
- float _glowLevelPulse; // ratio of the pulse to the glow level
float _alphaPulse; // ratio of the pulse to the alpha
float _colorPulse; // ratio of the pulse to the color
diff --git a/libraries/entities/src/BoxEntityItem.cpp b/libraries/entities/src/BoxEntityItem.cpp
index 061c5b3854..bf02d383ab 100644
--- a/libraries/entities/src/BoxEntityItem.cpp
+++ b/libraries/entities/src/BoxEntityItem.cpp
@@ -36,9 +36,6 @@ EntityItemProperties BoxEntityItem::getProperties(EntityPropertyFlags desiredPro
properties._color = getXColor();
properties._colorChanged = false;
- properties._glowLevel = getGlowLevel();
- properties._glowLevelChanged = false;
-
return properties;
}
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 187c4f51be..bd4292f75d 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -46,7 +46,6 @@ EntityItem::EntityItem(const EntityItemID& entityItemID) :
_lastEditedFromRemoteInRemoteTime(0),
_created(UNKNOWN_CREATED_TIME),
_changedOnServer(0),
- _glowLevel(ENTITY_ITEM_DEFAULT_GLOW_LEVEL),
_localRenderAlpha(ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA),
_density(ENTITY_ITEM_DEFAULT_DENSITY),
_volumeMultiplier(1.0f),
@@ -1116,7 +1115,6 @@ EntityItemProperties EntityItem::getProperties(EntityPropertyFlags desiredProper
COPY_ENTITY_PROPERTY_TO_PROPERTIES(registrationPoint, getRegistrationPoint);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(angularVelocity, getLocalAngularVelocity);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(angularDamping, getAngularDamping);
- COPY_ENTITY_PROPERTY_TO_PROPERTIES(glowLevel, getGlowLevel);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(localRenderAlpha, getLocalRenderAlpha);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(visible, getVisible);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(collisionless, getCollisionless);
@@ -1211,7 +1209,6 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
SET_ENTITY_PROPERTY_FROM_PROPERTIES(script, setScript);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(scriptTimestamp, setScriptTimestamp);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(collisionSoundURL, setCollisionSoundURL);
- SET_ENTITY_PROPERTY_FROM_PROPERTIES(glowLevel, setGlowLevel);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(localRenderAlpha, setLocalRenderAlpha);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(visible, setVisible);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(locked, setLocked);
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 8868830c8a..4d3d93e40f 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -186,9 +186,6 @@ public:
inline const glm::vec3 getDimensions() const { return getScale(); }
virtual void setDimensions(const glm::vec3& value);
- float getGlowLevel() const { return _glowLevel; }
- void setGlowLevel(float glowLevel) { _glowLevel = glowLevel; }
-
float getLocalRenderAlpha() const { return _localRenderAlpha; }
void setLocalRenderAlpha(float localRenderAlpha) { _localRenderAlpha = localRenderAlpha; }
@@ -460,7 +457,6 @@ protected:
mutable bool _recalcMinAACube = true;
mutable bool _recalcMaxAACube = true;
- float _glowLevel;
float _localRenderAlpha;
float _density = ENTITY_ITEM_DEFAULT_DENSITY; // kg/m^3
// NOTE: _volumeMultiplier is used to allow some mass properties code exist in the EntityItem base class
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 738e8910fe..7893fe4a37 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -38,10 +38,8 @@ _idSet(false),
_lastEdited(0),
_type(EntityTypes::Unknown),
-_glowLevel(0.0f),
_localRenderAlpha(1.0f),
-_glowLevelChanged(false),
_localRenderAlphaChanged(false),
_defaultSettings(true),
@@ -542,7 +540,6 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LOCAL_ROTATION, localRotation);
// FIXME - I don't think these properties are supported any more
- //COPY_PROPERTY_TO_QSCRIPTVALUE(glowLevel);
//COPY_PROPERTY_TO_QSCRIPTVALUE(localRenderAlpha);
return properties;
@@ -582,7 +579,6 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
COPY_PROPERTY_FROM_QSCRIPTVALUE(emitterShouldTrail , bool, setEmitterShouldTrail);
COPY_PROPERTY_FROM_QSCRIPTVALUE(modelURL, QString, setModelURL);
COPY_PROPERTY_FROM_QSCRIPTVALUE(compoundShapeURL, QString, setCompoundShapeURL);
- COPY_PROPERTY_FROM_QSCRIPTVALUE(glowLevel, float, setGlowLevel);
COPY_PROPERTY_FROM_QSCRIPTVALUE(localRenderAlpha, float, setLocalRenderAlpha);
COPY_PROPERTY_FROM_QSCRIPTVALUE(collisionless, bool, setCollisionless);
COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(ignoreForCollisions, bool, setCollisionless, getCollisionless); // legacy support
@@ -1468,7 +1464,6 @@ void EntityItemProperties::markAllChanged() {
_alphaChanged = true;
_modelURLChanged = true;
_compoundShapeURLChanged = true;
- _glowLevelChanged = true;
_localRenderAlphaChanged = true;
_isSpotlightChanged = true;
_collisionlessChanged = true;
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 2cf31e5632..49981913b5 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -218,9 +218,7 @@ public:
bool containsPositionChange() const { return _positionChanged; }
bool containsDimensionsChange() const { return _dimensionsChanged; }
- float getGlowLevel() const { return _glowLevel; }
float getLocalRenderAlpha() const { return _localRenderAlpha; }
- void setGlowLevel(float value) { _glowLevel = value; _glowLevelChanged = true; }
void setLocalRenderAlpha(float value) { _localRenderAlpha = value; _localRenderAlphaChanged = true; }
static bool encodeEntityEditPacket(PacketType command, EntityItemID id, const EntityItemProperties& properties,
@@ -231,7 +229,6 @@ public:
static bool decodeEntityEditPacket(const unsigned char* data, int bytesToRead, int& processedBytes,
EntityItemID& entityID, EntityItemProperties& properties);
- bool glowLevelChanged() const { return _glowLevelChanged; }
bool localRenderAlphaChanged() const { return _localRenderAlphaChanged; }
void clearID() { _id = UNKNOWN_ENTITY_ID; _idSet = false; }
@@ -287,9 +284,7 @@ private:
EntityTypes::EntityType _type;
void setType(const QString& typeName) { _type = EntityTypes::getEntityTypeFromName(typeName); }
- float _glowLevel;
float _localRenderAlpha;
- bool _glowLevelChanged;
bool _localRenderAlphaChanged;
bool _defaultSettings;
bool _dimensionsInitialized = true; // Only false if creating an entity localy with no dimensions properties
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index d5d44bb4a8..4ec0bea7df 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -31,7 +31,6 @@ const QUuid ENTITY_ITEM_DEFAULT_SIMULATOR_ID = QUuid();
const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;
const float ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;
-const float ENTITY_ITEM_DEFAULT_GLOW_LEVEL = 0.0f;
const bool ENTITY_ITEM_DEFAULT_VISIBLE = true;
const QString ENTITY_ITEM_DEFAULT_SCRIPT = QString("");
diff --git a/libraries/entities/src/LineEntityItem.cpp b/libraries/entities/src/LineEntityItem.cpp
index 78b6107d88..7b36856794 100644
--- a/libraries/entities/src/LineEntityItem.cpp
+++ b/libraries/entities/src/LineEntityItem.cpp
@@ -53,10 +53,6 @@ EntityItemProperties LineEntityItem::getProperties(EntityPropertyFlags desiredPr
COPY_ENTITY_PROPERTY_TO_PROPERTIES(linePoints, getLinePoints);
-
- properties._glowLevel = getGlowLevel();
- properties._glowLevelChanged = false;
-
return properties;
}
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 2ec1f5e9ed..40faf2c3c3 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -58,7 +58,6 @@ EntityItemProperties ModelEntityItem::getProperties(EntityPropertyFlags desiredP
COPY_ENTITY_PROPERTY_TO_PROPERTIES(color, getXColor);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(modelURL, getModelURL);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(compoundShapeURL, getCompoundShapeURL);
- COPY_ENTITY_PROPERTY_TO_PROPERTIES(glowLevel, getGlowLevel);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(textures, getTextures);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(shapeType, getShapeType);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(jointRotationsSet, getJointRotationsSet);
diff --git a/libraries/entities/src/ParticleEffectEntityItem.cpp b/libraries/entities/src/ParticleEffectEntityItem.cpp
index 02a86ab952..a7bd0038e6 100644
--- a/libraries/entities/src/ParticleEffectEntityItem.cpp
+++ b/libraries/entities/src/ParticleEffectEntityItem.cpp
@@ -304,7 +304,6 @@ EntityItemProperties ParticleEffectEntityItem::getProperties(EntityPropertyFlags
COPY_ENTITY_PROPERTY_TO_PROPERTIES(color, getXColor);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(alpha, getAlpha);
- COPY_ENTITY_PROPERTY_TO_PROPERTIES(glowLevel, getGlowLevel);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(shapeType, getShapeType); // FIXME - this doesn't appear to get used
COPY_ENTITY_PROPERTY_TO_PROPERTIES(maxParticles, getMaxParticles);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(lifespan, getLifespan);
@@ -343,7 +342,6 @@ bool ParticleEffectEntityItem::setProperties(const EntityItemProperties& propert
SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setColor);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(alpha, setAlpha);
- SET_ENTITY_PROPERTY_FROM_PROPERTIES(glowLevel, setGlowLevel);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(shapeType, updateShapeType);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(maxParticles, setMaxParticles);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(lifespan, setLifespan);
diff --git a/libraries/entities/src/PolyLineEntityItem.cpp b/libraries/entities/src/PolyLineEntityItem.cpp
index b0b78bc9c5..91fa6c4103 100644
--- a/libraries/entities/src/PolyLineEntityItem.cpp
+++ b/libraries/entities/src/PolyLineEntityItem.cpp
@@ -58,9 +58,6 @@ EntityItemProperties PolyLineEntityItem::getProperties(EntityPropertyFlags desir
COPY_ENTITY_PROPERTY_TO_PROPERTIES(normals, getNormals);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(strokeWidths, getStrokeWidths);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(textures, getTextures);
-
- properties._glowLevel = getGlowLevel();
- properties._glowLevelChanged = false;
return properties;
}
From 5acbed647ca1f47473b6ca37cc6ecd40ebe54021 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 11 May 2016 15:48:44 -0700
Subject: [PATCH 2/3] Remove glowLevel references in scripts
---
script-archive/libraries/overlayManager.js | 2 +-
script-archive/sit.js | 2 --
scripts/system/edit.js | 6 ------
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/script-archive/libraries/overlayManager.js b/script-archive/libraries/overlayManager.js
index 4438193313..7e25cc04ec 100644
--- a/script-archive/libraries/overlayManager.js
+++ b/script-archive/libraries/overlayManager.js
@@ -205,7 +205,7 @@
};
return generateOverlayClass(that, ABSTRACT, [
- "alpha", "glowLevel", "pulseMax", "pulseMin", "pulsePeriod", "glowLevelPulse",
+ "alpha", "pulseMax", "pulseMin", "pulsePeriod",
"alphaPulse", "colorPulse", "visible", "anchor"
]);
})();
diff --git a/script-archive/sit.js b/script-archive/sit.js
index 70cb086e36..7d86e2cc75 100644
--- a/script-archive/sit.js
+++ b/script-archive/sit.js
@@ -319,8 +319,6 @@ function addIndicators(modelID) {
}
models[modelID] = modelID;
- } else {
- Entities.editEntity(modelID, { glowLevel: 0.0 });
}
}
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index a8774db228..5f0317da7c 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -63,7 +63,6 @@ var MIN_ANGULAR_SIZE = 2;
var MAX_ANGULAR_SIZE = 45;
var allowLargeModels = true;
var allowSmallModels = true;
-var wantEntityGlow = false;
var SPAWN_DISTANCE = 1;
var DEFAULT_DIMENSION = 0.20;
@@ -800,11 +799,6 @@ function highlightEntityUnderCursor(position, accurateRay) {
var sizeOK = (allowLargeModels || angularSize < MAX_ANGULAR_SIZE) && (allowSmallModels || angularSize > MIN_ANGULAR_SIZE);
if (entityIntersection.entityID && sizeOK) {
- if (wantEntityGlow) {
- Entities.editEntity(entityIntersection.entityID, {
- glowLevel: 0.25
- });
- }
highlightedEntityID = entityIntersection.entityID;
selectionDisplay.highlightSelectable(entityIntersection.entityID);
}
From 4b1497fdf4ddd04bffeac34aba16d6ee3a75e277 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 16 May 2016 16:25:40 -0700
Subject: [PATCH 3/3] Remove dead code highlight entity in edit.js
---
scripts/system/edit.js | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 5f0317da7c..baf70033f9 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -714,7 +714,6 @@ function mousePressEvent(event) {
}
}
-var highlightedEntityID = null;
var mouseCapturedByTool = false;
var lastMousePosition = null;
var idleMouseTimerId = null;
@@ -780,33 +779,6 @@ function handleIdleMouse() {
idleMouseTimerId = null;
}
-function highlightEntityUnderCursor(position, accurateRay) {
- var pickRay = Camera.computePickRay(position.x, position.y);
- var entityIntersection = Entities.findRayIntersection(pickRay, accurateRay);
- if (entityIntersection.accurate) {
- if (highlightedEntityID && highlightedEntityID != entityIntersection.entityID) {
- selectionDisplay.unhighlightSelectable(highlightedEntityID);
- highlightedEntityID = {
- id: -1
- };
- }
-
- var halfDiagonal = Vec3.length(entityIntersection.properties.dimensions) / 2.0;
-
- var angularSize = 2 * Math.atan(halfDiagonal / Vec3.distance(Camera.getPosition(),
- entityIntersection.properties.position)) * 180 / 3.14;
-
- var sizeOK = (allowLargeModels || angularSize < MAX_ANGULAR_SIZE) && (allowSmallModels || angularSize > MIN_ANGULAR_SIZE);
-
- if (entityIntersection.entityID && sizeOK) {
- highlightedEntityID = entityIntersection.entityID;
- selectionDisplay.highlightSelectable(entityIntersection.entityID);
- }
-
- }
-}
-
-
function mouseReleaseEvent(event) {
mouseDown = false;