projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed bug in mirror matching
[laserbrain_demo]
/
src
/
metascene.cc
diff --git
a/src/metascene.cc
b/src/metascene.cc
index
a45bfec
..
465decf
100644
(file)
--- a/
src/metascene.cc
+++ b/
src/metascene.cc
@@
-108,7
+108,7
@@
void MetaScene::update(float dt)
static bool once;
if(!once) {
float x = ImGui::GetColumnOffset(1);
static bool once;
if(!once) {
float x = ImGui::GetColumnOffset(1);
- ImGui::SetColumnOffset(1, x * 1.7);
+ ImGui::SetColumnOffset(1, x * 1.55);
once = true;
}
}
once = true;
}
}
@@
-275,15
+275,17
@@
int MetaScene::calc_mirror_planes()
mir->next = mirrors;
mirrors = mir;
mir->next = mirrors;
mirrors = mir;
- node = new FlatMirror;
- node->wplane = mir->wplane;
- node->next = planes;
- planes = node;
+ // also add a node to the mirror plane matching list
+ FlatMirror *m = new FlatMirror;
+ m->wplane = mir->wplane;
+ m->next = planes;
+ planes = m;
mir->objects.push_back(obj);
objmirror[obj] = mir; // associate with object
++num_mirrors;
} else {
mir->objects.push_back(obj);
objmirror[obj] = mir; // associate with object
++num_mirrors;
} else {
+ node->objects.push_back(obj);
delete mir;
}
}
delete mir;
}
}