Commit a2b4dde3 authored by hybrid's avatar hybrid

Fixed the irrMath problem with c-math round function. Fixed a big endian...

Fixed the irrMath problem with c-math round function. Fixed a big endian problem in ms3d. Fixed a warning from endif comment. Changed version to alpha as the current repository is not feature complete.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@897 dfc29bdd-3216-0410-991c-e03cc46cb475
parent bda0b6e3
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define __IRR_COMPILE_CONFIG_H_INCLUDED__ #define __IRR_COMPILE_CONFIG_H_INCLUDED__
//! Irrlicht SDK Version //! Irrlicht SDK Version
#define IRRLICHT_SDK_VERSION "1.4RC" #define IRRLICHT_SDK_VERSION "1.4alpha"
//! The defines for different operating system are: //! The defines for different operating system are:
//! _IRR_XBOX_PLATFORM_ for XBox //! _IRR_XBOX_PLATFORM_ for XBox
......
...@@ -233,16 +233,23 @@ namespace core ...@@ -233,16 +233,23 @@ namespace core
inline f32 round ( f32 x )
{
return round(x);
}
REALINLINE void clearFPUException () REALINLINE void clearFPUException ()
{ {
#ifdef IRRLICHT_FAST_MATH
#ifdef feclearexcept #ifdef feclearexcept
feclearexcept(FE_ALL_EXCEPT); feclearexcept(FE_ALL_EXCEPT);
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
__asm fnclex; __asm fnclex;
#elif defined(__GNUC__) #elif defined(__GNUC__) && defined(__x86__)
__asm__ __volatile__ ("fclex \n\t"); __asm__ __volatile__ ("fclex \n\t");
#else #else
# warn clearFPUException not supported. # warn clearFPUException not supported.
#endif
#endif #endif
} }
...@@ -409,11 +416,6 @@ namespace core ...@@ -409,11 +416,6 @@ namespace core
return x - floorf ( x ); return x - floorf ( x );
} }
inline f32 round ( f32 x )
{
return ::round(x);
}
} // end namespace core } // end namespace core
} // end namespace irr } // end namespace irr
......
...@@ -422,4 +422,4 @@ void CGUIMessageBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRe ...@@ -422,4 +422,4 @@ void CGUIMessageBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
} // end namespace irr } // end namespace irr
#endif _IRR_COMPILE_WITH_GUI_ #endif // _IRR_COMPILE_WITH_GUI_
...@@ -193,7 +193,7 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file) ...@@ -193,7 +193,7 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
#ifdef __BIG_ENDIAN__ #ifdef __BIG_ENDIAN__
for (u16 tmp=0; tmp<numVertices; ++tmp) for (u16 tmp=0; tmp<numVertices; ++tmp)
for (u16 j=0; j<3; ++j) for (u16 j=0; j<3; ++j)
vertices[i].Vertex[j] = os::Byteswap::byteswap(vertices[i].Vertex[j]); vertices[tmp].Vertex[j] = os::Byteswap::byteswap(vertices[tmp].Vertex[j]);
#endif #endif
// triangles // triangles
......
VERSION = 1.4RC VERSION = 1.4alpha
# Irrlicht Engine 1.4RC # Irrlicht Engine 1.4alpha
# Makefile for Linux, created by N.Gebhardt. # Makefile for Linux, created by N.Gebhardt.
# #
# To use, just run: # To use, just run:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment