Merge remote-tracking branch 'sasha/master'

This commit is contained in:
MaD_CaT
2023-08-15 13:36:04 +03:00
4 changed files with 22 additions and 26 deletions

View File

@@ -8,12 +8,13 @@ func set_strob_width(val: float): $строб.material.set('shader_parameter/
func set_strob_band(val: float): $строб.material.set('shader_parameter/band', val / 125.0)
func set_strob_radius(val: float): $строб.material.set('shader_parameter/radius', sv(val))
func get_strob_center() -> Vector2: return $строб.position
func get_strob_visible() -> bool: return $строб.visible
func get_strob_width() -> float: return $строб.material.get('shader_parameter/width')
func get_strob_band() -> float: return $строб.material.get('shader_parameter/band') * 125.0
func get_strob_radius(val: float) -> float: return $строб.material.set('shader_parameter/radius', sv(val))
func get_radius_max() -> float: return $строб.scale.x
func get_radius_min() -> float: return 212.0
func get_strob_center() -> Vector2: return $строб.position
func get_strob_visible() -> bool: return $строб.visible
func get_strob_width() -> float: return $строб.material.get('shader_parameter/width')
func get_strob_band() -> float: return $строб.material.get('shader_parameter/band') * 125.0
func get_strob_radius() -> float: return $строб.material.get('shader_parameter/radius') * 125.0
func get_radius_outter() -> float: return material.get('shader_parameter/radius_outter')
func get_radius_inner() -> float: return material.get('shader_parameter/radius_inner')
func sv(val: float) -> float: return val / ($строб.scale.x / 2.0) * 0.125

View File

@@ -2,13 +2,13 @@
[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_uxbga"]
[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_vkwmy"]
[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/Sector.tscn" id="3_uhdvc"]
[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_uhdvc"]
[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_gb4a1"]
[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"]
size = Vector2(1600, 1200)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_hwrhs"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_laka7"]
resource_local_to_scene = true
shader = ExtResource("4_gb4a1")
shader_parameter/color = Color(1, 1, 1, 0.168627)
@@ -26,6 +26,6 @@ centered = false
script = ExtResource("2_vkwmy")
[node name="строб" parent="." instance=ExtResource("3_uhdvc")]
material = SubResource("ShaderMaterial_hwrhs")
material = SubResource("ShaderMaterial_laka7")
position = Vector2(560, 560)
scale = Vector2(1100, 1100)