diff --git a/libraries/render/src/render/Item.cpp b/libraries/render/src/render/Item.cpp index 036c7d3a99..75c38ec615 100644 --- a/libraries/render/src/render/Item.cpp +++ b/libraries/render/src/render/Item.cpp @@ -34,6 +34,14 @@ const int Item::LAYER_3D = 1; const int Item::LAYER_3D_FRONT = 2; const int Item::LAYER_3D_HUD = 3; +const uint8_t ItemKey::NUM_VISIBLE_MASK_INDICES { 4 }; +const uint8_t ItemKey::VISIBLE_MASK_ALL { 0x0F }; +const uint8_t ItemKey::VISIBLE_MASK_0 { 0x01 }; +const uint8_t ItemKey::VISIBLE_MASK_1 { 0x02 }; +const uint8_t ItemKey::VISIBLE_MASK_2 { 0x04 }; +const uint8_t ItemKey::VISIBLE_MASK_3 { 0x08 }; + + void Item::Status::Value::setScale(float scale) { _scale = (std::numeric_limits::max() -1) * 0.5f * (1.0f + std::max(std::min(scale, 1.0f), 0.0f)); } diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h index 3da7b07d7d..ebf3980489 100644 --- a/libraries/render/src/render/Item.h +++ b/libraries/render/src/render/Item.h @@ -63,12 +63,12 @@ public: // VISIBLE MASK is defined from several bits in the Key. // An Item can be visible in some mask bits and not other allowing for per view rendering // Beware that the visibility mask is the oposite of what stored in the key vals. - const static uint8_t NUM_VISIBLE_MASK_INDICES{ 4 }; - const static uint8_t VISIBLE_MASK_ALL{ 0x0F }; - const static uint8_t VISIBLE_MASK_0{ 0x01 }; - const static uint8_t VISIBLE_MASK_1{ 0x02 }; - const static uint8_t VISIBLE_MASK_2{ 0x04 }; - const static uint8_t VISIBLE_MASK_3{ 0x08 }; + const static uint8_t NUM_VISIBLE_MASK_INDICES; + const static uint8_t VISIBLE_MASK_ALL; + const static uint8_t VISIBLE_MASK_0; + const static uint8_t VISIBLE_MASK_1; + const static uint8_t VISIBLE_MASK_2; + const static uint8_t VISIBLE_MASK_3; // The key is the Flags Flags _flags;