Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 17:38:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix link trouble

Browse source
This commit is contained in:
Seth Alves 2018-01-18 08:12:14 -08:00
parent d897b1c1eb
commit 97a4f141eb
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/render/src/render/Item.cpp
View file

@ -34,6 +34,14 @@ const int Item::LAYER_3D = 1;
const int Item::LAYER_3D_FRONT = 2; const int Item::LAYER_3D_FRONT = 2;
const int Item::LAYER_3D_HUD = 3; 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) { void Item::Status::Value::setScale(float scale) {
_scale = (std::numeric_limits<unsigned short>::max() -1) * 0.5f * (1.0f + std::max(std::min(scale, 1.0f), 0.0f)); _scale = (std::numeric_limits<unsigned short>::max() -1) * 0.5f * (1.0f + std::max(std::min(scale, 1.0f), 0.0f));
} }

12
libraries/render/src/render/Item.h
View file

@ -63,12 +63,12 @@ public:
// VISIBLE MASK is defined from several bits in the Key. // 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 // 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. // 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 NUM_VISIBLE_MASK_INDICES;
const static uint8_t VISIBLE_MASK_ALL{ 0x0F }; const static uint8_t VISIBLE_MASK_ALL;
const static uint8_t VISIBLE_MASK_0{ 0x01 }; const static uint8_t VISIBLE_MASK_0;
const static uint8_t VISIBLE_MASK_1{ 0x02 }; const static uint8_t VISIBLE_MASK_1;
const static uint8_t VISIBLE_MASK_2{ 0x04 }; const static uint8_t VISIBLE_MASK_2;
const static uint8_t VISIBLE_MASK_3{ 0x08 }; const static uint8_t VISIBLE_MASK_3;
// The key is the Flags // The key is the Flags
Flags _flags; Flags _flags;