Skip to content

Commit

Permalink
Added 3 wave parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
goodtimes-code committed Dec 31, 2023
1 parent 06a6efc commit e60610a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ See *config_laser1.txt* for more optional settings.

## Parameters
- /parameters/wave_amplitude
- 0-5000: Wave amplitude (used in StaticWave laser object)
- 0-5000: Wave amplitude
- /parameters/wave_length
- 5000-15000: Wave length
- /parameters/wave_speed
- 0-75: Wave speed

## Effects
- /effect/x_pos and /effect/y_pos
Expand Down
15 changes: 14 additions & 1 deletion osc-receiver/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,16 @@ def update(self):
if 'wave_amplitude' in global_data.parameters and self.amplitude != global_data.parameters['wave_amplitude']:
self.amplitude = global_data.parameters['wave_amplitude']
self.draw_wave()

if 'wave_length' in global_data.parameters and self.wave_length != global_data.parameters['wave_length']:
self.wave_length = global_data.parameters['wave_length']
self.draw_wave()

"""
if 'wave_frequency' in global_data.parameters and self.frequency != global_data.parameters['wave_frequency']:
self.frequency = global_data.parameters['wave_frequency']
self.draw_wave()
"""


class AnimatedWave(StaticWave):
Expand All @@ -165,8 +175,11 @@ def __init__(self, group=0, animation_speed=0.5, amplitude_mod=0, frequency_mod=
def update(self):
self.animation_progress += self.animation_speed
self.point_list = []

if 'wave_speed' in global_data.parameters and self.animation_speed != global_data.parameters['wave_speed']:
self.animation_speed = global_data.parameters['wave_speed']

for x in range(0, self.wave_length, 50):
for x in range(0, int(self.wave_length), 50):
# Varying amplitude and frequency with new parameters
varied_amplitude = self.amplitude + math.sin(x / 100.0) * self.amplitude_mod
varied_frequency = self.frequency + math.sin(x / 200.0) * self.frequency_mod
Expand Down
2 changes: 1 addition & 1 deletion osc-receiver/osc_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def handle_osc_message(address, *args):
handle_effect(effect_name, pos)
elif address.startswith("/parameters/"):
parameter_name = address.split('/')[2]
parameter_value = int(args[0])
parameter_value = float(args[0])
if global_data.config['logging']['osc_server_parameter_handling'] == 'yes':
logging.info(f"[OSC] Handling parameter {parameter_name}: {parameter_value}")
global_data.parameters[parameter_name] = parameter_value
Expand Down

0 comments on commit e60610a

Please sign in to comment.