From: Pooya K. <po...@us...> - 2006-07-28 15:04:04
|
Update of /cvsroot/playerstage/code/stage/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26784/src Modified Files: .cvsignore Makefile.am model_audio.c Removed Files: ptest.c stest.c Log Message: new directory structure for examples Index: .cvsignore =================================================================== RCS file: /cvsroot/playerstage/code/stage/src/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 31 Jul 2005 19:26:28 -0000 1.4 --- .cvsignore 28 Jul 2006 22:04:01 -0000 1.5 *************** *** 1,5 **** Makefile Makefile.in - stest - ptest .DS_Store --- 1,3 ---- --- stest.c DELETED --- --- ptest.c DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/playerstage/code/stage/src/Makefile.am,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** Makefile.am 27 Jul 2006 02:33:02 -0000 1.141 --- Makefile.am 28 Jul 2006 22:04:01 -0000 1.142 *************** *** 18,32 **** lib_LTLIBRARIES = libstage.la - # build stest, a stand-alone test binary using the stage library, - bin_PROGRAMS = stest - # if Player is present, build the plugin and the test program if HAVE_PLAYER lib_LTLIBRARIES += libstageplugin.la - # bin_PROGRAMS += ptest #currently broken endif - - # The stage library contains everything you need to build a robot # simulation, including graphics and a world description file --- 18,26 ---- *************** *** 64,73 **** worldfile.cc \ worldfile.hh \ ! rtk.c \ ! rtk.h \ ! rtk_canvas.c \ ! rtk_fig.c \ ! rtk_region.c \ ! rtkprivate.h \ gui_menus.c gui.c --- 58,67 ---- worldfile.cc \ worldfile.hh \ ! rtk.c \ ! rtk.h \ ! rtk_canvas.c \ ! rtk_fig.c \ ! rtk_region.c \ ! rtkprivate.h \ gui_menus.c gui.c *************** *** 108,116 **** stg_time.cc \ stg_time.h \ ! zoo_driver.h \ ! zoo.h \ ! zoo_controller.h \ ! zoo_referee.h \ ! zoo_species.h # TODO --- 102,110 ---- stg_time.cc \ stg_time.h \ ! zoo_driver.h \ ! zoo.h \ ! zoo_controller.h \ ! zoo_referee.h \ ! zoo_species.h # TODO *************** *** 129,141 **** libstageplugin_la_LIBADD = libstage.la @PLAYER_LIBS@ - # build a stand-alone test program using libstage - stest_DEPENDENCIES = libstage.la - stest_SOURCES = stest.c - stest_LDADD = libstage.la - - # TODO - fix this - # build a stand-alone test program using libstage - #ptest_DEPENDENCIES = - #ptest_SOURCES = ptest.c - #ptest_CFLAGS = $(AM_CFLAGS) @PLAYER_CFLAGS@ - #ptest_LDADD = @PLAYERC_LIBS@ --- 123,124 ---- Index: model_audio.c =================================================================== RCS file: /cvsroot/playerstage/code/stage/src/model_audio.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** model_audio.c 27 Jul 2006 22:42:24 -0000 1.2 --- model_audio.c 28 Jul 2006 22:04:01 -0000 1.3 *************** *** 1168,1178 **** if (mod->subs < 1) return 0; - { - stg_rtk_fig_t *fig = - stg_rtk_fig_create(mod->world->win->canvas, NULL, - STG_LAYER_AUDIODATA); - stg_rtk_fig_destroy(fig); ! } #ifdef AUDIO_FIG_DESTROY_LATER --- 1168,1180 ---- if (mod->subs < 1) return 0; ! // { ! // stg_rtk_fig_t *fig = ! // stg_rtk_fig_create(mod->world->win->canvas, NULL, ! // STG_LAYER_AUDIODATA); ! // stg_rtk_fig_destroy(fig); ! // ! // } ! #ifdef AUDIO_FIG_DESTROY_LATER |