Commit 3db8e185 authored by hybrid's avatar hybrid

Use proper method for image format.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2507 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 1ec36fee
...@@ -508,7 +508,7 @@ static void executeBlit_TextureCopy_24_to_16( const SBlitJob * job ) ...@@ -508,7 +508,7 @@ static void executeBlit_TextureCopy_24_to_16( const SBlitJob * job )
for ( s32 dx = 0; dx != job->width; ++dx ) for ( s32 dx = 0; dx != job->width; ++dx )
{ {
dst[dx] = video::RGB16(s[0], s[1], s[2]); dst[dx] = video::RGBA16(s[0], s[1], s[2]);
s += 3; s += 3;
} }
......
...@@ -1166,7 +1166,7 @@ void CNullDriver::makeNormalMapTexture(video::ITexture* texture, f32 amplitude) ...@@ -1166,7 +1166,7 @@ void CNullDriver::makeNormalMapTexture(video::ITexture* texture, f32 amplitude)
n += core::vector3df(0.5f,0.5f,0.5f); // now between 0 and 1 n += core::vector3df(0.5f,0.5f,0.5f); // now between 0 and 1
n *= 255.0f; n *= 255.0f;
p[y*pitch + x] = video::RGB16((s32)n.X, (s32)n.Z, (s32)n.Y); p[y*pitch + x] = video::RGBA16((u32)n.X, (u32)n.Z, (u32)n.Y);
} }
delete [] in; delete [] in;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment