iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

update OsgCloud.cpp

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

Former-commit-id: 0fe242715320b8f38b0d81ae8c582c63d9f8f949
Former-commit-id: 0d9d551680d427e8b7e1ec8e92353a3ba086a279
This commit is contained in:
torcs-ng 2013-08-02 20:10:03 +00:00
parent 028438f9d0
commit 0e72c8c136
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/modules/graphic/osggraph/OsgSky/OsgCloud.cpp
View file

@ -46,6 +46,14 @@
using namespace osg; using namespace osg;
<<<<<<< .mine
static osg::ref_ptr<osg::StateSet> layer_states[SDCloudLayer::SD_MAX_CLOUD_COVERAGES];
static osg::ref_ptr<osg::StateSet> layer_states2[SDCloudLayer::SD_MAX_CLOUD_COVERAGES];
static osg::ref_ptr<osg::TextureCubeMap> cubeMap;
static bool state_initialized = false;
=======
>>>>>>> .r5649
// make an StateSet for a cloud layer given the named texture // make an StateSet for a cloud layer given the named texture
static osg::StateSet* static osg::StateSet*
SDMakeState(const std::string &texture_path, const std::string &texture_name) SDMakeState(const std::string &texture_path, const std::string &texture_name)