Revision: 8331
http://playerstage.svn.sourceforge.net/playerstage/?rev=8331&view=rev
Author: rtv
Date: 2009-10-28 04:23:50 +0000 (Wed, 28 Oct 2009)
Log Message:
-----------
small bigfix and removed gravity_return and sticky_return which appeared to do
nothing and weren't implemented correctly
Modified Paths:
--------------
code/stage/trunk/examples/ctrl/fasr.cc
code/stage/trunk/libstage/model.cc
code/stage/trunk/libstage/model_load.cc
code/stage/trunk/libstage/stage.hh
Modified: code/stage/trunk/examples/ctrl/fasr.cc
===================================================================
--- code/stage/trunk/examples/ctrl/fasr.cc 2009-10-27 19:13:58 UTC (rev
8330)
+++ code/stage/trunk/examples/ctrl/fasr.cc 2009-10-28 04:23:50 UTC (rev
8331)
@@ -513,7 +513,7 @@
putchar( data[x + ((dh-y-1)*dw)] ? 'O' : '.' );
putchar( '\n' );
}
- delete data;
+ delete[] data;
}
#endif
Modified: code/stage/trunk/libstage/model.cc
===================================================================
--- code/stage/trunk/libstage/model.cc 2009-10-27 19:13:58 UTC (rev 8330)
+++ code/stage/trunk/libstage/model.cc 2009-10-28 04:23:50 UTC (rev 8331)
@@ -33,8 +33,6 @@
blob_return 1
laser_return LaserVisible
gripper_return 0
- gravity_return 0
- sticky_return 0
# GUI properties
gui_nose 0
@@ -135,7 +133,6 @@
// default) means this model can not be pushed around (infinite
// friction).
-
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
@@ -233,8 +230,6 @@
laser_return = (stg_laser_return_t)wf->ReadInt( wf_entity, "laser_return",
laser_return);
obstacle_return = wf->ReadInt( wf_entity, "obstacle_return",
obstacle_return);
ranger_return = wf->ReadInt( wf_entity, "ranger_return", ranger_return);
- gravity_return = wf->ReadInt( wf_entity, "gravity_return", gravity_return);
- sticky_return = wf->ReadInt( wf_entity, "sticky_return", sticky_return);
}
Model::GuiState::GuiState() :
Modified: code/stage/trunk/libstage/model_load.cc
===================================================================
--- code/stage/trunk/libstage/model_load.cc 2009-10-27 19:13:58 UTC (rev
8330)
+++ code/stage/trunk/libstage/model_load.cc 2009-10-28 04:23:50 UTC (rev
8331)
@@ -187,13 +187,10 @@
if( wf->PropertyExists( wf_entity, "map_resolution" ))
this->SetMapResolution( wf->ReadFloat(wf_entity, "map_resolution",
this->map_resolution ));
-
- if (vis.gravity_return)
- {
- Velocity vel = GetVelocity();
- this->SetVelocity( vel );
- //StartUpdating();
- }
+
+ // todo - look into this
+ //if (vis.gravity_return)
+ //this->SetVelocity( GetVelocity() );
velocity_enable = wf->ReadInt( wf_entity, "enable_velocity",
velocity_enable );
Modified: code/stage/trunk/libstage/stage.hh
===================================================================
--- code/stage/trunk/libstage/stage.hh 2009-10-27 19:13:58 UTC (rev 8330)
+++ code/stage/trunk/libstage/stage.hh 2009-10-28 04:23:50 UTC (rev 8331)
@@ -1864,8 +1864,6 @@
stg_laser_return_t laser_return;
bool obstacle_return;
bool ranger_return;
- bool gravity_return;
- bool sticky_return;
Visibility();
void Load( Worldfile* wf, int wf_entity );
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
