mirror of
https://github.com/moparisthebest/minetest
synced 2024-12-24 08:28:49 -05:00
Add texture modifier [brighten and modify [toalpha to modify existing texture, not read a new base
This commit is contained in:
parent
0bf3a15886
commit
e8a9578774
@ -529,8 +529,8 @@ public:
|
|||||||
f->drawtype = NDT_NORMAL;
|
f->drawtype = NDT_NORMAL;
|
||||||
f->solidness = 1;
|
f->solidness = 1;
|
||||||
for(u32 i=0; i<6; i++){
|
for(u32 i=0; i<6; i++){
|
||||||
f->tname_tiles[i] = std::string("[noalpha:")
|
f->tname_tiles[i] = f->tname_tiles[i]
|
||||||
+ f->tname_tiles[i];
|
+ std::string("^[noalpha");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
79
src/tile.cpp
79
src/tile.cpp
@ -460,6 +460,8 @@ u32 TextureSource::getTextureId(const std::string &name)
|
|||||||
|
|
||||||
// Draw a progress bar on the image
|
// Draw a progress bar on the image
|
||||||
void make_progressbar(float value, video::IImage *image);
|
void make_progressbar(float value, video::IImage *image);
|
||||||
|
// Brighten image
|
||||||
|
void brighten(video::IImage *image);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Generate image based on a string like "stone.png" or "[crack0".
|
Generate image based on a string like "stone.png" or "[crack0".
|
||||||
@ -1306,53 +1308,46 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
|
|||||||
make_progressbar(value, baseimg);
|
make_progressbar(value, baseimg);
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
"[noalpha:filename.png"
|
"[brighten"
|
||||||
Use an image without it's alpha channel.
|
*/
|
||||||
|
else if(part_of_name.substr(0,9) == "[brighten")
|
||||||
|
{
|
||||||
|
if(baseimg == NULL)
|
||||||
|
{
|
||||||
|
errorstream<<"generate_image(): baseimg==NULL "
|
||||||
|
<<"for part_of_name=\""<<part_of_name
|
||||||
|
<<"\", cancelling."<<std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
brighten(baseimg);
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
"[noalpha"
|
||||||
|
Make image completely opaque.
|
||||||
Used for the leaves texture when in old leaves mode, so
|
Used for the leaves texture when in old leaves mode, so
|
||||||
that the transparent parts don't look completely black
|
that the transparent parts don't look completely black
|
||||||
when simple alpha channel is used for rendering.
|
when simple alpha channel is used for rendering.
|
||||||
*/
|
*/
|
||||||
else if(part_of_name.substr(0,8) == "[noalpha")
|
else if(part_of_name.substr(0,8) == "[noalpha")
|
||||||
{
|
{
|
||||||
if(baseimg != NULL)
|
if(baseimg == NULL)
|
||||||
{
|
{
|
||||||
errorstream<<"generate_image(): baseimg!=NULL "
|
errorstream<<"generate_image(): baseimg==NULL "
|
||||||
<<"for part_of_name=\""<<part_of_name
|
<<"for part_of_name=\""<<part_of_name
|
||||||
<<"\", cancelling."<<std::endl;
|
<<"\", cancelling."<<std::endl;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string filename = part_of_name.substr(9);
|
core::dimension2d<u32> dim = baseimg->getDimension();
|
||||||
|
|
||||||
std::string path = getTexturePath(filename.c_str());
|
|
||||||
|
|
||||||
/*infostream<<"generate_image(): Loading file \""<<filename
|
|
||||||
<<"\""<<std::endl;*/
|
|
||||||
|
|
||||||
video::IImage *image = sourcecache->getOrLoad(filename, device);
|
// Set alpha to full
|
||||||
|
for(u32 y=0; y<dim.Height; y++)
|
||||||
if(image == NULL)
|
for(u32 x=0; x<dim.Width; x++)
|
||||||
{
|
{
|
||||||
infostream<<"generate_image(): Loading path \""
|
video::SColor c = baseimg->getPixel(x,y);
|
||||||
<<path<<"\" failed"<<std::endl;
|
c.setAlpha(255);
|
||||||
}
|
baseimg->setPixel(x,y,c);
|
||||||
else
|
|
||||||
{
|
|
||||||
core::dimension2d<u32> dim = image->getDimension();
|
|
||||||
baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
|
|
||||||
|
|
||||||
// Set alpha to full
|
|
||||||
for(u32 y=0; y<dim.Height; y++)
|
|
||||||
for(u32 x=0; x<dim.Width; x++)
|
|
||||||
{
|
|
||||||
video::SColor c = image->getPixel(x,y);
|
|
||||||
c.setAlpha(255);
|
|
||||||
image->setPixel(x,y,c);
|
|
||||||
}
|
|
||||||
// Blit
|
|
||||||
image->copyTo(baseimg);
|
|
||||||
|
|
||||||
image->drop();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
@ -1650,3 +1645,21 @@ void make_progressbar(float value, video::IImage *image)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void brighten(video::IImage *image)
|
||||||
|
{
|
||||||
|
if(image == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
core::dimension2d<u32> dim = image->getDimension();
|
||||||
|
|
||||||
|
for(u32 y=0; y<dim.Height; y++)
|
||||||
|
for(u32 x=0; x<dim.Width; x++)
|
||||||
|
{
|
||||||
|
video::SColor c = image->getPixel(x,y);
|
||||||
|
c.setRed(0.5 * 255 + 0.5 * (float)c.getRed());
|
||||||
|
c.setGreen(0.5 * 255 + 0.5 * (float)c.getGreen());
|
||||||
|
c.setBlue(0.5 * 255 + 0.5 * (float)c.getBlue());
|
||||||
|
image->setPixel(x,y,c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user