diff --git a/source/Irrlicht/CSoftwareDriver2.cpp b/source/Irrlicht/CSoftwareDriver2.cpp index 253d031..fd5cd6a 100644 --- a/source/Irrlicht/CSoftwareDriver2.cpp +++ b/source/Irrlicht/CSoftwareDriver2.cpp @@ -2153,11 +2153,13 @@ void CBurningVideoDriver::VertexCache_fill(const u32 sourceIndex, const u32 dest v.x = dot(lightdir, t); v.y = dot(lightdir, b); v.z = dot(lightdir, n); + v.w = 0; lightVec = normalize(v); v.x = dot(vertexPosition, t); v.y = dot(vertexPosition, b); v.z = dot(vertexPosition, n); + v.w = 0; eyeVec = normalize(v); vertexPosition = normalize(vertexPosition); @@ -3366,7 +3368,7 @@ void CBurningVideoDriver::assignHardwareLight(SBurningShaderLight& l, const SLig //! adds a dynamic light s32 CBurningVideoDriver::addDynamicLight(const SLight& dl) { - s32 i0 = CNullDriver::addDynamicLight(dl); + /*s32 i0 = */CNullDriver::addDynamicLight(dl); SBurningShaderLight l; EyeSpace.Light.push_back(l); diff --git a/source/Irrlicht/CTRTextureGouraudAlpha.cpp b/source/Irrlicht/CTRTextureGouraudAlpha.cpp index 4a0d45a..41e40e3 100644 --- a/source/Irrlicht/CTRTextureGouraudAlpha.cpp +++ b/source/Irrlicht/CTRTextureGouraudAlpha.cpp @@ -225,7 +225,7 @@ void CTRTextureGouraudAlpha2::fragmentShader() #endif #ifdef IPOL_C1 - tFixPoint aFog = FIX_POINT_ONE; + //tFixPoint aFog = FIX_POINT_ONE; #endif #endif diff --git a/source/Irrlicht/IBurningShader.h b/source/Irrlicht/IBurningShader.h index d35bea1..a3f5ecd 100644 --- a/source/Irrlicht/IBurningShader.h +++ b/source/Irrlicht/IBurningShader.h @@ -47,6 +47,10 @@ struct SBurningShaderLight sVec3Color AmbientColor; sVec3Color DiffuseColor; sVec3Color SpecularColor; + SBurningShaderLight() + { + LightIsOn = false; + } }; enum eTransformLightFlags diff --git a/source/Irrlicht/burning_shader_compile_fragment_start.h b/source/Irrlicht/burning_shader_compile_fragment_start.h index 8a5cb15..40ede2a 100644 --- a/source/Irrlicht/burning_shader_compile_fragment_start.h +++ b/source/Irrlicht/burning_shader_compile_fragment_start.h @@ -4,7 +4,10 @@ */ void burning_shader_class::burning_shader_fragment() { +#ifdef burning_shader_colormask +#else tVideoSample *dst; +#endif #ifdef USE_ZBUFFER fp24 *z; @@ -84,7 +87,10 @@ void burning_shader_class::burning_shader_fragment() #endif SOFTWARE_DRIVER_2_CLIPCHECK; +#ifdef burning_shader_colormask +#else dst = (tVideoSample*)RenderTarget->getData() + (line.y * RenderTarget->getDimension().Width) + xStart; +#endif #ifdef USE_ZBUFFER z = (fp24*)DepthBuffer->lock() + (line.y * RenderTarget->getDimension().Width) + xStart;