albatross
/
ControlMain2017
2017年度の製作を開始します
Fork of Control_Main_Full_20160608 by
Diff: InputHandler/InputHandler.cpp
- Branch:
- ?????
- Revision:
- 54:65e6baedec04
- Parent:
- 53:947eff37d01d
--- a/InputHandler/InputHandler.cpp Thu Jun 15 05:44:18 2017 +0000 +++ b/InputHandler/InputHandler.cpp Fri Jun 16 12:25:26 2017 +0000 @@ -72,13 +72,12 @@ } //範囲外の値を下限値と上限値に置き換える -float InputCalc::CutInvalidInput(float input) +void InputCalc::CutInvalidInput(float* input) { - if(input > NORMMAX) - input = NORMMAX; - else if(input < NORMMIN) - input = NORMMIN; - return input; + if(*input > NORMMAX) + *input = NORMMAX; + else if(*input < NORMMIN) + *input = NORMMIN; } float InputCalc::Processing(float input) @@ -88,6 +87,6 @@ GetNormRate(); NormValue(&input); WidenNeutral(&input); + CutInvalidInput(&input); return input; - //return CutInvalidInput(input); } \ No newline at end of file