diff --git a/Demos/ColladaDemo/ColladaDemo.cpp b/Demos/ColladaDemo/ColladaDemo.cpp index 7a7736a32..809218797 100644 --- a/Demos/ColladaDemo/ColladaDemo.cpp +++ b/Demos/ColladaDemo/ColladaDemo.cpp @@ -796,8 +796,9 @@ int main(int argc,char** argv) /// Import Collada 1.4 Physics objects //char* filename = "analyticalGeomPhysicsTest.dae";//ColladaPhysics.dae"; - //char* filename = "colladaphysics_spherebox.dae"; - char* filename = "friction.dae"; + char* filename = "colladaphysics_spherebox.dae"; + + //char* filename = "friction.dae"; diff --git a/Extras/FCollada/FCDocument/FCDGeometry.cpp b/Extras/FCollada/FCDocument/FCDGeometry.cpp index 4720062fd..ef7ef1629 100644 --- a/Extras/FCollada/FCDocument/FCDGeometry.cpp +++ b/Extras/FCollada/FCDocument/FCDGeometry.cpp @@ -111,7 +111,7 @@ FUStatus FCDGeometry::LoadFromXML(xmlNode* geometryNode) FCDGeometry* entity = GetDocument()->FindGeometry(url.prefix); if (entity) { - printf("found convex_mesh%s\n",url.prefix); + printf("found convex_mesh\n"); //quick hack this->mesh = entity->GetMesh(); mesh->m_convex = true; diff --git a/msvc/71/appColladaDemo.vcproj b/msvc/71/appColladaDemo.vcproj index bbc9b902b..dad9d9511 100644 --- a/msvc/71/appColladaDemo.vcproj +++ b/msvc/71/appColladaDemo.vcproj @@ -1,4 +1,4 @@ - + + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2" + WholeProgramOptimization="TRUE"> - + Name="VCPostBuildEventTool"/> + Culture="1033" + AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"/> + + + + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> - + Name="VCPostBuildEventTool"/> + Culture="1033" + AdditionalIncludeDirectories=".;..\..;..\..\Bullet;..\..\BulletDynamics;..\..\LinearMath;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics"/> + + + + +