From 3acbd7820b19caa8676f4555fff9fd79bd9ca625 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Fri, 6 Oct 2017 17:22:07 -0700 Subject: [PATCH] build error --- .../src/display-plugins/hmd/HmdDisplayPlugin.cpp | 8 -------- libraries/render/src/render/Item.cpp | 5 +++++ libraries/render/src/render/Item.h | 8 ++++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp index 053f3171be..0785226836 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp @@ -49,14 +49,6 @@ static const glm::mat4 IDENTITY_MATRIX; //#define LIVE_SHADER_RELOAD 1 extern glm::vec3 getPoint(float yaw, float pitch); -static QString readFile(const QString& filename) { - QFile file(filename); - file.open(QFile::Text | QFile::ReadOnly); - QString result; - result.append(QTextStream(&file).readAll()); - return result; -} - glm::uvec2 HmdDisplayPlugin::getRecommendedUiSize() const { return CompositorHelper::VIRTUAL_SCREEN_SIZE; } diff --git a/libraries/render/src/render/Item.cpp b/libraries/render/src/render/Item.cpp index f0fbbb1973..036c7d3a99 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 int Item::LAYER_2D = 0; +const int Item::LAYER_3D = 1; +const int Item::LAYER_3D_FRONT = 2; +const int Item::LAYER_3D_HUD = 3; + 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 8cdb41de45..2b02db81f9 100644 --- a/libraries/render/src/render/Item.h +++ b/libraries/render/src/render/Item.h @@ -359,10 +359,10 @@ public: // Get the layer where the item belongs. int getLayer() const { return _payload->getLayer(); } - static const int LAYER_2D = 0; - static const int LAYER_3D = 1; - static const int LAYER_3D_FRONT = 2; - static const int LAYER_3D_HUD = 3; + static const int LAYER_2D; + static const int LAYER_3D; + static const int LAYER_3D_FRONT; + static const int LAYER_3D_HUD; // Render call for the item void render(RenderArgs* args) const { _payload->render(args); }