Skip to content

Commit 6875a21

Browse files
committed
Replace built-in scripts and delete strange "e" scripts
1 parent 694ee7f commit 6875a21

File tree

7 files changed

+41
-77
lines changed

7 files changed

+41
-77
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
extends LinkButton
2+
3+
func _on_LinkButton_button_up():
4+
# warning-ignore:return_value_discarded
5+
OS.shell_open("http://docs.godotengine.org/en/3.2/tutorials/io/background_loading.html#using-multiple-threads")

loading/multiple_threads_loading/preload.tscn

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
[gd_scene load_steps=3 format=2]
22

33
[ext_resource path="res://preload.gd" type="Script" id=1]
4-
5-
[sub_resource type="GDScript" id=1]
6-
script/source = "extends LinkButton
7-
8-
func _on_LinkButton_button_up():
9-
# warning-ignore:return_value_discarded
10-
OS.shell_open(\"http://docs.godotengine.org/en/3.2/tutorials/io/background_loading.html#using-multiple-threads\")
11-
"
4+
[ext_resource path="res://link_button.gd" type="Script" id=2]
125

136
[node name="Node" type="Node"]
147
script = ExtResource( 1 )
@@ -63,7 +56,7 @@ margin_top = 80.0
6356
margin_right = 233.0
6457
margin_bottom = 94.0
6558
text = "http://docs.godotengine.org/en/3.2/tutorials/io/background_loading.html"
66-
script = SubResource( 1 )
59+
script = ExtResource( 2 )
6760
__meta__ = {
6861
"_edit_use_anchors_": false
6962
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
extends LinkButton
2+
3+
func _on_LinkButton_pressed():
4+
OS.shell_open("https://github.com/godotengine/webrtc-native/releases")

networking/webrtc_minimal/main.tscn

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22

33
[ext_resource path="res://minimal.tscn" type="PackedScene" id=1]
44
[ext_resource path="res://main.gd" type="Script" id=2]
5-
6-
[sub_resource type="GDScript" id=1]
7-
script/source = "extends LinkButton
8-
9-
func _on_LinkButton_pressed():
10-
OS.shell_open(\"https://github.com/godotengine/webrtc-native/releases\")
11-
"
5+
[ext_resource path="res://link_button.gd" type="Script" id=3]
126

137
[node name="Main" type="Node"]
148
script = ExtResource( 2 )
@@ -28,7 +22,7 @@ margin_top = 293.0
2822
margin_right = 785.0
2923
margin_bottom = 307.0
3024
text = "Make sure to download the GDNative WebRTC Plugin and place it in the project folder"
31-
script = SubResource( 1 )
25+
script = ExtResource( 3 )
3226
__meta__ = {
3327
"_edit_use_anchors_": false
3428
}

viewport/2d_in_3d/2D_in_3D.tscn

Lines changed: 22 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=15 format=2]
1+
[gd_scene load_steps=13 format=2]
22

33
[ext_resource path="res://2D_in_3D.gd" type="Script" id=1]
44
[ext_resource path="res://pong.gd" type="Script" id=2]
@@ -9,35 +9,19 @@
99

1010
[sub_resource type="PlaneMesh" id=1]
1111

12-
[sub_resource type="GDScript" id=2]
13-
script/source = "tool
14-
extends Object
15-
func e():
16-
return .7
17-
"
18-
19-
[sub_resource type="SpatialMaterial" id=3]
12+
[sub_resource type="SpatialMaterial" id=2]
2013
roughness = 0.7
21-
script = SubResource( 2 )
2214

23-
[sub_resource type="CubeMesh" id=4]
15+
[sub_resource type="CubeMesh" id=3]
2416

25-
[sub_resource type="SpatialMaterial" id=5]
17+
[sub_resource type="SpatialMaterial" id=4]
2618
albedo_color = Color( 0.652344, 0.652344, 0.652344, 1 )
2719
roughness = 0.0
2820

29-
[sub_resource type="GDScript" id=6]
30-
script/source = "tool
31-
extends Object
32-
func e():
33-
return 0.1
34-
"
35-
36-
[sub_resource type="CubeMesh" id=7]
21+
[sub_resource type="CubeMesh" id=5]
3722
size = Vector3( 1.1, 0.8, 0.1 )
38-
script = SubResource( 6 )
3923

40-
[sub_resource type="SpatialMaterial" id=8]
24+
[sub_resource type="SpatialMaterial" id=6]
4125

4226
[node name="2Din3D" type="Spatial"]
4327
script = ExtResource( 1 )
@@ -50,48 +34,48 @@ near = 0.1
5034
[node name="Floor" type="MeshInstance" parent="."]
5135
transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, -1, -2 )
5236
mesh = SubResource( 1 )
53-
material/0 = SubResource( 3 )
37+
material/0 = SubResource( 2 )
5438

5539
[node name="Pillar1" type="Spatial" parent="."]
5640
transform = Transform( 0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -3, -0.2, -4 )
5741

5842
[node name="PillarBottom" type="MeshInstance" parent="Pillar1"]
5943
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0 )
60-
mesh = SubResource( 4 )
61-
material/0 = SubResource( 5 )
44+
mesh = SubResource( 3 )
45+
material/0 = SubResource( 4 )
6246

6347
[node name="PillarTop" type="MeshInstance" parent="Pillar1"]
6448
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.5, 0 )
65-
mesh = SubResource( 4 )
66-
material/0 = SubResource( 5 )
49+
mesh = SubResource( 3 )
50+
material/0 = SubResource( 4 )
6751

6852
[node name="PillarMiddle" type="MeshInstance" parent="Pillar1"]
6953
transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.5, 0 )
70-
mesh = SubResource( 4 )
71-
material/0 = SubResource( 5 )
54+
mesh = SubResource( 3 )
55+
material/0 = SubResource( 4 )
7256

7357
[node name="Pillar2" type="Spatial" parent="."]
7458
transform = Transform( 0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 3, -0.2, -4 )
7559

7660
[node name="PillarBottom" type="MeshInstance" parent="Pillar2"]
7761
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0 )
78-
mesh = SubResource( 4 )
79-
material/0 = SubResource( 5 )
62+
mesh = SubResource( 3 )
63+
material/0 = SubResource( 4 )
8064

8165
[node name="PillarTop" type="MeshInstance" parent="Pillar2"]
8266
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.5, 0 )
83-
mesh = SubResource( 4 )
84-
material/0 = SubResource( 5 )
67+
mesh = SubResource( 3 )
68+
material/0 = SubResource( 4 )
8569

8670
[node name="PillarMiddle" type="MeshInstance" parent="Pillar2"]
8771
transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.5, 0 )
88-
mesh = SubResource( 4 )
89-
material/0 = SubResource( 5 )
72+
mesh = SubResource( 3 )
73+
material/0 = SubResource( 4 )
9074

9175
[node name="PillarBack" type="MeshInstance" parent="."]
9276
transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 1.2, -4.5 )
93-
mesh = SubResource( 7 )
94-
material/0 = SubResource( 5 )
77+
mesh = SubResource( 5 )
78+
material/0 = SubResource( 4 )
9579

9680
[node name="DirectionalLight" type="DirectionalLight" parent="."]
9781
transform = Transform( 0.623013, -0.733525, 0.271654, 0.321394, 0.55667, 0.766044, -0.713134, -0.389948, 0.582563, 0, 10, 0 )
@@ -101,7 +85,7 @@ directional_shadow_normal_bias = 0.2
10185

10286
[node name="ViewportQuad" type="MeshInstance" parent="."]
10387
transform = Transform( 2, 0, 0, 0, 0, -1.333, 0, 1, 0, 0, 1.2, -4.25 )
104-
material_override = SubResource( 8 )
88+
material_override = SubResource( 6 )
10589
mesh = SubResource( 1 )
10690
material/0 = null
10791

viewport/3d_in_2d/robot_3d.tscn

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=8 format=2]
1+
[gd_scene load_steps=7 format=2]
22

33
[ext_resource path="res://robot_3d.gd" type="Script" id=1]
44

@@ -44,20 +44,12 @@ surfaces/1 = {
4444
"vertex_count": 625
4545
}
4646

47-
[sub_resource type="GDScript" id=4]
48-
script/source = "tool
49-
extends Object
50-
func e():
51-
return .1
52-
"
53-
54-
[sub_resource type="SpatialMaterial" id=5]
47+
[sub_resource type="SpatialMaterial" id=4]
5548
albedo_color = Color( 0.753906, 0.753906, 0.753906, 1 )
5649
metallic = 0.4
5750
roughness = 0.1
58-
script = SubResource( 4 )
5951

60-
[sub_resource type="SpatialMaterial" id=6]
52+
[sub_resource type="SpatialMaterial" id=5]
6153
roughness = 0.0
6254
emission_enabled = true
6355
emission = Color( 0.203125, 0.551758, 1, 1 )
@@ -71,8 +63,8 @@ script = ExtResource( 1 )
7163
[node name="Model" type="MeshInstance" parent="."]
7264
transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
7365
mesh = SubResource( 3 )
74-
material/0 = SubResource( 5 )
75-
material/1 = SubResource( 6 )
66+
material/0 = SubResource( 4 )
67+
material/1 = SubResource( 5 )
7668

7769
[node name="Camera" type="Camera" parent="."]
7870
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 2.75 )
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
[gd_resource type="Environment" load_steps=3 format=2]
1+
[gd_resource type="Environment" load_steps=2 format=2]
22

33
[sub_resource type="ProceduralSky" id=1]
44

5-
[sub_resource type="GDScript" id=2]
6-
script/source = "tool
7-
extends Object
8-
func e():
9-
return 0
10-
"
11-
125
[resource]
136
background_mode = 2
147
background_sky = SubResource( 1 )
158
ambient_light_color = Color( 1, 1, 1, 1 )
169
ambient_light_energy = 0.28
1710
ambient_light_sky_contribution = 0.0
1811
ssao_blur = 1
19-
script = SubResource( 2 )

0 commit comments

Comments
 (0)