Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass by value, remove c17 features

Browse Source
This commit is contained in:
PabstMirror 2019-03-11 11:24:36 -05:00
parent 93eb04f52a
commit 4ad1fba062
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/artillerytables/artillerytables.cpp
View File

@ -40,7 +40,8 @@ static const ace::vector3<double> gravityAccl(0, 0, -1 * gravityABS);
std::vector<std::future<std::string>> fWorkers; std::vector<std::future<std::string>> fWorkers;
unsigned int getLineIndex = 0; unsigned int getLineIndex = 0;
std::tuple<double, double, double> simulateShot(const double& _fireAngleRad, const double& _muzzleVelocity, const double& _heightOfTarget, const double& _crossWind, const double& _tailWind, const double& _temperature, const double& _airDensity, double _airFriction) { std::tuple<double, double, double> simulateShot(const double _fireAngleRad, const double _muzzleVelocity, const double _heightOfTarget, const double _crossWind, const double _tailWind, const double _temperature, const double _airDensity, double _airFriction) {
// returns: dist traveled to the side (crosswind), dist traveled foward (headwind), time of flight
const double kCoefficient = -1.0 * _airDensity * _airFriction; const double kCoefficient = -1.0 * _airDensity * _airFriction;
const double powderEffects = (_airFriction) ? ((_temperature + 273.13) / 288.13 - 1) / 40 + 1 : 1.0; const double powderEffects = (_airFriction) ? ((_temperature + 273.13) / 288.13 - 1) / 40 + 1 : 1.0;
@ -65,10 +66,12 @@ std::tuple<double, double, double> simulateShot(const double& _fireAngleRad, con
return { finalPos.x(), finalPos.y(), currentTime }; return { finalPos.x(), finalPos.y(), currentTime };
} }
std::tuple<double, double> findMaxAngle(const double& _muzzleVelocity, const double& _airFriction) { std::tuple<double, double> findMaxAngle(const double _muzzleVelocity, const double _airFriction) {
// retrns: angle that goes the furthest, max distance traveled
if (_airFriction == 0) { if (_airFriction == 0) {
return { M_PI_4, _muzzleVelocity * _muzzleVelocity / gravityABS }; return { M_PI_4, _muzzleVelocity * _muzzleVelocity / gravityABS };
} }
// With air resitsnce, max distance angle won't be 45 degrees
double bestAngle = M_PI_4; double bestAngle = M_PI_4;
double bestDistance = -1; double bestDistance = -1;
double testResultDist; double testResultDist;
@ -82,7 +85,7 @@ std::tuple<double, double> findMaxAngle(const double& _muzzleVelocity, const dou
return { bestAngle, bestDistance }; return { bestAngle, bestDistance };
} }
std::tuple<double, double, double> simulateFindSolution(const double& _rangeToHit, const double& _heightToHit, const double& _muzzleVelocity, const double& _airFriction, const double& _minElev, const double& _maxElev, const bool& _highArc) { std::tuple<double, double, double> simulateFindSolution(const double _rangeToHit, const double _heightToHit, const double _muzzleVelocity, const double _airFriction, const double _minElev, const double _maxElev, const bool _highArc) {
// returns: actual distance traveled, elevation, time of flight // returns: actual distance traveled, elevation, time of flight
double searchMin = _minElev; double searchMin = _minElev;
double searchMax = _maxElev; double searchMax = _maxElev;
@ -132,7 +135,7 @@ std::tuple<double, double, double> simulateFindSolution(const double& _rangeToHi
return { resultDistance, currentElevation, resultTime }; return { resultDistance, currentElevation, resultTime };
} }
void writeNumber(std::stringstream & ss, double _num, const int& _widthInt, const int& _widthDec) { void writeNumber(std::stringstream & ss, double _num, const int _widthInt, const int _widthDec) {
if ((_num < 0) && (_num > -0.05)) { // hard coded fix -0.0 rounding errors if ((_num < 0) && (_num > -0.05)) { // hard coded fix -0.0 rounding errors
_num = 0; _num = 0;
} }
@ -142,12 +145,14 @@ void writeNumber(std::stringstream & ss, double _num, const int& _widthInt, cons
ss << std::fixed << std::setw(_widthInt) << std::setprecision(_widthDec) << _num; ss << std::fixed << std::setw(_widthInt) << std::setprecision(_widthDec) << _num;
} }
std::string simulateCalcRangeTableLine(const double& _rangeToHit, const double& _muzzleVelocity, const double& _airFriction, const double& _minElev, const double& _maxElev, const bool& _highArc) { std::string simulateCalcRangeTableLine(const double _rangeToHit, const double _muzzleVelocity, const double _airFriction, const double _minElev, const double _maxElev, const bool _highArc) {
auto [actualDistance, lineElevation, lineTimeOfFlight] = simulateFindSolution(_rangeToHit, 0, _muzzleVelocity, _airFriction, _minElev, _maxElev, _highArc); double actualDistance, lineElevation, lineTimeOfFlight;
std::tie(actualDistance, lineElevation, lineTimeOfFlight) = simulateFindSolution(_rangeToHit, 0, _muzzleVelocity, _airFriction, _minElev, _maxElev, _highArc);
if (lineTimeOfFlight < 0) { if (lineTimeOfFlight < 0) {
return ""; return "";
} }
auto [actualDistanceHeight, lineHeightElevation, lineHeightTimeOfFlight] = simulateFindSolution(_rangeToHit, -100, _muzzleVelocity, _airFriction, _minElev, _maxElev, _highArc); double actualDistanceHeight, lineHeightElevation, lineHeightTimeOfFlight;
std::tie(actualDistanceHeight, lineHeightElevation, lineHeightTimeOfFlight) = simulateFindSolution(_rangeToHit, -100, _muzzleVelocity, _airFriction, _minElev, _maxElev, _highArc);
std::stringstream returnSS; std::stringstream returnSS;
@ -248,7 +253,8 @@ int RVExtensionArgs(char* output, int outputSize, const char* function, const ch
fWorkers.clear(); fWorkers.clear();
getLineIndex = 0; getLineIndex = 0;
auto [bestAngle, bestDistance] = findMaxAngle(muzzleVelocity, airFriction); double bestAngle, bestDistance;
std::tie(bestAngle, bestDistance) = findMaxAngle(muzzleVelocity, airFriction);
minElev = std::max(minElev, 2 * (M_PI / 180.0)); // cap min to 2 degrees (negative elev might get messy) minElev = std::max(minElev, 2 * (M_PI / 180.0)); // cap min to 2 degrees (negative elev might get messy)
maxElev = std::min(maxElev, 88 * (M_PI / 180.0)); // cap max to 88 degrees (mk6) maxElev = std::min(maxElev, 88 * (M_PI / 180.0)); // cap max to 88 degrees (mk6)
@ -321,7 +327,7 @@ int main() {
printf("[%f] = %f\n", ar, range); printf("[%f] = %f\n", ar, range);
} }
*/ */
/*
// test callExtension // test callExtension
char output[256]; char output[256];
char function1[] = "start"; char function1[] = "start";
@ -343,14 +349,14 @@ int main() {
ret2 = RVExtensionArgs(output, 256, function2, NULL, 0); ret2 = RVExtensionArgs(output, 256, function2, NULL, 0);
if (ret2 == 1) { if (ret2 == 1) {
lines++; lines++;
//std::printf("ret: %d - %s\n", ret2, output); std::printf("ret: %d - %s\n", ret2, output);
} }
} }
auto t4 = std::chrono::high_resolution_clock::now(); auto t4 = std::chrono::high_resolution_clock::now();
std::printf("func %s: %1.1f ms with %d lines\n", function2, std::chrono::duration<double, std::milli>(t4 - t3).count(), lines); std::printf("func %s: %1.1f ms with %d lines\n", function2, std::chrono::duration<double, std::milli>(t4 - t3).count(), lines);
std::printf("callExtensions finished in %1.1f ms\n", std::chrono::duration<double, std::milli>(t4 - t1).count()); std::printf("callExtensions finished in %1.1f ms\n", std::chrono::duration<double, std::milli>(t4 - t1).count());
*/
} }
#endif #endif