Revision: 6830
http://playerstage.svn.sourceforge.net/playerstage/?rev=6830&view=rev
Author: rtv
Date: 2008-07-09 16:03:55 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
removed historical gtk dependency from stage.pc
Modified Paths:
--------------
code/stage/trunk/libstage/stage.hh
code/stage/trunk/stage.pc.in
code/stage/trunk/worlds/fasr.world
code/stage/trunk/worlds/simple.world
Modified: code/stage/trunk/libstage/stage.hh
===================================================================
--- code/stage/trunk/libstage/stage.hh 2008-07-09 22:48:24 UTC (rev 6829)
+++ code/stage/trunk/libstage/stage.hh 2008-07-09 23:03:55 UTC (rev 6830)
@@ -605,22 +605,6 @@
stg_cb_t* cb_create( stg_model_callback_t callback, void* arg );
void cb_destroy( stg_cb_t* cb );
- typedef struct
- {
- StgModel* mod;
- void* member;
- char* name;
- stg_model_callback_t callback_on;
- stg_model_callback_t callback_off;
- void* arg_on; // argument to callback_on
- void* arg_off; // argument to callback_off
- //int default_state; // disabled = 0
- //GtkAction* action; // action associated with this toggle, may
be NULL
- char* path;
- } stg_property_toggle_args_t;
-
-
-
/** defines a rectangle of [size] located at [pose] */
typedef struct
{
@@ -1618,16 +1602,7 @@
*/
int SetProperty( char* key, void* data );
void UnsetProperty( char* key );
-
- void AddPropertyToggles( void* member,
- stg_model_callback_t
callback_on,
- void* arg_on,
- stg_model_callback_t
callback_off,
- void* arg_off,
- char* name,
- char* label,
- gboolean enabled );
-
+
virtual void Print( char* prefix );
virtual const char* PrintWithPose();
Modified: code/stage/trunk/stage.pc.in
===================================================================
--- code/stage/trunk/stage.pc.in 2008-07-09 22:48:24 UTC (rev 6829)
+++ code/stage/trunk/stage.pc.in 2008-07-09 23:03:55 UTC (rev 6830)
@@ -3,6 +3,6 @@
Name: stage
Description: Stage robot simulation C library and Player plugin - part of the
Player/Stage Project
Version: @VERSION@
-Requires: gtk+-2.0 >= 2.4 gthread-2.0 >= 2.4
+Requires: glib-2.0 >= 2.4
Libs: -L${prefix}/lib -lstage
Cflags: -I${prefix}/include/Stage-3.0
Modified: code/stage/trunk/worlds/fasr.world
===================================================================
--- code/stage/trunk/worlds/fasr.world 2008-07-09 22:48:24 UTC (rev 6829)
+++ code/stage/trunk/worlds/fasr.world 2008-07-09 23:03:55 UTC (rev 6830)
@@ -54,14 +54,14 @@
define autorob pioneer2dx
(
- sicklaser( pose [ 0.040 0 0 0 ] samples 32 range_max 5 laser_return 2 )
+ sicklaser( pose [ 1.040 0 0 0 ] origin [ 0 0 0 0 ] samples 180 range_max 5
laser_return 2 )
ctrl "fasr"
#camera( pose [ 0 0 0 0 ] width 100 height 100 horizfov 70 vertfov 40 yaw 0 )
#say "Autolab"
)
-autorob( pose [3.273 4.908 0 1.930] )
+autorob( pose [3.273 4.908 0 1.930] size [ 0.02 0.02 0.01 ])
autorob( pose [6.635 6.458 0 -52.629] )
autorob( pose [6.385 5.805 0 -87.082] )
autorob( pose [7.004 5.327 0 170.536] )
Modified: code/stage/trunk/worlds/simple.world
===================================================================
--- code/stage/trunk/worlds/simple.world 2008-07-09 22:48:24 UTC (rev
6829)
+++ code/stage/trunk/worlds/simple.world 2008-07-09 23:03:55 UTC (rev
6830)
@@ -36,6 +36,6 @@
sicklaser( pose [0.04 0 0 0] )
# remove this if you're using Player to control the robot
- # ctrl "wander"
+ ctrl "wander"
)
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
