Mirrorlandia_minetest/irrlicht
1
0
Fork 1
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-25 23:47:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Burningvideo: fix "Old HW Compatible blending" TextureLightMap2_Add

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6111 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
engineer_apple 2020-05-30 13:58:37 +00:00
parent 13a232aa9b
commit 2d67c2d92c
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/Irrlicht/CTRTextureLightMap2_Add.cpp
View File

@ -234,7 +234,7 @@ REALINLINE void CTRTextureLightMap2_Add::scanline_bilinear ()
#else #else
getSample_texture ( r0, g0, b0, &IT[0], tofix ( line.t[0][0].x,inversew), tofix ( line.t[0][0].y,inversew) ); getSample_texture ( r0, g0, b0, &IT[0], tofix ( line.t[0][0].x,inversew), tofix ( line.t[0][0].y,inversew) );
getSample_texture ( r1, g1, b1, &IT[1], tofix ( line.t[0][1].x,inversew), tofix ( line.t[0][1].y,inversew) ); getSample_texture ( r1, g1, b1, &IT[1], tofix ( line.t[1][0].x,inversew), tofix ( line.t[1][0].y,inversew) );
dst[i] = fix_to_sample( clampfix_maxcolor ( r0 + r1 ), dst[i] = fix_to_sample( clampfix_maxcolor ( r0 + r1 ),
clampfix_maxcolor ( g0 + g1 ), clampfix_maxcolor ( g0 + g1 ),
@ -641,6 +641,7 @@ namespace video
//! creates a flat triangle renderer //! creates a flat triangle renderer
IBurningShader* createTriangleRendererTextureLightMap2_Add(CBurningVideoDriver* driver) IBurningShader* createTriangleRendererTextureLightMap2_Add(CBurningVideoDriver* driver)
{ {
/* ETR_TEXTURE_GOURAUD_LIGHTMAP_ADD */
#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_ #ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
return new CTRTextureLightMap2_Add(driver); return new CTRTextureLightMap2_Add(driver);
#else #else

6
source/Irrlicht/SoftwareDriver2_helper.h
View File

@ -495,10 +495,12 @@ inline tFixPoint s32_to_fixPoint (const s32 x)
return x << FIX_POINT_PRE; return x << FIX_POINT_PRE;
} }
#if 0
inline tFixPointu u32_to_fixPoint (const u32 x) inline tFixPointu u32_to_fixPoint (const u32 x)
{ {
return x << FIX_POINT_PRE; return x << FIX_POINT_PRE;
} }
#endif
inline u32 fixPointu_to_u32 (const tFixPointu x) inline u32 fixPointu_to_u32 (const tFixPointu x)
{ {
@ -641,13 +643,13 @@ REALINLINE tFixPoint saturateFix ( const tFixPoint a)
} }
#if 0
// rount fixpoint to int // rount fixpoint to int
inline s32 roundFix ( const tFixPoint x ) inline s32 roundFix ( const tFixPoint x )
{ {
return (s32)(( x + FIX_POINT_ZERO_DOT_FIVE ) >> FIX_POINT_PRE); return (s32)(( x + FIX_POINT_ZERO_DOT_FIVE ) >> FIX_POINT_PRE);
} }
#endif
// x in [0;1[ // x in [0;1[
#if 0 #if 0

2
source/Irrlicht/burning_shader_compile_fragment_default.h
View File

@ -34,7 +34,7 @@ private:
//! constructor //! constructor
burning_shader_class::burning_shader_color(CBurningVideoDriver* driver) burning_shader_class::burning_shader_class(CBurningVideoDriver* driver)
: IBurningShader(driver) : IBurningShader(driver)
{ {
#ifdef _DEBUG #ifdef _DEBUG