Revision: 6774
http://playerstage.svn.sourceforge.net/playerstage/?rev=6774&view=rev
Author: rtv
Date: 2008-07-04 18:33:02 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
working on proper recursive 3D poses - it's been a hack so far
Modified Paths:
--------------
code/stage/trunk/libstage/model.cc
code/stage/trunk/libstage/worldgui.cc
code/stage/trunk/worlds/swarmbenchmark/cave.world
Modified: code/stage/trunk/libstage/model.cc
===================================================================
--- code/stage/trunk/libstage/model.cc 2008-07-05 01:07:11 UTC (rev 6773)
+++ code/stage/trunk/libstage/model.cc 2008-07-05 01:33:02 UTC (rev 6774)
@@ -176,9 +176,10 @@
world->AddModel( this );
bzero( &pose, sizeof(pose));
- if( parent )
- pose.z = parent->geom.size.z;
+ if( parent) pose.z += parent->geom.size.z;
+
bzero( &global_pose, sizeof(global_pose));
+ this->gpose_dirty = true;
this->trail = g_array_new( false, false, sizeof(stg_trail_item_t) );
@@ -186,7 +187,6 @@
this->disabled = false;
this->blocks = NULL;
this->rebuild_displaylist = true;
- this->gpose_dirty = true;
this->say_string = NULL;
this->subs = 0;
this->stall = false;
@@ -1268,6 +1268,9 @@
//PRINT_DEBUG5( "%s.SetPose(%.2f %.2f %.2f %.2f)",
// this->token, pose->x, pose->y, pose->z, pose->a );
+ if( parent )
+ pose.z += parent->geom.size.z;
+
// if the pose has changed, we need to do some work
if( memcmp( &this->pose, &pose, sizeof(stg_pose_t) ) != 0 )
{
Modified: code/stage/trunk/libstage/worldgui.cc
===================================================================
--- code/stage/trunk/libstage/worldgui.cc 2008-07-05 01:07:11 UTC (rev
6773)
+++ code/stage/trunk/libstage/worldgui.cc 2008-07-05 01:33:02 UTC (rev
6774)
@@ -125,10 +125,10 @@
"Part of the Player Project\n"
"http://playerstage.org\n";
"\n"
- "Copyright 2000-2008 Richard Vaughan, Brian Gerkey, "
- "Andrew Howard, Reed Hedges, Toby Collett, "
- "Alex Couture-Beil, Jeremy Asher "
- "and contributors";
+ "Copyright 2000-2008 Richard Vaughan,\n"
+ " Brian Gerkey, Andrew Howard, Reed Hedges, \n"
+ " Toby Collett, Alex Couture-Beil, Jeremy Asher \n"
+ " and contributors";
StgWorldGui::StgWorldGui(int W,int H,const char* L) :
Fl_Window(W,H,L )
@@ -544,7 +544,7 @@
tbuf->append( "-" );
tbuf->append( VERSION );
tbuf->append( AboutText );
- textDisplay->wrap_mode( true, 50 );
+ //textDisplay->wrap_mode( true, 50 );
textDisplay->buffer( tbuf );
Fl_Return_Button* button;
Modified: code/stage/trunk/worlds/swarmbenchmark/cave.world
===================================================================
--- code/stage/trunk/worlds/swarmbenchmark/cave.world 2008-07-05 01:07:11 UTC
(rev 6773)
+++ code/stage/trunk/worlds/swarmbenchmark/cave.world 2008-07-05 01:33:02 UTC
(rev 6774)
@@ -33,7 +33,7 @@
#define rob fancypioneer2dx # alternative with more complex polygons
(
- sicklaser( pose [ 0.040 0.000 0.000 ] samples 180 )
+ sicklaser( )#pose4 [ 0.040 0.000 0.01 0.000 ] samples 180 )
# alternative laser with more complex polygons
# fancysicklaser( pose [ 0.040 0.000 0.000 ] samples 180 )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
