diff --git a/Demos/ColladaDemo/ColladaConverter.cpp b/Demos/ColladaDemo/ColladaConverter.cpp index 47946a73c..8f715ad2d 100644 --- a/Demos/ColladaDemo/ColladaConverter.cpp +++ b/Demos/ColladaDemo/ColladaConverter.cpp @@ -172,6 +172,8 @@ bool ColladaConverter::load(const char* orgfilename) bool ColladaConverter::convert() { + + unsigned i; //succesfully loaded file, now convert data @@ -228,7 +230,7 @@ bool ColladaConverter::convert() // Load all the geometry libraries - for ( unsigned int i = 0; i < m_dom->getLibrary_geometries_array().getCount(); i++) + for ( i = 0; i < m_dom->getLibrary_geometries_array().getCount(); i++) { domLibrary_geometriesRef libgeom = m_dom->getLibrary_geometries_array()[i]; @@ -279,7 +281,7 @@ bool ColladaConverter::convert() //m_dom->getLibrary_physics_models_array() - for ( unsigned int i = 0; i < m_dom->getLibrary_physics_scenes_array().getCount(); i++) + for ( i = 0; i < m_dom->getLibrary_physics_scenes_array().getCount(); i++) { domLibrary_physics_scenesRef physicsScenesRef = m_dom->getLibrary_physics_scenes_array()[i]; for (unsigned int s=0;sgetPhysics_scene_array().getCount();s++) @@ -298,9 +300,9 @@ bool ColladaConverter::convert() } - for (unsigned int m=0;mgetInstance_physics_model_array().getCount();m++) + for (unsigned int ps=0;psgetInstance_physics_model_array().getCount();ps++) { - domInstance_physics_modelRef instance_physicsModelRef = physicsSceneRef->getInstance_physics_model_array()[m]; + domInstance_physics_modelRef instance_physicsModelRef = physicsSceneRef->getInstance_physics_model_array()[ps]; daeElementRef ref = instance_physicsModelRef->getUrl().getElement(); @@ -468,9 +470,9 @@ bool ColladaConverter::convert() //handle constraints - for (unsigned int m=0;mgetInstance_physics_model_array().getCount();m++) + for (unsigned int ma=0;magetInstance_physics_model_array().getCount();ma++) { - domInstance_physics_modelRef instance_physicsModelRef = physicsSceneRef->getInstance_physics_model_array()[m]; + domInstance_physics_modelRef instance_physicsModelRef = physicsSceneRef->getInstance_physics_model_array()[ma]; daeElementRef ref = instance_physicsModelRef->getUrl().getElement(); diff --git a/Demos/Raytracer/Raytracer.cpp b/Demos/Raytracer/Raytracer.cpp index af5a1b7d8..c8382c1e5 100644 --- a/Demos/Raytracer/Raytracer.cpp +++ b/Demos/Raytracer/Raytracer.cpp @@ -229,9 +229,10 @@ void Raytracer::displayCallback() btSphereShape pointShape(0.0f); + int x; ///clear texture - for (int x=0;x