From 457b77ca0980ad71dee23a17c9f40e09abfe6a0b Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 30 May 2018 13:37:32 -0700 Subject: [PATCH] fixing static definition maybe --- libraries/render/src/render/Item.cpp | 5 +++++ libraries/render/src/render/Item.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libraries/render/src/render/Item.cpp b/libraries/render/src/render/Item.cpp index e2fb69e003..ab24a11107 100644 --- a/libraries/render/src/render/Item.cpp +++ b/libraries/render/src/render/Item.cpp @@ -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 }; diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h index e8e5c99d7d..45641d42ff 100644 --- a/libraries/render/src/render/Item.h +++ b/libraries/render/src/render/Item.h @@ -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); }