Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation for MSVC 6.0 for Bullet and COLLADA DOM.

Browse Source 
Fix issues with btDbvt: use ATTRIBUTE_ALIGNED16
Removed several places where variable was declared within for statement: for (int i=0; should be int i; for (i=0
This commit is contained in:
erwin.coumans
2008-11-12 18:37:05 +00:00
parent 444fbfeb40
commit 5feea39803
68 changed files with 365 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Extras/COLLADA_DOM/src/dae/daeSIDResolver.cpp
View File

@@ -46,11 +46,11 @@ daeSIDResolver::daeSIDResolver( daeElement *container, daeString target, daeStri
daeSIDResolver::~daeSIDResolver()
{
if ( target != NULL ) {
delete[] target;
delete[] (void*)target;
target = NULL;
}
if ( profile != NULL ) {
delete[] profile;
delete[] (void*)profile;
profile = NULL;
}
}
@@ -58,7 +58,7 @@ daeSIDResolver::~daeSIDResolver()
void daeSIDResolver::setTarget( daeString t )
{
if ( target != NULL ) {
delete[] target;
delete[] (void*)target;
}
if ( t != NULL ) {
target = new char[ strlen( t ) +1 ];
@@ -78,7 +78,7 @@ void daeSIDResolver::setTarget( daeString t )
void daeSIDResolver::setProfile( daeString p )
{
if ( profile != NULL ) {
delete[] target;
delete[] (void*)target;
}
if ( p != NULL ) {
profile = new char[ strlen( p ) +1 ];
@@ -335,8 +335,10 @@ daeElement *daeSIDResolver::findSID( daeElement *el, daeString sid ) {
daeElementRefArray children;
el->getChildren( children );
size_t cnt = children.getCount();
for ( size_t x = 0; x < cnt; x++ ) {
size_t cnt = children.getCount();
size_t x;
for ( x = 0; x < cnt; x++ ) {
//examine the children
//char s[56];
//daeAtomicType::get( "token" )->memoryToString( children[x]->getAttributeValue( "sid" ), s, 56 );
@@ -346,7 +348,7 @@ daeElement *daeSIDResolver::findSID( daeElement *el, daeString sid ) {
return children[x];
}
}
for ( size_t x = 0; x < cnt; x++ ) {
for ( x = 0; x < cnt; x++ ) {
//if not found look for it in each child
if ( profile != NULL && strcmp( children[x]->getTypeName(), "technique_COMMON" ) == 0 ) {
//not looking for common profile