Revision: 7639
http://playerstage.svn.sourceforge.net/playerstage/?rev=7639&view=rev
Author: rtv
Date: 2009-05-12 23:48:06 +0000 (Tue, 12 May 2009)
Log Message:
-----------
reverted worldfile.cc changes that broke model property setting
Modified Paths:
--------------
code/stage/trunk/libstage/region.hh
code/stage/trunk/libstage/world.cc
code/stage/trunk/libstage/worldfile.cc
code/stage/trunk/worlds/fasr.world
Modified: code/stage/trunk/libstage/region.hh
===================================================================
--- code/stage/trunk/libstage/region.hh 2009-05-12 15:35:15 UTC (rev 7638)
+++ code/stage/trunk/libstage/region.hh 2009-05-12 23:48:06 UTC (rev 7639)
@@ -15,7 +15,7 @@
// a bit of experimenting suggests that these values are fast. YMMV.
#define RBITS 4 // regions contain (2^RBITS)^2 pixels
-#define SBITS 4 // superregions contain (2^SBITS)^2 regions
+#define SBITS 6 // superregions contain (2^SBITS)^2 regions
#define SRBITS (RBITS+SBITS)
#define REGIONWIDTH (1<<RBITS)
Modified: code/stage/trunk/libstage/world.cc
===================================================================
--- code/stage/trunk/libstage/world.cc 2009-05-12 15:35:15 UTC (rev 7638)
+++ code/stage/trunk/libstage/world.cc 2009-05-12 23:48:06 UTC (rev 7639)
@@ -1127,4 +1127,4 @@
printf( "log entry count %lu\n", LogEntry::Count() );
//LogEntry::Print();
}
-
+
Modified: code/stage/trunk/libstage/worldfile.cc
===================================================================
--- code/stage/trunk/libstage/worldfile.cc 2009-05-12 15:35:15 UTC (rev
7638)
+++ code/stage/trunk/libstage/worldfile.cc 2009-05-12 23:48:06 UTC (rev
7639)
@@ -103,7 +103,9 @@
this->unit_length = 1.0;
this->unit_angle = M_PI / 180;
- this->nametable = g_hash_table_new_full( g_str_hash, g_str_equal, NULL,
destroy_property );
+ // this attempt to fix memory leak breaks parsing of model properties -
investigate
+ //this->nametable = g_hash_table_new_full( g_str_hash, g_str_equal, NULL,
destroy_property );
+ this->nametable = g_hash_table_new( g_str_hash, g_str_equal );
}
@@ -1345,7 +1347,10 @@
if( this->nametable )
g_hash_table_destroy( this->nametable );
- this->nametable = g_hash_table_new_full( g_str_hash, g_str_equal, NULL,
destroy_property );
+
+ // this attempt to fix memory leak breaks parsing of model properties -
investigate
+ //this->nametable = g_hash_table_new_full( g_str_hash, g_str_equal, NULL,
destroy_property );
+ this->nametable = g_hash_table_new( g_str_hash, g_str_equal );
}
Modified: code/stage/trunk/worlds/fasr.world
===================================================================
--- code/stage/trunk/worlds/fasr.world 2009-05-12 15:35:15 UTC (rev 7638)
+++ code/stage/trunk/worlds/fasr.world 2009-05-12 23:48:06 UTC (rev 7639)
@@ -70,24 +70,6 @@
obstacle_return 0
)
-define autorob pioneer2dx
-(
- sicklaser( samples 180 range_max 5 laser_return 2 watts 30 )
- ctrl "fasr"
- joules 100000
- joules_capacity 400000
- fiducial_return 0
- # charging_bump( fiducial( range 3 pose [ 0 0 -0.100 0 ] ) )
-
- gripper( pose [0.250 0 -0.220 0]
- take_watts 1000.0
- fiducial( range 3 )
- # paddles [ "closed" "up" ]
- obstacle_return 0 # cheating for simplicity
- # autosnatch 1
- )
-)
-
define charge_station model
(
size [ 0.100 0.300 0.100 ]
@@ -153,6 +135,24 @@
#puck( pose [ 1.067 3.367 0 0 ] )
#puck( pose [ 1.412 3.604 0 0 ] )
+define autorob pioneer2dx
+(
+ sicklaser( samples 32 range_max 5 laser_return 2 watts 30 )
+ ctrl "fasr"
+ joules 100000
+ joules_capacity 400000
+ fiducial_return 0
+ # charging_bump( fiducial( range 3 pose [ 0 0 -0.100 0 ] ) )
+
+ gripper( pose [0.250 0 -0.220 0]
+ take_watts 1000.0
+ fiducial( range 3 )
+ # paddles [ "closed" "up" ]
+ obstacle_return 0 # cheating for simplicity
+ # autosnatch 1
+ )
+)
+
autorob( pose [5.488 5.149 0 35.947] joules 300000 name "r0" )
autorob( pose [6.431 5.593 0 -111.715] joules 100000 )
autorob( pose [5.615 6.185 0 107.666] joules 200000 )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
