fly/flightgear
1
0
Fork 0
Code Activity

Tweaks so tile loading still works in non-threaded mode.

Browse source
This commit is contained in:
curt 2001-04-17 05:21:56 +00:00
parent 9bc25d9ce3
commit 051e2a6dc3
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Scenery/FGTileLoader.cxx
View file

@ -29,6 +29,9 @@
#include "tileentry.hxx" #include "tileentry.hxx"
#include "tilemgr.hxx" #include "tilemgr.hxx"
extern ssgBranch *terrain;
extern ssgBranch *ground;
/** /**
* *
*/ */
@ -87,6 +90,7 @@ FGTileLoader::add( FGTileEntry* tile )
tile_queue.push( tile ); tile_queue.push( tile );
#else #else
tile->load( tile_path, true ); tile->load( tile_path, true );
tile->add_ssg_nodes( terrain, ground );
#endif // ENABLE_THREADS #endif // ENABLE_THREADS
} }

2
src/Scenery/FGTileLoader.hxx
View file

@ -77,10 +77,12 @@ private:
private: private:
#ifdef ENABLE_THREADS
/** /**
* FIFO queue of tiles to load from data files. * FIFO queue of tiles to load from data files.
*/ */
SGBlockingQueue< FGTileEntry* > tile_queue; SGBlockingQueue< FGTileEntry* > tile_queue;
#endif
/** /**
* Base name of directory containing tile data file. * Base name of directory containing tile data file.

6
tests/Makefile.am
View file

@ -1,4 +1,5 @@
bin_PROGRAMS = est-epsilon gl-info test-gethostname test-mktime test-up bin_PROGRAMS = est-epsilon gl-info test-gethostname test-mktime test-text \
test-up
est_epsilon_SOURCES = est-epsilon.c est_epsilon_SOURCES = est-epsilon.c
est_epsilon_LDADD = $(base_LIBS) est_epsilon_LDADD = $(base_LIBS)
@ -12,5 +13,8 @@ test_gethostname_LDADD = $(base_LIBS)
test_mktime_SOURCES = test-mktime.cxx test_mktime_SOURCES = test-mktime.cxx
test_mktime_LDADD = $(base_LIBS) test_mktime_LDADD = $(base_LIBS)
test_text_SOURCES = test-text.cxx
test_text_LDADD = $(base_LIBS)
test_up_SOURCES = test-up.cxx test_up_SOURCES = test-up.cxx
test_up_LDADD = -lsgmath -lsgdebug -lplibsg $(base_LIBS) test_up_LDADD = -lsgmath -lsgdebug -lplibsg $(base_LIBS)