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

added COLLADA domAsset (authoring tool/upaxis), added dummy time that complies with COLLADA (needs fixing), fixed include path again (relative to current folder)

Browse Source
This commit is contained in:
ejcoumans
2008-02-12 23:44:21 +00:00
parent c1bceede01
commit 1d576dd0af
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/ColladaDemo/ColladaDemo.cpp
View File

@@ -94,7 +94,7 @@ int main(int argc,char** argv)
colladaDemo->initPhysics(filename); colladaDemo->initPhysics(filename);
colladaDemo->clientResetScene(); // colladaDemo->clientResetScene();
colladaDemo->setCameraDistance(26.f); colladaDemo->setCameraDistance(26.f);

21
Extras/BulletColladaConverter/ColladaConverter.cpp
View File

@@ -2234,10 +2234,20 @@ bool ColladaConverter::save(const char* filename)
//create the required asset tag //create the required asset tag
domAssetRef asset = daeSafeCast<domAsset>( m_dom->createAndPlace( COLLADA_ELEMENT_ASSET ) ); domAssetRef asset = daeSafeCast<domAsset>( m_dom->createAndPlace( COLLADA_ELEMENT_ASSET ) );
domAsset::domCreatedRef created = daeSafeCast<domAsset::domCreated>( asset->createAndPlace( COLLADA_ELEMENT_CREATED ) ); domAsset::domCreatedRef created = daeSafeCast<domAsset::domCreated>( asset->createAndPlace( COLLADA_ELEMENT_CREATED ) );
created->setValue("FIXME O'CLOCK"); created->setValue("2008-02-12T15:28:54.891550");
domAsset::domModifiedRef modified = daeSafeCast<domAsset::domModified>( asset->createAndPlace( COLLADA_ELEMENT_MODIFIED ) ); domAsset::domModifiedRef modified = daeSafeCast<domAsset::domModified>( asset->createAndPlace( COLLADA_ELEMENT_MODIFIED ) );
modified->setValue("FIXME O'CLOCK"); modified->setValue("2008-02-12T15:28:54.891550");
domAsset::domContributorRef contrib = daeSafeCast<domAsset::domContributor>( asset->createAndPlace( COLLADA_TYPE_CONTRIBUTOR ) );
domAsset::domContributor::domAuthoring_toolRef authoringtool = daeSafeCast<domAsset::domContributor::domAuthoring_tool>( contrib->createAndPlace( COLLADA_ELEMENT_AUTHORING_TOOL ) );
char authbuffer[512];
sprintf(authbuffer,"Bullet Physics SDK %d Snapshot(BulletColladaConverter) http://bulletphysics.com",BT_BULLET_VERSION);
authoringtool->setValue(authbuffer);
domAsset::domUp_axisRef yup = daeSafeCast<domAsset::domUp_axis>( asset->createAndPlace( COLLADA_ELEMENT_UP_AXIS ) );
yup->setValue(UPAXISTYPE_Y_UP);
domPhysics_sceneRef physicsScene = getDefaultPhysicsScene (); domPhysics_sceneRef physicsScene = getDefaultPhysicsScene ();
domPhysics_scene::domTechnique_commonRef common = daeSafeCast<domPhysics_scene::domTechnique_common>(physicsScene->createAndPlace (COLLADA_ELEMENT_TECHNIQUE_COMMON)); domPhysics_scene::domTechnique_commonRef common = daeSafeCast<domPhysics_scene::domTechnique_common>(physicsScene->createAndPlace (COLLADA_ELEMENT_TECHNIQUE_COMMON));
domTargetableFloat3Ref g = daeSafeCast<domTargetableFloat3>(common->createAndPlace (COLLADA_ELEMENT_GRAVITY)); domTargetableFloat3Ref g = daeSafeCast<domTargetableFloat3>(common->createAndPlace (COLLADA_ELEMENT_GRAVITY));
@@ -2258,6 +2268,8 @@ bool ColladaConverter::save(const char* filename)
} }
{ {
//let the user deal with the name pre/post fixing etc.
/*
char saveName[550]; char saveName[550];
static int saveCount=1; static int saveCount=1;
sprintf(saveName,"%s%i",getLastFileName(),saveCount++); sprintf(saveName,"%s%i",getLastFileName(),saveCount++);
@@ -2266,8 +2278,9 @@ bool ColladaConverter::save(const char* filename)
{ {
name = &saveName[1]; name = &saveName[1];
} }
*/
m_collada->saveAs (name); m_collada->saveAs (filename);
} }
#if 0 #if 0
if (m_collada) if (m_collada)

2
Extras/BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.h
View File

@@ -4,7 +4,7 @@
#include "BulletCollision/CollisionDispatch/btCollisionObject.h" #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
#include "BulletCollision/CollisionDispatch/btCollisionWorld.h" #include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
#include "LinearMath/btVector3.h" #include "LinearMath/btVector3.h"
#include "PlatformDefinitions.h" #include "../PlatformDefinitions.h"
struct RaycastGatheredObjectData struct RaycastGatheredObjectData
{ {