TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation issues

Browse Source
This commit is contained in:
rdb 2013-03-28 22:58:41 +00:00
parent 0dd50f1d5a
commit fbc37338e4
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
panda/src/egg2pg/eggLoader.cxx
View File

@ -2852,8 +2852,8 @@ make_sphere(EggGroup *egg_group, EggGroup::CollideFlags flags,
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool EggLoader:: bool EggLoader::
make_box(EggGroup *egg_group, EggGroup::CollideFlags flags, make_box(EggGroup *egg_group, EggGroup::CollideFlags flags,
LPoint3 &_min, LPoint3 &_max, LColor &color) { LPoint3 &min_p, LPoint3 &max_p, LColor &color) {
bool success=false; bool success = false;
EggGroup *geom_group = find_collision_geometry(egg_group, flags); EggGroup *geom_group = find_collision_geometry(egg_group, flags);
if (geom_group != (EggGroup *)NULL) { if (geom_group != (EggGroup *)NULL) {
// Collect all of the vertices. // Collect all of the vertices.
@ -2870,26 +2870,25 @@ make_box(EggGroup *egg_group, EggGroup::CollideFlags flags,
} }
} }
// Now find the _min/_max points // Now find the min/max points
int num_vertices = 0; int num_vertices = 0;
bool first = true; bool first = true;
pset<EggVertex *>::const_iterator vi; pset<EggVertex *>::const_iterator vi;
for (vi = vertices.begin(); vi != vertices.end(); ++vi) { for (vi = vertices.begin(); vi != vertices.end(); ++vi) {
EggVertex *vtx = (*vi); EggVertex *vtx = (*vi);
LVertexd pos = vtx->get_pos3(); LVertex pos = LCAST(PN_stdfloat, vtx->get_pos3());
if (first) { if (first) {
_min.set(pos[0], pos[1], pos[2]); min_p.set(pos[0], pos[1], pos[2]);
_max.set(pos[0], pos[1], pos[2]); max_p.set(pos[0], pos[1], pos[2]);
first = false; first = false;
} } else {
else { min_p.set(min(min_p[0], pos[0]),
_min.set(min(_min[0], pos[0]), min(min_p[1], pos[1]),
min(_min[1], pos[1]), min(min_p[2], pos[2]));
min(_min[2], pos[2])); max_p.set(max(max_p[0], pos[0]),
_max.set(max(_max[0], pos[0]), max(max_p[1], pos[1]),
max(_max[1], pos[1]), max(max_p[2], pos[2]));
max(_max[2], pos[2]));
} }
num_vertices++; num_vertices++;
} }
@ -3106,12 +3105,12 @@ make_collision_sphere(EggGroup *egg_group, CollisionNode *cnode,
void EggLoader:: void EggLoader::
make_collision_box(EggGroup *egg_group, CollisionNode *cnode, make_collision_box(EggGroup *egg_group, CollisionNode *cnode,
EggGroup::CollideFlags flags) { EggGroup::CollideFlags flags) {
LPoint3 min; LPoint3 min_p;
LPoint3 max; LPoint3 max_p;
LColor dummycolor; LColor dummycolor;
if (make_box(egg_group, flags, min, max, dummycolor)) { if (make_box(egg_group, flags, min_p, max_p, dummycolor)) {
CollisionBox *csbox = CollisionBox *csbox =
new CollisionBox(min, max); new CollisionBox(min_p, max_p);
apply_collision_flags(csbox, flags); apply_collision_flags(csbox, flags);
cnode->add_solid(csbox); cnode->add_solid(csbox);
} }

2
panda/src/egg2pg/eggLoader.h
View File

@ -167,7 +167,7 @@ private:
LPoint3 &center, PN_stdfloat &radius, LColor &color); LPoint3 &center, PN_stdfloat &radius, LColor &color);
bool make_box(EggGroup *start_group, EggGroup::CollideFlags flags, bool make_box(EggGroup *start_group, EggGroup::CollideFlags flags,
LPoint3 &min, LPoint3 &max, LColor &color); LPoint3 &min_p, LPoint3 &max_p, LColor &color);
void make_collision_solids(EggGroup *start_group, EggGroup *egg_group, void make_collision_solids(EggGroup *start_group, EggGroup *egg_group,
CollisionNode *cnode); CollisionNode *cnode);