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

Changed joybox scaling

Browse Source
This commit is contained in:
Mark Mine 2002-12-19 23:13:40 +00:00
parent fcadfa3d40
commit 096b751815
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
direct/src/directdevices/DirectDeviceManager.py
View File

@ -135,28 +135,29 @@ class DirectAnalogs(AnalogNode, DirectObject):
((val - self.analogMin) / self.analogRange)) + minVal) ((val - self.analogMin) / self.analogRange)) + minVal)
def normalize(self, val, minVal = -1, maxVal = 1): def normalize(self, val, minVal = -1, maxVal = 1, sf = 1.0):
max = self.analogMax max = self.analogMax
min = self.analogMin min = self.analogMin
center = self.analogCenter center = self.analogCenter
deadband = self.analogDeadband deadband = self.analogDeadband
range = self.analogRange range = self.analogRange
# Zero out values in deadband
if (abs(val) <= deadband):
return 0.0
# Apply scale factor
val *= sf
# Clamp value between min and max and scale around center # Clamp value between min and max and scale around center
if (val >= center): if (val >= center):
val = (val - center) / (max - center) val = (val - center) / (max - center)
else: else:
val = (val - center) / (center - min) val = (val - center) / (center - min)
# Zero out values in deadband
if (abs(val) <= deadband):
val = 0.0
# Normalize values to given minVal and maxVal range # Normalize values to given minVal and maxVal range
return (((maxVal - minVal) * return (((maxVal - minVal) *
((val - min) / range)) + minVal) ((val - min) / range)) + minVal)
def normalizeChannel(self, chan, minVal = -1, maxVal = 1, sf = 1.0):
def normalizeChannel(self, chan, minVal = -1, maxVal = 1):
try: try:
return self.normalize(self[chan], minVal, maxVal) return self.normalize(self[chan], minVal, maxVal, sfx)
except IndexError: except IndexError:
return 0.0 return 0.0

2
direct/src/directdevices/DirectJoybox.py
View File

@ -409,7 +409,7 @@ class DirectJoybox(PandaObject):
if (chan == L_TWIST) or (chan == R_TWIST): if (chan == L_TWIST) or (chan == R_TWIST):
# These channels have reduced range # These channels have reduced range
return self.analogs.normalize( return self.analogs.normalize(
self.analogs.getControlState(chan) * 3.0, minVal, maxVal) self.analogs.getControlState(chan), minVal, maxVal, 3.0)
else: else:
return self.analogs.normalize( return self.analogs.normalize(
self.analogs.getControlState(chan), minVal, maxVal) self.analogs.getControlState(chan), minVal, maxVal)