TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix build break due to float constants

Browse Source
This commit is contained in:
David Rose 2001-12-06 00:30:23 +00:00
parent d0b59e4556
commit ccbfb5c9bd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/tform/driveInterface.cxx
View File

@ -253,14 +253,15 @@ apply(double x, double y, bool any_button) {
// Motion is forward. Compute the throttle value: the ratio of // Motion is forward. Compute the throttle value: the ratio of
// the mouse pointer within the range of vertical movement. // the mouse pointer within the range of vertical movement.
float throttle = float throttle =
(min(y, 1.0f) - dead_zone_top) / // double 1.0, not 1.0f, is required here to satisfy min()
(min(y, 1.0) - dead_zone_top) /
(1.0f - dead_zone_top); (1.0f - dead_zone_top);
_speed = throttle * _forward_speed; _speed = throttle * _forward_speed;
} else if (y <= dead_zone_bottom) { } else if (y <= dead_zone_bottom) {
// Motion is backward. // Motion is backward.
float throttle = float throttle =
(max(y, -1.0f) - dead_zone_bottom) / (max(y, -1.0) - dead_zone_bottom) /
(-1.0f - dead_zone_bottom); (-1.0f - dead_zone_bottom);
_speed = -throttle * _reverse_speed; _speed = -throttle * _reverse_speed;
} }
@ -276,14 +277,14 @@ apply(double x, double y, bool any_button) {
// ratio of the mouse pointer within the range of horizontal // ratio of the mouse pointer within the range of horizontal
// movement. // movement.
float throttle = float throttle =
(min(x, 1.0f) - dead_zone_right) / (min(x, 1.0) - dead_zone_right) /
(1.0f - dead_zone_right); (1.0f - dead_zone_right);
_rot_speed = throttle * _rotate_speed; _rot_speed = throttle * _rotate_speed;
} else if (x <= dead_zone_left) { } else if (x <= dead_zone_left) {
// Rotation is to the left. // Rotation is to the left.
float throttle = float throttle =
(max(x, -1.0f) - dead_zone_left) / (max(x, -1.0) - dead_zone_left) /
(-1.0f - dead_zone_left); (-1.0f - dead_zone_left);
_rot_speed = -throttle * _rotate_speed; _rot_speed = -throttle * _rotate_speed;
} }