diff --git a/DefaultMaterial.material b/DefaultMaterial.material new file mode 100644 index 0000000..ec73c77 Binary files /dev/null and b/DefaultMaterial.material differ diff --git a/Map/map0.tscn b/Map/map0.tscn index da468d3..d2bcca0 100644 --- a/Map/map0.tscn +++ b/Map/map0.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://Scene/Box.tscn" type="PackedScene" id=1] [ext_resource path="res://Scene/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Script/GameCamera.gd" type="Script" id=3] +[ext_resource path="res://Scene/GameCamera.tscn" type="PackedScene" id=3] [ext_resource path="res://Scene/SolidTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://Image/crate_tiles.png" type="Texture" id=5] [ext_resource path="res://Scene/DetailTileMap.tscn" type="PackedScene" id=6] @@ -72,29 +72,18 @@ tile_data = PoolIntArray( -262153, 2, 0, -262152, 0, 0, -262151, -1610612734, 0, [node name="SpikeTileMap" parent="." instance=ExtResource( 7 )] tile_data = PoolIntArray( 65533, 0, 0, 65534, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0 ) -[node name="GameCamera" type="Camera2D" parent="."] -position = Vector2( 0, -27 ) -current = true -drag_margin_h_enabled = true -drag_margin_v_enabled = true -smoothing_enabled = true -drag_margin_left = 0.1 -drag_margin_top = 0.1 -drag_margin_right = 0.1 -drag_margin_bottom = 0.1 -editor_draw_limits = true -editor_draw_drag_margin = true -script = ExtResource( 3 ) -is_focal_point = true +[node name="GameCamera" parent="." instance=ExtResource( 3 )] -[node name="Exit" parent="." instance=ExtResource( 8 )] +[node name="Actors" type="Node2D" parent="."] + +[node name="Exit" parent="Actors" instance=ExtResource( 8 )] position = Vector2( 49, -23 ) -[node name="Player" parent="." groups=[ +[node name="Player" parent="Actors" groups=[ "player", ] instance=ExtResource( 2 )] position = Vector2( -45, -8 ) -[node name="Box" parent="." instance=ExtResource( 1 )] +[node name="Box" parent="Actors" instance=ExtResource( 1 )] position = Vector2( -76, -8 ) gravity = 0.0 diff --git a/Map/map1.tscn b/Map/map1.tscn index 1ba032a..23edea4 100644 --- a/Map/map1.tscn +++ b/Map/map1.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://Scene/Box.tscn" type="PackedScene" id=1] [ext_resource path="res://Scene/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://Scene/GameCamera.tscn" type="PackedScene" id=3] [ext_resource path="res://Scene/SolidTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://Image/crate_tiles.png" type="Texture" id=5] [ext_resource path="res://Scene/DetailTileMap.tscn" type="PackedScene" id=6] @@ -71,34 +72,26 @@ tile_data = PoolIntArray( -196610, 0, 0, -196609, 0, 0, -262144, 0, 0, -262143, [node name="DetailTileMap" parent="." instance=ExtResource( 6 )] tile_data = PoolIntArray( -393223, 1610612738, 0, -393222, 1610612738, 0, -393221, 1610612738, 0, -393218, 1610612738, 0, -393217, 1610612738, 0, -458750, 1, 0, -393216, 3, 0, -393214, 0, 0, -327676, 3, 0, -196604, 0, 0, -196603, 0, 0, -196602, 0, 0, -65539, 1, 0, -65537, 3, 0, -131068, 0, 0, -131067, 0, 0, -131066, 0, 0, -3, 0, 0, -65532, 0, 0, -65531, 0, 0, -65530, 0, 0, 65531, 3, 0, 2, 3, 0, 5, 1, 0, 196601, 0, 0, 196602, 0, 0, 196603, 0, 0, 262137, 0, 0, 262138, 0, 0, 262139, 0, 0, 196608, 1610612738, 0, 196609, 1610612738, 0, 196612, 1610612738, 0, 196613, 1610612738, 0, 196614, 1610612738, 0, 327674, 1, 0, 327678, 3, 0, 393209, 2, 0, 393210, 1, 0, 327683, 3, 0 ) -[node name="Camera2D" type="Camera2D" parent="."] -position = Vector2( -32, -40 ) -current = true -limit_left = -64 -limit_top = -64 -limit_right = 64 -limit_bottom = 64 -drag_margin_h_enabled = true -drag_margin_v_enabled = true -smoothing_enabled = true -editor_draw_limits = true +[node name="GameCamera" parent="." instance=ExtResource( 3 )] -[node name="Player" parent="." groups=[ +[node name="Actors" type="Node2D" parent="."] + +[node name="Exit" parent="Actors" instance=ExtResource( 8 )] +position = Vector2( 41, 33 ) + +[node name="Player" parent="Actors" groups=[ "player", ] instance=ExtResource( 2 )] position = Vector2( -32, -40 ) -[node name="Box" parent="." instance=ExtResource( 1 )] +[node name="Box" parent="Actors" instance=ExtResource( 1 )] position = Vector2( -56, -40 ) -[node name="Box2" parent="." instance=ExtResource( 1 )] +[node name="Box2" parent="Actors" instance=ExtResource( 1 )] position = Vector2( -48, -40 ) -[node name="Box3" parent="." instance=ExtResource( 1 )] +[node name="Box3" parent="Actors" instance=ExtResource( 1 )] position = Vector2( -56, -48 ) -[node name="Box4" parent="." instance=ExtResource( 1 )] +[node name="Box4" parent="Actors" instance=ExtResource( 1 )] position = Vector2( -48, -48 ) - -[node name="Exit" parent="." instance=ExtResource( 8 )] -position = Vector2( 41, 33 ) diff --git a/Scene/GameCamera.tscn b/Scene/GameCamera.tscn new file mode 100644 index 0000000..62f6aef --- /dev/null +++ b/Scene/GameCamera.tscn @@ -0,0 +1,18 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Script/GameCamera.gd" type="Script" id=1] + +[node name="GameCamera" type="Camera2D"] +position = Vector2( 0, -27 ) +current = true +drag_margin_h_enabled = true +drag_margin_v_enabled = true +smoothing_enabled = true +drag_margin_left = 0.1 +drag_margin_top = 0.1 +drag_margin_right = 0.1 +drag_margin_bottom = 0.1 +editor_draw_limits = true +editor_draw_drag_margin = true +script = ExtResource( 1 ) +is_focal_point = true diff --git a/Scene/MonitorScene.tscn b/Scene/MonitorScene.tscn new file mode 100644 index 0000000..1689d33 --- /dev/null +++ b/Scene/MonitorScene.tscn @@ -0,0 +1,62 @@ +[gd_scene load_steps=8 format=2] + +[ext_resource path="res://Map/map1.tscn" type="PackedScene" id=1] +[ext_resource path="res://DefaultMaterial.material" type="Material" id=2] + +[sub_resource type="CubeMesh" id=1] + +[sub_resource type="PlaneMesh" id=2] + +[sub_resource type="ViewportTexture" id=3] +viewport_path = NodePath("Viewport") + +[sub_resource type="SpatialMaterial" id=4] +resource_local_to_scene = true +flags_unshaded = true +flags_albedo_tex_force_srgb = true +albedo_texture = SubResource( 3 ) + +[sub_resource type="ArrayMesh" id=5] +surfaces/0 = { +"aabb": AABB( -0.00875362, -0.00172911, -0.00883434, 0.0175072, 0.00154306, 0.0176687 ), +"array_data": PoolByteArray( 97, 237, 83, 187, 35, 43, 253, 185, 89, 157, 214, 59, 245, 126, 3, 0, 130, 245, 252, 129, 85, 57, 85, 49, 249, 153, 77, 187, 212, 67, 8, 186, 187, 20, 14, 60, 245, 126, 3, 0, 130, 245, 252, 129, 85, 57, 0, 0, 0, 0, 0, 0, 99, 14, 130, 185, 233, 189, 16, 60, 245, 126, 3, 0, 130, 245, 250, 129, 0, 56, 0, 0, 0, 0, 0, 0, 148, 21, 67, 185, 91, 35, 218, 59, 245, 126, 3, 0, 130, 245, 252, 129, 0, 56, 85, 49, 196, 164, 8, 188, 92, 163, 226, 186, 61, 61, 202, 59, 223, 122, 2, 0, 134, 223, 248, 129, 0, 60, 85, 49, 10, 197, 251, 187, 153, 226, 208, 186, 25, 46, 252, 59, 223, 122, 2, 0, 134, 223, 246, 129, 0, 60, 0, 0, 18, 156, 202, 187, 137, 131, 155, 186, 119, 157, 9, 60, 223, 122, 2, 0, 145, 227, 204, 129, 170, 58, 0, 0, 204, 75, 207, 187, 189, 138, 155, 186, 142, 165, 207, 59, 223, 122, 2, 0, 134, 223, 246, 129, 170, 58, 85, 49, 204, 75, 207, 187, 189, 138, 155, 186, 142, 165, 207, 59, 229, 123, 2, 0, 133, 229, 249, 129, 170, 58, 85, 49, 18, 156, 202, 187, 137, 131, 155, 186, 119, 157, 9, 60, 229, 123, 2, 0, 133, 229, 248, 129, 170, 58, 0, 0, 249, 153, 77, 187, 212, 67, 8, 186, 187, 20, 14, 60, 229, 123, 2, 0, 133, 229, 245, 129, 85, 57, 0, 0, 97, 237, 83, 187, 35, 43, 253, 185, 89, 157, 214, 59, 229, 123, 2, 0, 133, 229, 248, 129, 85, 57, 85, 49, 89, 107, 15, 188, 92, 163, 226, 186, 0, 0, 0, 0, 225, 122, 1, 0, 134, 225, 0, 129, 0, 60, 0, 56, 14, 105, 13, 188, 92, 163, 226, 186, 157, 218, 75, 59, 225, 122, 1, 0, 134, 225, 255, 129, 0, 60, 85, 53, 16, 218, 213, 187, 189, 138, 155, 186, 33, 132, 82, 59, 225, 122, 1, 0, 134, 225, 251, 129, 170, 58, 85, 53, 160, 190, 217, 187, 189, 138, 155, 186, 0, 0, 0, 0, 225, 122, 1, 0, 134, 225, 0, 129, 170, 58, 0, 56, 14, 105, 13, 188, 92, 163, 226, 186, 157, 218, 75, 59, 224, 122, 2, 0, 134, 225, 255, 129, 0, 60, 85, 53, 196, 164, 8, 188, 92, 163, 226, 186, 61, 61, 202, 59, 224, 122, 2, 0, 134, 223, 248, 129, 0, 60, 85, 49, 204, 75, 207, 187, 189, 138, 155, 186, 142, 165, 207, 59, 224, 122, 2, 0, 134, 223, 246, 129, 170, 58, 85, 49, 16, 218, 213, 187, 189, 138, 155, 186, 33, 132, 82, 59, 224, 122, 2, 0, 134, 225, 251, 129, 170, 58, 85, 53, 160, 190, 217, 187, 189, 138, 155, 186, 0, 0, 0, 0, 230, 124, 0, 0, 132, 230, 0, 129, 170, 58, 0, 56, 16, 218, 213, 187, 189, 138, 155, 186, 33, 132, 82, 59, 230, 124, 0, 0, 132, 229, 255, 129, 170, 58, 85, 53, 148, 74, 90, 187, 35, 43, 253, 185, 7, 186, 89, 59, 230, 124, 0, 0, 133, 229, 252, 129, 85, 57, 85, 53, 149, 178, 92, 187, 35, 43, 253, 185, 0, 0, 0, 0, 230, 124, 0, 0, 132, 230, 0, 129, 85, 57, 0, 56, 16, 218, 213, 187, 189, 138, 155, 186, 33, 132, 82, 59, 229, 123, 1, 0, 132, 229, 255, 129, 170, 58, 85, 53, 204, 75, 207, 187, 189, 138, 155, 186, 142, 165, 207, 59, 229, 123, 1, 0, 133, 229, 249, 129, 170, 58, 85, 49, 97, 237, 83, 187, 35, 43, 253, 185, 89, 157, 214, 59, 229, 123, 1, 0, 133, 229, 248, 129, 85, 57, 85, 49, 148, 74, 90, 187, 35, 43, 253, 185, 7, 186, 89, 59, 229, 123, 1, 0, 133, 229, 252, 129, 85, 57, 85, 53, 149, 178, 92, 187, 35, 43, 253, 185, 0, 0, 0, 0, 245, 126, 0, 0, 130, 245, 0, 129, 85, 57, 0, 56, 148, 74, 90, 187, 35, 43, 253, 185, 7, 186, 89, 59, 245, 126, 0, 0, 130, 245, 0, 129, 85, 57, 85, 53, 0, 0, 0, 0, 148, 21, 67, 185, 12, 116, 90, 59, 245, 126, 0, 0, 130, 245, 0, 129, 0, 56, 85, 53, 0, 0, 0, 0, 148, 21, 67, 185, 0, 0, 0, 0, 245, 126, 0, 0, 130, 245, 0, 129, 0, 56, 0, 56, 148, 74, 90, 187, 35, 43, 253, 185, 7, 186, 89, 59, 245, 126, 0, 0, 130, 245, 0, 129, 85, 57, 85, 53, 97, 237, 83, 187, 35, 43, 253, 185, 89, 157, 214, 59, 245, 126, 0, 0, 130, 245, 0, 129, 85, 57, 85, 49, 0, 0, 0, 0, 148, 21, 67, 185, 91, 35, 218, 59, 245, 126, 0, 0, 130, 245, 252, 129, 0, 56, 85, 49, 0, 0, 0, 0, 148, 21, 67, 185, 12, 116, 90, 59, 245, 126, 0, 0, 130, 245, 0, 129, 0, 56, 85, 53, 97, 237, 83, 59, 35, 43, 253, 185, 89, 157, 214, 59, 11, 126, 3, 0, 130, 11, 4, 129, 85, 53, 85, 49, 0, 0, 0, 0, 148, 21, 67, 185, 91, 35, 218, 59, 11, 126, 3, 0, 130, 11, 4, 129, 0, 56, 85, 49, 0, 0, 0, 0, 99, 14, 130, 185, 233, 189, 16, 60, 11, 126, 3, 0, 130, 11, 6, 129, 0, 56, 0, 0, 249, 153, 77, 59, 212, 67, 8, 186, 187, 20, 14, 60, 11, 126, 3, 0, 130, 11, 4, 129, 85, 53, 0, 0, 196, 164, 8, 60, 92, 163, 226, 186, 61, 61, 202, 59, 33, 122, 2, 0, 134, 33, 8, 129, 0, 0, 85, 49, 204, 75, 207, 59, 189, 138, 155, 186, 142, 165, 207, 59, 33, 122, 2, 0, 134, 33, 10, 129, 85, 49, 85, 49, 18, 156, 202, 59, 137, 131, 155, 186, 119, 157, 9, 60, 33, 122, 2, 0, 145, 29, 52, 129, 85, 49, 0, 0, 10, 197, 251, 59, 153, 226, 208, 186, 25, 46, 252, 59, 33, 122, 2, 0, 134, 33, 10, 129, 0, 0, 0, 0, 204, 75, 207, 59, 189, 138, 155, 186, 142, 165, 207, 59, 27, 123, 2, 0, 133, 27, 7, 129, 85, 49, 85, 49, 97, 237, 83, 59, 35, 43, 253, 185, 89, 157, 214, 59, 27, 123, 2, 0, 133, 27, 8, 129, 85, 53, 85, 49, 249, 153, 77, 59, 212, 67, 8, 186, 187, 20, 14, 60, 27, 123, 2, 0, 133, 27, 11, 129, 85, 53, 0, 0, 18, 156, 202, 59, 137, 131, 155, 186, 119, 157, 9, 60, 27, 123, 2, 0, 133, 27, 8, 129, 85, 49, 0, 0, 89, 107, 15, 60, 92, 163, 226, 186, 0, 0, 0, 0, 31, 122, 1, 0, 134, 31, 0, 129, 0, 0, 0, 56, 160, 190, 217, 59, 189, 138, 155, 186, 0, 0, 0, 0, 31, 122, 1, 0, 134, 31, 0, 129, 85, 49, 0, 56, 16, 218, 213, 59, 189, 138, 155, 186, 33, 132, 82, 59, 31, 122, 1, 0, 134, 31, 5, 129, 85, 49, 85, 53, 14, 105, 13, 60, 92, 163, 226, 186, 157, 218, 75, 59, 31, 122, 1, 0, 134, 31, 1, 129, 0, 0, 85, 53, 14, 105, 13, 60, 92, 163, 226, 186, 157, 218, 75, 59, 32, 122, 2, 0, 134, 31, 1, 129, 0, 0, 85, 53, 16, 218, 213, 59, 189, 138, 155, 186, 33, 132, 82, 59, 32, 122, 2, 0, 134, 31, 5, 129, 85, 49, 85, 53, 204, 75, 207, 59, 189, 138, 155, 186, 142, 165, 207, 59, 32, 122, 2, 0, 134, 33, 10, 129, 85, 49, 85, 49, 196, 164, 8, 60, 92, 163, 226, 186, 61, 61, 202, 59, 32, 122, 2, 0, 134, 33, 8, 129, 0, 0, 85, 49, 160, 190, 217, 59, 189, 138, 155, 186, 0, 0, 0, 0, 26, 124, 0, 0, 132, 26, 0, 129, 85, 49, 0, 56, 149, 178, 92, 59, 35, 43, 253, 185, 0, 0, 0, 0, 26, 124, 0, 0, 132, 26, 0, 129, 85, 53, 0, 56, 148, 74, 90, 59, 35, 43, 253, 185, 7, 186, 89, 59, 26, 124, 0, 0, 133, 27, 4, 129, 85, 53, 85, 53, 16, 218, 213, 59, 189, 138, 155, 186, 33, 132, 82, 59, 26, 124, 0, 0, 132, 27, 1, 129, 85, 49, 85, 53, 16, 218, 213, 59, 189, 138, 155, 186, 33, 132, 82, 59, 27, 123, 1, 0, 132, 27, 1, 129, 85, 49, 85, 53, 148, 74, 90, 59, 35, 43, 253, 185, 7, 186, 89, 59, 27, 123, 1, 0, 133, 27, 4, 129, 85, 53, 85, 53, 97, 237, 83, 59, 35, 43, 253, 185, 89, 157, 214, 59, 27, 123, 1, 0, 133, 27, 8, 129, 85, 53, 85, 49, 204, 75, 207, 59, 189, 138, 155, 186, 142, 165, 207, 59, 27, 123, 1, 0, 133, 27, 7, 129, 85, 49, 85, 49, 149, 178, 92, 59, 35, 43, 253, 185, 0, 0, 0, 0, 11, 126, 0, 0, 130, 11, 0, 129, 85, 53, 0, 56, 0, 0, 0, 0, 148, 21, 67, 185, 0, 0, 0, 0, 11, 126, 0, 0, 130, 11, 0, 129, 0, 56, 0, 56, 0, 0, 0, 0, 148, 21, 67, 185, 12, 116, 90, 59, 11, 126, 0, 0, 130, 11, 0, 129, 0, 56, 85, 53, 148, 74, 90, 59, 35, 43, 253, 185, 7, 186, 89, 59, 11, 126, 0, 0, 130, 11, 0, 129, 85, 53, 85, 53, 148, 74, 90, 59, 35, 43, 253, 185, 7, 186, 89, 59, 11, 126, 0, 0, 130, 11, 0, 129, 85, 53, 85, 53, 0, 0, 0, 0, 148, 21, 67, 185, 12, 116, 90, 59, 11, 126, 0, 0, 130, 11, 0, 129, 0, 56, 85, 53, 0, 0, 0, 0, 148, 21, 67, 185, 91, 35, 218, 59, 11, 126, 0, 0, 130, 11, 4, 129, 0, 56, 85, 49, 97, 237, 83, 59, 35, 43, 253, 185, 89, 157, 214, 59, 11, 126, 0, 0, 130, 11, 0, 129, 85, 53, 85, 49, 97, 237, 83, 187, 35, 43, 253, 185, 89, 157, 214, 187, 245, 126, 253, 0, 130, 245, 4, 129, 85, 57, 170, 58, 0, 0, 0, 0, 148, 21, 67, 185, 91, 35, 218, 187, 245, 126, 253, 0, 130, 245, 4, 129, 0, 56, 170, 58, 0, 0, 0, 0, 99, 14, 130, 185, 233, 189, 16, 188, 245, 126, 253, 0, 130, 245, 6, 129, 0, 56, 0, 60, 249, 153, 77, 187, 212, 67, 8, 186, 187, 20, 14, 188, 245, 126, 253, 0, 130, 245, 4, 129, 85, 57, 0, 60, 196, 164, 8, 188, 92, 163, 226, 186, 61, 61, 202, 187, 223, 122, 254, 0, 134, 223, 8, 129, 0, 60, 170, 58, 204, 75, 207, 187, 189, 138, 155, 186, 142, 165, 207, 187, 223, 122, 254, 0, 134, 223, 10, 129, 170, 58, 170, 58, 18, 156, 202, 187, 137, 131, 155, 186, 119, 157, 9, 188, 223, 122, 254, 0, 145, 227, 52, 129, 170, 58, 0, 60, 10, 197, 251, 187, 153, 226, 208, 186, 25, 46, 252, 187, 223, 122, 254, 0, 134, 223, 10, 129, 0, 60, 0, 60, 204, 75, 207, 187, 189, 138, 155, 186, 142, 165, 207, 187, 229, 123, 254, 0, 133, 229, 7, 129, 170, 58, 170, 58, 97, 237, 83, 187, 35, 43, 253, 185, 89, 157, 214, 187, 229, 123, 254, 0, 133, 229, 8, 129, 85, 57, 170, 58, 249, 153, 77, 187, 212, 67, 8, 186, 187, 20, 14, 188, 229, 123, 254, 0, 133, 229, 11, 129, 85, 57, 0, 60, 18, 156, 202, 187, 137, 131, 155, 186, 119, 157, 9, 188, 229, 123, 254, 0, 133, 229, 8, 129, 170, 58, 0, 60, 89, 107, 15, 188, 92, 163, 226, 186, 0, 0, 0, 0, 225, 122, 255, 0, 134, 225, 0, 129, 0, 60, 0, 56, 160, 190, 217, 187, 189, 138, 155, 186, 0, 0, 0, 0, 225, 122, 255, 0, 134, 225, 0, 129, 170, 58, 0, 56, 16, 218, 213, 187, 189, 138, 155, 186, 33, 132, 82, 187, 225, 122, 255, 0, 134, 225, 5, 129, 170, 58, 85, 57, 14, 105, 13, 188, 92, 163, 226, 186, 157, 218, 75, 187, 225, 122, 255, 0, 134, 225, 1, 129, 0, 60, 85, 57, 14, 105, 13, 188, 92, 163, 226, 186, 157, 218, 75, 187, 224, 122, 254, 0, 134, 225, 1, 129, 0, 60, 85, 57, 16, 218, 213, 187, 189, 138, 155, 186, 33, 132, 82, 187, 224, 122, 254, 0, 134, 225, 5, 129, 170, 58, 85, 57, 204, 75, 207, 187, 189, 138, 155, 186, 142, 165, 207, 187, 224, 122, 254, 0, 134, 223, 10, 129, 170, 58, 170, 58, 196, 164, 8, 188, 92, 163, 226, 186, 61, 61, 202, 187, 224, 122, 254, 0, 134, 223, 8, 129, 0, 60, 170, 58, 160, 190, 217, 187, 189, 138, 155, 186, 0, 0, 0, 0, 230, 124, 0, 0, 132, 230, 0, 129, 170, 58, 0, 56, 149, 178, 92, 187, 35, 43, 253, 185, 0, 0, 0, 0, 230, 124, 0, 0, 132, 230, 0, 129, 85, 57, 0, 56, 148, 74, 90, 187, 35, 43, 253, 185, 7, 186, 89, 187, 230, 124, 0, 0, 133, 229, 4, 129, 85, 57, 85, 57, 16, 218, 213, 187, 189, 138, 155, 186, 33, 132, 82, 187, 230, 124, 0, 0, 132, 229, 1, 129, 170, 58, 85, 57, 16, 218, 213, 187, 189, 138, 155, 186, 33, 132, 82, 187, 229, 123, 255, 0, 132, 229, 1, 129, 170, 58, 85, 57, 148, 74, 90, 187, 35, 43, 253, 185, 7, 186, 89, 187, 229, 123, 255, 0, 133, 229, 4, 129, 85, 57, 85, 57, 97, 237, 83, 187, 35, 43, 253, 185, 89, 157, 214, 187, 229, 123, 255, 0, 133, 229, 8, 129, 85, 57, 170, 58, 204, 75, 207, 187, 189, 138, 155, 186, 142, 165, 207, 187, 229, 123, 255, 0, 133, 229, 7, 129, 170, 58, 170, 58, 149, 178, 92, 187, 35, 43, 253, 185, 0, 0, 0, 0, 245, 126, 0, 0, 130, 245, 0, 129, 85, 57, 0, 56, 0, 0, 0, 0, 148, 21, 67, 185, 0, 0, 0, 0, 245, 126, 0, 0, 130, 245, 0, 129, 0, 56, 0, 56, 0, 0, 0, 0, 148, 21, 67, 185, 12, 116, 90, 187, 245, 126, 0, 0, 130, 245, 0, 129, 0, 56, 85, 57, 148, 74, 90, 187, 35, 43, 253, 185, 7, 186, 89, 187, 245, 126, 0, 0, 130, 245, 0, 129, 85, 57, 85, 57, 148, 74, 90, 187, 35, 43, 253, 185, 7, 186, 89, 187, 245, 126, 0, 0, 130, 245, 0, 129, 85, 57, 85, 57, 0, 0, 0, 0, 148, 21, 67, 185, 12, 116, 90, 187, 245, 126, 0, 0, 130, 245, 0, 129, 0, 56, 85, 57, 0, 0, 0, 0, 148, 21, 67, 185, 91, 35, 218, 187, 245, 126, 0, 0, 130, 245, 4, 129, 0, 56, 170, 58, 97, 237, 83, 187, 35, 43, 253, 185, 89, 157, 214, 187, 245, 126, 0, 0, 130, 245, 0, 129, 85, 57, 170, 58, 97, 237, 83, 59, 35, 43, 253, 185, 89, 157, 214, 187, 11, 126, 253, 0, 130, 11, 252, 129, 85, 53, 170, 58, 249, 153, 77, 59, 212, 67, 8, 186, 187, 20, 14, 188, 11, 126, 253, 0, 130, 11, 252, 129, 85, 53, 0, 60, 0, 0, 0, 0, 99, 14, 130, 185, 233, 189, 16, 188, 11, 126, 253, 0, 130, 11, 250, 129, 0, 56, 0, 60, 0, 0, 0, 0, 148, 21, 67, 185, 91, 35, 218, 187, 11, 126, 253, 0, 130, 11, 252, 129, 0, 56, 170, 58, 196, 164, 8, 60, 92, 163, 226, 186, 61, 61, 202, 187, 33, 122, 254, 0, 134, 33, 248, 129, 0, 0, 170, 58, 10, 197, 251, 59, 153, 226, 208, 186, 25, 46, 252, 187, 33, 122, 254, 0, 134, 33, 246, 129, 0, 0, 0, 60, 18, 156, 202, 59, 137, 131, 155, 186, 119, 157, 9, 188, 33, 122, 254, 0, 145, 29, 204, 129, 85, 49, 0, 60, 204, 75, 207, 59, 189, 138, 155, 186, 142, 165, 207, 187, 33, 122, 254, 0, 134, 33, 246, 129, 85, 49, 170, 58, 204, 75, 207, 59, 189, 138, 155, 186, 142, 165, 207, 187, 27, 123, 254, 0, 133, 27, 249, 129, 85, 49, 170, 58, 18, 156, 202, 59, 137, 131, 155, 186, 119, 157, 9, 188, 27, 123, 254, 0, 133, 27, 248, 129, 85, 49, 0, 60, 249, 153, 77, 59, 212, 67, 8, 186, 187, 20, 14, 188, 27, 123, 254, 0, 133, 27, 245, 129, 85, 53, 0, 60, 97, 237, 83, 59, 35, 43, 253, 185, 89, 157, 214, 187, 27, 123, 254, 0, 133, 27, 248, 129, 85, 53, 170, 58, 89, 107, 15, 60, 92, 163, 226, 186, 0, 0, 0, 0, 31, 122, 255, 0, 134, 31, 0, 129, 0, 0, 0, 56, 14, 105, 13, 60, 92, 163, 226, 186, 157, 218, 75, 187, 31, 122, 255, 0, 134, 31, 255, 129, 0, 0, 85, 57, 16, 218, 213, 59, 189, 138, 155, 186, 33, 132, 82, 187, 31, 122, 255, 0, 134, 31, 251, 129, 85, 49, 85, 57, 160, 190, 217, 59, 189, 138, 155, 186, 0, 0, 0, 0, 31, 122, 255, 0, 134, 31, 0, 129, 85, 49, 0, 56, 14, 105, 13, 60, 92, 163, 226, 186, 157, 218, 75, 187, 32, 122, 254, 0, 134, 31, 255, 129, 0, 0, 85, 57, 196, 164, 8, 60, 92, 163, 226, 186, 61, 61, 202, 187, 32, 122, 254, 0, 134, 33, 248, 129, 0, 0, 170, 58, 204, 75, 207, 59, 189, 138, 155, 186, 142, 165, 207, 187, 32, 122, 254, 0, 134, 33, 246, 129, 85, 49, 170, 58, 16, 218, 213, 59, 189, 138, 155, 186, 33, 132, 82, 187, 32, 122, 254, 0, 134, 31, 251, 129, 85, 49, 85, 57, 160, 190, 217, 59, 189, 138, 155, 186, 0, 0, 0, 0, 26, 124, 0, 0, 132, 26, 0, 129, 85, 49, 0, 56, 16, 218, 213, 59, 189, 138, 155, 186, 33, 132, 82, 187, 26, 124, 0, 0, 132, 27, 255, 129, 85, 49, 85, 57, 148, 74, 90, 59, 35, 43, 253, 185, 7, 186, 89, 187, 26, 124, 0, 0, 133, 27, 252, 129, 85, 53, 85, 57, 149, 178, 92, 59, 35, 43, 253, 185, 0, 0, 0, 0, 26, 124, 0, 0, 132, 26, 0, 129, 85, 53, 0, 56, 16, 218, 213, 59, 189, 138, 155, 186, 33, 132, 82, 187, 27, 123, 255, 0, 132, 27, 255, 129, 85, 49, 85, 57, 204, 75, 207, 59, 189, 138, 155, 186, 142, 165, 207, 187, 27, 123, 255, 0, 133, 27, 249, 129, 85, 49, 170, 58, 97, 237, 83, 59, 35, 43, 253, 185, 89, 157, 214, 187, 27, 123, 255, 0, 133, 27, 248, 129, 85, 53, 170, 58, 148, 74, 90, 59, 35, 43, 253, 185, 7, 186, 89, 187, 27, 123, 255, 0, 133, 27, 252, 129, 85, 53, 85, 57, 149, 178, 92, 59, 35, 43, 253, 185, 0, 0, 0, 0, 11, 126, 0, 0, 130, 11, 0, 129, 85, 53, 0, 56, 148, 74, 90, 59, 35, 43, 253, 185, 7, 186, 89, 187, 11, 126, 0, 0, 130, 11, 0, 129, 85, 53, 85, 57, 0, 0, 0, 0, 148, 21, 67, 185, 12, 116, 90, 187, 11, 126, 0, 0, 130, 11, 0, 129, 0, 56, 85, 57, 0, 0, 0, 0, 148, 21, 67, 185, 0, 0, 0, 0, 11, 126, 0, 0, 130, 11, 0, 129, 0, 56, 0, 56, 148, 74, 90, 59, 35, 43, 253, 185, 7, 186, 89, 187, 11, 126, 0, 0, 130, 11, 0, 129, 85, 53, 85, 57, 97, 237, 83, 59, 35, 43, 253, 185, 89, 157, 214, 187, 11, 126, 0, 0, 130, 11, 0, 129, 85, 53, 170, 58, 0, 0, 0, 0, 148, 21, 67, 185, 91, 35, 218, 187, 11, 126, 0, 0, 130, 11, 252, 129, 0, 56, 170, 58, 0, 0, 0, 0, 148, 21, 67, 185, 12, 116, 90, 187, 11, 126, 0, 0, 130, 11, 0, 129, 0, 56, 85, 57 ), +"array_index_data": PoolByteArray( 3, 0, 1, 0, 0, 0, 3, 0, 2, 0, 1, 0, 7, 0, 5, 0, 4, 0, 7, 0, 6, 0, 5, 0, 11, 0, 9, 0, 8, 0, 11, 0, 10, 0, 9, 0, 15, 0, 13, 0, 12, 0, 15, 0, 14, 0, 13, 0, 19, 0, 17, 0, 16, 0, 19, 0, 18, 0, 17, 0, 23, 0, 21, 0, 20, 0, 23, 0, 22, 0, 21, 0, 27, 0, 25, 0, 24, 0, 27, 0, 26, 0, 25, 0, 31, 0, 29, 0, 28, 0, 31, 0, 30, 0, 29, 0, 35, 0, 33, 0, 32, 0, 35, 0, 34, 0, 33, 0, 39, 0, 37, 0, 36, 0, 39, 0, 38, 0, 37, 0, 43, 0, 41, 0, 40, 0, 43, 0, 42, 0, 41, 0, 47, 0, 45, 0, 44, 0, 47, 0, 46, 0, 45, 0, 51, 0, 49, 0, 48, 0, 51, 0, 50, 0, 49, 0, 55, 0, 53, 0, 52, 0, 55, 0, 54, 0, 53, 0, 59, 0, 57, 0, 56, 0, 59, 0, 58, 0, 57, 0, 63, 0, 61, 0, 60, 0, 63, 0, 62, 0, 61, 0, 67, 0, 65, 0, 64, 0, 67, 0, 66, 0, 65, 0, 71, 0, 69, 0, 68, 0, 71, 0, 70, 0, 69, 0, 75, 0, 73, 0, 72, 0, 75, 0, 74, 0, 73, 0, 79, 0, 77, 0, 76, 0, 79, 0, 78, 0, 77, 0, 83, 0, 81, 0, 80, 0, 83, 0, 82, 0, 81, 0, 87, 0, 85, 0, 84, 0, 87, 0, 86, 0, 85, 0, 91, 0, 89, 0, 88, 0, 91, 0, 90, 0, 89, 0, 95, 0, 93, 0, 92, 0, 95, 0, 94, 0, 93, 0, 99, 0, 97, 0, 96, 0, 99, 0, 98, 0, 97, 0, 103, 0, 101, 0, 100, 0, 103, 0, 102, 0, 101, 0, 107, 0, 105, 0, 104, 0, 107, 0, 106, 0, 105, 0, 111, 0, 109, 0, 108, 0, 111, 0, 110, 0, 109, 0, 115, 0, 113, 0, 112, 0, 115, 0, 114, 0, 113, 0, 119, 0, 117, 0, 116, 0, 119, 0, 118, 0, 117, 0, 123, 0, 121, 0, 120, 0, 123, 0, 122, 0, 121, 0, 127, 0, 125, 0, 124, 0, 127, 0, 126, 0, 125, 0, 131, 0, 129, 0, 128, 0, 131, 0, 130, 0, 129, 0, 135, 0, 133, 0, 132, 0, 135, 0, 134, 0, 133, 0, 139, 0, 137, 0, 136, 0, 139, 0, 138, 0, 137, 0, 143, 0, 141, 0, 140, 0, 143, 0, 142, 0, 141, 0 ), +"blend_shape_data": [ ], +"format": 97559, +"index_count": 216, +"material": ExtResource( 2 ), +"name": "Plane", +"primitive": 4, +"skeleton_aabb": [ ], +"vertex_count": 144 +} + +[node name="Spatial" type="Spatial"] + +[node name="MeshInstance" type="MeshInstance" parent="."] +transform = Transform( 3.42302, 0, 0, 0, 1, 0, 0, 0, 3.42302, 0, -1.64083, 0 ) +mesh = SubResource( 1 ) +material/0 = null + +[node name="Camera" type="Camera" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.670389, 2.01528 ) + +[node name="Plane" type="MeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0.78, 0 ) +visible = false +mesh = SubResource( 2 ) +material/0 = SubResource( 4 ) + +[node name="CrtPlane" type="MeshInstance" parent="."] +transform = Transform( -133, 3.89414e-05, 1.70218e-12, 0, -4.37114e-06, 100, 5.17921e-05, 100, 4.37114e-06, 0, 0.7, 0 ) +mesh = SubResource( 5 ) +material/0 = SubResource( 4 ) + +[node name="Viewport" type="Viewport" parent="."] +size = Vector2( 136, 128 ) +hdr = false +usage = 0 +render_target_v_flip = true +audio_listener_enable_2d = true + +[node name="Node2D2" parent="Viewport" instance=ExtResource( 1 )] diff --git a/Script/GameCamera.gd b/Script/GameCamera.gd index 95d78c8..892639f 100644 --- a/Script/GameCamera.gd +++ b/Script/GameCamera.gd @@ -24,3 +24,5 @@ func _process(delta): pass else: position = node_target.position + pos_offset + position.x = round(position.x) + position.y = round(position.y) diff --git a/Script/Player.gd b/Script/Player.gd index e78a79c..2d5a260 100644 --- a/Script/Player.gd +++ b/Script/Player.gd @@ -52,9 +52,10 @@ func _ready(): node_audio_throw = get_node("AudioThrow") # assign camera target - node_camera_game = Shared.node_camera_game - node_camera_game.node_target = self - node_camera_game.pos_offset = Vector2(4, 4) + if Shared.node_camera_game: + node_camera_game = Shared.node_camera_game + node_camera_game.node_target = self + node_camera_game.pos_offset = Vector2(4, 4) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): diff --git a/crt.fbx b/crt.fbx new file mode 100644 index 0000000..d514e03 Binary files /dev/null and b/crt.fbx differ diff --git a/project.godot b/project.godot index 22c2388..e7f43af 100644 --- a/project.godot +++ b/project.godot @@ -45,7 +45,7 @@ _global_script_class_icons={ [application] config/name="gdBox" -run/main_scene="res://Map/map0.tscn" +run/main_scene="res://Scene/MonitorScene.tscn" config/icon="res://icon.png" [autoload] @@ -57,8 +57,9 @@ Shared="*res://Script/Shared.gd" window/size/width=128 window/size/height=128 -window/size/test_width=1280 -window/size/test_height=1280 +window/size/always_on_top=true +window/size/test_width=1080 +window/size/test_height=1080 window/dpi/allow_hidpi=true window/stretch/mode="2d" window/stretch/aspect="keep"