Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26853/libstage
Modified Files:
CMakeLists.txt model_laser.cc stage.hh
Log Message:
added laser noise generating plugin as a demo
Index: stage.hh
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/stage.hh,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** stage.hh 3 Mar 2008 06:02:26 -0000 1.13
--- stage.hh 4 Mar 2008 02:09:56 -0000 1.14
***************
*** 1892,1901 ****
uint32_t GetSampleCount(){ return sample_count; }
!
! stg_laser_sample_t* GetSamples( uint32_t* count=NULL)
! {
! if( count ) *count = sample_count;
! return samples;
! }
// Get the user-tweakable configuration of the laser
--- 1892,1899 ----
uint32_t GetSampleCount(){ return sample_count; }
!
! stg_laser_sample_t* GetSamples( uint32_t* count=NULL);
!
! void SetSamples( stg_laser_sample_t* samples, uint32_t count);
// Get the user-tweakable configuration of the laser
Index: model_laser.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/model_laser.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** model_laser.cc 3 Mar 2008 06:02:26 -0000 1.6
--- model_laser.cc 4 Mar 2008 02:09:56 -0000 1.7
***************
*** 286,290 ****
--- 286,302 ----
+ stg_laser_sample_t* StgModelLaser::GetSamples( uint32_t* count )
+ {
+ if( count ) *count = sample_count;
+ return samples;
+ }
+ void StgModelLaser::SetSamples( stg_laser_sample_t* samples, uint32_t count)
+ {
+ this->samples = g_renew( stg_laser_sample_t, this->samples, sample_count );
+ memcpy( this->samples, samples, sample_count * sizeof(stg_laser_sample_t));
+ this->sample_count = count;
+ this->data_dirty = true;
+ }
void StgModelLaser::DataVisualize( void )
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CMakeLists.txt 27 Feb 2008 22:51:12 -0000 1.2
--- CMakeLists.txt 4 Mar 2008 02:09:56 -0000 1.3
***************
*** 1,30 ****
- include(FindPkgConfig)
- pkg_check_modules( GLIB gdk-pixbuf-2.0 )
-
- find_package(OPENGL REQUIRED)
-
- if(APPLE)
- set(FLTK_INCLUDE_DIR /opt/local/include) # MacPorts' install path
- endif(APPLE)
-
- find_package(FLTK REQUIRED)
-
- message("FLTK")
- message(" include ${FLTK_INCLUDE_DIR}")
- message(" libs ${FLTK_LIBRARIES}")
- message("OpenGL")
- message(" include ${OPENGL_INCLUDE_DIR}")
- message(" libs ${OPENGL_LIBRARIES}")
-
- include_directories( .
- ..
- ../replace
- ${GLIB_INCLUDE_DIRS}
- ${FLTK_INCLUDE_DIR}
- ${OPENGL_INCLUDE_DIR}
- )
-
-
link_directories(${GLIB_LIBRARY_DIRS}
${FLTK_LIBRARY_DIRS}
--- 1,3 ----
***************
*** 32,58 ****
)
! add_executable(stage
! ancestor.cc
! block.cc
! canvas.cc
! gl.cc
! glcolorstack.cc
! model.cc
! model_callbacks.cc
! model_fiducial.cc
! model_laser.cc
! model_load.cc
! model_position.cc
! model_ranger.cc
! model_blobfinder.cc
! model_props.cc
! stage.cc
! typetable.cc
! world.cc
! worldfile.cc
! worldgui.cc
! main.cc
)
--- 5,33 ----
)
!
! add_library( stage SHARED
! ancestor.cc
! block.cc
! canvas.cc
! gl.cc
! glcolorstack.cc
! model.cc
! model_callbacks.cc
! model_fiducial.cc
! model_laser.cc
! model_load.cc
! model_position.cc
! model_ranger.cc
! model_blobfinder.cc
! model_props.cc
! stage.cc
! typetable.cc
! world.cc
! worldfile.cc
! worldgui.cc
)
+ add_executable( stage main.cc )
+
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
