diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index ab82700..de171bd 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -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) diff --git a/shaders/shader_edu.tres b/shaders/shader_edu.tres index 62508d8..f51e41b 100644 --- a/shaders/shader_edu.tres +++ b/shaders/shader_edu.tres @@ -7,6 +7,8 @@ uniform vec2 pc0; /* Центр сетки антенн */ uniform float rotation: hint_range(0.0, 360.0) = 0.0; /* */ uniform vec4 color0: source_color = vec4(0.38, 0.47, 0.51, 0.4); uniform vec4 color1: source_color = vec4(0.39, 0.44, 0.50, 0.4); +uniform float radius_inner = 200.0; /* Радиус внутренний. Должно быть равно ant_band_r0_0 */ +uniform float radius_outter = 550.0; /* Радиус внешний. Должно быть равно ant_band_r1_6 */ const float ant_band_count_0 = 2.0; const float ant_band_count_1 = 2.0; @@ -127,3 +129,5 @@ shader_parameter/pc0 = Vector2(560, 560) shader_parameter/rotation = 0.0 shader_parameter/color0 = Color(0.380392, 0.470588, 0.509804, 0.537255) shader_parameter/color1 = Color(0.3315, 0.45645, 0.51, 0.537255) +shader_parameter/radius_inner = 200.0 +shader_parameter/radius_outter = 550.0