v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Config.h.in: fix typo.

pull/1220/head
Kim Kulling 2017-03-29 21:08:40 +02:00
parent 55595a7d18
commit 6d71e4d5d7
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
code/X3DImporter.cpp
View File

@ -73,24 +73,29 @@ const aiImporterDesc X3DImporter::Description = {
"x3d"
};
void X3DImporter::Clear()
{
X3DImporter::X3DImporter()
: NodeElement_Cur( nullptr )
, mReader( nullptr ) {
// empty
}
X3DImporter::~X3DImporter() {
delete mReader;
// Clear() is accounting if data already is deleted. So, just check again if all data is deleted.
Clear();
}
void X3DImporter::Clear() {
NodeElement_Cur = nullptr;
// Delete all elements
if(NodeElement_List.size())
{
for(std::list<CX3DImporter_NodeElement*>::iterator it = NodeElement_List.begin(); it != NodeElement_List.end(); it++) delete *it;
if(NodeElement_List.size()) {
for ( std::list<CX3DImporter_NodeElement*>::iterator it = NodeElement_List.begin(); it != NodeElement_List.end(); it++ ) {
delete *it;
}
NodeElement_List.clear();
}
}
X3DImporter::~X3DImporter()
{
delete mReader;
// Clear() is accounting if data already is deleted. So, just check again if all data is deleted.
Clear();
}
/*********************************************************************************************************************************************/
/************************************************************ Functions: find set ************************************************************/

9
code/X3DImporter.hpp
View File

@ -56,8 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseImporter.h"
#include "irrXMLWrapper.h"
namespace Assimp
{
namespace Assimp {
/// \class X3DImporter
/// Class that holding scene graph which include: groups, geometry, metadata etc.
@ -199,9 +198,7 @@ public:
/***********************************************/
/// Default constructor.
X3DImporter()
: NodeElement_Cur( nullptr ), mReader( nullptr )
{}
X3DImporter();
/// Default destructor.
~X3DImporter();
@ -211,7 +208,7 @@ public:
/***********************************************/
/// Parse X3D file and fill scene graph. The function has no return value. Result can be found by analyzing the generated graph.
/// Also exception can be throwed if trouble will found.
/// Also exception can be thrown if trouble will found.
/// \param [in] pFile - name of file to be parsed.
/// \param [in] pIOHandler - pointer to IO helper object.
void ParseFile( const std::string& pFile, IOSystem* pIOHandler );

4
include/assimp/config.h.in
View File

@ -323,14 +323,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** @brief Set the maximum number of bones affecting a single vertex
*
* This is used by the #aiProcess_LimitBoneWeights PostProcess-Step.
* @note The default value is AI_CONFIG_PP_LBW_MAX_WEIGHTS
* @note The default value is AI_LMW_MAX_WEIGHTS
* Property type: integer.*/
#define AI_CONFIG_PP_LBW_MAX_WEIGHTS \
"PP_LBW_MAX_WEIGHTS"
// default value for AI_CONFIG_PP_LBW_MAX_WEIGHTS
#if (!defined AI_LMW_MAX_WEIGHTS)
# define AI_CONFIG_PP_LBW_MAX_WEIGHTS 0x4
# define AI_LMW_MAX_WEIGHTS 0x4
#endif // !! AI_LMW_MAX_WEIGHTS
// ---------------------------------------------------------------------------