From: durk Date: Tue, 14 Oct 2008 05:04:43 +0000 (+0000) Subject: Syd Adams: Replace rgb with png. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f9250ae522a2b5c337c2d030cf0965953c5c9637;p=simgear.git Syd Adams: Replace rgb with png. --- diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx index 27ab8327..4a8c1aea 100644 --- a/simgear/scene/sky/cloud.cxx +++ b/simgear/scene/sky/cloud.cxx @@ -429,24 +429,24 @@ SGCloudLayer::rebuild() cubeMap->setImage(osg::TextureCubeMap::NEGATIVE_Z, image); 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; - 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; - 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_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_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_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_states2[SG_CLOUD_CIRRUS] = state; diff --git a/simgear/scene/sky/moon.cxx b/simgear/scene/sky/moon.cxx index ca472096..7ad47bba 100644 --- a/simgear/scene/sky/moon.cxx +++ b/simgear/scene/sky/moon.cxx @@ -77,7 +77,7 @@ SGMoon::build( SGPath path, double moon_size ) { osg::ref_ptr options = 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); osg::TexEnv* texEnv = new osg::TexEnv; texEnv->setMode(osg::TexEnv::MODULATE); diff --git a/simgear/scene/sky/newcloud.cxx b/simgear/scene/sky/newcloud.cxx index 9eb5d20d..e18475c3 100644 --- a/simgear/scene/sky/newcloud.cxx +++ b/simgear/scene/sky/newcloud.cxx @@ -129,13 +129,13 @@ void SGNewCloud::loadTextures(const string &tex_path) { SGPath cloud_path; cloud_path.set(tex_path); - cloud_path.append("cl_cumulus.rgb"); + cloud_path.append("cl_cumulus.png"); // OSGFIXME // cloudTextures[ CLTexture_cumulus ] = new osg::Texture2D( cloud_path.str().c_str(), false, false, false ); cloudTextures[ CLTexture_cumulus ] = new osg::Texture2D; cloud_path.set(tex_path); - cloud_path.append("cl_stratus.rgb"); + cloud_path.append("cl_stratus.png"); // OSGFIXME // cloudTextures[ CLTexture_stratus ] = new ssgTexture( cloud_path.str().c_str(), false, false, false ); cloudTextures[ CLTexture_stratus ] = new osg::Texture2D; diff --git a/simgear/scene/sky/oursun.cxx b/simgear/scene/sky/oursun.cxx index fb114627..931ef0a7 100644 --- a/simgear/scene/sky/oursun.cxx +++ b/simgear/scene/sky/oursun.cxx @@ -111,7 +111,7 @@ SGSun::build( SGPath path, double sun_size, SGPropertyNode *property_tree_Node ) stateSet->setRenderBinDetails(-6, "RenderBin"); // 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); // Build scenegraph @@ -147,7 +147,7 @@ SGSun::build( SGPath path, double sun_size, SGPropertyNode *property_tree_Node ) stateSet = geode->getOrCreateStateSet(); stateSet->setRenderBinDetails(-7, "RenderBin"); - texture = SGLoadTexture2D("inner_halo.rgba", options.get()); + texture = SGLoadTexture2D("inner_halo.png", options.get()); stateSet->setTextureAttributeAndModes(0, texture); // Build ssg structure @@ -185,7 +185,7 @@ SGSun::build( SGPath path, double sun_size, SGPropertyNode *property_tree_Node ) stateSet = geode->getOrCreateStateSet(); stateSet->setRenderBinDetails(-8, "RenderBin"); - texture = SGLoadTexture2D("outer_halo.rgba", options.get()); + texture = SGLoadTexture2D("outer_halo.png", options.get()); stateSet->setTextureAttributeAndModes(0, texture); // Build ssg structure