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

Fix Eotvos effect

Browse Source
This commit is contained in:
PabstMirror 2015-12-20 02:16:29 -06:00
parent 4d041c3c94
commit 683f45682a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ace_advanced_ballistics.dll
View File

Binary file not shown.

4
extensions/CMakeLists.txt
View File

@ -89,8 +89,8 @@ endif()
string(TIMESTAMP ACE_BUILDSTAMP "%Y-%m-%dT%H:%M:%SZ") string(TIMESTAMP ACE_BUILDSTAMP "%Y-%m-%dT%H:%M:%SZ")
set(ACE_VERSION_MAJOR 3) set(ACE_VERSION_MAJOR 3)
set(ACE_VERSION_MINOR 2) set(ACE_VERSION_MINOR 4)
set(ACE_VERSION_REVISION 0) set(ACE_VERSION_REVISION 1)
EXECUTE_PROCESS(COMMAND git rev-parse --verify HEAD EXECUTE_PROCESS(COMMAND git rev-parse --verify HEAD
OUTPUT_VARIABLE T_ACE_VERSION_BUILD OUTPUT_VARIABLE T_ACE_VERSION_BUILD
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE

9
extensions/advanced_ballistics/AdvancedBallistics.cpp
View File

@ -5,6 +5,11 @@
#include <unordered_map> #include <unordered_map>
#include <random> #include <random>
//Guard for M_PI ???? ref https://github.com/acemod/ACE3/pull/2382
#ifndef M_PI
#define M_PI 3.14159265358979323846f
#endif
#define GRAVITY 9.80665f #define GRAVITY 9.80665f
#define ABSOLUTE_ZERO_IN_CELSIUS -273.15f #define ABSOLUTE_ZERO_IN_CELSIUS -273.15f
#define KELVIN(t) (t - ABSOLUTE_ZERO_IN_CELSIUS) #define KELVIN(t) (t - ABSOLUTE_ZERO_IN_CELSIUS)
@ -572,8 +577,8 @@ void __stdcall RVExtension(char *output, int outputSize, const char *function)
positionOffset[1] += cos(bulletDir + M_PI / 2) * horizontalDeflectionPartial; positionOffset[1] += cos(bulletDir + M_PI / 2) * horizontalDeflectionPartial;
} }
double centripetalAccel = 2 * 0.0000729 * (bulletDatabase[index].muzzleVelocity / -32.2) * cos(bulletDatabase[index].latitude) * sin(bulletDir); double centripetalAccel = 2 * 0.0000729 * (bulletDatabase[index].muzzleVelocity) * cos(bulletDatabase[index].latitude) * sin(bulletDir);
velocityOffset[2] -= centripetalAccel * deltaT; velocityOffset[2] += centripetalAccel * deltaT;
double spinDrift = bulletDatabase[index].twistDirection * 0.0254 * 1.25 * (bulletDatabase[index].stabilityFactor + 1.2) * pow(TOF, 1.83); double spinDrift = bulletDatabase[index].twistDirection * 0.0254 * 1.25 * (bulletDatabase[index].stabilityFactor + 1.2) * pow(TOF, 1.83);
double spinDriftPartial = spinDrift - bulletDatabase[index].spinDrift; double spinDriftPartial = spinDrift - bulletDatabase[index].spinDrift;