Revision: 8542
http://playerstage.svn.sourceforge.net/playerstage/?rev=8542&view=rev
Author: rtv
Date: 2010-02-02 02:07:54 +0000 (Tue, 02 Feb 2010)
Log Message:
-----------
fixed bug that caused assert failure on saving
Modified Paths:
--------------
code/stage/trunk/libstage/model_load.cc
code/stage/trunk/worlds/pioneer_flocking.world
Modified: code/stage/trunk/libstage/model_load.cc
===================================================================
--- code/stage/trunk/libstage/model_load.cc 2010-01-30 23:03:39 UTC (rev
8541)
+++ code/stage/trunk/libstage/model_load.cc 2010-02-02 02:07:54 UTC (rev
8542)
@@ -234,11 +234,14 @@
void Model::Save( void )
{
- assert( wf );
+ //printf( "Model \"%s\" saving...\n", token.c_str() );
+
+ // some models were not loaded, so have no worldfile. Just bail here.
+ if( wf == NULL )
+ return;
+
assert( wf_entity );
- PRINT_DEBUG1( "Model \"%s\" saving...", token );
-
PRINT_DEBUG4( "saving model %s pose %.2f %.2f %.2f",
this->token,
this->pose.x,
Modified: code/stage/trunk/worlds/pioneer_flocking.world
===================================================================
--- code/stage/trunk/worlds/pioneer_flocking.world 2010-01-30 23:03:39 UTC
(rev 8541)
+++ code/stage/trunk/worlds/pioneer_flocking.world 2010-02-02 02:07:54 UTC
(rev 8542)
@@ -13,7 +13,7 @@
resolution 0.1
# this is very helpful if you have multiple CPUs - a good value is $(number of
CPU cores) -
-threads 2
+# threads 2
# configure the GUI window
window
@@ -29,8 +29,9 @@
floorplan
(
name "cave"
- size [100.000 100.000 0.800]
- pose [0 0 0 0]
+# size [100.000 100.000 0.800]
+ size [32.000 32.000 0.600]
+pose [-24 -16 0 0]
bitmap "bitmaps/cave.png"
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
