From fc630bb32c5b8729625574ffa3913e295cc02e15 Mon Sep 17 00:00:00 2001 From: Ilya Orlov Date: Tue, 6 Nov 2018 16:03:56 +0300 Subject: [PATCH] Revert "xrGame: fix some IK undefined reference" This reverts commit 30d85f18e91716f7d03a96e9ede62f12442d2c9e. --- src/xrGame/ik/{aint.cpp => aint.cxx} | 2 +- src/xrGame/ik/{eqn.cpp => eqn.cxx} | 2 +- src/xrGame/ik/{eulersolver.cpp => eulersolver.cxx} | 2 +- src/xrGame/ik/{jtlimits.cpp => jtlimits.cxx} | 2 +- src/xrGame/ik/{limb.cpp => limb.cxx} | 6 +++--- src/xrGame/xrGame.vcxproj | 12 ++++++------ src/xrGame/xrGame.vcxproj.filters | 12 ++++++------ 7 files changed, 19 insertions(+), 19 deletions(-) rename src/xrGame/ik/{aint.cpp => aint.cxx} (99%) rename src/xrGame/ik/{eqn.cpp => eqn.cxx} (99%) rename src/xrGame/ik/{eulersolver.cpp => eulersolver.cxx} (99%) rename src/xrGame/ik/{jtlimits.cpp => jtlimits.cxx} (99%) rename src/xrGame/ik/{limb.cpp => limb.cxx} (99%) diff --git a/src/xrGame/ik/aint.cpp b/src/xrGame/ik/aint.cxx similarity index 99% rename from src/xrGame/ik/aint.cpp rename to src/xrGame/ik/aint.cxx index 85f1077deaa..b5a545501fb 100644 --- a/src/xrGame/ik/aint.cpp +++ b/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 b/src/xrGame/ik/eqn.cxx similarity index 99% rename from src/xrGame/ik/eqn.cpp rename to src/xrGame/ik/eqn.cxx index 25a9e52af7c..1c20e2a533b 100644 --- a/src/xrGame/ik/eqn.cpp +++ b/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 b/src/xrGame/ik/eulersolver.cxx similarity index 99% rename from src/xrGame/ik/eulersolver.cpp rename to src/xrGame/ik/eulersolver.cxx index 3efefb64b61..5adc059983c 100644 --- a/src/xrGame/ik/eulersolver.cpp +++ b/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 b/src/xrGame/ik/jtlimits.cxx similarity index 99% rename from src/xrGame/ik/jtlimits.cpp rename to src/xrGame/ik/jtlimits.cxx index f0bcce5ad7d..e13657c376e 100644 --- a/src/xrGame/ik/jtlimits.cpp +++ b/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 b/src/xrGame/ik/limb.cxx similarity index 99% rename from src/xrGame/ik/limb.cpp rename to src/xrGame/ik/limb.cxx index c2041ebf530..11e133d7dfe 100644 --- a/src/xrGame/ik/limb.cpp +++ b/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 index cb5751408fc..edab4d68418 100644 --- a/src/xrGame/xrGame.vcxproj +++ b/src/xrGame/xrGame.vcxproj @@ -2537,13 +2537,13 @@ - + - - + + - - + + @@ -3715,4 +3715,4 @@ - + \ No newline at end of file diff --git a/src/xrGame/xrGame.vcxproj.filters b/src/xrGame/xrGame.vcxproj.filters index 83594d99af5..72fc728191c 100644 --- a/src/xrGame/xrGame.vcxproj.filters +++ b/src/xrGame/xrGame.vcxproj.filters @@ -9664,16 +9664,16 @@ Physics\Hit - + Physics\IK Physics\IK - + Physics\IK - + Physics\IK @@ -9703,10 +9703,10 @@ Physics\IK - + Physics\IK - + Physics\IK @@ -9825,4 +9825,4 @@ - + \ No newline at end of file