luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6075 through r6106 from trunk to ogl-es branch.

Browse Source 
Burnings renderer changes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2020-06-12 20:41:49 +00:00
parent 084e0e669a
commit 20b3d56987
117 changed files with 10384 additions and 3817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
source/Irrlicht/CTRTextureLightMapGouraud2_M4.cpp
View File

@@ -46,7 +46,7 @@
#undef SUBTEXEL
#endif
#ifndef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
#if BURNING_MATERIAL_MAX_COLORS < 1
#undef IPOL_C0
#endif
@@ -82,15 +82,12 @@ public:
CTRGTextureLightMap2_M4(CBurningVideoDriver* driver);
//! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_;
private:
void scanline_bilinear ();
sScanConvertData scan;
sScanLineData line;
};
//! constructor
@@ -137,8 +134,8 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
#endif
// apply top-left fill-convention, left
xStart = core::ceil32_fast( line.x[0] );
xEnd = core::ceil32_fast( line.x[1] ) - 1;
xStart = fill_convention_left( line.x[0] );
xEnd = fill_convention_right( line.x[1] );
dx = xEnd - xStart;
@@ -146,7 +143,7 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
return;
// slopes
const f32 invDeltaX = core::reciprocal_approxim ( line.x[1] - line.x[0] );
const f32 invDeltaX = reciprocal_zero2( line.x[1] - line.x[0] );
#ifdef IPOL_Z
slopeZ = (line.z[1] - line.z[0]) * invDeltaX;
@@ -183,6 +180,7 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
#endif
#endif
SOFTWARE_DRIVER_2_CLIPCHECK;
dst = (tVideoSample*)RenderTarget->getData() + ( line.y * RenderTarget->getDimension().Width ) + xStart;
#ifdef USE_ZBUFFER
@@ -230,26 +228,22 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
getSample_texture ( r1, g1, b1, &IT[1], tx1, ty1 );
#ifdef IPOL_C0
r2 = imulFix ( r0, r3 );
g2 = imulFix ( g0, g3 );
b2 = imulFix ( b0, b3 );
r2 = imulFix_simple( r0, r3 );
g2 = imulFix_simple( g0, g3 );
b2 = imulFix_simple( b0, b3 );
r2 = imulFix_tex4 ( r2, r1 );
g2 = imulFix_tex4 ( g2, g1 );
b2 = imulFix_tex4 ( b2, b1 );
r2 = clampfix_maxcolor ( imulFix_tex4 ( r2, r1 ) );
g2 = clampfix_maxcolor ( imulFix_tex4 ( g2, g1 ) );
b2 = clampfix_maxcolor ( imulFix_tex4 ( b2, b1 ) );
/*
r2 = r3 << 8;
g2 = g3 << 8;
b2 = b3 << 8;
*/
#else
r2 = clampfix_maxcolor ( imulFix_tex4 ( r0, r1 ) );
g2 = clampfix_maxcolor ( imulFix_tex4 ( g0, g1 ) );
b2 = clampfix_maxcolor ( imulFix_tex4 ( b0, b1 ) );
r2 = imulFix_tex4 ( r0, r1 );
g2 = imulFix_tex4 ( g0, g1 );
b2 = imulFix_tex4 ( b0, b1 );
#endif
dst[i] = fix_to_color ( r2, g2, b2 );
dst[i] = fix_to_sample( r2, g2, b2 );
#ifdef WRITE_Z
z[i] = line.z[0];
@@ -278,7 +272,7 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
}
void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c )
void CTRGTextureLightMap2_M4::drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c)
{
// sort on height, y
if ( F32_A_GREATER_B ( a->Pos.y , b->Pos.y ) ) swapVertexPointer(&a, &b);
@@ -289,9 +283,9 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
const f32 ba = b->Pos.y - a->Pos.y;
const f32 cb = c->Pos.y - b->Pos.y;
// calculate delta y of the edges
scan.invDeltaY[0] = core::reciprocal( ca );
scan.invDeltaY[1] = core::reciprocal( ba );
scan.invDeltaY[2] = core::reciprocal( cb );
scan.invDeltaY[0] = reciprocal_zero( ca );
scan.invDeltaY[1] = reciprocal_zero( ba );
scan.invDeltaY[2] = reciprocal_zero( cb );
if ( F32_LOWER_0 ( scan.invDeltaY[0] ) )
return;
@@ -379,8 +373,8 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
#endif
// apply top-left fill convention, top part
yStart = core::ceil32_fast( a->Pos.y );
yEnd = core::ceil32_fast( b->Pos.y ) - 1;
yStart = fill_convention_left( a->Pos.y );
yEnd = fill_convention_right( b->Pos.y );
#ifdef SUBTEXEL
subPixel = ( (f32) yStart ) - a->Pos.y;
@@ -540,8 +534,8 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
#endif
// apply top-left fill convention, top part
yStart = core::ceil32_fast( b->Pos.y );
yEnd = core::ceil32_fast( c->Pos.y ) - 1;
yStart = fill_convention_left( b->Pos.y );
yEnd = fill_convention_right( c->Pos.y );
#ifdef SUBTEXEL