mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 23:54:35 +00:00
update assimp to 5.2.3 Bugfix-Release
This commit is contained in:
AzaezelX
parent
3f796d2a06
commit
f297476092
1150 changed files with 165834 additions and 112019 deletions
|
|
@ -1,7 +1,7 @@
|
|||
/*-----------------------------------------------------------------------------------------------
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2014-2015 Kim Kulling
|
||||
Copyright (c) 2014-2020 Kim Kulling
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
|
|
@ -20,17 +20,17 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
|||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
-----------------------------------------------------------------------------------------------*/
|
||||
#include <openddlparser/OpenDDLCommon.h>
|
||||
#include <openddlparser/DDLNode.h>
|
||||
#include <openddlparser/OpenDDLCommon.h>
|
||||
#include <openddlparser/Value.h>
|
||||
|
||||
BEGIN_ODDLPARSER_NS
|
||||
|
||||
Text::Text( const char *buffer, size_t numChars )
|
||||
: m_capacity( 0 )
|
||||
, m_len( 0 )
|
||||
, m_buffer( ddl_nullptr ) {
|
||||
set( buffer, numChars );
|
||||
Text::Text(const char *buffer, size_t numChars) :
|
||||
m_capacity(0),
|
||||
m_len(0),
|
||||
m_buffer(nullptr) {
|
||||
set(buffer, numChars);
|
||||
}
|
||||
|
||||
Text::~Text() {
|
||||
|
|
@ -39,103 +39,98 @@ Text::~Text() {
|
|||
|
||||
void Text::clear() {
|
||||
delete[] m_buffer;
|
||||
m_buffer = ddl_nullptr;
|
||||
m_buffer = nullptr;
|
||||
m_capacity = 0;
|
||||
m_len = 0;
|
||||
}
|
||||
|
||||
void Text::set( const char *buffer, size_t numChars ) {
|
||||
void Text::set(const char *buffer, size_t numChars) {
|
||||
clear();
|
||||
if( numChars > 0 ) {
|
||||
if (numChars > 0) {
|
||||
m_len = numChars;
|
||||
m_capacity = m_len + 1;
|
||||
m_buffer = new char[ m_capacity ];
|
||||
strncpy( m_buffer, buffer, numChars );
|
||||
m_buffer[ numChars ] = '\0';
|
||||
m_buffer = new char[m_capacity];
|
||||
strncpy(m_buffer, buffer, numChars);
|
||||
m_buffer[numChars] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
bool Text::operator == ( const std::string &name ) const {
|
||||
if( m_len != name.size() ) {
|
||||
bool Text::operator==(const std::string &name) const {
|
||||
if (m_len != name.size()) {
|
||||
return false;
|
||||
}
|
||||
const int res( strncmp( m_buffer, name.c_str(), name.size() ) );
|
||||
const int res(strncmp(m_buffer, name.c_str(), name.size()));
|
||||
|
||||
return ( 0 == res );
|
||||
return (0 == res);
|
||||
}
|
||||
|
||||
bool Text::operator == ( const Text &rhs ) const {
|
||||
if( m_len != rhs.m_len ) {
|
||||
bool Text::operator==(const Text &rhs) const {
|
||||
if (m_len != rhs.m_len) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const int res( strncmp( m_buffer, rhs.m_buffer, m_len ) );
|
||||
const int res(strncmp(m_buffer, rhs.m_buffer, m_len));
|
||||
|
||||
return ( 0 == res );
|
||||
return (0 == res);
|
||||
}
|
||||
|
||||
Name::Name( NameType type, Text *id )
|
||||
: m_type( type )
|
||||
, m_id( id ) {
|
||||
Name::Name(NameType type, Text *id) :
|
||||
m_type(type), m_id(id) {
|
||||
// empty
|
||||
}
|
||||
|
||||
Name::~Name() {
|
||||
delete m_id;
|
||||
m_id = ddl_nullptr;
|
||||
m_id = nullptr;
|
||||
}
|
||||
|
||||
Name::Name( const Name &name ){
|
||||
m_type=name.m_type;
|
||||
m_id=new Text(name.m_id->m_buffer,name.m_id->m_len);
|
||||
Name::Name(const Name &name) {
|
||||
m_type = name.m_type;
|
||||
m_id = new Text(name.m_id->m_buffer, name.m_id->m_len);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference::Reference()
|
||||
: m_numRefs( 0 )
|
||||
, m_referencedName( ddl_nullptr ) {
|
||||
Reference::Reference() :
|
||||
m_numRefs(0), m_referencedName(nullptr) {
|
||||
// empty
|
||||
}
|
||||
|
||||
Reference::Reference( size_t numrefs, Name **names )
|
||||
: m_numRefs( numrefs )
|
||||
, m_referencedName( ddl_nullptr ) {
|
||||
if ( numrefs > 0 ) {
|
||||
m_referencedName = new Name *[ numrefs ];
|
||||
for ( size_t i = 0; i < numrefs; i++ ) {
|
||||
m_referencedName[ i ] = names[i];
|
||||
Reference::Reference(size_t numrefs, Name **names) :
|
||||
m_numRefs(numrefs), m_referencedName(nullptr) {
|
||||
if (numrefs > 0) {
|
||||
m_referencedName = new Name *[numrefs];
|
||||
for (size_t i = 0; i < numrefs; i++) {
|
||||
m_referencedName[i] = names[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference::Reference(const Reference &ref) {
|
||||
m_numRefs=ref.m_numRefs;
|
||||
if(m_numRefs!=0){
|
||||
m_referencedName = new Name*[m_numRefs];
|
||||
for ( size_t i = 0; i < m_numRefs; i++ ) {
|
||||
m_numRefs = ref.m_numRefs;
|
||||
if (m_numRefs != 0) {
|
||||
m_referencedName = new Name *[m_numRefs];
|
||||
for (size_t i = 0; i < m_numRefs; i++) {
|
||||
m_referencedName[i] = new Name(*ref.m_referencedName[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference::~Reference() {
|
||||
for( size_t i = 0; i < m_numRefs; i++ ) {
|
||||
delete m_referencedName[ i ];
|
||||
for (size_t i = 0; i < m_numRefs; i++) {
|
||||
delete m_referencedName[i];
|
||||
}
|
||||
m_numRefs = 0;
|
||||
delete [] m_referencedName;
|
||||
m_referencedName = ddl_nullptr;
|
||||
delete[] m_referencedName;
|
||||
m_referencedName = nullptr;
|
||||
}
|
||||
|
||||
size_t Reference::sizeInBytes() {
|
||||
if ( 0 == m_numRefs ) {
|
||||
if (0 == m_numRefs) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
size_t size( 0 );
|
||||
for ( size_t i = 0; i < m_numRefs; i++ ) {
|
||||
Name *name( m_referencedName[ i ] );
|
||||
if ( ddl_nullptr != name ) {
|
||||
size_t size(0);
|
||||
for (size_t i = 0; i < m_numRefs; i++) {
|
||||
Name *name(m_referencedName[i]);
|
||||
if (nullptr != name) {
|
||||
size += name->m_id->m_len;
|
||||
}
|
||||
}
|
||||
|
|
@ -143,60 +138,53 @@ size_t Reference::sizeInBytes() {
|
|||
return size;
|
||||
}
|
||||
|
||||
Property::Property( Text *id )
|
||||
: m_key( id )
|
||||
, m_value( ddl_nullptr )
|
||||
, m_ref( ddl_nullptr )
|
||||
, m_next( ddl_nullptr ) {
|
||||
Property::Property(Text *id) :
|
||||
m_key(id), m_value(nullptr), m_ref(nullptr), m_next(nullptr) {
|
||||
// empty
|
||||
}
|
||||
|
||||
Property::~Property() {
|
||||
delete m_key;
|
||||
if(m_value!=ddl_nullptr)
|
||||
if (m_value != nullptr)
|
||||
delete m_value;
|
||||
if(m_ref!=ddl_nullptr)
|
||||
delete(m_ref);
|
||||
if(m_next!=ddl_nullptr)
|
||||
if (m_ref != nullptr)
|
||||
delete (m_ref);
|
||||
if (m_next != nullptr)
|
||||
delete m_next;
|
||||
}
|
||||
|
||||
DataArrayList::DataArrayList()
|
||||
: m_numItems( 0 )
|
||||
, m_dataList( ddl_nullptr )
|
||||
, m_next( ddl_nullptr )
|
||||
, m_refs(ddl_nullptr)
|
||||
, m_numRefs(0){
|
||||
DataArrayList::DataArrayList() :
|
||||
m_numItems(0), m_dataList(nullptr), m_next(nullptr), m_refs(nullptr), m_numRefs(0) {
|
||||
// empty
|
||||
}
|
||||
|
||||
DataArrayList::~DataArrayList() {
|
||||
delete m_dataList;
|
||||
if(m_next!=ddl_nullptr)
|
||||
if (m_next != nullptr)
|
||||
delete m_next;
|
||||
if(m_refs!=ddl_nullptr)
|
||||
if (m_refs != nullptr)
|
||||
delete m_refs;
|
||||
}
|
||||
|
||||
size_t DataArrayList::size() {
|
||||
size_t result( 0 );
|
||||
if ( ddl_nullptr == m_next ) {
|
||||
if ( m_dataList != ddl_nullptr ) {
|
||||
size_t result(0);
|
||||
if (nullptr == m_next) {
|
||||
if (m_dataList != nullptr) {
|
||||
result = 1;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
DataArrayList *n( m_next );
|
||||
while( ddl_nullptr != n ) {
|
||||
DataArrayList *n(m_next);
|
||||
while (nullptr != n) {
|
||||
result++;
|
||||
n = n->m_next;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
Context::Context()
|
||||
: m_root( ddl_nullptr ) {
|
||||
Context::Context() :
|
||||
m_root(nullptr) {
|
||||
// empty
|
||||
}
|
||||
|
||||
|
|
@ -206,7 +194,7 @@ Context::~Context() {
|
|||
|
||||
void Context::clear() {
|
||||
delete m_root;
|
||||
m_root = ddl_nullptr;
|
||||
m_root = nullptr;
|
||||
}
|
||||
|
||||
END_ODDLPARSER_NS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue