From f342c55099bbd6af781aab7324340460b6299e98 Mon Sep 17 00:00:00 2001 From: dusoleil Date: Thu, 22 Sep 2022 07:45:09 -0400 Subject: Use the root of the Water scene for the Water API --- water/Water.gd | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'water/Water.gd') diff --git a/water/Water.gd b/water/Water.gd index 99efa74..32f89ca 100644 --- a/water/Water.gd +++ b/water/Water.gd @@ -1,4 +1,4 @@ -extends MeshInstance +extends Spatial tool export var wave1_steepness = 0.5 setget _set_wave1_steepness @@ -13,11 +13,13 @@ export var wave3_steepness = 0.5 setget _set_wave3_steepness export var wave3_wavelength = 10.0 setget _set_wave3_wavelength export var wave3_direction = Vector2(1.0,0.0) setget _set_wave3_direction +onready var water_plane = $"MeshInstance" + func _set_wave_prop(idx, prop, val): if val == null: return if idx >= waves.size(): return waves[idx].set(prop,val) - _update_wave(0) + _update_wave(idx) func _set_wave1_steepness(val): wave1_steepness = val @@ -66,13 +68,13 @@ func _wave_to_v3(wave): return Vector3(wave.steepness,wave._k,wave._a) func _update_wave(idx): - var material = self.get_surface_material(0) + var material = self.water_plane.get_surface_material(0) material.set_shader_param("wave" + str(idx+1), _wave_to_v3(waves[idx])) material.set_shader_param("wave" + str(idx+1) + "_dir", waves[idx].direction) func _set_time(val): _time = val - var material = self.get_surface_material(0) + var material = self.water_plane.get_surface_material(0) for idx in waves.size(): waves[idx]._time = _time material.set_shader_param("wave" + str(idx+1) + "_t", waves[idx]._t) @@ -109,5 +111,5 @@ func height(pos): y = new_pos.y new_pos = old_pos - (new_pos - old_pos) old_pos = new_pos - y += self.global_transform.origin.y + y += self.water_plane.global_transform.origin.y return y -- cgit v1.2.3