2008-05-13 23:26:52 +00:00
|
|
|
/*
|
|
|
|
---------------------------------------------------------------------------
|
2008-05-22 10:20:31 +00:00
|
|
|
Open Asset Import Library (ASSIMP)
|
2008-05-13 23:26:52 +00:00
|
|
|
---------------------------------------------------------------------------
|
|
|
|
|
2010-04-10 15:30:22 +00:00
|
|
|
Copyright (c) 2006-2010, ASSIMP Development Team
|
2008-05-13 23:26:52 +00:00
|
|
|
|
|
|
|
All rights reserved.
|
|
|
|
|
|
|
|
Redistribution and use of this software in source and binary forms,
|
|
|
|
with or without modification, are permitted provided that the following
|
|
|
|
conditions are met:
|
|
|
|
|
|
|
|
* Redistributions of source code must retain the above
|
|
|
|
copyright notice, this list of conditions and the
|
|
|
|
following disclaimer.
|
|
|
|
|
|
|
|
* Redistributions in binary form must reproduce the above
|
|
|
|
copyright notice, this list of conditions and the
|
|
|
|
following disclaimer in the documentation and/or other
|
|
|
|
materials provided with the distribution.
|
|
|
|
|
|
|
|
* Neither the name of the ASSIMP team, nor the names of its
|
|
|
|
contributors may be used to endorse or promote products
|
|
|
|
derived from this software without specific prior
|
|
|
|
written permission of the ASSIMP Development Team.
|
|
|
|
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
|
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
|
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
|
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
---------------------------------------------------------------------------
|
|
|
|
*/
|
|
|
|
|
2009-01-23 21:06:43 +00:00
|
|
|
/** @file DefaultLogger.cpp
|
|
|
|
* @brief Implementation of DefaultLogger (and Logger)
|
|
|
|
*/
|
|
|
|
|
2008-10-13 16:45:48 +00:00
|
|
|
#include "AssimpPCH.h"
|
2008-05-08 20:02:51 +00:00
|
|
|
#include "DefaultIOSystem.h"
|
2009-01-12 22:06:54 +00:00
|
|
|
|
|
|
|
// Default log streams
|
2008-05-08 20:02:51 +00:00
|
|
|
#include "Win32DebugLogStream.h"
|
2009-01-12 22:06:54 +00:00
|
|
|
#include "StdOStreamLogStream.h"
|
2008-05-08 20:02:51 +00:00
|
|
|
#include "FileLogStream.h"
|
|
|
|
|
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
|
|
|
#ifndef ASSIMP_BUILD_SINGLETHREADED
|
|
|
|
# include <boost/thread/thread.hpp>
|
|
|
|
# include <boost/thread/mutex.hpp>
|
|
|
|
|
|
|
|
boost::mutex loggerMutex;
|
|
|
|
#endif
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
namespace Assimp {
|
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-25 22:29:05 +00:00
|
|
|
NullLogger DefaultLogger::s_pNullLogger;
|
|
|
|
Logger *DefaultLogger::m_pLogger = &DefaultLogger::s_pNullLogger;
|
2008-05-08 20:02:51 +00:00
|
|
|
|
2011-01-23 22:49:02 +00:00
|
|
|
static const unsigned int SeverityAll = Logger::Info | Logger::Err | Logger::Warn | Logger::Debugging;
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2011-01-23 22:49:02 +00:00
|
|
|
// Represents a log-stream + its error severity
|
2008-05-08 20:02:51 +00:00
|
|
|
struct LogStreamInfo
|
|
|
|
{
|
|
|
|
unsigned int m_uiErrorSeverity;
|
|
|
|
LogStream *m_pStream;
|
|
|
|
|
|
|
|
// Constructor
|
|
|
|
LogStreamInfo( unsigned int uiErrorSev, LogStream *pStream ) :
|
|
|
|
m_uiErrorSeverity( uiErrorSev ),
|
|
|
|
m_pStream( pStream )
|
|
|
|
{
|
|
|
|
// empty
|
|
|
|
}
|
2008-08-11 19:17:33 +00:00
|
|
|
|
|
|
|
// Destructor
|
|
|
|
~LogStreamInfo()
|
|
|
|
{
|
2010-04-10 15:00:36 +00:00
|
|
|
delete m_pStream;
|
2008-08-11 19:17:33 +00:00
|
|
|
}
|
2008-05-08 20:02:51 +00:00
|
|
|
};
|
2009-01-12 22:06:54 +00:00
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------------
|
|
|
|
// Construct a default log stream
|
2009-05-28 11:32:54 +00:00
|
|
|
LogStream* LogStream::createDefaultStream(aiDefaultLogStream streams,
|
2009-01-23 21:06:43 +00:00
|
|
|
const char* name /*= "AssimpLog.txt"*/,
|
2009-01-12 22:06:54 +00:00
|
|
|
IOSystem* io /*= NULL*/)
|
|
|
|
{
|
|
|
|
switch (streams)
|
|
|
|
{
|
|
|
|
// This is a platform-specific feature
|
2009-05-28 11:32:54 +00:00
|
|
|
case aiDefaultLogStream_DEBUGGER:
|
2009-01-12 22:06:54 +00:00
|
|
|
#ifdef WIN32
|
|
|
|
return new Win32DebugLogStream();
|
|
|
|
#else
|
|
|
|
return NULL;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// Platform-independent default streams
|
2009-05-28 11:32:54 +00:00
|
|
|
case aiDefaultLogStream_STDERR:
|
2009-01-12 22:06:54 +00:00
|
|
|
return new StdOStreamLogStream(std::cerr);
|
2009-05-28 11:32:54 +00:00
|
|
|
case aiDefaultLogStream_STDOUT:
|
2009-01-12 22:06:54 +00:00
|
|
|
return new StdOStreamLogStream(std::cout);
|
2009-05-28 11:32:54 +00:00
|
|
|
case aiDefaultLogStream_FILE:
|
2009-01-23 21:06:43 +00:00
|
|
|
return (name && *name ? new FileLogStream(name,io) : NULL);
|
2009-01-12 22:06:54 +00:00
|
|
|
default:
|
|
|
|
// We don't know this default log stream, so raise an assertion
|
|
|
|
ai_assert(false);
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
// For compilers without dead code path detection
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Creates the only singleton instance
|
2009-01-23 21:06:43 +00:00
|
|
|
Logger *DefaultLogger::create(const char* name /*= "AssimpLog.txt"*/,
|
|
|
|
LogSeverity severity /*= NORMAL*/,
|
2009-05-28 11:32:54 +00:00
|
|
|
unsigned int defStreams /*= aiDefaultLogStream_DEBUGGER | aiDefaultLogStream_FILE*/,
|
2009-01-23 21:06:43 +00:00
|
|
|
IOSystem* io /*= NULL*/)
|
2008-05-08 20:02:51 +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
|
|
|
// enter the mutex here to avoid concurrency problems
|
|
|
|
#ifndef ASSIMP_BUILD_SINGLETHREADED
|
|
|
|
boost::mutex::scoped_lock lock(loggerMutex);
|
|
|
|
#endif
|
|
|
|
|
2008-08-11 20:57:18 +00:00
|
|
|
if (m_pLogger && !isNullLogger() )
|
|
|
|
delete m_pLogger;
|
2009-01-12 22:06:54 +00:00
|
|
|
|
|
|
|
m_pLogger = new DefaultLogger( severity );
|
|
|
|
|
|
|
|
// Attach default log streams
|
|
|
|
// Stream the log to the MSVC debugger?
|
2009-05-28 11:32:54 +00:00
|
|
|
if (defStreams & aiDefaultLogStream_DEBUGGER)
|
|
|
|
m_pLogger->attachStream( LogStream::createDefaultStream(aiDefaultLogStream_DEBUGGER));
|
2009-01-12 22:06:54 +00:00
|
|
|
|
|
|
|
// Stream the log to COUT?
|
2009-05-28 11:32:54 +00:00
|
|
|
if (defStreams & aiDefaultLogStream_STDOUT)
|
|
|
|
m_pLogger->attachStream( LogStream::createDefaultStream(aiDefaultLogStream_STDOUT));
|
2009-01-12 22:06:54 +00:00
|
|
|
|
|
|
|
// Stream the log to CERR?
|
2009-05-28 11:32:54 +00:00
|
|
|
if (defStreams & aiDefaultLogStream_STDERR)
|
|
|
|
m_pLogger->attachStream( LogStream::createDefaultStream(aiDefaultLogStream_STDERR));
|
2008-05-08 20:02:51 +00:00
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// Stream the log to a file
|
2009-05-28 11:32:54 +00:00
|
|
|
if (defStreams & aiDefaultLogStream_FILE && name && *name)
|
|
|
|
m_pLogger->attachStream( LogStream::createDefaultStream(aiDefaultLogStream_FILE,name,io));
|
2009-01-12 22:06:54 +00:00
|
|
|
|
2008-05-08 20:02:51 +00:00
|
|
|
return m_pLogger;
|
|
|
|
}
|
2009-01-12 22:06:54 +00:00
|
|
|
|
2009-01-23 21:06:43 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2011-04-03 15:12:05 +00:00
|
|
|
void Logger::debug(const char* message) {
|
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
|
|
|
|
2011-04-03 15:12:05 +00:00
|
|
|
// SECURITY FIX: otherwise it's easy to produce overruns since
|
|
|
|
// sometimes importers will include data from the input file
|
|
|
|
// (i.e. node names) in their messages.
|
|
|
|
if (strlen(message)>MAX_LOG_MESSAGE_LENGTH) {
|
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
|
|
|
ai_assert(false);
|
|
|
|
return;
|
|
|
|
}
|
2011-04-03 15:12:05 +00:00
|
|
|
return OnDebug(message);
|
2009-01-23 21:06:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------------
|
2011-04-03 15:12:05 +00:00
|
|
|
void Logger::info(const char* message) {
|
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
|
|
|
|
2011-04-03 15:12:05 +00:00
|
|
|
// SECURITY FIX: see above
|
|
|
|
if (strlen(message)>MAX_LOG_MESSAGE_LENGTH) {
|
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
|
|
|
ai_assert(false);
|
|
|
|
return;
|
|
|
|
}
|
2011-04-03 15:12:05 +00:00
|
|
|
return OnInfo(message);
|
2009-01-23 21:06:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------------
|
2011-04-03 15:12:05 +00:00
|
|
|
void Logger::warn(const char* message) {
|
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
|
|
|
|
2011-04-03 15:12:05 +00:00
|
|
|
// SECURITY FIX: see above
|
|
|
|
if (strlen(message)>MAX_LOG_MESSAGE_LENGTH) {
|
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
|
|
|
ai_assert(false);
|
|
|
|
return;
|
|
|
|
}
|
2011-04-03 15:12:05 +00:00
|
|
|
return OnWarn(message);
|
2009-01-23 21:06:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------------
|
2011-04-03 15:12:05 +00:00
|
|
|
void Logger::error(const char* message) {
|
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
|
|
|
|
2011-04-03 15:12:05 +00:00
|
|
|
// SECURITY FIX: see above
|
|
|
|
if (strlen(message)>MAX_LOG_MESSAGE_LENGTH) {
|
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
|
|
|
ai_assert(false);
|
|
|
|
return;
|
|
|
|
}
|
2011-04-03 15:12:05 +00:00
|
|
|
return OnError(message);
|
2009-01-23 21:06:43 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-08-11 19:17:33 +00:00
|
|
|
void DefaultLogger::set( Logger *logger )
|
2008-05-25 22:29:05 +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
|
|
|
// enter the mutex here to avoid concurrency problems
|
|
|
|
#ifndef ASSIMP_BUILD_SINGLETHREADED
|
|
|
|
boost::mutex::scoped_lock lock(loggerMutex);
|
|
|
|
#endif
|
|
|
|
|
2008-08-12 01:50:16 +00:00
|
|
|
if (!logger)logger = &s_pNullLogger;
|
|
|
|
if (m_pLogger && !isNullLogger() )
|
|
|
|
delete m_pLogger;
|
|
|
|
|
2008-05-25 22:29:05 +00:00
|
|
|
DefaultLogger::m_pLogger = logger;
|
|
|
|
}
|
2009-01-12 22:06:54 +00:00
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-25 22:29:05 +00:00
|
|
|
bool DefaultLogger::isNullLogger()
|
|
|
|
{
|
|
|
|
return m_pLogger == &s_pNullLogger;
|
|
|
|
}
|
2009-01-12 22:06:54 +00:00
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Singleton getter
|
|
|
|
Logger *DefaultLogger::get()
|
|
|
|
{
|
|
|
|
return m_pLogger;
|
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Kills the only instance
|
|
|
|
void DefaultLogger::kill()
|
|
|
|
{
|
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
|
|
|
// enter the mutex here to avoid concurrency problems
|
|
|
|
#ifndef ASSIMP_BUILD_SINGLETHREADED
|
|
|
|
boost::mutex::scoped_lock lock(loggerMutex);
|
|
|
|
#endif
|
|
|
|
|
2010-04-10 15:00:36 +00:00
|
|
|
if (m_pLogger == &s_pNullLogger)return;
|
2008-05-08 20:02:51 +00:00
|
|
|
delete m_pLogger;
|
2008-05-25 22:29:05 +00:00
|
|
|
m_pLogger = &s_pNullLogger;
|
2008-05-08 20:02:51 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Debug message
|
2009-01-23 21:06:43 +00:00
|
|
|
void DefaultLogger::OnDebug( const char* message )
|
2008-05-08 20:02:51 +00:00
|
|
|
{
|
|
|
|
if ( m_Severity == Logger::NORMAL )
|
|
|
|
return;
|
|
|
|
|
2009-01-23 21:06:43 +00:00
|
|
|
char msg[MAX_LOG_MESSAGE_LENGTH*2];
|
|
|
|
::sprintf(msg,"Debug, T%i: %s", GetThreadID(), message );
|
|
|
|
|
2011-01-23 22:49:02 +00:00
|
|
|
WriteToStreams( msg, Logger::Debugging );
|
2008-05-08 20:02:51 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Logs an info
|
2009-01-23 21:06:43 +00:00
|
|
|
void DefaultLogger::OnInfo( const char* message )
|
2008-05-08 20:02:51 +00:00
|
|
|
{
|
2009-01-23 21:06:43 +00:00
|
|
|
char msg[MAX_LOG_MESSAGE_LENGTH*2];
|
|
|
|
::sprintf(msg,"Info, T%i: %s", GetThreadID(), message );
|
|
|
|
|
2011-01-23 22:49:02 +00:00
|
|
|
WriteToStreams( msg , Logger::Info );
|
2008-05-08 20:02:51 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Logs a warning
|
2009-01-23 21:06:43 +00:00
|
|
|
void DefaultLogger::OnWarn( const char* message )
|
2008-05-08 20:02:51 +00:00
|
|
|
{
|
2009-01-23 21:06:43 +00:00
|
|
|
char msg[MAX_LOG_MESSAGE_LENGTH*2];
|
|
|
|
::sprintf(msg,"Warn, T%i: %s", GetThreadID(), message );
|
|
|
|
|
2011-01-23 22:49:02 +00:00
|
|
|
WriteToStreams( msg, Logger::Warn );
|
2008-05-08 20:02:51 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Logs an error
|
2009-01-23 21:06:43 +00:00
|
|
|
void DefaultLogger::OnError( const char* message )
|
2008-05-08 20:02:51 +00:00
|
|
|
{
|
2009-01-23 21:06:43 +00:00
|
|
|
char msg[MAX_LOG_MESSAGE_LENGTH*2];
|
|
|
|
::sprintf(msg,"Error, T%i: %s", GetThreadID(), message );
|
|
|
|
|
2011-01-23 22:49:02 +00:00
|
|
|
WriteToStreams( msg, Logger::Err );
|
2008-05-08 20:02:51 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2011-01-23 22:49:02 +00:00
|
|
|
// Will attach a new stream
|
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
|
|
|
bool DefaultLogger::attachStream( LogStream *pStream, unsigned int severity )
|
2008-05-08 20:02:51 +00:00
|
|
|
{
|
2009-01-12 22:06:54 +00:00
|
|
|
if (!pStream)
|
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 false;
|
2008-05-25 22:29:05 +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
|
|
|
if (0 == severity) {
|
2011-01-23 22:49:02 +00:00
|
|
|
severity = Logger::Info | Logger::Err | Logger::Warn | Logger::Debugging;
|
2008-05-25 22:29:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for ( StreamIt it = m_StreamArray.begin();
|
|
|
|
it != m_StreamArray.end();
|
|
|
|
++it )
|
|
|
|
{
|
|
|
|
if ( (*it)->m_pStream == pStream )
|
|
|
|
{
|
|
|
|
(*it)->m_uiErrorSeverity |= severity;
|
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 true;
|
2008-05-25 22:29:05 +00:00
|
|
|
}
|
|
|
|
}
|
2008-05-08 20:02:51 +00:00
|
|
|
|
|
|
|
LogStreamInfo *pInfo = new LogStreamInfo( severity, pStream );
|
|
|
|
m_StreamArray.push_back( pInfo );
|
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 true;
|
2008-05-08 20:02:51 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Detatch a stream
|
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
|
|
|
bool DefaultLogger::detatchStream( LogStream *pStream, unsigned int severity )
|
2008-05-08 20:02:51 +00:00
|
|
|
{
|
2009-01-12 22:06:54 +00:00
|
|
|
if (!pStream)
|
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 false;
|
2008-05-25 22:29:05 +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
|
|
|
if (0 == severity) {
|
2011-01-23 22:49:02 +00:00
|
|
|
severity = SeverityAll;
|
2008-05-25 22:29:05 +00:00
|
|
|
}
|
2008-05-08 20:02:51 +00:00
|
|
|
|
|
|
|
for ( StreamIt it = m_StreamArray.begin();
|
|
|
|
it != m_StreamArray.end();
|
|
|
|
++it )
|
|
|
|
{
|
|
|
|
if ( (*it)->m_pStream == pStream )
|
|
|
|
{
|
2009-01-12 22:06:54 +00:00
|
|
|
(*it)->m_uiErrorSeverity &= ~severity;
|
2008-05-08 20:02:51 +00:00
|
|
|
if ( (*it)->m_uiErrorSeverity == 0 )
|
|
|
|
{
|
2010-04-10 15:00:36 +00:00
|
|
|
// don't delete the underlying stream 'cause the caller gains ownership again
|
|
|
|
(**it).m_pStream = NULL;
|
|
|
|
delete *it;
|
2009-01-12 22:06:54 +00:00
|
|
|
m_StreamArray.erase( it );
|
2008-05-08 20:02:51 +00:00
|
|
|
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
|
|
|
return true;
|
2008-05-08 20:02:51 +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
|
|
|
return false;
|
2008-05-08 20:02:51 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Constructor
|
2009-01-12 22:06:54 +00:00
|
|
|
DefaultLogger::DefaultLogger(LogSeverity severity)
|
2008-10-31 19:32:00 +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
|
|
|
: Logger ( severity )
|
2009-01-12 22:06:54 +00:00
|
|
|
, noRepeatMsg (false)
|
2009-03-04 19:46:18 +00:00
|
|
|
, lastLen( 0 )
|
|
|
|
{
|
|
|
|
lastMsg[0] = '\0';
|
|
|
|
}
|
2008-05-08 20:02:51 +00:00
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Destructor
|
|
|
|
DefaultLogger::~DefaultLogger()
|
|
|
|
{
|
2010-04-10 15:00:36 +00:00
|
|
|
for ( StreamIt it = m_StreamArray.begin(); it != m_StreamArray.end(); ++it ) {
|
|
|
|
// also frees the underlying stream, we are its owner.
|
2008-05-08 20:02:51 +00:00
|
|
|
delete *it;
|
2010-04-10 15:00:36 +00:00
|
|
|
}
|
2008-05-08 20:02:51 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
// Writes message to stream
|
2009-01-23 21:06:43 +00:00
|
|
|
void DefaultLogger::WriteToStreams(const char *message,
|
2009-01-12 22:06:54 +00:00
|
|
|
ErrorSeverity ErrorSev )
|
2008-05-08 20:02:51 +00:00
|
|
|
{
|
2009-01-23 21:06:43 +00:00
|
|
|
ai_assert(NULL != message);
|
2009-01-12 22:06:54 +00:00
|
|
|
|
|
|
|
// Check whether this is a repeated message
|
2009-01-23 21:06:43 +00:00
|
|
|
if (! ::strncmp( message,lastMsg, lastLen-1))
|
2008-10-31 19:32:00 +00:00
|
|
|
{
|
|
|
|
if (!noRepeatMsg)
|
|
|
|
{
|
|
|
|
noRepeatMsg = true;
|
2009-01-23 21:06:43 +00:00
|
|
|
message = "Skipping one or more lines with the same contents\n";
|
2008-10-31 19:32:00 +00:00
|
|
|
}
|
|
|
|
else return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-01-23 21:06:43 +00:00
|
|
|
// append a new-line character to the message to be printed
|
|
|
|
lastLen = ::strlen(message);
|
|
|
|
::memcpy(lastMsg,message,lastLen+1);
|
|
|
|
::strcat(lastMsg+lastLen,"\n");
|
2008-10-31 19:32:00 +00:00
|
|
|
|
2009-01-23 21:06:43 +00:00
|
|
|
message = lastMsg;
|
|
|
|
noRepeatMsg = false;
|
|
|
|
++lastLen;
|
2009-01-12 22:06:54 +00:00
|
|
|
}
|
2008-08-11 19:17:33 +00:00
|
|
|
for ( ConstStreamIt it = m_StreamArray.begin();
|
2008-05-08 20:02:51 +00:00
|
|
|
it != m_StreamArray.end();
|
|
|
|
++it)
|
|
|
|
{
|
|
|
|
if ( ErrorSev & (*it)->m_uiErrorSeverity )
|
2009-01-23 21:06:43 +00:00
|
|
|
(*it)->m_pStream->write( message);
|
2008-05-08 20:02:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-08-11 19:17:33 +00:00
|
|
|
// Returns thread id, if not supported only a zero will be returned.
|
2009-01-23 21:06:43 +00:00
|
|
|
unsigned int DefaultLogger::GetThreadID()
|
2008-08-11 19:17:33 +00:00
|
|
|
{
|
2009-01-23 21:06:43 +00:00
|
|
|
// fixme: we can get this value via boost::threads
|
2008-08-11 19:17:33 +00:00
|
|
|
#ifdef WIN32
|
2009-01-23 21:06:43 +00:00
|
|
|
return (unsigned int)::GetCurrentThreadId();
|
2008-08-11 19:17:33 +00:00
|
|
|
#else
|
2009-01-23 21:06:43 +00:00
|
|
|
return 0; // not supported
|
2008-08-11 19:17:33 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
// ----------------------------------------------------------------------------------
|
2008-05-08 20:02:51 +00:00
|
|
|
|
2009-01-12 22:06:54 +00:00
|
|
|
} // !namespace Assimp
|