Skip to content

Commit fc630bb

Browse files
committed
Revert "xrGame: fix some IK undefined reference"
This reverts commit 30d85f1.
1 parent aa15fbd commit fc630bb

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

src/xrGame/ik/aint.cpp renamed to src/xrGame/ik/aint.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
MODIFICATIONS.
3030
3131
*/
32-
#include "StdAfx.h"
32+
#include "stdafx.h"
3333

3434
#include "aint.h"
3535

src/xrGame/ik/eqn.cpp renamed to src/xrGame/ik/eqn.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
MODIFICATIONS.
3030
3131
*/
32-
#include "StdAfx.h"
32+
#include "stdafx.h"
3333
#include "eqn.h"
3434

3535
/*

src/xrGame/ik/eulersolver.cpp renamed to src/xrGame/ik/eulersolver.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
MODIFICATIONS.
3030
3131
*/
32-
#include "StdAfx.h"
32+
#include "stdafx.h"
3333
#include "eulersolver.h"
3434

3535
typedef void (*euler_solver)(const Matrix G, float& t1, float& t2, float& t3, int family);

src/xrGame/ik/jtlimits.cpp renamed to src/xrGame/ik/jtlimits.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
3131
*/
3232

33-
#include "StdAfx.h"
33+
#include "stdafx.h"
3434
#include "aint.h"
3535
#include "jtlimits.h"
3636

src/xrGame/ik/limb.cpp renamed to src/xrGame/ik/limb.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
3131
*/
3232

33-
#include "StdAfx.h"
33+
#include "stdafx.h"
3434
#include "limb.h"
3535

3636
enum
@@ -903,7 +903,7 @@ int Limb::InLimits(const float x[7]) const
903903
return 1;
904904
}
905905

906-
float round_up(float x)
906+
float roundup(float x)
907907
{
908908
if (x < 0)
909909
x += 2 * M_PI;
@@ -914,7 +914,7 @@ void dump_file(char* file, int euler_type, float min[], float max[], Matrix c, M
914914
FILE* fp = fopen(file, "w");
915915

916916
fprintf(fp, "%d\n", euler_type);
917-
fprintf(fp, "%f %f %f \n", round_up(min[2]), round_up(min[1]), round_up(min[0]));
917+
fprintf(fp, "%f %f %f \n", roundup(min[2]), roundup(min[1]), roundup(min[0]));
918918
fprintf(fp, "%f %f %f \n", max[2], max[1], max[0]);
919919
for (int i = 0; i < 4; i++)
920920
fprintf(fp, "%f %f %f %f\n", c[i][0], c[i][1], c[i][2], c[i][3]);

src/xrGame/xrGame.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2537,13 +2537,13 @@
25372537
<ClCompile Include="hud_item_object.cpp" />
25382538
<ClCompile Include="IKFoot.cpp" />
25392539
<ClCompile Include="IKLimbsController.cpp" />
2540-
<ClCompile Include="Ik\aint.cpp" />
2540+
<ClCompile Include="Ik\aint.cxx" />
25412541
<ClCompile Include="Ik\Dof7control.cpp" />
2542-
<ClCompile Include="Ik\eqn.cpp" />
2543-
<ClCompile Include="Ik\eulersolver.cpp" />
2542+
<ClCompile Include="Ik\eqn.cxx" />
2543+
<ClCompile Include="Ik\eulersolver.cxx" />
25442544
<ClCompile Include="Ik\IKLimb.cpp" />
2545-
<ClCompile Include="Ik\jtlimits.cpp" />
2546-
<ClCompile Include="Ik\limb.cpp" />
2545+
<ClCompile Include="Ik\jtlimits.cxx" />
2546+
<ClCompile Include="Ik\limb.cxx" />
25472547
<ClCompile Include="Ik\math3d.cpp" />
25482548
<ClCompile Include="Ik\mathTrig.cpp" />
25492549
<ClCompile Include="ik_anim_state.cpp" />
@@ -3715,4 +3715,4 @@
37153715
<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'))" />
37163716
<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'))" />
37173717
</Target>
3718-
</Project>
3718+
</Project>

src/xrGame/xrGame.vcxproj.filters

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9664,16 +9664,16 @@
96649664
<ClCompile Include="Hit.cpp">
96659665
<Filter>Physics\Hit</Filter>
96669666
</ClCompile>
9667-
<ClCompile Include="Ik\aint.cpp">
9667+
<ClCompile Include="Ik\aint.cxx">
96689668
<Filter>Physics\IK</Filter>
96699669
</ClCompile>
96709670
<ClCompile Include="Ik\Dof7control.cpp">
96719671
<Filter>Physics\IK</Filter>
96729672
</ClCompile>
9673-
<ClCompile Include="Ik\eqn.cpp">
9673+
<ClCompile Include="Ik\eqn.cxx">
96749674
<Filter>Physics\IK</Filter>
96759675
</ClCompile>
9676-
<ClCompile Include="Ik\eulersolver.cpp">
9676+
<ClCompile Include="Ik\eulersolver.cxx">
96779677
<Filter>Physics\IK</Filter>
96789678
</ClCompile>
96799679
<ClCompile Include="ik_anim_state.cpp">
@@ -9703,10 +9703,10 @@
97039703
<ClCompile Include="IKLimbsController.cpp">
97049704
<Filter>Physics\IK</Filter>
97059705
</ClCompile>
9706-
<ClCompile Include="Ik\jtlimits.cpp">
9706+
<ClCompile Include="Ik\jtlimits.cxx">
97079707
<Filter>Physics\IK</Filter>
97089708
</ClCompile>
9709-
<ClCompile Include="Ik\limb.cpp">
9709+
<ClCompile Include="Ik\limb.cxx">
97109710
<Filter>Physics\IK</Filter>
97119711
</ClCompile>
97129712
<ClCompile Include="Ik\math3d.cpp">
@@ -9825,4 +9825,4 @@
98259825
<ItemGroup>
98269826
<None Include="packages.config" />
98279827
</ItemGroup>
9828-
</Project>
9828+
</Project>

0 commit comments

Comments
 (0)