Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: If mask is using colors, convert it to grayscale using Red value (compatible with previous algorithm)

Browse source
This commit is contained in:
kervala 2016-01-04 13:58:54 +01:00
parent 3f2959f668
commit 6f69256c48
1 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
code/nel/tools/3d/panoply_maker/panoply_maker.cpp
View file

@ -791,16 +791,15 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
throw NLMISC::Exception("Failed to load mask"); throw NLMISC::Exception("Failed to load mask");
} }
// masks can be converted to grayscale files // convert color mask to grayscale (red is the new gray value)
if (bi.OptimizeTextures > 0 && maskDepth > 8) if (li.Mask.getPixelFormat() == CBitmap::RGBA)
{ {
if (!li.Mask.isGrayscale()) // display a warning if checks enabled
if (bi.OptimizeTextures > 0 && !li.Mask.isGrayscale())
{ {
nlwarning("Mask %s is using colors, results may by incorrect! Use OptimizeTextures = 2 to fix it.", maskFileName.c_str()); nlwarning("Mask %s is using colors, results may by incorrect! Use OptimizeTextures = 2 to fix it.", maskFileName.c_str());
} }
if (bi.OptimizeTextures > 1)
{
// get a pointer on original data // get a pointer on original data
uint32 size = li.Mask.getPixels().size(); uint32 size = li.Mask.getPixels().size();
uint32 *data = (uint32*)li.Mask.getPixels().getPtr(); uint32 *data = (uint32*)li.Mask.getPixels().getPtr();
@ -822,10 +821,19 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
++data; ++data;
} }
}
// convert image to real grayscale // convert image to real grayscale
if (li.Mask.PixelFormat != NLMISC::CBitmap::Luminance)
{
li.Mask.convertToType(NLMISC::CBitmap::Luminance); li.Mask.convertToType(NLMISC::CBitmap::Luminance);
}
// masks can be converted to grayscale files
if (bi.OptimizeTextures > 0 && maskDepth > 8)
{
if (bi.OptimizeTextures > 1)
{
NLMISC::COFile os; NLMISC::COFile os;
if (os.open(maskFileName)) if (os.open(maskFileName))
@ -855,11 +863,6 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
} }
} }
if (li.Mask.PixelFormat != NLMISC::CBitmap::Luminance)
{
li.Mask.convertToType(NLMISC::CBitmap::Luminance);
}
/// make sure the mask has the same size /// make sure the mask has the same size
if (li.Mask.getWidth() != srcBitmap.getWidth() if (li.Mask.getWidth() != srcBitmap.getWidth()
|| li.Mask.getHeight() != srcBitmap.getHeight()) || li.Mask.getHeight() != srcBitmap.getHeight())