From 8db01f6d4ab11ae68899996af67bbf60ddc5ac43 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 6 Apr 2023 23:08:31 +0200 Subject: [PATCH] Make sure everything works under the viewport folder. --- viewport/2d_in_3d/2D_in_3D.tscn | 1 - viewport/2d_in_3d/project.pandemonium | 1 - viewport/3d_in_2d/3d_in_2d.tscn | 4 +- viewport/3d_scaling/project.pandemonium | 1 - .../dynamic_split_screen/project.pandemonium | 5 --- .../dynamic_split_screen/split_screen.tscn | 43 ------------------- viewport/gui_in_3d/gui_3d.gd | 2 +- viewport/gui_in_3d/gui_in_3d.tscn | 5 --- viewport/screen_capture/project.pandemonium | 5 --- 9 files changed, 2 insertions(+), 65 deletions(-) diff --git a/viewport/2d_in_3d/2D_in_3D.tscn b/viewport/2d_in_3d/2D_in_3D.tscn index e087aba..5e7a127 100644 --- a/viewport/2d_in_3d/2D_in_3D.tscn +++ b/viewport/2d_in_3d/2D_in_3D.tscn @@ -87,7 +87,6 @@ directional_shadow_normal_bias = 0.2 transform = Transform( 2, 0, 0, 0, 0, -1.333, 0, 1, 0, 0, 1.2, -4.25 ) material_override = SubResource( 6 ) mesh = SubResource( 1 ) -material/0 = null [node name="Viewport" type="Viewport" parent="."] size = Vector2( 600, 400 ) diff --git a/viewport/2d_in_3d/project.pandemonium b/viewport/2d_in_3d/project.pandemonium index bf21912..c95de93 100644 --- a/viewport/2d_in_3d/project.pandemonium +++ b/viewport/2d_in_3d/project.pandemonium @@ -44,7 +44,6 @@ right_move_down={ [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_environment="res://default_env.tres" diff --git a/viewport/3d_in_2d/3d_in_2d.tscn b/viewport/3d_in_2d/3d_in_2d.tscn index 6fb5098..ce25704 100644 --- a/viewport/3d_in_2d/3d_in_2d.tscn +++ b/viewport/3d_in_2d/3d_in_2d.tscn @@ -31,7 +31,7 @@ region = Rect2( 256, 0, 64, 64 ) animations = [ { "frames": [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ) ], "loop": true, -"name": "default", +"name": @"default", "speed": 5.0 } ] @@ -40,7 +40,6 @@ script = ExtResource( 1 ) [node name="Viewport" type="Viewport" parent="."] size = Vector2( 300, 300 ) -own_world = true transparent_bg = true msaa = 2 hdr = false @@ -60,4 +59,3 @@ frames = SubResource( 7 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 512, 300 ) -current = true diff --git a/viewport/3d_scaling/project.pandemonium b/viewport/3d_scaling/project.pandemonium index 68a97ca..f00d7e0 100644 --- a/viewport/3d_scaling/project.pandemonium +++ b/viewport/3d_scaling/project.pandemonium @@ -40,7 +40,6 @@ toggle_filtering={ [rendering] -quality/driver/driver_name="GLES2" quality/intended_usage/framebuffer_allocation=3 vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/viewport/dynamic_split_screen/project.pandemonium b/viewport/dynamic_split_screen/project.pandemonium index 4cbb063..3c7b37d 100644 --- a/viewport/dynamic_split_screen/project.pandemonium +++ b/viewport/dynamic_split_screen/project.pandemonium @@ -16,10 +16,6 @@ split screen, also called Voronoi split screen, using GDSL." run/main_scene="res://split_screen.tscn" config/icon="res://icon.png" -[debug] - -gdscript/warnings/return_value_discarded=false - [input] move_up_player1={ @@ -83,7 +79,6 @@ move_right_player2={ [rendering] -quality/driver/driver_name="GLES2" quality/intended_usage/framebuffer_allocation=3 vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/viewport/dynamic_split_screen/split_screen.tscn b/viewport/dynamic_split_screen/split_screen.tscn index 79e3b1a..13b8d3f 100644 --- a/viewport/dynamic_split_screen/split_screen.tscn +++ b/viewport/dynamic_split_screen/split_screen.tscn @@ -241,7 +241,6 @@ shape = SubResource( 4 ) [node name="Mesh" type="MeshInstance" parent="Ground"] transform = Transform( 20, 0, 0, 0, 1, 0, 0, 0, 20, 0, 0, 0 ) mesh = SubResource( 7 ) -material/0 = null [node name="CollisionShape" type="CollisionShape" parent="Ground"] transform = Transform( 200, 0, 0, 0, 1, 0, 0, 0, 200, 0, -1, 0 ) @@ -260,7 +259,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group1/Wall1" groups=["walls"]] material_override = SubResource( 10 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall2" type="StaticBody" parent="Walls/Group1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.3812, 1, -2.68735 ) @@ -271,7 +269,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group1/Wall2" groups=["walls"]] material_override = SubResource( 12 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall3" type="StaticBody" parent="Walls/Group1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.99091, 1, -13.3028 ) @@ -282,7 +279,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group1/Wall3" groups=["walls"]] material_override = SubResource( 13 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall4" type="StaticBody" parent="Walls/Group1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.10164, 1, 4.39061 ) @@ -293,7 +289,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group1/Wall4" groups=["walls"]] material_override = SubResource( 14 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall5" type="StaticBody" parent="Walls/Group1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12965, 1, -9.09735 ) @@ -304,7 +299,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group1/Wall5" groups=["walls"]] material_override = SubResource( 15 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall6" type="StaticBody" parent="Walls/Group1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.99301, 1, 1.77014 ) @@ -315,7 +309,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group1/Wall6" groups=["walls"]] material_override = SubResource( 16 ) mesh = SubResource( 11 ) -material/0 = null [node name="Group2" type="Spatial" parent="Walls"] transform = Transform( 0.988065, 0, -0.154039, 0, 1, 0, 0.154039, 0, 0.988065, -22.59, 0, -3.1796 ) @@ -329,7 +322,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group2/Wall1" groups=["walls"]] material_override = SubResource( 17 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall2" type="StaticBody" parent="Walls/Group2"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.3812, 1, -2.68735 ) @@ -340,7 +332,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group2/Wall2" groups=["walls"]] material_override = SubResource( 18 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall3" type="StaticBody" parent="Walls/Group2"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.99091, 1, -13.3028 ) @@ -351,7 +342,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group2/Wall3" groups=["walls"]] material_override = SubResource( 19 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall4" type="StaticBody" parent="Walls/Group2"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.10164, 1, 4.39061 ) @@ -362,7 +352,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group2/Wall4" groups=["walls"]] material_override = SubResource( 20 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall5" type="StaticBody" parent="Walls/Group2"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12965, 1, -9.09735 ) @@ -373,7 +362,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group2/Wall5" groups=["walls"]] material_override = SubResource( 21 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall6" type="StaticBody" parent="Walls/Group2"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.99301, 1, 1.77014 ) @@ -384,7 +372,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group2/Wall6" groups=["walls"]] material_override = SubResource( 22 ) mesh = SubResource( 11 ) -material/0 = null [node name="Group3" type="Spatial" parent="Walls"] transform = Transform( 0.905096, 0, 0.425207, 0, 1, 0, -0.425207, 0, 0.905096, -12.7693, 0, 17.7449 ) @@ -398,7 +385,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group3/Wall1" groups=["walls"]] material_override = SubResource( 23 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall2" type="StaticBody" parent="Walls/Group3"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.3812, 1, -2.68735 ) @@ -409,7 +395,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group3/Wall2" groups=["walls"]] material_override = SubResource( 24 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall3" type="StaticBody" parent="Walls/Group3"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.99091, 1, -13.3028 ) @@ -420,7 +405,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group3/Wall3" groups=["walls"]] material_override = SubResource( 25 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall4" type="StaticBody" parent="Walls/Group3"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.10164, 1, 4.39061 ) @@ -431,7 +415,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group3/Wall4" groups=["walls"]] material_override = SubResource( 26 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall5" type="StaticBody" parent="Walls/Group3"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12965, 1, -9.09735 ) @@ -442,7 +425,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group3/Wall5" groups=["walls"]] material_override = SubResource( 27 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall6" type="StaticBody" parent="Walls/Group3"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.99301, 1, 1.77014 ) @@ -453,7 +435,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group3/Wall6" groups=["walls"]] material_override = SubResource( 28 ) mesh = SubResource( 11 ) -material/0 = null [node name="Group4" type="Spatial" parent="Walls"] transform = Transform( 0.155702, 0, -0.987804, 0, 1, 0, 0.987804, 0, 0.155702, 14.0374, 0, 12.1476 ) @@ -467,7 +448,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group4/Wall1" groups=["walls"]] material_override = SubResource( 29 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall2" type="StaticBody" parent="Walls/Group4"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.3812, 1, -2.68735 ) @@ -478,7 +458,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group4/Wall2" groups=["walls"]] material_override = SubResource( 30 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall3" type="StaticBody" parent="Walls/Group4"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.99091, 1, -13.3028 ) @@ -489,7 +468,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group4/Wall3" groups=["walls"]] material_override = SubResource( 31 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall4" type="StaticBody" parent="Walls/Group4"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.10164, 1, 4.39061 ) @@ -500,7 +478,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group4/Wall4" groups=["walls"]] material_override = SubResource( 32 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall5" type="StaticBody" parent="Walls/Group4"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12965, 1, -9.09735 ) @@ -511,7 +488,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group4/Wall5" groups=["walls"]] material_override = SubResource( 33 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall6" type="StaticBody" parent="Walls/Group4"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.99301, 1, 1.77014 ) @@ -522,7 +498,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group4/Wall6" groups=["walls"]] material_override = SubResource( 34 ) mesh = SubResource( 11 ) -material/0 = null [node name="Group5" type="Spatial" parent="Walls"] transform = Transform( 0.999549, 0, 0.0300306, 0, 1, 0, -0.0300306, 0, 0.999549, 0.500639, 0, 27.6888 ) @@ -536,7 +511,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group5/Wall1" groups=["walls"]] material_override = SubResource( 35 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall2" type="StaticBody" parent="Walls/Group5"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.3812, 1, -2.68735 ) @@ -547,7 +521,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group5/Wall2" groups=["walls"]] material_override = SubResource( 36 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall3" type="StaticBody" parent="Walls/Group5"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.99091, 1, -13.3028 ) @@ -558,7 +531,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group5/Wall3" groups=["walls"]] material_override = SubResource( 37 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall4" type="StaticBody" parent="Walls/Group5"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.10164, 1, 4.39061 ) @@ -569,7 +541,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group5/Wall4" groups=["walls"]] material_override = SubResource( 38 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall5" type="StaticBody" parent="Walls/Group5"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12965, 1, -9.09735 ) @@ -580,7 +551,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group5/Wall5" groups=["walls"]] material_override = SubResource( 39 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall6" type="StaticBody" parent="Walls/Group5"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.99301, 1, 1.77014 ) @@ -591,7 +561,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group5/Wall6" groups=["walls"]] material_override = SubResource( 40 ) mesh = SubResource( 11 ) -material/0 = null [node name="Group6" type="Spatial" parent="Walls"] transform = Transform( 0.613129, 0, -0.789983, 0, 1, 0, 0.789983, 0, 0.613129, 21.2586, 0, -14.244 ) @@ -605,7 +574,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group6/Wall1" groups=["walls"]] material_override = SubResource( 41 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall2" type="StaticBody" parent="Walls/Group6"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.3812, 1, -2.68735 ) @@ -616,7 +584,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group6/Wall2" groups=["walls"]] material_override = SubResource( 42 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall3" type="StaticBody" parent="Walls/Group6"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.99091, 1, -13.3028 ) @@ -627,7 +594,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group6/Wall3" groups=["walls"]] material_override = SubResource( 43 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall4" type="StaticBody" parent="Walls/Group6"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.10164, 1, 4.39061 ) @@ -638,7 +604,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group6/Wall4" groups=["walls"]] material_override = SubResource( 44 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall5" type="StaticBody" parent="Walls/Group6"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12965, 1, -9.09735 ) @@ -649,7 +614,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group6/Wall5" groups=["walls"]] material_override = SubResource( 45 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall6" type="StaticBody" parent="Walls/Group6"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.99301, 1, 1.77014 ) @@ -660,7 +624,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group6/Wall6" groups=["walls"]] material_override = SubResource( 46 ) mesh = SubResource( 11 ) -material/0 = null [node name="Group7" type="Spatial" parent="Walls"] transform = Transform( -0.999329, 0, -0.0366257, 0, 1, 0, 0.0366257, 0, -0.999329, -8.83615, 0, -32.7996 ) @@ -674,7 +637,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group7/Wall1" groups=["walls"]] material_override = SubResource( 47 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall2" type="StaticBody" parent="Walls/Group7"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.3812, 1, -2.68735 ) @@ -685,7 +647,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group7/Wall2" groups=["walls"]] material_override = SubResource( 48 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall3" type="StaticBody" parent="Walls/Group7"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.99091, 1, -13.3028 ) @@ -696,7 +657,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group7/Wall3" groups=["walls"]] material_override = SubResource( 49 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall4" type="StaticBody" parent="Walls/Group7"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.10164, 1, 4.39061 ) @@ -707,7 +667,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group7/Wall4" groups=["walls"]] material_override = SubResource( 50 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall5" type="StaticBody" parent="Walls/Group7"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12965, 1, -9.09735 ) @@ -718,7 +677,6 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group7/Wall5" groups=["walls"]] material_override = SubResource( 51 ) mesh = SubResource( 11 ) -material/0 = null [node name="Wall6" type="StaticBody" parent="Walls/Group7"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.99301, 1, 1.77014 ) @@ -729,4 +687,3 @@ shape = SubResource( 9 ) [node name="MeshInstance" type="MeshInstance" parent="Walls/Group7/Wall6" groups=["walls"]] material_override = SubResource( 52 ) mesh = SubResource( 11 ) -material/0 = null diff --git a/viewport/gui_in_3d/gui_3d.gd b/viewport/gui_in_3d/gui_3d.gd index 33a6d3d..a1a744b 100644 --- a/viewport/gui_in_3d/gui_3d.gd +++ b/viewport/gui_in_3d/gui_3d.gd @@ -128,7 +128,7 @@ func find_mouse(global_position): # Manually raycasts the are to find the mouse position - var result = get_world().direct_space_state.intersect_ray(from, to, [], node_area.collision_layer,false,true) #for 3.1 changes + var result = get_world_3d().direct_space_state.intersect_ray(from, to, [], node_area.collision_layer,false,true) #for 3.1 changes if result.size() > 0: return result.position diff --git a/viewport/gui_in_3d/gui_in_3d.tscn b/viewport/gui_in_3d/gui_in_3d.tscn index cbe49d0..9d509ba 100644 --- a/viewport/gui_in_3d/gui_in_3d.tscn +++ b/viewport/gui_in_3d/gui_in_3d.tscn @@ -50,27 +50,22 @@ anims/Move_camera = SubResource( 1 ) [node name="Wall" type="MeshInstance" parent="Background"] transform = Transform( 4, 0, 0, 0, -1.74846e-07, -4, 0, 4, -1.74846e-07, -2.60819, 0.589247, -2.08943 ) mesh = SubResource( 2 ) -material/0 = null [node name="Wall2" type="MeshInstance" parent="Background"] transform = Transform( 4, 0, 0, 0, -1.74846e-07, -4, 0, 4, -1.74846e-07, 5.08055, 0.589247, -2.08943 ) mesh = SubResource( 2 ) -material/0 = null [node name="Wall3" type="MeshInstance" parent="Background"] transform = Transform( -1.74846e-07, -4, 0, -1.74846e-07, 7.64274e-15, -4, 4, -1.74846e-07, -1.74846e-07, 9.04446, 0.589247, 1.62058 ) mesh = SubResource( 2 ) -material/0 = null [node name="Floor" type="MeshInstance" parent="Background"] transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, -2.60819, -2.68765, 1.46502 ) mesh = SubResource( 2 ) -material/0 = null [node name="Floor2" type="MeshInstance" parent="Background"] transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 5.08055, -2.68765, 1.46502 ) mesh = SubResource( 2 ) -material/0 = null [node name="Cube" type="MeshInstance" parent="Background"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.25901, -0.598608, 0.374871 ) diff --git a/viewport/screen_capture/project.pandemonium b/viewport/screen_capture/project.pandemonium index d29acaa..877501f 100644 --- a/viewport/screen_capture/project.pandemonium +++ b/viewport/screen_capture/project.pandemonium @@ -15,10 +15,6 @@ config/description="An example showing how to take screenshots of the screen." run/main_scene="res://screen_capture.tscn" config/icon="res://icon.png" -[debug] - -gdscript/warnings/return_value_discarded=false - [display] window/dpi/allow_hidpi=true @@ -31,6 +27,5 @@ singletons=[ ] [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false