Skip to content

Commit cd7c652

Browse files
committed
Improve scene instancing demo
1 parent e5ee4a5 commit cd7c652

File tree

4 files changed

+23
-24
lines changed

4 files changed

+23
-24
lines changed

misc/instancing/ball.tscn

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ bounce = 0.4
88
[sub_resource type="CircleShape2D" id=2]
99
radius = 30.0
1010

11-
[node name="ball" type="RigidBody2D"]
11+
[node name="Ball" type="RigidBody2D"]
1212
physics_material_override = SubResource( 1 )
1313

14-
[node name="sprite" type="Sprite" parent="."]
14+
[node name="Sprite" type="Sprite" parent="."]
1515
texture = ExtResource( 1 )
1616

17-
[node name="collision" type="CollisionShape2D" parent="."]
17+
[node name="Collision" type="CollisionShape2D" parent="."]
1818
shape = SubResource( 2 )
19-

misc/instancing/ball_factory.gd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
extends Position2D
1+
extends Node2D
22

3-
export (PackedScene) var ball_scene = preload("res://ball.tscn")
3+
export(PackedScene) var ball_scene = preload("res://ball.tscn")
44

55
func _unhandled_input(event):
66
if event.is_echo():
@@ -10,7 +10,7 @@ func _unhandled_input(event):
1010
spawn(get_global_mouse_position())
1111

1212

13-
func spawn(spawn_global_position = global_position):
13+
func spawn(spawn_global_position):
1414
var instance = ball_scene.instance()
1515
instance.global_position = spawn_global_position
1616
add_child(instance)

misc/instancing/project.godot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ _global_script_class_icons={
1616
[application]
1717

1818
config/name="Scene Instancing Demo"
19-
run/main_scene="res://container.tscn"
19+
run/main_scene="res://scene_instancing.tscn"
2020
config/icon="res://icon.png"
2121

2222
[display]
@@ -35,4 +35,4 @@ singletons=[ ]
3535

3636
[rendering]
3737

38-
environment/default_clear_color=Color( 0.290196, 0.160784, 0.160784, 1 )
38+
environment/default_clear_color=Color( 0.301961, 0.301961, 0.301961, 1 )

misc/instancing/container.tscn renamed to misc/instancing/scene_instancing.tscn

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,57 +33,57 @@ bounce = 0.4
3333
[sub_resource type="PhysicsMaterial" id=10]
3434
bounce = 0.4
3535

36-
[node name="container" type="Node"]
36+
[node name="SceneInstancing" type="Node2D"]
3737

38-
[node name="ball_factory" type="Position2D" parent="."]
38+
[node name="BallFactory" type="Node2D" parent="."]
3939
script = ExtResource( 1 )
4040

41-
[node name="static" type="StaticBody2D" parent="."]
41+
[node name="Static" type="StaticBody2D" parent="."]
4242

43-
[node name="collision" type="CollisionPolygon2D" parent="static"]
43+
[node name="Collision" type="CollisionPolygon2D" parent="Static"]
4444
polygon = PoolVector2Array( 8.68994, 22.1976, 50.4445, 556.656, 292.621, 501.54, 335.36, 550.855, 510.039, 563.135, 542.137, 526.368, 567.463, 515.822, 612.463, 506.822, 667.291, 495.079, 747.553, 553.575, 793.806, 6.70509, 802.465, 601.097, 4.43558, 596.186 )
4545

46-
[node name="polygon2d" type="Polygon2D" parent="static"]
46+
[node name="Polygon2D" type="Polygon2D" parent="Static"]
4747
color = Color( 1, 0.266667, 0.419608, 1 )
4848
polygon = PoolVector2Array( 8.68994, 22.1976, 50.4445, 556.656, 292.621, 501.54, 335.36, 550.855, 510.039, 563.135, 542.137, 526.368, 567.463, 515.822, 612.463, 506.822, 667.291, 495.079, 747.553, 553.575, 793.806, 6.70509, 802.465, 601.097, 4.43558, 596.186 )
4949

50-
[node name="ball 1" parent="." instance=ExtResource( 2 )]
50+
[node name="Ball1" parent="." instance=ExtResource( 2 )]
5151
position = Vector2( 223.823, 161.773 )
5252
physics_material_override = SubResource( 1 )
5353

54-
[node name="ball 2" parent="." instance=ExtResource( 2 )]
54+
[node name="Ball2" parent="." instance=ExtResource( 2 )]
5555
position = Vector2( 388.078, 213.215 )
5656
physics_material_override = SubResource( 2 )
5757

58-
[node name="ball 3" parent="." instance=ExtResource( 2 )]
58+
[node name="Ball3" parent="." instance=ExtResource( 2 )]
5959
position = Vector2( 439.52, 104.013 )
6060
physics_material_override = SubResource( 3 )
6161

62-
[node name="ball 4" parent="." instance=ExtResource( 2 )]
62+
[node name="Ball4" parent="." instance=ExtResource( 2 )]
6363
position = Vector2( 235.555, 336.858 )
6464
physics_material_override = SubResource( 4 )
6565

66-
[node name="ball 5" parent="." instance=ExtResource( 2 )]
66+
[node name="Ball5" parent="." instance=ExtResource( 2 )]
6767
position = Vector2( 509.555, 362.858 )
6868
physics_material_override = SubResource( 5 )
6969

70-
[node name="ball 6" parent="." instance=ExtResource( 2 )]
70+
[node name="Ball6" parent="." instance=ExtResource( 2 )]
7171
position = Vector2( 635.555, 147.858 )
7272
physics_material_override = SubResource( 6 )
7373

74-
[node name="ball 7" parent="." instance=ExtResource( 2 )]
74+
[node name="Ball7" parent="." instance=ExtResource( 2 )]
7575
position = Vector2( 631.872, 325.88 )
7676
physics_material_override = SubResource( 7 )
7777

78-
[node name="ball 8" parent="." instance=ExtResource( 2 )]
78+
[node name="Ball8" parent="." instance=ExtResource( 2 )]
7979
position = Vector2( 529.97, 205.561 )
8080
physics_material_override = SubResource( 8 )
8181

82-
[node name="ball 9" parent="." instance=ExtResource( 2 )]
82+
[node name="Ball9" parent="." instance=ExtResource( 2 )]
8383
position = Vector2( 101.489, 167.502 )
8484
physics_material_override = SubResource( 9 )
8585

86-
[node name="ball 10" parent="." instance=ExtResource( 2 )]
86+
[node name="Ball10" parent="." instance=ExtResource( 2 )]
8787
position = Vector2( 143.756, 295.139 )
8888
physics_material_override = SubResource( 10 )
8989

0 commit comments

Comments
 (0)