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

removed warning for VisualStudio 2012

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6093 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
engineer_apple 2020-02-22 22:54:23 +00:00
parent a790b163ee
commit 0de51c3c3d
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Irrlicht/CAnimatedMeshSceneNode.cpp
View File

@ -112,12 +112,12 @@ void CAnimatedMeshSceneNode::buildFrameNr(u32 timeMs)
if (FramesPerSecond > 0.f) //forwards... if (FramesPerSecond > 0.f) //forwards...
{ {
if (CurrentFrameNr > EndFrame) if (CurrentFrameNr > EndFrame)
CurrentFrameNr = StartFrame + fmod(CurrentFrameNr - StartFrame, (f32)(EndFrame-StartFrame)); CurrentFrameNr = StartFrame + fmodf(CurrentFrameNr - StartFrame, (f32)(EndFrame-StartFrame));
} }
else //backwards... else //backwards...
{ {
if (CurrentFrameNr < StartFrame) if (CurrentFrameNr < StartFrame)
CurrentFrameNr = EndFrame - fmod(EndFrame - CurrentFrameNr, (f32)(EndFrame-StartFrame)); CurrentFrameNr = EndFrame - fmodf(EndFrame - CurrentFrameNr, (f32)(EndFrame-StartFrame));
} }
} }
else else

2
source/Irrlicht/CImageLoaderRGB.cpp
View File

@ -555,7 +555,7 @@ void CImageLoaderRGB::readRGBrow(u8 *buf, int y, int z, io::IReadFile* file, rgb
// limit the count value to the remaining row size // limit the count value to the remaining row size
if (oPtr + count*rgb.Header.BPC > buf + rgb.Header.Xsize * rgb.Header.BPC) if (oPtr + count*rgb.Header.BPC > buf + rgb.Header.Xsize * rgb.Header.BPC)
{ {
count = ( (buf + rgb.Header.Xsize * rgb.Header.BPC) - oPtr ) / rgb.Header.BPC; count = (s32)( (buf + rgb.Header.Xsize * rgb.Header.BPC) - oPtr ) / rgb.Header.BPC;
} }
if (count<=0) if (count<=0)

9
source/Irrlicht/IBurningShader.cpp
View File

@ -25,7 +25,7 @@ namespace video
0xf0,0x70,0xd0,0x50 0xf0,0x70,0xd0,0x50
}; };
IBurningShader::IBurningShader(CBurningVideoDriver* driver) void IBurningShader::constructor_IBurningShader(CBurningVideoDriver* driver)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("IBurningShader"); setDebugName("IBurningShader");
@ -61,6 +61,11 @@ IBurningShader::IBurningShader(CBurningVideoDriver* driver)
TL_Flag = 0; TL_Flag = 0;
} }
IBurningShader::IBurningShader(CBurningVideoDriver* driver)
{
constructor_IBurningShader(driver);
}
//! Constructor //! Constructor
IBurningShader::IBurningShader( IBurningShader::IBurningShader(
CBurningVideoDriver* driver, CBurningVideoDriver* driver,
@ -80,8 +85,8 @@ IBurningShader::IBurningShader(
IShaderConstantSetCallBack* callback, IShaderConstantSetCallBack* callback,
E_MATERIAL_TYPE baseMaterial, E_MATERIAL_TYPE baseMaterial,
s32 userData) s32 userData)
:IBurningShader(driver)
{ {
constructor_IBurningShader(driver);
BaseMaterial = baseMaterial; BaseMaterial = baseMaterial;
CallBack = callback; CallBack = callback;
if (CallBack) if (CallBack)

2
source/Irrlicht/IBurningShader.h
View File

@ -328,6 +328,8 @@ namespace video
protected: protected:
void constructor_IBurningShader(CBurningVideoDriver* driver);
CBurningVideoDriver *Driver; CBurningVideoDriver *Driver;
IShaderConstantSetCallBack* CallBack; IShaderConstantSetCallBack* CallBack;
E_MATERIAL_TYPE BaseMaterial; E_MATERIAL_TYPE BaseMaterial;

2
source/Irrlicht/SoftwareDriver2_compile_config.h
View File

@ -216,7 +216,7 @@ enum edge_test_flag
#define ipol_lower_equal_0(n) ((n) <= (ipoltype)0.0) #define ipol_lower_equal_0(n) ((n) <= (ipoltype)0.0)
#define ipol_greater_0(n) ((n) > (ipoltype)0.0) #define ipol_greater_0(n) ((n) > (ipoltype)0.0)
#if (_MSC_VER >= 1600 ) #if (_MSC_VER > 1700 )
#define burning_restrict __restrict #define burning_restrict __restrict
#else #else
#define burning_restrict #define burning_restrict