Syd Adams: Replace rgb with png.

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index 27ab8327d5f8563e30ecd901fd402c90729bdbf2..4a8c1aea3b0279e2b1cf1117b51e98d152e27839 100644 (file)
--- 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 ca4720966ece1d5a34242849dfee61001a8127e1..7ad47bba3effeb1b349e5fdab53a68d77649bc4e 100644 (file)
--- 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<osgDB::ReaderWriter::Options> 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 9eb5d20d540ee915fa29ce2a1dfa07891bdf7c64..e18475c3a5405928bbec99db51a6c0f72745054f 100644 (file)
--- 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 fb114627bc8899ade003392a3384e2fba03ed72b..931ef0a779c9034afc88390bb7977cc989e9d826 100644 (file)
--- 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