FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Syd Adams: Replace rgb with png.

Browse Source
This commit is contained in:
durk
2008-10-14 05:04:43 +00:00
parent 2f8621ed3d
commit f9250ae522
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/sky/cloud.cxx
+6 -6
View File
@@ -429,24 +429,24 @@ SGCloudLayer::rebuild()
cubeMap->setImage(osg::TextureCubeMap::NEGATIVE_Z, image); cubeMap->setImage(osg::TextureCubeMap::NEGATIVE_Z, image);
osg::StateSet* state; osg::StateSet* state;
state = SGMakeState(texture_path, "overcast.rgb", "overcast_n.rgb"); state = SGMakeState(texture_path, "overcast.png", "overcast_n.png");
layer_states[SG_CLOUD_OVERCAST] = state; layer_states[SG_CLOUD_OVERCAST] = state;
state = SGMakeState(texture_path, "overcast_top.rgb", "overcast_top_n.rgb"); state = SGMakeState(texture_path, "overcast_top.png", "overcast_top_n.png");
layer_states2[SG_CLOUD_OVERCAST] = state; layer_states2[SG_CLOUD_OVERCAST] = state;
state = SGMakeState(texture_path, "broken.rgba", "broken_n.rgb"); state = SGMakeState(texture_path, "broken.png", "broken_n.png");
layer_states[SG_CLOUD_BROKEN] = state; layer_states[SG_CLOUD_BROKEN] = state;
layer_states2[SG_CLOUD_BROKEN] = state; layer_states2[SG_CLOUD_BROKEN] = state;
state = SGMakeState(texture_path, "scattered.rgba", "scattered_n.rgb"); state = SGMakeState(texture_path, "scattered.png", "scattered_n.png");
layer_states[SG_CLOUD_SCATTERED] = state; layer_states[SG_CLOUD_SCATTERED] = state;
layer_states2[SG_CLOUD_SCATTERED] = state; layer_states2[SG_CLOUD_SCATTERED] = state;
state = SGMakeState(texture_path, "few.rgba", "few_n.rgb"); state = SGMakeState(texture_path, "few.png", "few_n.png");
layer_states[SG_CLOUD_FEW] = state; layer_states[SG_CLOUD_FEW] = state;
layer_states2[SG_CLOUD_FEW] = state; layer_states2[SG_CLOUD_FEW] = state;
state = SGMakeState(texture_path, "cirrus.rgba", "cirrus_n.rgb"); state = SGMakeState(texture_path, "cirrus.png", "cirrus_n.png");
layer_states[SG_CLOUD_CIRRUS] = state; layer_states[SG_CLOUD_CIRRUS] = state;
layer_states2[SG_CLOUD_CIRRUS] = state; layer_states2[SG_CLOUD_CIRRUS] = state;
simgear/scene/sky/moon.cxx
+1 -1
View File
@@ -77,7 +77,7 @@ SGMoon::build( SGPath path, double moon_size ) {
osg::ref_ptr<osgDB::ReaderWriter::Options> options osg::ref_ptr<osgDB::ReaderWriter::Options> options
= makeOptionsFromPath(path); = makeOptionsFromPath(path);
osg::Texture2D* texture = SGLoadTexture2D("moon.rgba", options.get()); osg::Texture2D* texture = SGLoadTexture2D("moon.png", options.get());
stateSet->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON); stateSet->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
osg::TexEnv* texEnv = new osg::TexEnv; osg::TexEnv* texEnv = new osg::TexEnv;
texEnv->setMode(osg::TexEnv::MODULATE); texEnv->setMode(osg::TexEnv::MODULATE);
simgear/scene/sky/newcloud.cxx
+2 -2
View File
@@ -129,13 +129,13 @@ void SGNewCloud::loadTextures(const string &tex_path) {
SGPath cloud_path; SGPath cloud_path;
cloud_path.set(tex_path); cloud_path.set(tex_path);
cloud_path.append("cl_cumulus.rgb"); cloud_path.append("cl_cumulus.png");
// OSGFIXME // OSGFIXME
// cloudTextures[ CLTexture_cumulus ] = new osg::Texture2D( cloud_path.str().c_str(), false, false, false ); // cloudTextures[ CLTexture_cumulus ] = new osg::Texture2D( cloud_path.str().c_str(), false, false, false );
cloudTextures[ CLTexture_cumulus ] = new osg::Texture2D; cloudTextures[ CLTexture_cumulus ] = new osg::Texture2D;
cloud_path.set(tex_path); cloud_path.set(tex_path);
cloud_path.append("cl_stratus.rgb"); cloud_path.append("cl_stratus.png");
// OSGFIXME // OSGFIXME
// cloudTextures[ CLTexture_stratus ] = new ssgTexture( cloud_path.str().c_str(), false, false, false ); // cloudTextures[ CLTexture_stratus ] = new ssgTexture( cloud_path.str().c_str(), false, false, false );
cloudTextures[ CLTexture_stratus ] = new osg::Texture2D; cloudTextures[ CLTexture_stratus ] = new osg::Texture2D;
simgear/scene/sky/oursun.cxx
+3 -3
View File
@@ -111,7 +111,7 @@ SGSun::build( SGPath path, double sun_size, SGPropertyNode *property_tree_Node )
stateSet->setRenderBinDetails(-6, "RenderBin"); stateSet->setRenderBinDetails(-6, "RenderBin");
// set up the sun-state // set up the sun-state
osg::Texture2D* texture = SGLoadTexture2D("sun.rgba", options.get()); osg::Texture2D* texture = SGLoadTexture2D("sun.png", options.get());
stateSet->setTextureAttributeAndModes(0, texture); stateSet->setTextureAttributeAndModes(0, texture);
// Build scenegraph // Build scenegraph
@@ -147,7 +147,7 @@ SGSun::build( SGPath path, double sun_size, SGPropertyNode *property_tree_Node )
stateSet = geode->getOrCreateStateSet(); stateSet = geode->getOrCreateStateSet();
stateSet->setRenderBinDetails(-7, "RenderBin"); stateSet->setRenderBinDetails(-7, "RenderBin");
texture = SGLoadTexture2D("inner_halo.rgba", options.get()); texture = SGLoadTexture2D("inner_halo.png", options.get());
stateSet->setTextureAttributeAndModes(0, texture); stateSet->setTextureAttributeAndModes(0, texture);
// Build ssg structure // Build ssg structure
@@ -185,7 +185,7 @@ SGSun::build( SGPath path, double sun_size, SGPropertyNode *property_tree_Node )
stateSet = geode->getOrCreateStateSet(); stateSet = geode->getOrCreateStateSet();
stateSet->setRenderBinDetails(-8, "RenderBin"); stateSet->setRenderBinDetails(-8, "RenderBin");
texture = SGLoadTexture2D("outer_halo.rgba", options.get()); texture = SGLoadTexture2D("outer_halo.png", options.get());
stateSet->setTextureAttributeAndModes(0, texture); stateSet->setTextureAttributeAndModes(0, texture);
// Build ssg structure // Build ssg structure