2008-05-05 12:36:31 +00:00
|
|
|
// Copyright (C) 2002-2007 Nikolaus Gebhardt
|
|
|
|
// This file is part of the "Irrlicht Engine" and the "irrXML" project.
|
|
|
|
// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
|
2008-08-13 23:46:46 +00:00
|
|
|
|
|
|
|
// ------------------------------------------------------------------------------------
|
|
|
|
// Original description: (Schrompf)
|
2008-05-05 12:36:31 +00:00
|
|
|
// Adapted to the ASSIMP library because the builtin atof indeed takes AGES to parse a
|
|
|
|
// float inside a large string. Before parsing, it does a strlen on the given point.
|
2008-08-13 23:46:46 +00:00
|
|
|
// Changes:
|
|
|
|
// 22nd October 08 (Aramis_acg): Added temporary cast to double, added strtol10_64
|
|
|
|
// to ensure long numbers are handled correctly
|
|
|
|
// ------------------------------------------------------------------------------------
|
|
|
|
|
2008-05-05 12:36:31 +00:00
|
|
|
|
|
|
|
#ifndef __FAST_A_TO_F_H_INCLUDED__
|
|
|
|
#define __FAST_A_TO_F_H_INCLUDED__
|
|
|
|
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
namespace Assimp
|
|
|
|
{
|
|
|
|
|
|
|
|
const float fast_atof_table[16] = { // we write [16] here instead of [] to work around a swig bug
|
|
|
|
0.f,
|
|
|
|
0.1f,
|
|
|
|
0.01f,
|
|
|
|
0.001f,
|
|
|
|
0.0001f,
|
|
|
|
0.00001f,
|
|
|
|
0.000001f,
|
|
|
|
0.0000001f,
|
|
|
|
0.00000001f,
|
|
|
|
0.000000001f,
|
|
|
|
0.0000000001f,
|
|
|
|
0.00000000001f,
|
|
|
|
0.000000000001f,
|
|
|
|
0.0000000000001f,
|
|
|
|
0.00000000000001f,
|
|
|
|
0.000000000000001f
|
|
|
|
};
|
|
|
|
|
2008-08-13 23:46:46 +00:00
|
|
|
|
2008-10-22 20:06:16 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2009-04-15 14:16:11 +00:00
|
|
|
// Convert a string in decimal format to a number
|
2008-08-13 23:46:46 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2008-05-05 12:36:31 +00:00
|
|
|
inline unsigned int strtol10( const char* in, const char** out=0)
|
|
|
|
{
|
|
|
|
unsigned int value = 0;
|
|
|
|
|
2009-10-10 11:59:00 +00:00
|
|
|
bool running = true;
|
|
|
|
while ( running )
|
2008-05-05 12:36:31 +00:00
|
|
|
{
|
|
|
|
if ( *in < '0' || *in > '9' )
|
|
|
|
break;
|
|
|
|
|
|
|
|
value = ( value * 10 ) + ( *in - '0' );
|
|
|
|
++in;
|
|
|
|
}
|
2008-10-13 16:45:48 +00:00
|
|
|
if (out)*out = in;
|
2008-05-05 12:36:31 +00:00
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2008-10-22 20:06:16 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2009-04-15 14:16:11 +00:00
|
|
|
// Convert a string in octal format to a number
|
2008-10-13 16:45:48 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
|
|
|
inline unsigned int strtol8( const char* in, const char** out=0)
|
|
|
|
{
|
|
|
|
unsigned int value = 0;
|
|
|
|
|
2009-10-10 11:59:00 +00:00
|
|
|
bool running = true;
|
|
|
|
while ( running )
|
2008-10-13 16:45:48 +00:00
|
|
|
{
|
|
|
|
if ( *in < '0' || *in > '7' )
|
|
|
|
break;
|
|
|
|
|
|
|
|
value = ( value << 3 ) + ( *in - '0' );
|
|
|
|
++in;
|
|
|
|
}
|
|
|
|
if (out)*out = in;
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
// ------------------------------------------------------------------------------------
|
2009-04-15 14:16:11 +00:00
|
|
|
// Convert a string in hex format to a number
|
2008-10-22 20:06:16 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2008-10-13 16:45:48 +00:00
|
|
|
inline unsigned int strtol16( const char* in, const char** out=0)
|
|
|
|
{
|
|
|
|
unsigned int value = 0;
|
|
|
|
|
2009-10-10 11:59:00 +00:00
|
|
|
bool running = true;
|
|
|
|
while ( running )
|
2008-10-13 16:45:48 +00:00
|
|
|
{
|
|
|
|
if ( *in >= '0' && *in <= '9' )
|
|
|
|
{
|
|
|
|
value = ( value << 4u ) + ( *in - '0' );
|
|
|
|
}
|
|
|
|
else if (*in >= 'A' && *in <= 'F')
|
|
|
|
{
|
|
|
|
value = ( value << 4u ) + ( *in - 'A' ) + 10;
|
|
|
|
}
|
|
|
|
else if (*in >= 'a' && *in <= 'f')
|
|
|
|
{
|
|
|
|
value = ( value << 4u ) + ( *in - 'a' ) + 10;
|
|
|
|
}
|
|
|
|
else break;
|
|
|
|
++in;
|
|
|
|
}
|
|
|
|
if (out)*out = in;
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2008-10-22 20:06:16 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2009-02-11 20:56:05 +00:00
|
|
|
// Convert just one hex digit
|
|
|
|
// Return value is 0xffffffff if the input is not hex
|
2008-10-22 20:06:16 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2008-10-13 16:45:48 +00:00
|
|
|
inline unsigned int HexDigitToDecimal(char in)
|
|
|
|
{
|
|
|
|
unsigned int out = 0xffffffff;
|
|
|
|
if (in >= '0' && in <= '9')
|
|
|
|
out = in - '0';
|
|
|
|
|
|
|
|
else if (in >= 'a' && in <= 'f')
|
|
|
|
out = 10u + in - 'a';
|
|
|
|
|
|
|
|
else if (in >= 'A' && in <= 'F')
|
|
|
|
out = 10u + in - 'A';
|
|
|
|
|
|
|
|
// return value is 0xffffffff if the input is not a hex digit
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
2009-02-11 20:56:05 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
|
|
|
// Convert a hex-encoded octet (2 characters processed)
|
|
|
|
// Return value is 0xffffffff if the input is not hex
|
|
|
|
// ------------------------------------------------------------------------------------
|
|
|
|
inline uint8_t HexOctetToDecimal(const char* in)
|
|
|
|
{
|
|
|
|
return ((uint8_t)HexDigitToDecimal(in[0])<<4)+(uint8_t)HexDigitToDecimal(in[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-09-05 13:21:01 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
|
|
|
// signed variant of strtol10
|
2008-10-22 20:06:16 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2008-09-05 13:21:01 +00:00
|
|
|
inline int strtol10s( const char* in, const char** out=0)
|
|
|
|
{
|
2009-05-03 21:49:34 +00:00
|
|
|
bool inv = (*in=='-');
|
|
|
|
if (inv || *in=='+')
|
|
|
|
++in;
|
|
|
|
|
2008-09-05 13:21:01 +00:00
|
|
|
int value = strtol10(in,out);
|
2009-05-03 21:49:34 +00:00
|
|
|
if (inv) {
|
|
|
|
value = -value;
|
|
|
|
}
|
2008-09-05 13:21:01 +00:00
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2008-10-13 16:45:48 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2008-10-22 20:06:16 +00:00
|
|
|
// Parse a C++-like integer literal - hex and oct prefixes.
|
2008-10-13 16:45:48 +00:00
|
|
|
// 0xNNNN - hex
|
|
|
|
// 0NNN - oct
|
|
|
|
// NNN - dec
|
2008-10-22 20:06:16 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2008-10-13 16:45:48 +00:00
|
|
|
inline unsigned int strtol_cppstyle( const char* in, const char** out=0)
|
|
|
|
{
|
|
|
|
if ('0' == in[0])
|
|
|
|
{
|
2008-10-19 11:32:33 +00:00
|
|
|
return 'x' == in[1] ? strtol16(in+2,out) : strtol8(in+1,out);
|
2008-10-13 16:45:48 +00:00
|
|
|
}
|
|
|
|
return strtol10(in, out);
|
|
|
|
}
|
2008-08-06 23:01:38 +00:00
|
|
|
|
2008-08-13 23:46:46 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2009-04-15 14:16:11 +00:00
|
|
|
// Special version of the function, providing higher accuracy and safety
|
|
|
|
// It is mainly used by fast_atof to prevent ugly and unwanted integer overflows.
|
2008-10-22 20:06:16 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
inline uint64_t strtol10_64( const char* in, const char** out=0, unsigned int* max_inout=0)
|
2008-08-06 23:01:38 +00:00
|
|
|
{
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
unsigned int cur = 0;
|
2008-08-06 23:01:38 +00:00
|
|
|
uint64_t value = 0;
|
|
|
|
|
2009-10-10 11:59:00 +00:00
|
|
|
bool running = true;
|
|
|
|
while ( running )
|
2008-08-06 23:01:38 +00:00
|
|
|
{
|
|
|
|
if ( *in < '0' || *in > '9' )
|
|
|
|
break;
|
|
|
|
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
const uint64_t new_value = ( value * 10 ) + ( *in - '0' );
|
|
|
|
|
2009-04-15 14:16:11 +00:00
|
|
|
if (new_value < value) /* numeric overflow, we rely on you */
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
return value;
|
|
|
|
|
|
|
|
value = new_value;
|
|
|
|
|
2008-08-06 23:01:38 +00:00
|
|
|
++in;
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
++cur;
|
|
|
|
|
|
|
|
if (max_inout && *max_inout == cur) {
|
|
|
|
|
|
|
|
if (out) { /* skip to end */
|
2009-04-15 14:16:11 +00:00
|
|
|
while (*in >= '0' && *in <= '9')
|
|
|
|
++in;
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
*out = in;
|
|
|
|
}
|
|
|
|
|
|
|
|
return value;
|
|
|
|
}
|
2008-08-06 23:01:38 +00:00
|
|
|
}
|
|
|
|
if (out)
|
|
|
|
*out = in;
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
|
|
|
|
if (max_inout)
|
|
|
|
*max_inout = cur;
|
|
|
|
|
2008-08-06 23:01:38 +00:00
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2009-04-15 14:16:11 +00:00
|
|
|
// Number of relevant decimals for floating-point parsing.
|
2010-12-27 15:59:06 +00:00
|
|
|
#define AI_FAST_ATOF_RELAVANT_DECIMALS 10
|
2008-08-13 23:46:46 +00:00
|
|
|
|
|
|
|
// ------------------------------------------------------------------------------------
|
2008-05-05 12:36:31 +00:00
|
|
|
//! Provides a fast function for converting a string into a float,
|
|
|
|
//! about 6 times faster than atof in win32.
|
|
|
|
// If you find any bugs, please send them to me, niko (at) irrlicht3d.org.
|
2008-10-22 20:06:16 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2008-05-05 12:36:31 +00:00
|
|
|
inline const char* fast_atof_move( const char* c, float& out)
|
|
|
|
{
|
|
|
|
float f;
|
|
|
|
|
2009-04-15 14:16:11 +00:00
|
|
|
bool inv = (*c=='-');
|
|
|
|
if (inv || *c=='+')
|
2008-05-05 12:36:31 +00:00
|
|
|
++c;
|
|
|
|
|
2009-05-03 21:49:34 +00:00
|
|
|
f = (float) strtol10_64 ( c, &c);
|
2009-04-15 14:16:11 +00:00
|
|
|
if (*c == '.' || (c[0] == ',' && (c[1] >= '0' || c[1] <= '9'))) // allow for commas, too
|
2008-05-05 12:36:31 +00:00
|
|
|
{
|
|
|
|
++c;
|
|
|
|
|
2009-04-15 14:16:11 +00:00
|
|
|
// NOTE: The original implementation is highly unaccurate here. The precision of a single
|
|
|
|
// IEEE 754 float is not high enough, everything behind the 6th digit tends to be more
|
|
|
|
// inaccurate than it would need to be. Casting to double seems to solve the problem.
|
2008-08-06 23:01:38 +00:00
|
|
|
// strtol_64 is used to prevent integer overflow.
|
|
|
|
|
2009-04-15 14:16:11 +00:00
|
|
|
// Another fix: this tends to become 0 for long numbers if we don't limit the maximum
|
|
|
|
// number of digits to be read. AI_FAST_ATOF_RELAVANT_DECIMALS can be a value between
|
|
|
|
// 1 and 15.
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
unsigned int diff = AI_FAST_ATOF_RELAVANT_DECIMALS;
|
2009-05-03 21:49:34 +00:00
|
|
|
double pl = (double) strtol10_64 ( c, &c, &diff );
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
|
|
|
|
pl *= fast_atof_table[diff];
|
2008-08-06 23:01:38 +00:00
|
|
|
f += (float)pl;
|
2009-04-15 14:16:11 +00:00
|
|
|
}
|
2008-05-05 12:36:31 +00:00
|
|
|
|
2009-04-15 14:16:11 +00:00
|
|
|
// A major 'E' must be allowed. Necessary for proper reading of some DXF files.
|
|
|
|
// Thanks to Zhao Lei to point out that this if() must be outside the if (*c == '.' ..)
|
|
|
|
if (*c == 'e' || *c == 'E')
|
|
|
|
{
|
|
|
|
++c;
|
|
|
|
bool einv = (*c=='-');
|
|
|
|
if (einv || *c=='+')
|
2008-05-05 12:36:31 +00:00
|
|
|
++c;
|
|
|
|
|
2009-05-03 21:49:34 +00:00
|
|
|
float exp = (float)strtol10_64(c, &c);
|
2009-04-15 14:16:11 +00:00
|
|
|
if (einv)
|
|
|
|
exp *= -1.0f;
|
2008-05-05 12:36:31 +00:00
|
|
|
|
2009-04-15 14:16:11 +00:00
|
|
|
f *= pow(10.0f, exp);
|
2008-05-05 12:36:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (inv)
|
|
|
|
f *= -1.0f;
|
|
|
|
|
|
|
|
out = f;
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2008-08-13 23:46:46 +00:00
|
|
|
// ------------------------------------------------------------------------------------
|
2009-04-15 14:16:11 +00:00
|
|
|
// The same but more human.
|
2008-05-05 12:36:31 +00:00
|
|
|
inline float fast_atof(const char* c)
|
|
|
|
{
|
|
|
|
float ret;
|
|
|
|
fast_atof_move(c, ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-04-02 04:17:05 +00:00
|
|
|
|
|
|
|
inline float fast_atof( const char* c, const char** cout)
|
|
|
|
{
|
|
|
|
float ret;
|
|
|
|
*cout = fast_atof_move(c, ret);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline float fast_atof( const char** inout)
|
|
|
|
{
|
|
|
|
float ret;
|
|
|
|
*inout = fast_atof_move(*inout, ret);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-05-05 12:36:31 +00:00
|
|
|
} // end of namespace Assimp
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|