From 7388234a6e2baf157af84e77009ff3aabf6571ac Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 13 Jan 2023 11:02:01 +0100 Subject: [PATCH] Fix issues. --- godot/Demos/Arrive/TargetDrawer.gd | 10 ++++------ godot/Demos/DemoSelector.tscn | 3 --- godot/Demos/SeekFlee/Boundaries.gd | 2 +- .../Behaviors/GSAIBlend.gd | 8 +++++++- godot/assets/icon.png.import | 1 + godot/assets/icon.svg.import | 1 + godot/assets/sprites/background.png.import | 1 + godot/assets/theme/icons/chevron-right.svg.import | 1 + godot/assets/theme/icons/chevron-up.svg.import | 1 + godot/default_env.tres | 2 +- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/godot/Demos/Arrive/TargetDrawer.gd b/godot/Demos/Arrive/TargetDrawer.gd index 3bdfc31..a5dccf7 100644 --- a/godot/Demos/Arrive/TargetDrawer.gd +++ b/godot/Demos/Arrive/TargetDrawer.gd @@ -1,9 +1,7 @@ extends Node2D -const COLORS := { - deceleration_radius = Color(1.0, 0.419, 0.592, 0.5), - arrival_tolerance = Color(0.278, 0.231, 0.47, 0.3) -} +var deceleration_radius_color : Color = Color(1.0, 0.419, 0.592, 0.5) +var arrival_tolerance_color : Color = Color(0.278, 0.231, 0.47, 0.3) var arriver: Node2D @@ -15,5 +13,5 @@ func _ready() -> void: func _draw(): var target_position := GSAIUtils.to_vector2(arriver.target.position) - draw_circle(target_position, owner.deceleration_radius, COLORS.deceleration_radius) - draw_circle(target_position, owner.arrival_tolerance, COLORS.arrival_tolerance) + draw_circle(target_position, owner.deceleration_radius, deceleration_radius_color) + draw_circle(target_position, owner.arrival_tolerance, arrival_tolerance_color) diff --git a/godot/Demos/DemoSelector.tscn b/godot/Demos/DemoSelector.tscn index 12d8cf2..6d36925 100644 --- a/godot/Demos/DemoSelector.tscn +++ b/godot/Demos/DemoSelector.tscn @@ -18,9 +18,6 @@ anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 2 ) script = ExtResource( 4 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="TextureRect" type="TextureRect" parent="DemoPickerUI"] anchor_right = 1.0 diff --git a/godot/Demos/SeekFlee/Boundaries.gd b/godot/Demos/SeekFlee/Boundaries.gd index f54e6cf..827671f 100644 --- a/godot/Demos/SeekFlee/Boundaries.gd +++ b/godot/Demos/SeekFlee/Boundaries.gd @@ -19,7 +19,7 @@ func _on_SceneTree_size_changed() -> void: ProjectSettings["display/window/size/width"], ProjectSettings["display/window/size/height"] ) for b in get_children(): - var boundary: String = b.name.rsplit("Boundary")[0] + var boundary: String = str(b.name).rsplit("Boundary")[0] match boundary: "Left": b.global_position = Vector2(0, size.y / 2) diff --git a/godot/addons/com.gdquest.godot-steering-ai-framework/Behaviors/GSAIBlend.gd b/godot/addons/com.gdquest.godot-steering-ai-framework/Behaviors/GSAIBlend.gd index 053e789..f45bc6b 100644 --- a/godot/addons/com.gdquest.godot-steering-ai-framework/Behaviors/GSAIBlend.gd +++ b/godot/addons/com.gdquest.godot-steering-ai-framework/Behaviors/GSAIBlend.gd @@ -21,7 +21,13 @@ func _init(agent: GSAISteeringAgent).(agent) -> void: # Appends a behavior to the internal array along with its `weight`. func add(behavior: GSAISteeringBehavior, weight: float) -> void: behavior.agent = agent - _behaviors.append({behavior = behavior, weight = weight}) + + var dict : Dictionary = Dictionary() + + dict["behavior"] = behavior; + dict["weight"] = weight; + + _behaviors.append(dict) # Returns the behavior at the specified `index`, or an empty `Dictionary` if diff --git a/godot/assets/icon.png.import b/godot/assets/icon.png.import index 4e9f7bb..19c032f 100644 --- a/godot/assets/icon.png.import +++ b/godot/assets/icon.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/godot/assets/icon.svg.import b/godot/assets/icon.svg.import index d499e66..3c98329 100644 --- a/godot/assets/icon.svg.import +++ b/godot/assets/icon.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/godot/assets/sprites/background.png.import b/godot/assets/sprites/background.png.import index 8d1c5f6..1835864 100644 --- a/godot/assets/sprites/background.png.import +++ b/godot/assets/sprites/background.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/godot/assets/theme/icons/chevron-right.svg.import b/godot/assets/theme/icons/chevron-right.svg.import index 000f669..a70eff6 100644 --- a/godot/assets/theme/icons/chevron-right.svg.import +++ b/godot/assets/theme/icons/chevron-right.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/godot/assets/theme/icons/chevron-up.svg.import b/godot/assets/theme/icons/chevron-up.svg.import index 14e96f7..79aeba4 100644 --- a/godot/assets/theme/icons/chevron-up.svg.import +++ b/godot/assets/theme/icons/chevron-up.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/godot/default_env.tres b/godot/default_env.tres index 20207a4..4f08e8f 100644 --- a/godot/default_env.tres +++ b/godot/default_env.tres @@ -1,4 +1,4 @@ -[gd_resource type="Environment" load_steps=2 format=2] +[gd_resource type="Environment3D" load_steps=2 format=2] [sub_resource type="ProceduralSky" id=1]