Hoikas
/
korman
mirror of https://github.com/H-uru/korman.git
3
2
Fork 0
Code Releases Activity
Browse Source

Implement review suggestions: 

- Prevent animating EAX region properties
- Automatically enable/disable EAX
- Better flag assignment

Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
pull/253/head
Jrius 4 years ago
parent
63526834f0
commit
5bee3e8c0b
3 changed files with 46 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      korman/properties/modifiers/region.py
  2. 8
      korman/properties/modifiers/sound.py
  3. 12
      korman/ui/modifiers/sound.py

63
korman/properties/modifiers/region.py
Unescape View File

@ -254,7 +254,7 @@ class PlasmaReverbRegion(PlasmaModifierProperties):
default="GENERIC", default="GENERIC",
options=set()) options=set())
# Thikk list for annoying users. # Thicc list for annoying users.
preset_more = EnumProperty(name="More Environment Preset", preset_more = EnumProperty(name="More Environment Preset",
description="Some more environment presets for your convenience", description="Some more environment presets for your convenience",
items=[("CASTLE_SMALLROOM", "Castle - Small room", ""), items=[("CASTLE_SMALLROOM", "Castle - Small room", ""),
@ -348,43 +348,62 @@ class PlasmaReverbRegion(PlasmaModifierProperties):
options=set()) options=set())
environment_size = FloatProperty(name="Environment Size", description="Environment Size", environment_size = FloatProperty(name="Environment Size", description="Environment Size",
default=7.5, min=1.0, max=100.0) default=7.5, min=1.0, max=100.0,
options=set())
environment_diffusion = FloatProperty(name="Environment Diffusion", description="Environment Diffusion", environment_diffusion = FloatProperty(name="Environment Diffusion", description="Environment Diffusion",
default=1.0, min=0.0, max=1.0) default=1.0, min=0.0, max=1.0,
options=set())
room = IntProperty(name="Room", description="Room", room = IntProperty(name="Room", description="Room",
default=-1000, min=-10000, max=0) default=-1000, min=-10000, max=0,
options=set())
room_hf = IntProperty(name="Room HF", description="Room High Frequency", room_hf = IntProperty(name="Room HF", description="Room High Frequency",
default=-100, min=-10000, max=0) default=-100, min=-10000, max=0,
options=set())
room_lf = IntProperty(name="Room LF", description="Room Low Frequency", room_lf = IntProperty(name="Room LF", description="Room Low Frequency",
default=0, min=-10000, max=0) default=0, min=-10000, max=0,
options=set())
decay_time = FloatProperty(name="Decay Time", description="Decay Time", decay_time = FloatProperty(name="Decay Time", description="Decay Time",
default=1.49, min=0.1, max=20.0) default=1.49, min=0.1, max=20.0,
options=set())
decay_hf_ratio = FloatProperty(name="Decay HF Ratio", description="Decay High Frequency Ratio", decay_hf_ratio = FloatProperty(name="Decay HF Ratio", description="Decay High Frequency Ratio",
default=0.83, min=0.1, max=2.0) default=0.83, min=0.1, max=2.0,
options=set())
decay_lf_ratio = FloatProperty(name="Decay LF Ratio", description="Decay Low Frequency Ratio", decay_lf_ratio = FloatProperty(name="Decay LF Ratio", description="Decay Low Frequency Ratio",
default=1.0, min=0.1, max=2.0) default=1.0, min=0.1, max=2.0,
options=set())
reflections = IntProperty(name="Reflections", description="Reflections", reflections = IntProperty(name="Reflections", description="Reflections",
default=-2602, min=-10000, max=1000) default=-2602, min=-10000, max=1000,
options=set())
reflections_delay = FloatProperty(name="Reflections Delay", description="Reflections Delay", reflections_delay = FloatProperty(name="Reflections Delay", description="Reflections Delay",
default=0.007, min=0.0, max=0.3) default=0.007, min=0.0, max=0.3,
options=set())
reverb = IntProperty(name="Reverb", description="Reverb", reverb = IntProperty(name="Reverb", description="Reverb",
default=200, min=-10000, max=2000) default=200, min=-10000, max=2000,
options=set())
reverb_delay = FloatProperty(name="Reverb Delay", description="Reverb Delay", reverb_delay = FloatProperty(name="Reverb Delay", description="Reverb Delay",
default=0.011, min=0.0, max=0.3) default=0.011, min=0.0, max=0.3,
options=set())
echo_time = FloatProperty(name="Echo Time", description="Echo Time", echo_time = FloatProperty(name="Echo Time", description="Echo Time",
default=0.25, min=0.1, max=0.5) default=0.25, min=0.1, max=0.5,
options=set())
echo_depth = FloatProperty(name="Echo Depth", description="Echo Depth", echo_depth = FloatProperty(name="Echo Depth", description="Echo Depth",
default=0.0, min=0.0, max=1.0) default=0.0, min=0.0, max=1.0,
options=set())
modulation_time = FloatProperty(name="Modulation Time", description="Modulation Time", modulation_time = FloatProperty(name="Modulation Time", description="Modulation Time",
default=0.25, min=0.1, max=5.0) default=0.25, min=0.1, max=5.0,
options=set())
modulation_depth = FloatProperty(name="Modulation Depth", description="Modulation Depth", modulation_depth = FloatProperty(name="Modulation Depth", description="Modulation Depth",
default=0.0, min=0.0, max=1.0) default=0.0, min=0.0, max=1.0,
options=set())
air_absorption_hf = FloatProperty(name="Air Absorption HF", description="Air Absorption High Frequency", air_absorption_hf = FloatProperty(name="Air Absorption HF", description="Air Absorption High Frequency",
default=-5.0, min=-10.0, max=0.0) default=-5.0, min=-10.0, max=0.0,
options=set())
hf_reference = FloatProperty(name="HF reference", description="High Frequency Reference", hf_reference = FloatProperty(name="HF reference", description="High Frequency Reference",
default=5000.0, min=1000.0, max=20000.0) default=5000.0, min=1000.0, max=20000.0,
options=set())
lf_reference = FloatProperty(name="LF reference", description="Low Frequency Reference", lf_reference = FloatProperty(name="LF reference", description="Low Frequency Reference",
default=250.0, min=20.0, max=1000.0) default=250.0, min=20.0, max=1000.0,
options=set())
# Room rolloff - always at 0 in all presets, so screw it. # Room rolloff - always at 0 in all presets, so screw it.
# room_rolloff_factor = FloatProperty(name="Room Rolloff Factor", description="Room Rolloff Factor", # room_rolloff_factor = FloatProperty(name="Room Rolloff Factor", description="Room Rolloff Factor",
@ -423,10 +442,8 @@ class PlasmaReverbRegion(PlasmaModifierProperties):
props.airAbsorptionHF = self.air_absorption_hf props.airAbsorptionHF = self.air_absorption_hf
props.hfReference = self.hf_reference props.hfReference = self.hf_reference
props.lfReference = self.lf_reference props.lfReference = self.lf_reference
flags = 0
for flag in self.flags: for flag in self.flags:
flags |= getattr(EAXReverbProperties, flag) props.flags |= getattr(EAXReverbProperties, flag)
props.flags = flags
eax_listener.listenerProps = props eax_listener.listenerProps = props
elif self.preset == "MORE": elif self.preset == "MORE":
eax_listener.listenerProps = getattr(EAXReverbProperties, "REVERB_PRESET_" + self.preset_more) eax_listener.listenerProps = getattr(EAXReverbProperties, "REVERB_PRESET_" + self.preset_more)

8
korman/properties/modifiers/sound.py
Unescape View File

@ -152,12 +152,8 @@ class PlasmaSound(idprops.IDPropMixin, bpy.types.PropertyGroup):
options={"ANIMATABLE"}, options={"ANIMATABLE"},
subtype="PERCENTAGE") subtype="PERCENTAGE")
use_reverb = BoolProperty(name="Reverberation",
description="Allow the sound to be affected by reverberation regions",
default=False,
options=set())
reverb_amount = IntProperty(name="Reverb amount", reverb_amount = IntProperty(name="Reverb amount",
description="Amount of reverb to apply to this sound (at 0, reverb volume reduced by 100 dB)", description="Amount of reverb to apply to this sound (at 0%, reverb volume is reduced by 100 dB and thus disabled)",
min=0, max=100, default=100, min=0, max=100, default=100,
options=set(), options=set(),
subtype="PERCENTAGE") subtype="PERCENTAGE")
@ -301,7 +297,7 @@ class PlasmaSound(idprops.IDPropMixin, bpy.types.PropertyGroup):
sound.channel = plWin32Sound.kRightChannel sound.channel = plWin32Sound.kRightChannel
# Reverb/EAX # Reverb/EAX
if self.use_reverb: if self.sfx_type in ("kSoundFX", "kNPCVoices") and self.reverb_amount > 0:
eax = sound.eaxSettings eax = sound.eaxSettings
eax.enable = True eax.enable = True
# Occlusion: the minimum is -100 dB (but the value is multiplied by 100 in EAX's API) # Occlusion: the minimum is -100 dB (but the value is multiplied by 100 in EAX's API)

12
korman/ui/modifiers/sound.py
Unescape View File

@ -83,6 +83,10 @@ def soundemit(modifier, layout, context):
col.separator() col.separator()
_draw_fade_ui(sound.fade_out, col, "Fade Out:") _draw_fade_ui(sound.fade_out, col, "Fade Out:")
if sound.sfx_type in ("kSoundFX", "kNPCVoices"):
col.separator()
col.prop(sound, "reverb_amount", text="Reverb Amount")
col = split.column() col = split.column()
col.label("Cone Effect:") col.label("Cone Effect:")
col.prop(sound, "inner_cone") col.prop(sound, "inner_cone")
@ -101,11 +105,3 @@ def soundemit(modifier, layout, context):
col.separator() col.separator()
col.label("Soft Region:") col.label("Soft Region:")
col.prop(sound, "sfx_region", text="") col.prop(sound, "sfx_region", text="")
layout.separator()
split = layout.split()
col = split.column()
col.prop(sound, "use_reverb")
if sound.use_reverb:
col = split.column()
col.prop(sound, "reverb_amount", text="Reverb Amount")

Write Preview
Loading…
Cancel
Save