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

build error

Browse source
This commit is contained in:
SamGondelman 2017-10-06 17:22:07 -07:00
parent b4a3ab9204
commit 3acbd7820b
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
View file

@ -49,14 +49,6 @@ static const glm::mat4 IDENTITY_MATRIX;
//#define LIVE_SHADER_RELOAD 1 //#define LIVE_SHADER_RELOAD 1
extern glm::vec3 getPoint(float yaw, float pitch); 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 { glm::uvec2 HmdDisplayPlugin::getRecommendedUiSize() const {
return CompositorHelper::VIRTUAL_SCREEN_SIZE; return CompositorHelper::VIRTUAL_SCREEN_SIZE;
} }

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::BLUE = 240.0f;
const float Item::Status::Value::MAGENTA = 300.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) { 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));
} }

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

@ -359,10 +359,10 @@ public:
// Get the layer where the item belongs. // Get the layer where the item belongs.
int getLayer() const { return _payload->getLayer(); } int getLayer() const { return _payload->getLayer(); }
static const int LAYER_2D = 0; static const int LAYER_2D;
static const int LAYER_3D = 1; static const int LAYER_3D;
static const int LAYER_3D_FRONT = 2; static const int LAYER_3D_FRONT;
static const int LAYER_3D_HUD = 3; static const int LAYER_3D_HUD;
// Render call for the item // Render call for the item
void render(RenderArgs* args) const { _payload->render(args); } void render(RenderArgs* args) const { _payload->render(args); }