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

Handle dds object masks properly:

Browse Source 
1) Only flip the object-mask if the texture xor the object mask is dds
2) Handle NTFS file systems where the extension may be .DDS rather than .dds.
This commit is contained in:
Stuart Buchanan
2012-02-26 22:38:38 +00:00
parent 4fae9039c1
commit 39d45e9e0a
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/mat.cxx
+14 -6
View File
@@ -128,7 +128,9 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
tname = "unknown.rgb"; tname = "unknown.rgb";
} }
if (tname.rfind(".dds") == (tname.length() - 4)) { if ((tname.rfind(".dds") == (tname.length() - 4)) ||
(tname.rfind(".DDS") == (tname.length() - 4)) )
{
dds.push_back(true); dds.push_back(true);
} else { } else {
dds.push_back(false); dds.push_back(false);
@@ -162,7 +164,9 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
} }
if (j == 0) { if (j == 0) {
if (tname.rfind(".dds") == (tname.length() - 4)) { if ((tname.rfind(".dds") == (tname.length() - 4)) ||
(tname.rfind(".DDS") == (tname.length() - 4)) )
{
dds.push_back(true); dds.push_back(true);
} else { } else {
dds.push_back(false); dds.push_back(false);
@@ -215,10 +219,14 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
{ {
osg::Texture2D* object_mask = new osg::Texture2D; osg::Texture2D* object_mask = new osg::Texture2D;
if (dds[i]) { bool dds_mask = ((omname.rfind(".dds") == (omname.length() - 4)) ||
// Texture is a DDS. This is relevant for the object mask, as DDS (omname.rfind(".DDS") == (omname.length() - 4)) );
// textures have an origin at the bottom left rather than top
// left, therefore we flip the object mask vertically. if (dds[i] != dds_mask) {
// Texture format does not match mask format. This is relevant for
// the object mask, as DDS textures have an origin at the bottom
// left rather than top left, therefore we flip the object mask
// vertically.
image->flipVertical(); image->flipVertical();
} }