Explorar o código

Improve scene instancing demo

Aaron Franke %!s(int64=5) %!d(string=hai) anos
pai
achega
cd7c652975

+ 3 - 4
misc/instancing/ball.tscn

@@ -8,12 +8,11 @@ bounce = 0.4
 [sub_resource type="CircleShape2D" id=2]
 radius = 30.0
 
-[node name="ball" type="RigidBody2D"]
+[node name="Ball" type="RigidBody2D"]
 physics_material_override = SubResource( 1 )
 
-[node name="sprite" type="Sprite" parent="."]
+[node name="Sprite" type="Sprite" parent="."]
 texture = ExtResource( 1 )
 
-[node name="collision" type="CollisionShape2D" parent="."]
+[node name="Collision" type="CollisionShape2D" parent="."]
 shape = SubResource( 2 )
-

+ 3 - 3
misc/instancing/ball_factory.gd

@@ -1,6 +1,6 @@
-extends Position2D
+extends Node2D
 
-export (PackedScene) var ball_scene = preload("res://ball.tscn")
+export(PackedScene) var ball_scene = preload("res://ball.tscn")
 
 func _unhandled_input(event):
 	if event.is_echo():
@@ -10,7 +10,7 @@ func _unhandled_input(event):
 			spawn(get_global_mouse_position())
 
 
-func spawn(spawn_global_position = global_position):
+func spawn(spawn_global_position):
 	var instance = ball_scene.instance()
 	instance.global_position = spawn_global_position
 	add_child(instance)

+ 2 - 2
misc/instancing/project.godot

@@ -16,7 +16,7 @@ _global_script_class_icons={
 [application]
 
 config/name="Scene Instancing Demo"
-run/main_scene="res://container.tscn"
+run/main_scene="res://scene_instancing.tscn"
 config/icon="res://icon.png"
 
 [display]
@@ -35,4 +35,4 @@ singletons=[  ]
 
 [rendering]
 
-environment/default_clear_color=Color( 0.290196, 0.160784, 0.160784, 1 )
+environment/default_clear_color=Color( 0.301961, 0.301961, 0.301961, 1 )

+ 15 - 15
misc/instancing/container.tscn → misc/instancing/scene_instancing.tscn

@@ -33,57 +33,57 @@ bounce = 0.4
 [sub_resource type="PhysicsMaterial" id=10]
 bounce = 0.4
 
-[node name="container" type="Node"]
+[node name="SceneInstancing" type="Node2D"]
 
-[node name="ball_factory" type="Position2D" parent="."]
+[node name="BallFactory" type="Node2D" parent="."]
 script = ExtResource( 1 )
 
-[node name="static" type="StaticBody2D" parent="."]
+[node name="Static" type="StaticBody2D" parent="."]
 
-[node name="collision" type="CollisionPolygon2D" parent="static"]
+[node name="Collision" type="CollisionPolygon2D" parent="Static"]
 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 )
 
-[node name="polygon2d" type="Polygon2D" parent="static"]
+[node name="Polygon2D" type="Polygon2D" parent="Static"]
 color = Color( 1, 0.266667, 0.419608, 1 )
 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 )
 
-[node name="ball 1" parent="." instance=ExtResource( 2 )]
+[node name="Ball1" parent="." instance=ExtResource( 2 )]
 position = Vector2( 223.823, 161.773 )
 physics_material_override = SubResource( 1 )
 
-[node name="ball 2" parent="." instance=ExtResource( 2 )]
+[node name="Ball2" parent="." instance=ExtResource( 2 )]
 position = Vector2( 388.078, 213.215 )
 physics_material_override = SubResource( 2 )
 
-[node name="ball 3" parent="." instance=ExtResource( 2 )]
+[node name="Ball3" parent="." instance=ExtResource( 2 )]
 position = Vector2( 439.52, 104.013 )
 physics_material_override = SubResource( 3 )
 
-[node name="ball 4" parent="." instance=ExtResource( 2 )]
+[node name="Ball4" parent="." instance=ExtResource( 2 )]
 position = Vector2( 235.555, 336.858 )
 physics_material_override = SubResource( 4 )
 
-[node name="ball 5" parent="." instance=ExtResource( 2 )]
+[node name="Ball5" parent="." instance=ExtResource( 2 )]
 position = Vector2( 509.555, 362.858 )
 physics_material_override = SubResource( 5 )
 
-[node name="ball 6" parent="." instance=ExtResource( 2 )]
+[node name="Ball6" parent="." instance=ExtResource( 2 )]
 position = Vector2( 635.555, 147.858 )
 physics_material_override = SubResource( 6 )
 
-[node name="ball 7" parent="." instance=ExtResource( 2 )]
+[node name="Ball7" parent="." instance=ExtResource( 2 )]
 position = Vector2( 631.872, 325.88 )
 physics_material_override = SubResource( 7 )
 
-[node name="ball 8" parent="." instance=ExtResource( 2 )]
+[node name="Ball8" parent="." instance=ExtResource( 2 )]
 position = Vector2( 529.97, 205.561 )
 physics_material_override = SubResource( 8 )
 
-[node name="ball 9" parent="." instance=ExtResource( 2 )]
+[node name="Ball9" parent="." instance=ExtResource( 2 )]
 position = Vector2( 101.489, 167.502 )
 physics_material_override = SubResource( 9 )
 
-[node name="ball 10" parent="." instance=ExtResource( 2 )]
+[node name="Ball10" parent="." instance=ExtResource( 2 )]
 position = Vector2( 143.756, 295.139 )
 physics_material_override = SubResource( 10 )