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

fixing static definition maybe

Browse source
This commit is contained in:
samcake 2018-05-30 13:37:32 -07:00
parent 2e9076c71e
commit 457b77ca09
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,11 @@ const float Item::Status::Value::CYAN = 180.0f;
const float Item::Status::Value::BLUE = 240.0f;
const float Item::Status::Value::MAGENTA = 300.0f;
const uint8_t Item::LAYER_3D = ItemKey::LAYER_DEFAULT;
const uint8_t Item::LAYER_3D_FRONT = ItemKey::LAYER_1;
const uint8_t Item::LAYER_3D_HUD = ItemKey::LAYER_2;
const uint8_t Item::LAYER_2D = ItemKey::LAYER_3;
const uint8_t ItemKey::TAG_BITS_ALL { 0xFF };
const uint8_t ItemKey::TAG_BITS_NONE { 0x00 };
const uint8_t ItemKey::TAG_BITS_0 { 0x01 };

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

@ -457,10 +457,10 @@ public:
// Get the layer where the item belongs, simply reflecting the key.
int getLayer() const { return _key.getLayer(); }
static const uint8_t LAYER_3D{ ItemKey::LAYER_DEFAULT };
static const uint8_t LAYER_3D_FRONT{ ItemKey::LAYER_1 };
static const uint8_t LAYER_3D_HUD{ ItemKey::LAYER_2 };
static const uint8_t LAYER_2D{ ItemKey::LAYER_3 };
static const uint8_t LAYER_3D;
static const uint8_t LAYER_3D_FRONT;
static const uint8_t LAYER_3D_HUD;
static const uint8_t LAYER_2D;
// Render call for the item
void render(RenderArgs* args) const { _payload->render(args); }