Revert "xrGame: fix some IK undefined reference"

This reverts commit 30d85f1.
OpenXRay · Nov 8, 2018 · fc630bb · fc630bb
1 parent aa15fbd
commit fc630bb
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/src/xrGame/ik/aint.cpp → src/xrGame/ik/aint.cxx b/src/xrGame/ik/aint.cpp → src/xrGame/ik/aint.cxx
@@ -29,7 +29,7 @@
   MODIFICATIONS.
 
  */
-#include "StdAfx.h"
+#include "stdafx.h"
 
 #include "aint.h"
 

diff --git a/src/xrGame/ik/eqn.cpp → src/xrGame/ik/eqn.cxx b/src/xrGame/ik/eqn.cpp → src/xrGame/ik/eqn.cxx
@@ -29,7 +29,7 @@
   MODIFICATIONS.
 
  */
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "eqn.h"
 
 /*

diff --git a/src/xrGame/ik/eulersolver.cpp → src/xrGame/ik/eulersolver.cxx b/src/xrGame/ik/eulersolver.cpp → src/xrGame/ik/eulersolver.cxx
@@ -29,7 +29,7 @@
   MODIFICATIONS.
 
  */
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "eulersolver.h"
 
 typedef void (*euler_solver)(const Matrix G, float& t1, float& t2, float& t3, int family);

diff --git a/src/xrGame/ik/jtlimits.cpp → src/xrGame/ik/jtlimits.cxx b/src/xrGame/ik/jtlimits.cpp → src/xrGame/ik/jtlimits.cxx
@@ -30,7 +30,7 @@
 
  */
 
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "aint.h"
 #include "jtlimits.h"
 

diff --git a/src/xrGame/ik/limb.cpp → src/xrGame/ik/limb.cxx b/src/xrGame/ik/limb.cpp → src/xrGame/ik/limb.cxx
@@ -30,7 +30,7 @@
 
  */
 
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "limb.h"
 
 enum
@@ -903,7 +903,7 @@ int Limb::InLimits(const float x[7]) const
     return 1;
 }
 
-float round_up(float x)
+float roundup(float x)
 {
     if (x < 0)
         x += 2 * M_PI;
@@ -914,7 +914,7 @@ void dump_file(char* file, int euler_type, float min[], float max[], Matrix c, M
     FILE* fp = fopen(file, "w");
 
     fprintf(fp, "%d\n", euler_type);
-    fprintf(fp, "%f %f %f \n", round_up(min[2]), round_up(min[1]), round_up(min[0]));
+    fprintf(fp, "%f %f %f \n", roundup(min[2]), roundup(min[1]), roundup(min[0]));
     fprintf(fp, "%f %f %f \n", max[2], max[1], max[0]);
     for (int i = 0; i < 4; i++)
         fprintf(fp, "%f %f %f %f\n", c[i][0], c[i][1], c[i][2], c[i][3]);

diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj
@@ -2537,13 +2537,13 @@
     <ClCompile Include="hud_item_object.cpp" />
     <ClCompile Include="IKFoot.cpp" />
     <ClCompile Include="IKLimbsController.cpp" />
-    <ClCompile Include="Ik\aint.cpp" />
+    <ClCompile Include="Ik\aint.cxx" />
     <ClCompile Include="Ik\Dof7control.cpp" />
-    <ClCompile Include="Ik\eqn.cpp" />
-    <ClCompile Include="Ik\eulersolver.cpp" />
+    <ClCompile Include="Ik\eqn.cxx" />
+    <ClCompile Include="Ik\eulersolver.cxx" />
     <ClCompile Include="Ik\IKLimb.cpp" />
-    <ClCompile Include="Ik\jtlimits.cpp" />
-    <ClCompile Include="Ik\limb.cpp" />
+    <ClCompile Include="Ik\jtlimits.cxx" />
+    <ClCompile Include="Ik\limb.cxx" />
     <ClCompile Include="Ik\math3d.cpp" />
     <ClCompile Include="Ik\mathTrig.cpp" />
     <ClCompile Include="ik_anim_state.cpp" />
@@ -3715,4 +3715,4 @@
     <Error Condition="!Exists('..\packages\sdl2.redist.2.0.5\build\native\sdl2.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2.redist.2.0.5\build\native\sdl2.redist.targets'))" />
     <Error Condition="!Exists('..\packages\sdl2.2.0.5\build\native\sdl2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2.2.0.5\build\native\sdl2.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/src/xrGame/xrGame.vcxproj.filters b/src/xrGame/xrGame.vcxproj.filters
@@ -9664,16 +9664,16 @@
     <ClCompile Include="Hit.cpp">
       <Filter>Physics\Hit</Filter>
     </ClCompile>
-    <ClCompile Include="Ik\aint.cpp">
+    <ClCompile Include="Ik\aint.cxx">
       <Filter>Physics\IK</Filter>
     </ClCompile>
     <ClCompile Include="Ik\Dof7control.cpp">
       <Filter>Physics\IK</Filter>
     </ClCompile>
-    <ClCompile Include="Ik\eqn.cpp">
+    <ClCompile Include="Ik\eqn.cxx">
       <Filter>Physics\IK</Filter>
     </ClCompile>
-    <ClCompile Include="Ik\eulersolver.cpp">
+    <ClCompile Include="Ik\eulersolver.cxx">
       <Filter>Physics\IK</Filter>
     </ClCompile>
     <ClCompile Include="ik_anim_state.cpp">
@@ -9703,10 +9703,10 @@
     <ClCompile Include="IKLimbsController.cpp">
       <Filter>Physics\IK</Filter>
     </ClCompile>
-    <ClCompile Include="Ik\jtlimits.cpp">
+    <ClCompile Include="Ik\jtlimits.cxx">
       <Filter>Physics\IK</Filter>
     </ClCompile>
-    <ClCompile Include="Ik\limb.cpp">
+    <ClCompile Include="Ik\limb.cxx">
       <Filter>Physics\IK</Filter>
     </ClCompile>
     <ClCompile Include="Ik\math3d.cpp">
@@ -9825,4 +9825,4 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-</Project>
+</Project>