Merge pull request #397 from aaronfranke/misc

Update and improve misc demos for Godot 3.1.2

Author: aaronfranke

misc/android_iap/iap.gd

@@ -1,4 +1,3 @@
-
 extends Node
 
 signal purchase_success(item_name)
@@ -24,16 +23,16 @@ func _ready():
 		print("GodotPayment singleton is only available on Android devices.")
 
 	if payment:
-		# set callback with this script instance
+		# Set callback with this script instance.
 		payment.setPurchaseCallbackId(get_instance_id())
 
-# set consume purchased item automatically after purchase, defulat value is true
+# Set consume purchased item automatically after purchase, default value is true.
 func set_auto_consume(auto):
 	if payment:
 		payment.setAutoConsume(auto)
 
 
-# request user owned item, callback : has_purchased
+# Request user owned item, callback: has_purchased.
 func request_purchased():
 	if payment:
 		payment.requestPurchased()
@@ -54,49 +53,57 @@ func purchase(item_name):
 		# transaction_id could be any string that used for validation internally in java
 		payment.purchase(item_name, "transaction_id")
 
+
 func purchase_success(_receipt, _signature, sku):
 	print("purchase_success : ", sku)
 	emit_signal("purchase_success", sku)
 
+
 func purchase_fail():
 	print("purchase_fail")
 	emit_signal("purchase_fail")
 
+
 func purchase_cancel():
 	print("purchase_cancel")
 	emit_signal("purchase_cancel")
 
+
 func purchase_owned(sku):
 	print("purchase_owned : ", sku)
 	emit_signal("purchase_owned", sku)
 
 
-# consume purchased item
-# callback : consume_success, consume_fail
+# Consume purchased item.
+# Callback: consume_success, consume_fail
 func consume(item_name):
 	if payment:
 		payment.consume(item_name)
 
-# consume all purchased items
+
+# Consume all purchased items.
 func consume_all():
 	if payment:
 		payment.consumeUnconsumedPurchases()
 
+
 func consume_success(_receipt, _signature, sku):
 	print("consume_success : ", sku)
 	emit_signal("consume_success", sku)
 
-# if consume fail, need to call request_purchased() to get purchase token from google
-# then try to consume again
+
+# If consume fails, need to call request_purchased() to get purchase token from Google.
+# Then try to consume again.
 func consume_fail():
 	emit_signal("consume_fail")
 
-# no purchased item to consume
+
+# No purchased item to consume.
 func consume_not_required():
 	emit_signal("consume_not_required")
 
 
-# detail info of IAP items
+# Detail info of IAP items:
 # sku_details = {
 #     product_id (String) : {
 #         type (String),
@@ -111,19 +118,21 @@ func consume_not_required():
 # }
 var sku_details = {}
 
-# query for details of IAP items
-# callback : sku_details_complete
+# Query for details of IAP items.
+# Callback: sku_details_complete
 func sku_details_query(list):
 	if payment:
 		var sku_list = PoolStringArray(list)
 		payment.querySkuDetails(sku_list)
 
+
 func sku_details_complete(result):
 	print("sku_details_complete : ", result)
 	for key in result.keys():
 		sku_details[key] = result[key]
 	emit_signal("sku_details_complete")
 
+
 func sku_details_error(error_message):
 	print("error_sku_details = ", error_message)
 	emit_signal("sku_details_error")

misc/android_iap/iap_demo.gd

@@ -1,4 +1,3 @@
-
 extends Control
 
 onready var alert = get_node("alert")
@@ -24,47 +23,56 @@ func on_purchase_success(item_name):
 	alert.set_text("Purchase success : " + item_name)
 	alert.popup()
 
+
 func on_purchase_fail():
 	alert.set_text("Purchase fail")
 	alert.popup()
 
+
 func on_purchase_cancel():
 	alert.set_text("Purchase cancel")
 	alert.popup()
 
+
 func on_purchase_owned(item_name):
-	alert.set_text("Purchase owned : " + item_name)
+	alert.set_text("Purchase owned: " + item_name)
 	alert.popup()
 
+
 func on_has_purchased(item_name):
 	if item_name == null:
 		alert.set_text("Don't have purchased item")
 	else:
-		alert.set_text("Has purchased : " + item_name)
+		alert.set_text("Has purchased: " + item_name)
 	alert.popup()
 
+
 func on_consume_success(item_name):
-	alert.set_text("Consume success : " + item_name)
+	alert.set_text("Consume success: " + item_name)
 	alert.popup()
 
+
 func on_consume_fail():
 	alert.set_text("Try to request purchased first")
 	alert.popup()
 
+
 func on_sku_details_complete():
-	alert.set_text("Got detail info : " + to_json(iap.sku_details["item_test_a"]))
+	alert.set_text("Got detail info: " + to_json(iap.sku_details["item_test_a"]))
 	alert.popup()
 
 
 func button_purchase():
 	iap.purchase("item_tess")
 
+
 func button_consume():
 	iap.consume("item_tess")
 
+
 func button_request():
 	iap.request_purchased()
 
+
 func button_query():
 	iap.sku_details_query(["item_test_a", "item_test_b"])
-

misc/android_iap/icon.png

@@ -19,7 +19,7 @@ modules="org/godotengine/godot/GodotPaymentV3"
 
 [application]
 
-config/name="Android IAP"
+config/name="Android in-app purchases"
 run/main_scene="res://main.tscn"
 config/icon="res://icon.png"
 

misc/android_iap/project.godot

@@ -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 )
-

misc/instancing/ball.tscn

@@ -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)

misc/instancing/ball_factory.gd

@@ -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 )

misc/instancing/project.godot

@@ -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 )
 

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

@@ -7,26 +7,30 @@ extends Control
 #
 # Licensed under the MIT license
 
-# Member variables
+const DEADZONE = 0.2
+
 var joy_num
 var cur_joy = -1
 var axis_value
 
-const DEADZONE = 0.2
+func _ready():
+	set_physics_process(true)
+	Input.connect("joy_connection_changed", self, "_on_joy_connection_changed")
+
 
 func _physics_process(_delta):
-	# Get the joypad device number from the spinbox
+	# Get the joypad device number from the spinbox.
 	joy_num = get_node("device_info/joy_num").get_value()
 
-	# Display the name of the joypad if we haven't already
+	# Display the name of the joypad if we haven't already.
 	if joy_num != cur_joy:
 		cur_joy = joy_num
 		get_node("device_info/joy_name").set_text(Input.get_joy_name(joy_num))
 
-	# Loop through the axes and show their current values
+	# Loop through the axes and show their current values.
 	for axis in range(JOY_AXIS_0, JOY_AXIS_MAX):
 		axis_value = Input.get_joy_axis(joy_num, axis)
-		get_node("axes/axis_prog" + str(axis)).set_value(100*axis_value)
+		get_node("axes/axis_prog" + str(axis)).set_value(100 * axis_value)
 		get_node("axes/axis_val" + str(axis)).set_text(str(axis_value))
 		# Show joypad direction indicators
 		if axis <= JOY_ANALOG_RY:
@@ -40,33 +44,31 @@ func _physics_process(_delta):
 				get_node("diagram/axes/" + str(axis) + "+").hide()
 				get_node("diagram/axes/" + str(axis) + "-").show()
 
-	# Loop through the buttons and highlight the ones that are pressed
+	# Loop through the buttons and highlight the ones that are pressed.
 	for btn in range(JOY_BUTTON_0, JOY_BUTTON_MAX):
 		if Input.is_joy_button_pressed(joy_num, btn):
-			get_node("buttons/btn" + str(btn)).add_color_override("font_color", Color(1, 1, 1, 1))
+			get_node("buttons/btn" + str(btn)).add_color_override("font_color", Color.white)
 			get_node("diagram/buttons/" + str(btn)).show()
 		else:
 			get_node("buttons/btn" + str(btn)).add_color_override("font_color", Color(0.2, 0.1, 0.3, 1))
 			get_node("diagram/buttons/" + str(btn)).hide()
 
-func _ready():
-	set_physics_process(true)
-	Input.connect("joy_connection_changed", self, "_on_joy_connection_changed")
 
-#Called whenever a joypad has been connected or disconnected.
+# Called whenever a joypad has been connected or disconnected.
 func _on_joy_connection_changed(device_id, connected):
 	if device_id == cur_joy:
 		if connected:
 			get_node("device_info/joy_name").set_text(Input.get_joy_name(device_id))
 		else:
 			get_node("device_info/joy_name").set_text("")
 
+
 func _on_start_vibration_pressed():
 	var weak = get_node("vibration/vibration_weak_value").get_value()
 	var strong = get_node("vibration/vibration_strong_value").get_value()
 	var duration = get_node("vibration/vibration_duration_value").get_value()
-
 	Input.start_joy_vibration(cur_joy, weak, strong, duration)
 
+
 func _on_stop_vibration_pressed():
 	Input.stop_joy_vibration(cur_joy)

misc/joypads/joypads.gd

@@ -27,4 +27,3 @@ near = 0.1
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = ExtResource( 1 )
-