Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 20:06:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing compilation on mac and a glsl error on mac

Browse source
This commit is contained in:
samcake 2016-01-31 17:19:47 -08:00
parent b2f6360020
commit f551ea9f76
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/render/src/render/Scene.cpp
View file

@ -130,7 +130,7 @@ void Scene::processPendingChangesQueue() {
void Scene::resetItems(const ItemIDs& ids, Payloads& payloads) { void Scene::resetItems(const ItemIDs& ids, Payloads& payloads) {
auto& resetPayload = payloads.begin(); auto resetPayload = payloads.begin();
for (auto resetID : ids) { for (auto resetID : ids) {
// Access the true item // Access the true item
auto& item = _items[resetID]; auto& item = _items[resetID];
@ -171,7 +171,7 @@ void Scene::removeItems(const ItemIDs& ids) {
void Scene::updateItems(const ItemIDs& ids, UpdateFunctors& functors) { void Scene::updateItems(const ItemIDs& ids, UpdateFunctors& functors) {
auto& updateFunctor = functors.begin(); auto updateFunctor = functors.begin();
for (auto updateID : ids) { for (auto updateID : ids) {
// Access the true item // Access the true item
auto& item = _items[updateID]; auto& item = _items[updateID];

2
libraries/render/src/render/SceneOctree.slh
View file

@ -60,7 +60,7 @@ float getInvDepthDimension(int depth) { return INV_DEPTH_DIM[depth]; }
float getCellWidth(int depth) { return _size * getInvDepthDimension(depth); } float getCellWidth(int depth) { return _size * getInvDepthDimension(depth); }
float getInvCellWidth(int depth) { return getDepthDimensionf(depth) * _invSize; } float getInvCellWidth(int depth) { return getDepthDimensionf(depth) * _invSize; }
vec3 evalPos(ivec3 coord, int depth = MAX_DEPTH) { vec3 evalPos(ivec3 coord, int depth) {
return getOrigin() + vec3(coord) * getCellWidth(depth); return getOrigin() + vec3(coord) * getCellWidth(depth);
} }
vec3 evalPosDepthWidth(ivec3 coord, float cellWidth) { vec3 evalPosDepthWidth(ivec3 coord, float cellWidth) {