Revision: 7103
http://playerstage.svn.sourceforge.net/playerstage/?rev=7103&view=rev
Author: gerkey
Date: 2008-10-17 05:14:50 +0000 (Fri, 17 Oct 2008)
Log Message:
-----------
fixed collision detection to ignore children
Modified Paths:
--------------
code/stage/branches/stage-ros/libstage/model.cc
Modified: code/stage/branches/stage-ros/libstage/model.cc
===================================================================
--- code/stage/branches/stage-ros/libstage/model.cc 2008-10-16 16:22:39 UTC
(rev 7102)
+++ code/stage/branches/stage-ros/libstage/model.cc 2008-10-17 05:14:50 UTC
(rev 7103)
@@ -1338,7 +1338,8 @@
StgModel* hitmod = NULL;
// unrender myself - avoids a lot of self-hits
- this->UnMap();
+ //this->UnMap();
+ this->UnMapWithChildren();
// add the local geom offset
//stg_pose_t local;
@@ -1389,7 +1390,8 @@
}
// re-render myself
- this->Map();
+ //this->Map();
+ this->MapWithChildren();
return hitmod; // done
}
@@ -1435,7 +1437,7 @@
// XX
SetStall( true );
//printf( "hit %s at %.2f %.2f\n",
- // hitthing->Token(), hitx, hity );
+ //hitthing->Token(), hitx, hity );
//dd// //memcpy( &mod->pose, &old_pose, sizeof(mod->pose));
//this->SetPose( &old_pose );
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
