Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4091/libstage
Modified Files:
Tag: opengl
Makefile Makefile.am stage.hh
Log Message:
fixed plugin
Index: stage.hh
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/stage.hh,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -C2 -d -r1.1.2.20 -r1.1.2.21
*** stage.hh 24 Dec 2007 10:50:45 -0000 1.1.2.20
--- stage.hh 24 Dec 2007 11:20:36 -0000 1.1.2.21
***************
*** 2195,2203 ****
stg_position_drive_mode_t drive_mode;
- // localization state
- stg_pose_t est_pose; ///< position estimate in local coordinates
- stg_pose_t est_pose_error; ///< estimated error in position estimate
- stg_pose_t est_origin; ///< global origin of the local coordinate system
-
stg_position_localization_mode_t localization_mode; ///< global or local
mode
stg_velocity_t integration_error; ///< errors to apply in simple odometry
model
--- 2195,2198 ----
***************
*** 2238,2241 ****
--- 2233,2241 ----
}
+ // localization state
+ stg_pose_t est_pose; ///< position estimate in local coordinates
+ stg_pose_t est_pose_error; ///< estimated error in position estimate
+ stg_pose_t est_origin; ///< global origin of the local coordinate system
+
// static wrapper for the constructor - all models must implement
// this method and add an entry in typetable.cc
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/Makefile.am,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** Makefile.am 27 Nov 2007 05:36:01 -0000 1.1.2.6
--- Makefile.am 24 Dec 2007 11:20:36 -0000 1.1.2.7
***************
*** 30,33 ****
--- 30,34 ----
model.cc \
model_callbacks.cc \
+ model_fiducial.cc \
model_laser.cc \
model_load.cc \
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/Makefile,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** Makefile 27 Nov 2007 07:03:33 -0000 1.1.2.9
--- Makefile 24 Dec 2007 11:20:36 -0000 1.1.2.10
***************
*** 66,72 ****
libstage_la_DEPENDENCIES =
am_libstage_la_OBJECTS = ancestor.lo block.lo blockgrid.lo canvas.lo \
! glcolorstack.lo model.lo model_callbacks.lo model_laser.lo \
! model_load.lo model_position.lo model_ranger.lo model_props.lo \
! stage.lo typetable.lo world.lo worldfile.lo worldgui.lo
libstage_la_OBJECTS = $(am_libstage_la_OBJECTS)
libstage_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
--- 66,73 ----
libstage_la_DEPENDENCIES =
am_libstage_la_OBJECTS = ancestor.lo block.lo blockgrid.lo canvas.lo \
! glcolorstack.lo model.lo model_callbacks.lo model_fiducial.lo \
! model_laser.lo model_load.lo model_position.lo model_ranger.lo \
! model_props.lo stage.lo typetable.lo world.lo worldfile.lo \
! worldgui.lo
libstage_la_OBJECTS = $(am_libstage_la_OBJECTS)
libstage_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
***************
*** 251,254 ****
--- 252,256 ----
model.cc \
model_callbacks.cc \
+ model_fiducial.cc \
model_laser.cc \
model_load.cc \
***************
*** 378,381 ****
--- 380,384 ----
include ./$(DEPDIR)/model.Plo
include ./$(DEPDIR)/model_callbacks.Plo
+ include ./$(DEPDIR)/model_fiducial.Plo
include ./$(DEPDIR)/model_laser.Plo
include ./$(DEPDIR)/model_load.Plo
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
