speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix build OsgSky

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5258 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: dabeff109cdfdb659fb9ab5f7b219cd5991738bc
Former-commit-id: 8877830404a71316bd11686e45ce3f3e936cf6e6
This commit is contained in:
torcs-ng 2013-03-04 12:57:05 +00:00
parent bf2b3a150c
commit 26371da646
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/modules/graphic/osggraph/CMakeLists.txt
View file

@ -2,14 +2,14 @@ INCLUDE(../../../../cmake/macros.cmake)
SET(OSGGRAPH_HEADERS OsgVectorArrayAdapter.h OsgColor.h OsgAtomic.h SET(OSGGRAPH_HEADERS OsgVectorArrayAdapter.h OsgColor.h OsgAtomic.h
OsgReferenced.h OsgSharedPtr.h OsgSphere.h OsgSun.h OsgReferenced.h OsgSharedPtr.h OsgSphere.h OsgSun.h
OsgMoon.h OsgStars.h # OsgDome.h OsgSky.h OsgMoon.h OsgStars.h OsgDome.h OsgSky.h
AccGeode.h AccException.h ReaderWriterACC.h AccGeode.h AccException.h ReaderWriterACC.h
OsgLoader.h OsgScenery.h OsgRender.h OsgMath.h OsgMain.h OsgLoader.h OsgScenery.h OsgRender.h OsgMath.h OsgMain.h
OsgView.h OsgGraph.h OsgCar.h OsgWheel.h OsgBrake.h OsgView.h OsgGraph.h OsgCar.h OsgWheel.h OsgBrake.h
OsgScreens.h OsgCamera.h) OsgScreens.h OsgCamera.h)
SET(OSGGRAPH_SOURCES OsgSphere.cpp OsgSun.cpp OsgMoon.cpp OsgStars.cpp SET(OSGGRAPH_SOURCES OsgSphere.cpp OsgSun.cpp OsgMoon.cpp OsgStars.cpp
#OsgDome.cpp OsgSky.cpp OsgDome.cpp OsgSky.cpp
AccGeode.cpp AccException.cpp AccGeode.cpp AccException.cpp
ReaderWriterACC.cpp OsgLoader.cpp OsgBackground.cpp ReaderWriterACC.cpp OsgLoader.cpp OsgBackground.cpp
OsgScenery.cpp OsgView.cpp OsgRender.cpp OsgScenery.cpp OsgView.cpp OsgRender.cpp

2
src/modules/graphic/osggraph/OsgSky.cpp
View file

@ -76,7 +76,7 @@ void SDSky::build( std::string tex_path, double h_radius, double v_radius, doubl
int nstars, osg::Vec3d *star_data ) int nstars, osg::Vec3d *star_data )
{ {
dome = new SDSkyDome; dome = new SDSkyDome;
pre_transform->addChild( dome->build( h_radius_m, v_radius_m )); pre_transform->addChild( dome->build( h_radius, v_radius ));
//pre_transform->addChild(_ephTransform.get()); //pre_transform->addChild(_ephTransform.get());
planets = new SDStars; planets = new SDStars;

4
src/modules/graphic/osggraph/OsgSky.h
View file

@ -27,7 +27,7 @@
#include <osg/Node> #include <osg/Node>
#include <osg/Switch> #include <osg/Switch>
//#include "OsgDome.h" #include "OsgDome.h"
#include "OsgMoon.h" #include "OsgMoon.h"
#include "OsgSun.h" #include "OsgSun.h"
#include "OsgStars.h" #include "OsgStars.h"
@ -128,7 +128,7 @@ public:
double moon_angle, int nplanets, osg::Vec3d *planet_data, double moon_angle, int nplanets, osg::Vec3d *planet_data,
int nstars, osg::Vec3d *star_data); int nstars, osg::Vec3d *star_data);
//bool reposition( const SDSkyState &st/*, const SDEphemeris& eph*/, double dt = 0.0 ); //bool reposition( const SDSkyState &st/*, const SDEphemeris& eph*/, double dt = 0.0 );
bool reposition(osg::Vec3 view_pos, osg::Vec3 zero_elev, osg::Vec3 view_up, double lon, double lat, double alt, double spin, double gst, double dt); bool reposition(osg::Vec3& view_pos, osg::Vec3 zero_elev, osg::Vec3 view_up, double lon, double lat, double alt, double spin, double gst, double dt);
void modify_vis( float alt, float time_factor ); void modify_vis( float alt, float time_factor );