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

Replaced HazeMode with uint8_t in transport protocol.

Browse source
This commit is contained in:
Nissim Hadar 2017-10-03 19:39:34 -07:00
parent d4acb00aa5
commit c1f4735468
8 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
View file

@ -331,7 +331,7 @@ void ZoneEntityRenderer::updateKeyAmbientFromEntity() {
}
void ZoneEntityRenderer::updateHazeFromEntity(const TypedEntityPointer& entity) {
setHazeMode(entity->getHazeMode());
setHazeMode((HazeMode)entity->getHazeMode());
const auto& haze = editHaze();

2
libraries/entities/src/EntityItemProperties.cpp
View file

@ -231,7 +231,7 @@ QString EntityItemProperties::getHazeModeAsString() const {
return HAZE_MODES[_hazeMode].second;
}
QString EntityItemProperties::getHazeModeString(HazeMode mode) {
QString EntityItemProperties::getHazeModeString(uint8_t mode) {
return HAZE_MODES[mode].second;
}

4
libraries/entities/src/EntityItemProperties.h
View file

@ -178,7 +178,7 @@ public:
DEFINE_PROPERTY_REF(PROP_NAME, Name, name, QString, ENTITY_ITEM_DEFAULT_NAME);
DEFINE_PROPERTY_REF_ENUM(PROP_BACKGROUND_MODE, BackgroundMode, backgroundMode, BackgroundMode, BACKGROUND_MODE_INHERIT);
DEFINE_PROPERTY_REF_ENUM(PROP_HAZE_MODE, HazeMode, hazeMode, HazeMode, HAZE_MODE_INHERIT);
DEFINE_PROPERTY_REF_ENUM(PROP_HAZE_MODE, HazeMode, hazeMode, uint8_t, (uint8_t)HAZE_MODE_INHERIT);
DEFINE_PROPERTY(PROP_HAZE_RANGE, HazeRange, hazeRange, float, HazePropertyGroup::DEFAULT_HAZE_RANGE);
DEFINE_PROPERTY(PROP_HAZE_BLEND_IN_COLOR, HazeBlendInColor, hazeBlendInColor, xColor, HazePropertyGroup::DEFAULT_HAZE_BLEND_IN_COLOR);
@ -258,7 +258,7 @@ public:
DEFINE_PROPERTY_REF(PROP_SERVER_SCRIPTS, ServerScripts, serverScripts, QString, ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS);
static QString getBackgroundModeString(BackgroundMode mode);
static QString getHazeModeString(HazeMode mode);
static QString getHazeModeString(uint8_t mode);
public:

6
libraries/entities/src/ZoneEntityItem.cpp
View file

@ -164,7 +164,7 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
READ_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, QString, setCompoundShapeURL);
READ_ENTITY_PROPERTY(PROP_BACKGROUND_MODE, BackgroundMode, setBackgroundMode);
READ_ENTITY_PROPERTY(PROP_BACKGROUND_MODE, HazeMode, setHazeMode);
READ_ENTITY_PROPERTY(PROP_BACKGROUND_MODE, uint8_t, setHazeMode);
int bytesFromSkybox;
withWriteLock([&] {
@ -335,12 +335,12 @@ void ZoneEntityItem::resetRenderingPropertiesChanged() {
}
#pragma optimize("", off)
void ZoneEntityItem::setHazeMode(const HazeMode value) {
void ZoneEntityItem::setHazeMode(const uint8_t value) {
_hazeMode = value;
_hazePropertiesChanged = true;
}
HazeMode ZoneEntityItem::getHazeMode() const {
uint8_t ZoneEntityItem::getHazeMode() const {
return _hazeMode;
}

6
libraries/entities/src/ZoneEntityItem.h
View file

@ -69,8 +69,8 @@ public:
void setBackgroundMode(BackgroundMode value) { _backgroundMode = value; _backgroundPropertiesChanged = true; }
BackgroundMode getBackgroundMode() const { return _backgroundMode; }
void setHazeMode(const HazeMode value);
HazeMode getHazeMode() const;
void setHazeMode(const uint8_t value);
uint8_t getHazeMode() const;
void setHazeRange(const float hazeRange);
float getHazeRange()const;
@ -141,7 +141,7 @@ protected:
BackgroundMode _backgroundMode = BACKGROUND_MODE_INHERIT;
HazeMode _hazeMode{ HAZE_MODE_INHERIT };
uint8_t _hazeMode{ (uint8_t)HAZE_MODE_INHERIT };
float _hazeRange{ HazePropertyGroup::DEFAULT_HAZE_RANGE };
xColor _hazeBlendInColor{ HazePropertyGroup::DEFAULT_HAZE_BLEND_IN_COLOR };

2
libraries/model/src/model/Stage.cpp
View file

@ -257,7 +257,7 @@ void SunSkyStage::setSkybox(const SkyboxPointer& skybox) {
}
// Haze
void SunSkyStage::setHazeMode(HazeMode mode) {
void SunSkyStage::setHazeMode(uint8_t mode) {
_hazeMode = mode;
invalidate();
}

6
libraries/model/src/model/Stage.h
View file

@ -183,8 +183,8 @@ public:
NUM_HAZE_MODES
};
void setHazeMode(HazeMode mode);
HazeMode getHazeMode() const { return _hazeMode; }
void setHazeMode(uint8_t mode);
uint8_t getHazeMode() const { return _hazeMode; }
void setHazeRange(float hazeRange) { _hazeRange = hazeRange; }
float getHazeRange() const { return _hazeRange; }
@ -211,7 +211,7 @@ public:
protected:
BackgroundMode _backgroundMode = SKY_DEFAULT;
HazeMode _hazeMode = HAZE_OFF;
uint8_t _hazeMode = (uint8_t)HAZE_OFF;
float _hazeRange;
xColor _hazeBlendInColor;

1
libraries/octree/src/OctreePacketData.h
View file

@ -259,7 +259,6 @@ public:
static int unpackDataFromBytes(const unsigned char* dataBytes, glm::quat& result) { int bytes = unpackOrientationQuatFromBytes(dataBytes, result); return bytes; }
static int unpackDataFromBytes(const unsigned char* dataBytes, ShapeType& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
static int unpackDataFromBytes(const unsigned char* dataBytes, BackgroundMode& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
static int unpackDataFromBytes(const unsigned char* dataBytes, HazeMode& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
static int unpackDataFromBytes(const unsigned char* dataBytes, QString& result);
static int unpackDataFromBytes(const unsigned char* dataBytes, QUuid& result);
static int unpackDataFromBytes(const unsigned char* dataBytes, xColor& result);