- Update OsgGraph
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6029 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 905c829378a19cf307fe7a715b46d4ef60119b02 Former-commit-id: dbed119bb118a76702139576d8db24972f50d46a
This commit is contained in:
parent
536a81641a
commit
2bb576da9f
3 changed files with 8 additions and 8 deletions
|
@ -3,7 +3,7 @@ INCLUDE(../../../../cmake/macros.cmake)
|
|||
SET(OSGGRAPH_HEADERS Utils/OsgVectorArrayAdapter.h
|
||||
Utils/OsgColor.h
|
||||
Utils/OsgMath.h
|
||||
Utils/OsgOptions.h
|
||||
#Utils/OsgOptions.h
|
||||
|
||||
Sky/OsgSphere.h
|
||||
Sky/OsgSun.h
|
||||
|
@ -40,7 +40,7 @@ SET(OSGGRAPH_HEADERS Utils/OsgVectorArrayAdapter.h
|
|||
)
|
||||
|
||||
SET(OSGGRAPH_SOURCES Utils/OsgMath.cpp
|
||||
Utils/OsgOptions.cpp
|
||||
#Utils/OsgOptions.cpp
|
||||
|
||||
Sky/OsgSphere.cpp
|
||||
Sky/OsgSun.cpp
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <graphic.h>
|
||||
|
||||
#include "OsgMain.h"
|
||||
#include "OsgOptions.h"
|
||||
//#include "OsgOptions.h"
|
||||
#include "OsgCar.h"
|
||||
#include "OsgScenery.h"
|
||||
#include "OsgRender.h"
|
||||
|
@ -39,16 +39,16 @@
|
|||
//extern osg::Timer m_timer;
|
||||
//extern osg::Timer_t m_start_tick;
|
||||
|
||||
SDOptions *Options = 0;
|
||||
//SDOptions *Options = 0;
|
||||
SDCars *cars = 0;
|
||||
SDScenery *scenery = 0;
|
||||
SDRender *render = 0;
|
||||
SDScreens *screens = 0;
|
||||
|
||||
void *getOptions()
|
||||
/*oid *getOptions()
|
||||
{
|
||||
return Options;
|
||||
}
|
||||
}*/
|
||||
|
||||
void *getScreens()
|
||||
{
|
||||
|
@ -249,7 +249,7 @@ int initTrack(tTrack *track)
|
|||
// Now, do the real track loading job.
|
||||
grTrackHandle = GfParmReadFile(track->filename, GFPARM_RMODE_STD | GFPARM_RMODE_CREAT);
|
||||
|
||||
Options = new SDOptions;
|
||||
//Options = new SDOptions;
|
||||
|
||||
scenery = new SDScenery;
|
||||
render = new SDRender;
|
||||
|
|
|
@ -77,6 +77,6 @@ void * getScreens();
|
|||
void * getRender();
|
||||
void * getCars();
|
||||
void * getScenery();
|
||||
void * getOptions();
|
||||
//void * getOptions();
|
||||
|
||||
#endif /* _OSGMAIN_H_ */
|
||||
|
|
Loading…
Reference in a new issue