From 1d576dd0afb5713640aae7a3621f9082f00e454f Mon Sep 17 00:00:00 2001
From: ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Tue, 12 Feb 2008 23:44:21 +0000
Subject: [PATCH] added COLLADA domAsset (authoring tool/upaxis), added dummy
 time that complies with COLLADA (needs fixing), fixed include path again
 (relative to current folder)

---
 Demos/ColladaDemo/ColladaDemo.cpp             |  2 +-
 .../ColladaConverter.cpp                      | 21 +++++++++++++++----
 .../SpuRaycastTask/SpuRaycastTask.h           |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Demos/ColladaDemo/ColladaDemo.cpp b/Demos/ColladaDemo/ColladaDemo.cpp
index 541437bcb..b69a7fc77 100644
--- a/Demos/ColladaDemo/ColladaDemo.cpp
+++ b/Demos/ColladaDemo/ColladaDemo.cpp
@@ -94,7 +94,7 @@ int main(int argc,char** argv)
 	colladaDemo->initPhysics(filename);
 
 	
-	colladaDemo->clientResetScene();
+//	colladaDemo->clientResetScene();
 
 	colladaDemo->setCameraDistance(26.f);
 
diff --git a/Extras/BulletColladaConverter/ColladaConverter.cpp b/Extras/BulletColladaConverter/ColladaConverter.cpp
index b0c4cd6a5..717105fd8 100644
--- a/Extras/BulletColladaConverter/ColladaConverter.cpp
+++ b/Extras/BulletColladaConverter/ColladaConverter.cpp
@@ -2234,10 +2234,20 @@ bool ColladaConverter::save(const char* filename)
 		//create the required asset tag
 		domAssetRef asset = daeSafeCast<domAsset>( m_dom->createAndPlace( COLLADA_ELEMENT_ASSET ) );
 		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 ) );
-		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_scene::domTechnique_commonRef common = daeSafeCast<domPhysics_scene::domTechnique_common>(physicsScene->createAndPlace (COLLADA_ELEMENT_TECHNIQUE_COMMON));
 		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];
 		static int saveCount=1;
 		sprintf(saveName,"%s%i",getLastFileName(),saveCount++);
@@ -2266,8 +2278,9 @@ bool ColladaConverter::save(const char* filename)
 		{
 			name = &saveName[1];
 		} 
+		*/
 
-		m_collada->saveAs (name);
+		m_collada->saveAs (filename);
 	}
 #if 0
 	if (m_collada)
diff --git a/Extras/BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.h b/Extras/BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.h
index 682c25c89..491123deb 100644
--- a/Extras/BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.h
+++ b/Extras/BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.h
@@ -4,7 +4,7 @@
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
 #include "LinearMath/btVector3.h"
-#include "PlatformDefinitions.h"
+#include "../PlatformDefinitions.h"
 
 struct RaycastGatheredObjectData
 {