moving map into separate scene.

Author: Marco Bakera

godot_emu/Main.gd

@@ -1,74 +1,11 @@
 extends Node2D
 
-var width
-var height
-var tilemap
-var server
-
-const PORT = 10101
-
-const YELLOW = 49  # ascii 1
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	tilemap = get_node("TileMap")
-	update_width_height()
-	clear_display()
-
-	print("listening on port ", PORT)
-	server = TCP_Server.new()
-	server.listen(PORT)
+	pass # Replace with function body.
 
-func clear_display():
-	for x in range(width):
-		for y in range(height):
-			tilemap.set_cell(x, y, 0)
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
-	if server.is_connection_available():
-		print("conn available")
-		var conn = server.take_connection()
-		print("bytes available ", conn.get_available_bytes())
-		var bs = conn.get_data(conn.get_available_bytes())
-		print("bytes ", bs, len(bs))
-		process_bytes(bs[1])
-		
-
-func process_bytes(bytes):
-	var x = 0
-	var y = 0
-	
-	for b in bytes:
-		print("byte ", b)
-		print("xy ", x, " ", y)
-		
-		tilemap.set_cell(x, y, b == YELLOW)
-		
-		x += 1
-		if x >= width:
-			x = 0
-			y += 1
-
-func _on_Button_pressed():
-	var cell
-	for x in range(4):
-		cell = tilemap.get_cell(x, 0)
-		print("x ", x, " cell ", cell, 
-		      " type ", typeof(tilemap), " invalid ", cell == TileMap.INVALID_CELL)
-		tilemap.set_cell(x, 2, cell)
-		
-func _on_teWidth_text_changed():
-	update_width_height()
-
-func _on_teHeight_text_changed():
-	update_width_height()	
-
-func update_width_height():
-	print("updating width and height")
-	var tHeight = get_node("teHeight").text
-	height = int(tHeight)
-	var tWidth = get_node("teWidth").text
-	width = int(tWidth)
-	print(width, " ", height)
-
+#func _process(delta):
+#	pass

godot_emu/Main.tscn

@@ -1,36 +1,9 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://Main.gd" type="Script" id=1]
-[ext_resource path="res://Main.tres" type="TileSet" id=2]
+[ext_resource path="res://Map.tscn" type="PackedScene" id=2]
 
 [node name="Main" type="Node2D"]
 script = ExtResource( 1 )
 
-[node name="Button" type="Button" parent="."]
-margin_left = 6.0
-margin_top = 547.0
-margin_right = 122.0
-margin_bottom = 592.0
-
-[node name="TileMap" type="TileMap" parent="."]
-scale = Vector2( 2, 2 )
-tile_set = ExtResource( 2 )
-cell_size = Vector2( 20, 20 )
-format = 1
-
-[node name="teWidth" type="TextEdit" parent="."]
-margin_left = 135.0
-margin_top = 570.0
-margin_right = 165.0
-margin_bottom = 590.0
-text = "28"
-
-[node name="teHeight" type="TextEdit" parent="."]
-margin_left = 187.0
-margin_top = 570.0
-margin_right = 217.0
-margin_bottom = 590.0
-text = "13"
-[connection signal="pressed" from="Button" to="." method="_on_Button_pressed"]
-[connection signal="text_changed" from="teWidth" to="." method="_on_teWidth_text_changed"]
-[connection signal="text_changed" from="teHeight" to="." method="_on_teHeight_text_changed"]
+[node name="Map" parent="." instance=ExtResource( 2 )]

godot_emu/Map.gd

@@ -1,14 +1,74 @@
 extends Node2D
 
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
+var width
+var height
+var tilemap
+var server
 
+const PORT = 10101
+
+const YELLOW = 49  # ascii 1
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	pass # Replace with function body.
+	tilemap = get_node("TileMap")
+	update_width_height()
+	clear_display()
+
+	print("listening on port ", PORT)
+	server = TCP_Server.new()
+	server.listen(PORT)
+	
+func clear_display():
+	for x in range(width):
+		for y in range(height):
+			tilemap.set_cell(x, y, 0)
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-#func _process(delta):
-#	pass
+func _process(delta):
+	if server.is_connection_available():
+		print("conn available")
+		var conn = server.take_connection()
+		print("bytes available ", conn.get_available_bytes())
+		var bs = conn.get_data(conn.get_available_bytes())
+		print("bytes ", bs, len(bs))
+		process_bytes(bs[1])
+		
+
+func process_bytes(bytes):
+	var x = 0
+	var y = 0
+	
+	for b in bytes:
+		print("byte ", b)
+		print("xy ", x, " ", y)
+		
+		tilemap.set_cell(x, y, b == YELLOW)
+		
+		x += 1
+		if x >= width:
+			x = 0
+			y += 1
+
+func _on_Button_pressed():
+	var cell
+	for x in range(4):
+		cell = tilemap.get_cell(x, 0)
+		print("x ", x, " cell ", cell, 
+		      " type ", typeof(tilemap), " invalid ", cell == TileMap.INVALID_CELL)
+		tilemap.set_cell(x, 2, cell)
+		
+func _on_teWidth_text_changed():
+	update_width_height()
+
+func _on_teHeight_text_changed():
+	update_width_height()	
+
+func update_width_height():
+	print("updating width and height")
+	var tHeight = get_node("teHeight").text
+	height = int(tHeight)
+	var tWidth = get_node("teWidth").text
+	width = int(tWidth)
+	print(width, " ", height)
+

godot_emu/Main.tres godot_emu/Map.tres

@@ -1,12 +1,35 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://Map.gd" type="Script" id=1]
-[ext_resource path="res://Main.tres" type="TileSet" id=2]
+[ext_resource path="res://Map.tres" type="TileSet" id=2]
 
 [node name="Map" type="Node2D"]
 script = ExtResource( 1 )
 
+[node name="Button" type="Button" parent="."]
+margin_left = 6.0
+margin_top = 547.0
+margin_right = 122.0
+margin_bottom = 592.0
+
 [node name="TileMap" type="TileMap" parent="."]
 tile_set = ExtResource( 2 )
 cell_size = Vector2( 20, 20 )
 format = 1
+
+[node name="teWidth" type="TextEdit" parent="."]
+margin_left = 135.0
+margin_top = 570.0
+margin_right = 165.0
+margin_bottom = 590.0
+text = "28"
+
+[node name="teHeight" type="TextEdit" parent="."]
+margin_left = 187.0
+margin_top = 570.0
+margin_right = 217.0
+margin_bottom = 590.0
+text = "13"
+[connection signal="pressed" from="Button" to="." method="_on_Button_pressed"]
+[connection signal="text_changed" from="teWidth" to="." method="_on_teWidth_text_changed"]
+[connection signal="text_changed" from="teHeight" to="." method="_on_teHeight_text_changed"]