diff options
| author | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2021-08-26 21:57:27 +0000 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-08-27 10:59:31 +0200 |
| commit | 9690c1b3e30410f4780dc6466ae474cc1350f82a (patch) | |
| tree | 09128dd0088f9e135e62d2a16b87a46c89e98262 /source/Irrlicht/COBJMeshFileLoader.cpp | |
| parent | c26ff3476f5cce6c6ce2d6fa1b88c9dfff3674ca (diff) | |
| download | irrlicht-9690c1b3e30410f4780dc6466ae474cc1350f82a.tar.xz | |
Merging r6196 through r6248 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6249 dfc29bdd-3216-0410-991c-e03cc46cb475
Diffstat (limited to 'source/Irrlicht/COBJMeshFileLoader.cpp')
| -rw-r--r-- | source/Irrlicht/COBJMeshFileLoader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp index f16cf9e..19b9f56 100644 --- a/source/Irrlicht/COBJMeshFileLoader.cpp +++ b/source/Irrlicht/COBJMeshFileLoader.cpp @@ -358,11 +358,11 @@ const c8* COBJMeshFileLoader::readColor(const c8* bufPtr, video::SColor& color, c8 colStr[COLOR_BUFFER_LENGTH];
bufPtr = goAndCopyNextWord(colStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
- color.setRed((s32)(core::fast_atof(colStr) * 255.0f));
+ color.setRed((u32)core::round32(core::fast_atof(colStr)*255.f));
bufPtr = goAndCopyNextWord(colStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
- color.setGreen((s32)(core::fast_atof(colStr) * 255.0f));
+ color.setGreen((u32)core::round32(core::fast_atof(colStr)*255.f));
bufPtr = goAndCopyNextWord(colStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
- color.setBlue((s32)(core::fast_atof(colStr) * 255.0f));
+ color.setBlue((u32)core::round32(core::fast_atof(colStr)*255.f));
return bufPtr;
}
|