From b0a831e6671ff0fe436e269730668970cc43ac36 Mon Sep 17 00:00:00 2001 From: Henning Stahlke Date: Wed, 3 May 2017 22:17:08 +0200 Subject: [PATCH] YASim: initialize floats with 'f' suffix to avoid problems with windows build --- src/FDM/YASim/Airplane.hpp | 2 +- src/FDM/YASim/Surface.hpp | 2 +- src/FDM/YASim/yasim-common.hpp | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/FDM/YASim/Airplane.hpp b/src/FDM/YASim/Airplane.hpp index 3aee7c224..d985d6734 100644 --- a/src/FDM/YASim/Airplane.hpp +++ b/src/FDM/YASim/Airplane.hpp @@ -43,7 +43,7 @@ public: void addVStab(Wing* vstab) { _vstabs.add(vstab); } void addFuselage(float* front, float* back, float width, - float taper=1, float mid=0.5, + float taper=1, float mid=0.5f, float cx=1, float cy=1, float cz=1, float idrag=1); int addTank(float* pos, float cap, float fuelDensity); void addGear(Gear* g); diff --git a/src/FDM/YASim/Surface.hpp b/src/FDM/YASim/Surface.hpp index 6114dc26f..278c05a83 100644 --- a/src/FDM/YASim/Surface.hpp +++ b/src/FDM/YASim/Surface.hpp @@ -100,7 +100,7 @@ private: float _cz0 {0}; // Z-axis force offset float _peaks[2] {1, 1}; // Stall peak coefficients (fwd, back) float _stalls[4] {0, 0, 0, 0}; // Stall angles (fwd/back, pos/neg) - float _widths[4] {0.01, 0.01, 0.01, 0.01}; // Stall widths " " + float _widths[4] {0.01f, 0.01f, 0.01f, 0.01f}; // Stall widths float _pos[3]; // position in local coords float _orient[9]; // local->surface orthonormal matrix diff --git a/src/FDM/YASim/yasim-common.hpp b/src/FDM/YASim/yasim-common.hpp index 6f2678087..ed1c4f018 100644 --- a/src/FDM/YASim/yasim-common.hpp +++ b/src/FDM/YASim/yasim-common.hpp @@ -2,32 +2,32 @@ #define _YASIM_COMMON_HPP namespace yasim { - static const float YASIM_PI = 3.14159265358979323846; + static const float YASIM_PI = 3.14159265358979323846f; static const float PI2 = YASIM_PI*2; static const float RAD2DEG = 180/YASIM_PI; static const float DEG2RAD = YASIM_PI/180; static const float RPM2RAD = YASIM_PI/30; - static const float KTS2MPS = 1852.0/3600.0; - static const float MPS2KTS = 3600.0/1852.0; - static const float KMH2MPS = 1/3.6; + static const float KTS2MPS = 1852.0f/3600.0f; + static const float MPS2KTS = 3600.0f/1852.0f; + static const float KMH2MPS = 1/3.6f; - static const float FT2M = 0.3048; + static const float FT2M = 0.3048f; static const float M2FT = 1/FT2M; - static const float LBS2N = 4.44822; + static const float LBS2N = 4.44822f; static const float N2LB = 1/LBS2N; - static const float LBS2KG = 0.45359237; + static const float LBS2KG = 0.45359237f; static const float KG2LBS = 1/LBS2KG; - static const float CM2GALS = 264.172037284; - static const float HP2W = 745.700; - static const float INHG2PA = 3386.389; - static const float K2DEGF = 1.8; - static const float K2DEGFOFFSET = -459.4; - static const float CIN2CM = 1.6387064e-5; + static const float CM2GALS = 264.172037284f; + static const float HP2W = 745.700f; + static const float INHG2PA = 3386.389f; + static const float K2DEGF = 1.8f; + static const float K2DEGFOFFSET = -459.4f; + static const float CIN2CM = 1.6387064e-5f; static const float NM2FTLB = (1/(LBS2N*FT2M)); - static const float SLUG2KG = 14.59390; + static const float SLUG2KG = 14.59390f; };