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

Yet some more compilation fixes for Mac and Linux

Browse source
This commit is contained in:
Olivier Prat 2017-07-13 18:22:18 +02:00
parent 93218da473
commit 96f0c35b79
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/render-utils/src/FadeEffect.cpp
View file

@ -91,12 +91,8 @@ render::ItemID FadeEditJob::findNearestItem(const render::RenderContextPointer&
for (const auto& itemBound : inputs) { for (const auto& itemBound : inputs) {
if (!itemBound.bound.contains(rayOrigin) && itemBound.bound.findRayIntersection(rayOrigin, rayDirection, isectDistance, face, normal)) { if (!itemBound.bound.contains(rayOrigin) && itemBound.bound.findRayIntersection(rayOrigin, rayDirection, isectDistance, face, normal)) {
if (isectDistance>minDistance && isectDistance < minIsectDistance) { if (isectDistance>minDistance && isectDistance < minIsectDistance) {
auto& item = scene->getItem(itemBound.id); nearestItem = itemBound.id;
minIsectDistance = isectDistance;
// if (!item.getKey().isMeta()) {
nearestItem = itemBound.id;
minIsectDistance = isectDistance;
// }
} }
} }
} }
@ -629,7 +625,7 @@ void FadeJob::update(const Config& config, const render::ScenePointer& scene, re
case render::Transition::ELEMENT_ENTER_DOMAIN: case render::Transition::ELEMENT_ENTER_DOMAIN:
case render::Transition::ELEMENT_LEAVE_DOMAIN: case render::Transition::ELEMENT_LEAVE_DOMAIN:
{ {
transition.threshold = computeElementEnterRatio(transition.time, eventConfig.duration, timing); transition.threshold = computeElementEnterRatio(transition.time, eventDuration, timing);
transition.baseOffset = transition.noiseOffset; transition.baseOffset = transition.noiseOffset;
transition.baseInvSize.x = 1.f / dimensions.x; transition.baseInvSize.x = 1.f / dimensions.x;
transition.baseInvSize.y = 1.f / dimensions.y; transition.baseInvSize.y = 1.f / dimensions.y;
@ -658,7 +654,7 @@ void FadeJob::update(const Config& config, const render::ScenePointer& scene, re
case render::Transition::USER_ENTER_DOMAIN: case render::Transition::USER_ENTER_DOMAIN:
case render::Transition::USER_LEAVE_DOMAIN: case render::Transition::USER_LEAVE_DOMAIN:
{ {
transition.threshold = computeElementEnterRatio(transition.time, eventConfig.duration, timing); transition.threshold = computeElementEnterRatio(transition.time, eventDuration, timing);
transition.baseOffset = transition.noiseOffset - dimensions.y / 2.f; transition.baseOffset = transition.noiseOffset - dimensions.y / 2.f;
transition.baseInvSize.y = 1.f / dimensions.y; transition.baseInvSize.y = 1.f / dimensions.y;
transition.isFinished += (transition.threshold >= 1.f) & 1; transition.isFinished += (transition.threshold >= 1.f) & 1;

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

@ -17,6 +17,9 @@
using namespace render; using namespace render;
const Item::ID Item::INVALID_ITEM_ID = 0;
const ItemCell Item::INVALID_CELL = -1;
const Item::Status::Value Item::Status::Value::INVALID = Item::Status::Value(); const Item::Status::Value Item::Status::Value::INVALID = Item::Status::Value();
const float Item::Status::Value::RED = 0.0f; const float Item::Status::Value::RED = 0.0f;

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

@ -243,8 +243,8 @@ public:
typedef std::vector<Item> Vector; typedef std::vector<Item> Vector;
typedef ItemID ID; typedef ItemID ID;
static const ID INVALID_ITEM_ID = 0; static const ID INVALID_ITEM_ID;
static const ItemCell INVALID_CELL = -1; static const ItemCell INVALID_CELL;
// Convenient function to clear an ID or check it s valid // Convenient function to clear an ID or check it s valid
static void clearID(ID& id) { id = INVALID_ITEM_ID; } static void clearID(ID& id) { id = INVALID_ITEM_ID; }