From caa610ae89fbe4d1a3466ca5dd256d40db7cd979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <41945903+qarmin@users.noreply.github.com> Date: Sun, 18 Apr 2021 20:06:14 +0200 Subject: [PATCH] Removed operators and Light scenes (#42) --- AIO/Operators/Operators.gd | 178 ----------------- AIO/Operators/Operators.tscn | 16 -- AIO/Operators/Operators2.gd | 192 ------------------ AIO/Operators/Operators3.gd | 70 ------- All.tscn | 31 --- Autoload/Autoload.gd | 8 - Nodes/Nodes.gd | 11 +- Rendering/Lights2D/Light2D.gd | 18 -- Rendering/Lights2D/Light2D.tscn | 12 -- Rendering/Lights2D/Lights2D.tscn | 215 --------------------- Rendering/Lights3D/Camera.gd | 10 - Rendering/Lights3D/DirectionalLight.gd | 10 - Rendering/Lights3D/Lights3D.tscn | 167 ---------------- Rendering/Lights3D/OmniLight.gd | 10 - Rendering/Lights3D/SpotLight.gd | 10 - ReparentingDeleting/ReparentingDeleting.gd | 11 +- Start.gd | 8 - project.godot | 10 - 18 files changed, 18 insertions(+), 969 deletions(-) delete mode 100644 AIO/Operators/Operators.gd delete mode 100644 AIO/Operators/Operators.tscn delete mode 100644 AIO/Operators/Operators2.gd delete mode 100644 AIO/Operators/Operators3.gd delete mode 100644 All.tscn delete mode 100644 Rendering/Lights2D/Light2D.gd delete mode 100644 Rendering/Lights2D/Light2D.tscn delete mode 100644 Rendering/Lights2D/Lights2D.tscn delete mode 100644 Rendering/Lights3D/Camera.gd delete mode 100644 Rendering/Lights3D/DirectionalLight.gd delete mode 100644 Rendering/Lights3D/Lights3D.tscn delete mode 100644 Rendering/Lights3D/OmniLight.gd delete mode 100644 Rendering/Lights3D/SpotLight.gd diff --git a/AIO/Operators/Operators.gd b/AIO/Operators/Operators.gd deleted file mode 100644 index f0a7d30..0000000 --- a/AIO/Operators/Operators.gd +++ /dev/null @@ -1,178 +0,0 @@ -extends Node2D - -class_name Operators - -signal roman - -@onready var sew : int = 0 - - -func _process(delta: float) -> void: - - assert(2>1) - - var arr : Array = [25,235236,236,236,23,6,236,236,236,23,634,63,7,35,4734,64,64,34,62,72,32,535] - var dict : Dictionary = {35:535,5236:535,35236:"35","safasf":"w","etwet":"qwrqrqwrqwrq","t":"wet"} - var number = 5242434 - var strin = "asfqwfasfasf" - - 52 % -25 - arr.append(254) - arr[45 % arr.size()] - arr[-45 % arr.size()] - if dict.has(strin): - dict[strin] - sew = sew - number is Node2D - ~45 - -45 - 45 * 45 - 45 / (21) - 45 % (21) - 45 + 45 - 45 - 45 - 1 >> int(max(min(12,0),61)) - 1 << int(max(min(12,0),61)) - 45 & 45 - 45 ^ 45 - 45 | 45 - 45 < 45 - 45 > 45 - 45 == 45 - 45 != 45 - 45 >= 45 - 45 <= 45 - 45 in ["asfasfqw","asfqwgqani"] - !45 - not 45 - 45 and 45 - 45 && 45 - 45 or 45 - 45 || 45 - - number = 45 - number += 45 - number -= 45 - number *= 45 - number /= 21 - number %= 21 - number &= 45 - number |= 45 - - 1234567890 - 0x0123456789ABCDEF - 0x123456789ABCDEF - 0b101010101010101010101 - 0b010101010101010101010 - 3.242 - 25.1e-125 - 125e+24 - "2122222222222222222222222222222225125125125215s" - "Chrabąszcz" - """ - MULTILINIONOWOŚĆ - """ - $"." - - #Comment - - var _r2 = qq() - var _rr = qqr("WRT") - call("qqr","QWT") - - if 45: - pass - else: - pass - - var rr : int = 10 - while(rr != 0): - rr -= 1 - - match 45: - 2: - 45 - 5: - pass - 45 - 3: - continue - false - _: - [521252,"asfasfw", "asfw"] - - match typeof(45): - TYPE_AABB: - 45 - TYPE_INT: - 45 - - match 45: - 2: - 45 -# var RR: -# RR = 45 - - match randi() % 26: - 2: - pass -# var TT: -# var ss = TT # BUG GH#34384 - - for _i in [5,2,5]: - pass - for _i in {"a":0}: - pass - for _i in range(3): - pass - for _i in range(1,2): - pass - for _i in range(1,1,3): - pass - for _i in "Roman": - pass - for _i in 3: - pass - for _i in 2.2: - pass - - -enum {TILE, MILE} -enum State {STATE_IDLE, STATE_JUMP = 5, STATE_SHOOT} -#const Roman = {IDLE = 0, JUMP = 5, SHOOT = 6} # TODO Not working in Godot 4 -const TITLE = 0 -const TITLE2 : int = 0 -var describtion - - -func qq(): - return - -func qqr(_stat : String = "TQW") -> String: - return "FAASFW" - -static func ff(_rr : String = "FA") -> String: - return "qtqwtwey" - -#class ram: # TODO this version leaks in Godot 4 -# var sa : int = 0 -# var qq -# static func rr() -> ram: -# return ram.new() -# static func Wr() -> Node: -# return Node.new() -# static func rqq() -> String: -# return "as" -# func roman() -> String: -# return "wqr" -# func wykop() -> String: -# return "wqr" -# -#func func_ready() -> void: -# var rr : ram = ram.new() -# rr.sa = 125 -# rr.qq = "qw" -# var _s = rr.rr() -# var _r = rr.rqq() -# var _t = rr.roman() -# var _y = rr.wykop() diff --git a/AIO/Operators/Operators.tscn b/AIO/Operators/Operators.tscn deleted file mode 100644 index 734c8e7..0000000 --- a/AIO/Operators/Operators.tscn +++ /dev/null @@ -1,16 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://AIO/Operators/Operators.gd" type="Script" id=1] -[ext_resource path="res://AIO/Operators/Operators2.gd" type="Script" id=2] -[ext_resource path="res://AIO/Operators/Operators3.gd" type="Script" id=3] - -[node name="Node2D" type="Node2D"] - -[node name="Operators" type="Node2D" parent="."] -script = ExtResource( 1 ) - -[node name="Operators2" type="Node2D" parent="."] -script = ExtResource( 2 ) - -[node name="Operators3" type="Node2D" parent="."] -script = ExtResource( 3 ) diff --git a/AIO/Operators/Operators2.gd b/AIO/Operators/Operators2.gd deleted file mode 100644 index c5b0866..0000000 --- a/AIO/Operators/Operators2.gd +++ /dev/null @@ -1,192 +0,0 @@ -extends Node2D - -#var all_types: Array = [ -# AABB(), -# Array(), -# Basis(), -# Color(), -# Dictionary(), -# NodePath(), -# Plane(), -# Quat(), -# Rect2(), -# String(), -# Transform(), -# Transform2D(), -# Vector2(), -# Vector3(), -# float(), -# int(), -# bool() -#] - - -func _process(delta: float) -> void: -# for i in [] - - for i in [ - Color(), - Plane(), - Quat(), - Vector2(), - Vector3(), - float(), - int(), - ]: - i = -i - for i in [ - AABB(), - Array(), - Basis(), - Color(), - Dictionary(), - NodePath(), - Plane(), - Quat(), - Rect2(), - String(), - Transform(), - Transform2D(), - Vector2(), - Vector3(), - float(), - int(), - bool() -]: - i = i - for i in [ - Plane(), - Quat(), - Vector2(), - Vector3(), - float(), - int(), -]: - i = +i - for i in [ - Color(), - Vector2(), - Vector3(), - float(), - int(), -]: - i = i * 1.0 - i = i * 1 - - - - for i in [ - Color(), - Vector2(), - Vector3(), - float(), - int(), -]: - i = i / 1.0 - i = i / 1 - - - for i in [ - AABB(), - Array(), - Basis(), - Color(), - Dictionary(), - NodePath(), - Plane(), - Quat(), - Rect2(), - String(), - Transform(), - Transform2D(), - Vector2(), - Vector3(), - float(), - int(), - bool() -]: - i == i - i != i - - - for i in [ - String(), - Vector2(), - Vector3(), - float(), - int(), -]: - i >= i - i <= i - i > i - i < i - - - for i in [ - int() -]: - i | i - i & i - - for i in [ - AABB(), - Array(), - Basis(), - Color(), - Dictionary(), - NodePath(), - Plane(), - Quat(), - Rect2(), - String(), - Transform(), - Transform2D(), - Vector2(), - Vector3(), - float(), - int(), - bool() -]: - i || i - i && i - - for i in [ - int(), -]: - i = i % 10 - - for i in [ - Array(), - Dictionary(), - String(), -]: - i in i - - for i in [ - float(), - int(), - bool() -]: - i as int - - for i in [ - AABB(), - Array(), - Basis(), - Color(), - Dictionary(), - NodePath(), - Plane(), - Quat(), - Rect2(), - String(), - Transform(), - Transform2D(), - Vector2(), - Vector3(), - float(), - int(), - bool() -]: - typeof(i) - diff --git a/AIO/Operators/Operators3.gd b/AIO/Operators/Operators3.gd deleted file mode 100644 index 098a84a..0000000 --- a/AIO/Operators/Operators3.gd +++ /dev/null @@ -1,70 +0,0 @@ -extends Node2D - -func _process(delta: float) -> void: - - var trzy = 3 - assert(trzy - 1 == 2) - assert(3 - 1 == 2) - - assert(trzy + 1 == 4) - assert(3 + 1 == 4) - - assert(trzy * 8 == 24) - assert(3 * 8 == 24) - - assert(trzy / 3 == 1) - assert(3 / 3 == 1) - - assert(trzy % 2 == 1) - assert(3 % 2 == 1) - - assert(trzy | 4 == 7) - assert(3 | 4 == 7) - - assert(trzy & 2 == 2) - assert(3 & 2 == 2) - - assert(trzy && true == true) - assert(3 && true == true) - - assert(trzy || false == true) - assert(3 || false == true) - - assert(trzy << 2 == 12) - assert(3 << 2 == 12) - - assert(trzy >> 1 == 1) - assert(3 >> 1 == 1) - - assert(trzy ^ 2 == 1) - assert(3 ^ 2 == 1) - - assert(trzy in [2,3,4]) - assert(3 in [2,3,4]) - - assert(trzy is int) - assert(3 is int) - - assert(trzy as int) - assert(3 as int) - - assert(~trzy == -4) - assert(~3 == -4) - - assert(trzy != 4) - assert(3 != 4) - - assert(!(trzy == 4)) - assert(!(3 == 4)) - - assert(trzy < 4) - assert(3 < 4) - - assert(trzy <= 4) - assert(3 <= 4) - - assert(trzy > 2) - assert(3 > 2) - - assert(trzy >= 2) - assert(3 >= 2) diff --git a/All.tscn b/All.tscn deleted file mode 100644 index 47649d3..0000000 --- a/All.tscn +++ /dev/null @@ -1,31 +0,0 @@ -[gd_scene load_steps=8 format=2] - -[ext_resource path="res://Nodes/Nodes.tscn" type="PackedScene" id=1] -[ext_resource path="res://AIO/Operators/Operators.tscn" type="PackedScene" id=5] -[ext_resource path="res://Physics/2D/Physics2D.tscn" type="PackedScene" id=6] -[ext_resource path="res://Rendering/Lights3D/Lights3D.tscn" type="PackedScene" id=7] -[ext_resource path="res://Rendering/Lights2D/Lights2D.tscn" type="PackedScene" id=8] -[ext_resource path="res://Physics/3D/Physics3D.tscn" type="PackedScene" id=9] -[ext_resource path="res://ReparentingDeleting/ReparentingDeleting.tscn" type="PackedScene" id=12] - -[node name="All" type="Node"] - -[node name="Physics" type="Node" parent="."] - -[node name="Physics2D" parent="Physics" instance=ExtResource( 6 )] - -[node name="Physics3D" parent="Physics" instance=ExtResource( 9 )] - -[node name="Rendering" type="Node" parent="."] - -[node name="Lights2D" parent="Rendering" instance=ExtResource( 8 )] - -[node name="Lights3D" parent="Rendering" instance=ExtResource( 7 )] - -[node name="ReparentingDeleting" parent="." instance=ExtResource( 12 )] - -[node name="AIO" type="Node" parent="."] - -[node name="Operators" parent="AIO" instance=ExtResource( 5 )] - -[node name="MainScenes" parent="." instance=ExtResource( 1 )] diff --git a/Autoload/Autoload.gd b/Autoload/Autoload.gd index fa617a6..315c93a 100644 --- a/Autoload/Autoload.gd +++ b/Autoload/Autoload.gd @@ -18,18 +18,10 @@ const alone_steps : Array = [ "res://Nodes/Nodes.tscn", "res://ReparentingDeleting/ReparentingDeleting.tscn", "res://Physics/2D/Physics2D.tscn", -# "res://Rendering/Lights2D/Lights2D.tscn", -# "res://Rendering/Lights3D/Lights3D.tscn", "res://AutomaticBugs/FunctionExecutor.tscn", # Only Needs to be executed once, but this is workaround a little # "res://Physics/3D/Physics3D.tscn", # Loads very long but isn't necessarry so we skip it now ] -# All scenes run in one step -# This should be put regression scripts which needs to run only once -const all_in_one : Array = [ -"res://AIO/Operators/Operators.tscn", -] - func _init(): start_time = OS.get_ticks_msec() diff --git a/Nodes/Nodes.gd b/Nodes/Nodes.gd index a14aa59..b0cccd8 100644 --- a/Nodes/Nodes.gd +++ b/Nodes/Nodes.gd @@ -3,10 +3,17 @@ extends Node var TIME_TO_DELETE : float = 1.0 var time_to_delete : float = TIME_TO_DELETE -var disabled_classes : Array = ["NavigationAgent2D", "NavigationAgent3D","GPUParticlesCollisionHeightField"] +var disabled_classes : Array = ["NavigationAgent2D", "NavigationAgent3D","GPUParticlesCollisionHeightField", + + # Creating them is really slow in Godot 4.0 + "ColorPicker", + "FileDialog", + "ColorPickerButton", + "PhysicalSkyMaterial", + "ProceduralSkyMaterial"] func _populate() -> void: - for _i in range(2): # Number of created + for _i in range(1): # Number of created for name_of_class in ClassDB.get_class_list(): if name_of_class in disabled_classes: continue diff --git a/Rendering/Lights2D/Light2D.gd b/Rendering/Lights2D/Light2D.gd deleted file mode 100644 index dd953ba..0000000 --- a/Rendering/Lights2D/Light2D.gd +++ /dev/null @@ -1,18 +0,0 @@ -extends PointLight2D - -var move_vector: Vector2 = Vector2(1, 1) -var speed: float = 100.0 - - -func _process(delta): - position += Vector2(move_vector.x * delta * speed, move_vector.y * delta * speed) - rotation += speed * delta - - if position.y > Autoload.screen_size.y: - move_vector.y = -1 - elif position.y < 0: - move_vector.y = 1 - elif position.x > Autoload.screen_size.x: - move_vector.x = -1 - elif position.x < 0: - move_vector.x = 1 diff --git a/Rendering/Lights2D/Light2D.tscn b/Rendering/Lights2D/Light2D.tscn deleted file mode 100644 index 4c709dd..0000000 --- a/Rendering/Lights2D/Light2D.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://Rendering/Lights2D/Light2D.gd" type="Script" id=1] -[ext_resource path="res://icon.png" type="Texture" id=2] - -[node name="Light2D" type="Light2D"] -position = Vector2( 36.375, 37.875 ) -texture = ExtResource( 2 ) -texture_scale = 3.39 -energy = 6.7 -shadow_enabled = true -script = ExtResource( 1 ) diff --git a/Rendering/Lights2D/Lights2D.tscn b/Rendering/Lights2D/Lights2D.tscn deleted file mode 100644 index 66ce0c3..0000000 --- a/Rendering/Lights2D/Lights2D.tscn +++ /dev/null @@ -1,215 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://Rendering/Lights2D/Light2D.tscn" type="PackedScene" id=2] - -[sub_resource type="OccluderPolygon2D" id=1] -cull_mode = 1 -polygon = PoolVector2Array( -17.0128, 10.1432, -70.8541, 35.4749, 23.5811, 77.3471, 44.4183, 22.5847 ) - -[sub_resource type="OccluderPolygon2D" id=2] -cull_mode = 1 -polygon = PoolVector2Array( -94.173, -250.818, -70.8541, 35.4749, 23.5811, 77.3471, 44.4183, 22.5847 ) - -[sub_resource type="OccluderPolygon2D" id=3] -cull_mode = 2 -polygon = PoolVector2Array( 181.122, -348.705, -275.018, -211.507, -285.709, -168.744, 444.828, -400.378 ) - -[node name="Lights2D" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="ColorRect" type="ColorRect" parent="."] -self_modulate = Color( 0.294118, 0.294118, 0.294118, 1 ) -anchor_right = 1.0 -anchor_bottom = 1.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Lights" type="Node2D" parent="."] - -[node name="Light2D" parent="Lights" instance=ExtResource( 2 )] - -[node name="Light2D2" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 552.563, -17.2793 ) - -[node name="Light2D3" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 34.9607, 524.365 ) - -[node name="Light2D4" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 679.842, 556.891 ) - -[node name="Light2D5" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 418.213, 295.262 ) - -[node name="Light2D6" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 863.69, 330.617 ) - -[node name="Light2D7" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 336.188, 565.377 ) - -[node name="Light2D8" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 996.626, 563.962 ) - -[node name="Light2D9" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 582.261, 406.985 ) - -[node name="Light2D10" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 600.646, 208.995 ) - -[node name="Light2D11" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 842.477, 139.698 ) - -[node name="Light2D12" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( -187.091, -47.1287 ) - -[node name="Light2D13" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( -342.655, 44.7952 ) - -[node name="Light2D14" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( -175.778, 114.091 ) - -[node name="Light2D15" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( -194.162, -211.178 ) - -[node name="Light2D16" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 289.499, -218.249 ) - -[node name="Light2D35" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( -102.216, -74.258 ) - -[node name="Light2D36" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 841.085, 146.51 ) - -[node name="Light2D37" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 323.483, 688.155 ) - -[node name="Light2D38" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 968.364, 720.681 ) - -[node name="Light2D39" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 706.735, 459.052 ) - -[node name="Light2D40" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 1152.21, 494.407 ) - -[node name="Light2D41" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 624.71, 729.167 ) - -[node name="Light2D42" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 1285.15, 727.752 ) - -[node name="Light2D43" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 870.783, 570.775 ) - -[node name="Light2D44" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 889.168, 372.785 ) - -[node name="Light2D45" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 1131, 303.488 ) - -[node name="Light2D46" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 528.544, 392.584 ) - -[node name="Light2D47" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 372.98, 484.508 ) - -[node name="Light2D48" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 539.857, 553.804 ) - -[node name="Light2D49" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 521.473, 228.535 ) - -[node name="Light2D50" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 1005.13, 221.464 ) - -[node name="Light2D17" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 966.927, 117.071 ) - -[node name="Light2D18" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 136.375, 90.875 ) - -[node name="Light2D19" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 652.563, 35.7207 ) - -[node name="Light2D20" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 134.961, 577.365 ) - -[node name="Light2D21" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 779.842, 609.891 ) - -[node name="Light2D22" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 518.213, 348.262 ) - -[node name="Light2D23" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 963.69, 383.617 ) - -[node name="Light2D24" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 436.188, 618.377 ) - -[node name="Light2D25" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 1096.63, 616.962 ) - -[node name="Light2D26" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 682.261, 459.985 ) - -[node name="Light2D27" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 700.646, 261.995 ) - -[node name="Light2D28" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 942.477, 192.698 ) - -[node name="Light2D29" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 340.022, 281.794 ) - -[node name="Light2D30" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 184.458, 373.718 ) - -[node name="Light2D31" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 351.335, 443.014 ) - -[node name="Light2D32" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 332.951, 117.745 ) - -[node name="Light2D33" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 816.612, 110.674 ) - -[node name="Light2D34" parent="Lights" instance=ExtResource( 2 )] -position = Vector2( 1066.93, 170.071 ) - -[node name="LightOccluders" type="Node2D" parent="."] - -[node name="LightOccluder2D" type="LightOccluder2D" parent="LightOccluders"] -position = Vector2( 469.444, 367.746 ) -occluder = SubResource( 1 ) - -[node name="LightOccluder2D2" type="LightOccluder2D" parent="LightOccluders"] -position = Vector2( 641.978, 284.308 ) -occluder = SubResource( 1 ) - -[node name="LightOccluder2D3" type="LightOccluder2D" parent="LightOccluders"] -position = Vector2( 374.692, 76.4184 ) -occluder = SubResource( 1 ) - -[node name="LightOccluder2D4" type="LightOccluder2D" parent="LightOccluders"] -position = Vector2( 876.738, 219.254 ) -occluder = SubResource( 1 ) - -[node name="LightOccluder2D5" type="LightOccluder2D" parent="LightOccluders"] -position = Vector2( 906.436, 492.197 ) -occluder = SubResource( 1 ) - -[node name="LightOccluder2D6" type="LightOccluder2D" parent="LightOccluders"] -position = Vector2( 906.436, 492.197 ) -occluder = SubResource( 1 ) - -[node name="LightOccluder2D7" type="LightOccluder2D" parent="LightOccluders"] -position = Vector2( 216.3, 438.457 ) -occluder = SubResource( 2 ) - -[node name="LightOccluder2D8" type="LightOccluder2D" parent="LightOccluders"] -position = Vector2( 496.042, 443.802 ) -occluder = SubResource( 3 ) diff --git a/Rendering/Lights3D/Camera.gd b/Rendering/Lights3D/Camera.gd deleted file mode 100644 index e8fd6df..0000000 --- a/Rendering/Lights3D/Camera.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends Camera3D - -var speed = 1 -var curr = 0 - - -func _process(delta): - curr += delta * speed - - look_at_from_position(Vector3(cos(curr) * 3, 0, sin(curr) * 3), Vector3.ZERO, Vector3(0, 1, 0)) diff --git a/Rendering/Lights3D/DirectionalLight.gd b/Rendering/Lights3D/DirectionalLight.gd deleted file mode 100644 index f002eb4..0000000 --- a/Rendering/Lights3D/DirectionalLight.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends DirectionalLight3D - -var speed = 1.2 -var curr = 0 - - -func _process(delta): - curr += delta * speed - - rotation = Vector3(sin(curr) * speed, cos(curr) * speed, sin(8 * curr) * speed) diff --git a/Rendering/Lights3D/Lights3D.tscn b/Rendering/Lights3D/Lights3D.tscn deleted file mode 100644 index 01db7bd..0000000 --- a/Rendering/Lights3D/Lights3D.tscn +++ /dev/null @@ -1,167 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://Rendering/Lights3D/Camera.gd" type="Script" id=1] -[ext_resource path="res://Rendering/Lights3D/DirectionalLight.gd" type="Script" id=2] -[ext_resource path="res://Rendering/Lights3D/OmniLight.gd" type="Script" id=3] -[ext_resource path="res://Rendering/Lights3D/SpotLight.gd" type="Script" id=4] - -[node name="Lights3D" type="Spatial"] - -[node name="Lights" type="Spatial" parent="."] - -[node name="Lights1" type="Spatial" parent="Lights"] - -[node name="DirectionalLight" type="DirectionalLight" parent="Lights/Lights1"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.521, 0 ) -light_color = Color( 0.458824, 0.690196, 0.988235, 1 ) -script = ExtResource( 2 ) - -[node name="OmniLight" type="OmniLight" parent="Lights/Lights1"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.0767, 0 ) -light_color = Color( 0.556863, 0, 0, 1 ) -script = ExtResource( 3 ) - -[node name="SpotLight" type="SpotLight" parent="Lights/Lights1"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.09376 ) -light_color = Color( 0.478431, 0.266667, 1, 1 ) -spot_range = 8.6 -script = ExtResource( 4 ) - -[node name="Lights2" type="Spatial" parent="Lights"] -transform = Transform( 0.506063, -0.520563, -0.687688, 0.308539, 0.853823, -0.419272, 0.805422, 0, 0.592702, 0, 0, 0 ) - -[node name="DirectionalLight" type="DirectionalLight" parent="Lights/Lights2"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.521, 0 ) -light_color = Color( 0.458824, 0.690196, 0.988235, 1 ) -script = ExtResource( 2 ) - -[node name="OmniLight" type="OmniLight" parent="Lights/Lights2"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.0767, 0 ) -light_color = Color( 0.556863, 0, 0, 1 ) -script = ExtResource( 3 ) - -[node name="SpotLight" type="SpotLight" parent="Lights/Lights2"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.09376 ) -light_color = Color( 0.478431, 0.266667, 1, 1 ) -spot_range = 8.6 -script = ExtResource( 4 ) - -[node name="Lights3" type="Spatial" parent="Lights"] -transform = Transform( 0.767362, -0.583576, 0.265697, 0.547886, 0.381458, -0.744521, 0.333133, 0.716888, 0.612449, 0, 0, 0 ) - -[node name="DirectionalLight" type="DirectionalLight" parent="Lights/Lights3"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.521, 0 ) -light_color = Color( 0.458824, 0.690196, 0.988235, 1 ) -script = ExtResource( 2 ) - -[node name="OmniLight" type="OmniLight" parent="Lights/Lights3"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.0767, 0 ) -light_color = Color( 0.556863, 0, 0, 1 ) -script = ExtResource( 3 ) - -[node name="SpotLight" type="SpotLight" parent="Lights/Lights3"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.09376 ) -light_color = Color( 0.478431, 0.266667, 1, 1 ) -spot_range = 8.6 -script = ExtResource( 4 ) - -[node name="Lights4" type="Spatial" parent="Lights"] -transform = Transform( -0.0303629, 0.898468, 0.437989, 0.547886, 0.381458, -0.744521, -0.836002, 0.217362, -0.50384, 0, 2.70549, 0 ) - -[node name="DirectionalLight" type="DirectionalLight" parent="Lights/Lights4"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.521, 0 ) -light_color = Color( 0.458824, 0.690196, 0.988235, 1 ) -script = ExtResource( 2 ) - -[node name="OmniLight" type="OmniLight" parent="Lights/Lights4"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.0767, 0 ) -light_color = Color( 0.556863, 0, 0, 1 ) -script = ExtResource( 3 ) - -[node name="SpotLight" type="SpotLight" parent="Lights/Lights4"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.09376 ) -light_color = Color( 0.478431, 0.266667, 1, 1 ) -spot_range = 8.6 -script = ExtResource( 4 ) - -[node name="Lights5" type="Spatial" parent="Lights"] -transform = Transform( -0.0303629, 0.898468, 0.437989, 0.547886, 0.381458, -0.744521, -0.836002, 0.217362, -0.50384, 0, 2.70549, 6.00353 ) - -[node name="DirectionalLight" type="DirectionalLight" parent="Lights/Lights5"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.521, 0 ) -light_color = Color( 0.458824, 0.690196, 0.988235, 1 ) -script = ExtResource( 2 ) - -[node name="OmniLight" type="OmniLight" parent="Lights/Lights5"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.0767, 0 ) -light_color = Color( 0.556863, 0, 0, 1 ) -script = ExtResource( 3 ) - -[node name="SpotLight" type="SpotLight" parent="Lights/Lights5"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.09376 ) -light_color = Color( 0.478431, 0.266667, 1, 1 ) -spot_range = 8.6 -script = ExtResource( 4 ) - -[node name="Camera" type="Camera" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.87313 ) -script = ExtResource( 1 ) - -[node name="Boxes" type="Spatial" parent="."] - -[node name="CSGBox" type="CSGBox" parent="Boxes"] -width = 0.782 -height = 1.07 -depth = 1.12259 - -[node name="CSGBox2" type="CSGBox" parent="Boxes"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.437537, 0.150547, -0.302456 ) -width = 0.782 -height = 1.583 -depth = 0.394 - -[node name="CSGBox3" type="CSGBox" parent="Boxes"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.699736, 0.150547, -0.302456 ) -width = 0.342 -height = 0.521 -depth = 0.394 - -[node name="Boxes2" type="Spatial" parent="."] -transform = Transform( 0.675732, 0, 0.737148, 0, 1, 0, -0.737148, 0, 0.675732, 0, 0, 0 ) - -[node name="CSGBox" type="CSGBox" parent="Boxes2"] -width = 0.782 -height = 1.07 -depth = 1.12259 - -[node name="CSGBox2" type="CSGBox" parent="Boxes2"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.437537, 0.150547, -0.302456 ) -width = 0.782 -height = 1.583 -depth = 0.394 - -[node name="CSGBox3" type="CSGBox" parent="Boxes2"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.699736, 0.150547, -0.302456 ) -width = 0.342 -height = 0.521 -depth = 0.394 - -[node name="Boxes3" type="Spatial" parent="."] -transform = Transform( 0.675732, 0, 0.737148, 0, 1, 0, -0.737148, 0, 0.675732, -1.59745, -2.38419e-07, -0.843414 ) - -[node name="CSGBox" type="CSGBox" parent="Boxes3"] -width = 0.782 -height = 1.07 -depth = 1.12259 - -[node name="CSGBox2" type="CSGBox" parent="Boxes3"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.437537, 0.150547, -0.302456 ) -width = 0.782 -height = 1.583 -depth = 0.394 - -[node name="CSGBox3" type="CSGBox" parent="Boxes3"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.699736, 0.150547, -0.302456 ) -width = 0.342 -height = 0.521 -depth = 0.394 diff --git a/Rendering/Lights3D/OmniLight.gd b/Rendering/Lights3D/OmniLight.gd deleted file mode 100644 index eea080a..0000000 --- a/Rendering/Lights3D/OmniLight.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends OmniLight3D - -var speed = 0.2 -var curr = 0 - - -func _process(delta): - curr += delta * speed - - look_at_from_position(Vector3(cos(curr) * 3, sin(curr * curr) * 3, sin(curr) * 3), Vector3.ZERO, Vector3(0, 1, 0)) diff --git a/Rendering/Lights3D/SpotLight.gd b/Rendering/Lights3D/SpotLight.gd deleted file mode 100644 index 1897c22..0000000 --- a/Rendering/Lights3D/SpotLight.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends SpotLight3D - -var speed = 0.3 -var curr = 0 - - -func _process(delta): - curr += delta * speed - - look_at_from_position(Vector3(cos(curr) * 3, sin(curr * curr) * 3, sin(curr) * 3), Vector3.ZERO, Vector3(0, 1, 0)) diff --git a/ReparentingDeleting/ReparentingDeleting.gd b/ReparentingDeleting/ReparentingDeleting.gd index 361216c..1197502 100644 --- a/ReparentingDeleting/ReparentingDeleting.gd +++ b/ReparentingDeleting/ReparentingDeleting.gd @@ -5,7 +5,14 @@ var number_of_nodes : int = 0 var collected_nodes : Array = [] var disabled_classes : Array = [ "NavigationAgent2D", "NavigationAgent3D","GPUParticlesCollisionHeightField", - "ReflectionProbe", # Cause errors, not sure about it + "ReflectionProbe",# Cause errors, not sure about it + + # Creating them is really slow in Godot 4.0 + "ColorPicker", + "FileDialog", + "ColorPickerButton", + "PhysicalSkyMaterial", + "ProceduralSkyMaterial" ] # Just add name of any class if cause problems func collect() -> void: @@ -23,7 +30,7 @@ func collect() -> void: func _ready() -> void: seed(405) collect() - number_of_nodes = max(collected_nodes.size(),200) # Use at least all nodes, or more if you want(168 is probably number nodes) + number_of_nodes = max(collected_nodes.size(),11) # Use at least all nodes, or more if you want(168 is probably number nodes) for i in range(number_of_nodes): var index = i if i >= collected_nodes.size(): # Wrap values diff --git a/Start.gd b/Start.gd index 49ede83..de02dcb 100644 --- a/Start.gd +++ b/Start.gd @@ -9,14 +9,6 @@ var array_with_time_to_change : Array = [] func _ready(): for i in Autoload.alone_steps.size() + 1: array_with_time_to_change.append(OS.get_ticks_msec() + i * Autoload.time_for_each_step) - - print("Starting with scene(s):") - for path in Autoload.all_in_one: - for _i in range(NUMBER_OF_INSTANCES): - var scene : Node = load(path).instance() - add_child(scene) - print(" - " + path) - func _process(_delta): if current_scene < Autoload.alone_steps.size() - 1 && OS.get_ticks_msec() > array_with_time_to_change[current_scene + 1]: diff --git a/project.godot b/project.godot index 7d0ceae..e6a7c06 100644 --- a/project.godot +++ b/project.godot @@ -8,16 +8,6 @@ config_version=4 -_global_script_classes=[ { -"base": "Node2D", -"class": @"Operators", -"language": @"GDScript", -"path": "res://AIO/Operators/Operators.gd" -} ] -_global_script_class_icons={ -@"Operators": "" -} - [application] run/main_scene="res://Start.tscn"