BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

burning v0.53 g++ warning remove

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6365 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
engineer_apple 2022-05-01 00:59:58 +00:00
parent 4fe6a16165
commit e08e37fc0f
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Irrlicht/CSoftwareDriver2.cpp
View File

@ -2153,11 +2153,13 @@ void CBurningVideoDriver::VertexCache_fill(const u32 sourceIndex, const u32 dest
v.x = dot(lightdir, t); v.x = dot(lightdir, t);
v.y = dot(lightdir, b); v.y = dot(lightdir, b);
v.z = dot(lightdir, n); v.z = dot(lightdir, n);
v.w = 0;
lightVec = normalize(v); lightVec = normalize(v);
v.x = dot(vertexPosition, t); v.x = dot(vertexPosition, t);
v.y = dot(vertexPosition, b); v.y = dot(vertexPosition, b);
v.z = dot(vertexPosition, n); v.z = dot(vertexPosition, n);
v.w = 0;
eyeVec = normalize(v); eyeVec = normalize(v);
vertexPosition = normalize(vertexPosition); vertexPosition = normalize(vertexPosition);
@ -3366,7 +3368,7 @@ void CBurningVideoDriver::assignHardwareLight(SBurningShaderLight& l, const SLig
//! adds a dynamic light //! adds a dynamic light
s32 CBurningVideoDriver::addDynamicLight(const SLight& dl) s32 CBurningVideoDriver::addDynamicLight(const SLight& dl)
{ {
s32 i0 = CNullDriver::addDynamicLight(dl); /*s32 i0 = */CNullDriver::addDynamicLight(dl);
SBurningShaderLight l; SBurningShaderLight l;
EyeSpace.Light.push_back(l); EyeSpace.Light.push_back(l);

2
source/Irrlicht/CTRTextureGouraudAlpha.cpp
View File

@ -225,7 +225,7 @@ void CTRTextureGouraudAlpha2::fragmentShader()
#endif #endif
#ifdef IPOL_C1 #ifdef IPOL_C1
tFixPoint aFog = FIX_POINT_ONE; //tFixPoint aFog = FIX_POINT_ONE;
#endif #endif
#endif #endif

4
source/Irrlicht/IBurningShader.h
View File

@ -47,6 +47,10 @@ struct SBurningShaderLight
sVec3Color AmbientColor; sVec3Color AmbientColor;
sVec3Color DiffuseColor; sVec3Color DiffuseColor;
sVec3Color SpecularColor; sVec3Color SpecularColor;
SBurningShaderLight()
{
LightIsOn = false;
}
}; };
enum eTransformLightFlags enum eTransformLightFlags

6
source/Irrlicht/burning_shader_compile_fragment_start.h
View File

@ -4,7 +4,10 @@
*/ */
void burning_shader_class::burning_shader_fragment() void burning_shader_class::burning_shader_fragment()
{ {
#ifdef burning_shader_colormask
#else
tVideoSample *dst; tVideoSample *dst;
#endif
#ifdef USE_ZBUFFER #ifdef USE_ZBUFFER
fp24 *z; fp24 *z;
@ -84,7 +87,10 @@ void burning_shader_class::burning_shader_fragment()
#endif #endif
SOFTWARE_DRIVER_2_CLIPCHECK; SOFTWARE_DRIVER_2_CLIPCHECK;
#ifdef burning_shader_colormask
#else
dst = (tVideoSample*)RenderTarget->getData() + (line.y * RenderTarget->getDimension().Width) + xStart; dst = (tVideoSample*)RenderTarget->getData() + (line.y * RenderTarget->getDimension().Width) + xStart;
#endif
#ifdef USE_ZBUFFER #ifdef USE_ZBUFFER
z = (fp24*)DepthBuffer->lock() + (line.y * RenderTarget->getDimension().Width) + xStart; z = (fp24*)DepthBuffer->lock() + (line.y * RenderTarget->getDimension().Width) + xStart;