From: <sf...@us...> - 2011-09-08 00:03:53
|
Revision: 2986 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2986&view=rev Author: sfcbias Date: 2011-09-08 00:03:46 +0000 (Thu, 08 Sep 2011) Log Message: ----------- Modified Paths: -------------- branches/ogrenewt/newton20/.cproject branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp Modified: branches/ogrenewt/newton20/.cproject =================================================================== --- branches/ogrenewt/newton20/.cproject 2011-08-22 01:45:12 UTC (rev 2985) +++ branches/ogrenewt/newton20/.cproject 2011-09-08 00:03:46 UTC (rev 2986) @@ -47,8 +47,16 @@ <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.289230271" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/> <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1825451809" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"> <option id="gnu.cpp.link.option.libs.965630787" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs"> +<listOptionValue builtIn="false" value="OgreMain"/> +<listOptionValue builtIn="false" value="OgreTerrain"/> <listOptionValue builtIn="false" value="Newton"/> +<listOptionValue builtIn="false" value="dJointLibrary"/> +<listOptionValue builtIn="false" value="dContainers"/> +<listOptionValue builtIn="false" value="dMath"/> </option> +<option id="gnu.cpp.link.option.paths.1238797954" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"> +<listOptionValue builtIn="false" value="/home/bryce/Dev/newton-dynamics-2.33/packages/linux64"/> +</option> <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1233710170" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/> @@ -60,7 +68,7 @@ </toolChain> </folderInfo> <sourceEntries> -<entry excluding="demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> +<entry excluding="Test.cpp|demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -525,7 +533,7 @@ </toolChain> </folderInfo> <sourceEntries> -<entry excluding="demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> +<entry excluding="Test.cpp|demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> Modified: branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2011-08-22 01:45:12 UTC (rev 2985) +++ branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2011-09-08 00:03:46 UTC (rev 2986) @@ -307,7 +307,7 @@ bool optimize, int id, FaceWinding fw) : Collision(world) { - Ogre::Vector3 scale; + Ogre::Vector3 scale(1.0f,1.0f,1.0f); start(id); Modified: branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp 2011-08-22 01:45:12 UTC (rev 2985) +++ branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp 2011-09-08 00:03:46 UTC (rev 2986) @@ -31,7 +31,7 @@ collision->m_col, &CollisionSerializer::_newtonSerializeCallback, this); - fclose( mpfFile); + fclose(mpfFile); } //CollisionPtr CollisionSerializer::importCollision(Ogre::DataStreamPtr& stream, OgreNewt::World* world) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |