From 73ddb8e6dc1d5f88bb3f9b7dd4e5eb7a948dee9a Mon Sep 17 00:00:00 2001 From: ajuvercr Date: Tue, 21 Jan 2020 17:00:57 +0100 Subject: [PATCH] something something textures, bg not working --- Camera2D.gd | 3 ++ Main.tscn | 12 ++++---- Player.tscn | 80 +++++++++++++++++++++++++++++++++++++++++++---------- Tower.tscn | 20 ++++++++------ 4 files changed, 85 insertions(+), 30 deletions(-) diff --git a/Camera2D.gd b/Camera2D.gd index e6d1d35..5d21a4d 100644 --- a/Camera2D.gd +++ b/Camera2D.gd @@ -4,6 +4,7 @@ export (PackedScene) var Tower = preload("res://Tower.tscn"); onready var screen_size = Vector2(ProjectSettings.get("display/window/size/width"), ProjectSettings.get("display/window/size/height")) onready var player = get_node("Player") +onready var bg = get_node("Background") export var tower_density = 200 var last_built = 300 @@ -22,6 +23,8 @@ func update_view(): var pos = player.position pos.y = 0 canvas_transform[2] = -pos + screen_size / 2 + + bg.position = player.position get_viewport().set_canvas_transform(canvas_transform) func _ready(): diff --git a/Main.tscn b/Main.tscn index 6851528..010585a 100644 --- a/Main.tscn +++ b/Main.tscn @@ -7,14 +7,12 @@ [node name="View" type="Node"] script = ExtResource( 1 ) -[node name="Background" type="TextureRect" parent="."] -margin_left = -1.16638 -margin_top = -321.166 -margin_right = 1244.83 -margin_bottom = 318.834 +[node name="Background" type="Sprite" parent="."] +position = Vector2( 774.747, 318.138 ) +scale = Vector2( 10, 10 ) texture = ExtResource( 2 ) -expand = true -stretch_mode = 2 +region_enabled = true +region_rect = Rect2( 0, 0, 144, 256 ) [node name="Player" parent="." instance=ExtResource( 3 )] position = Vector2( 155.182, -2.28882e-05 ) diff --git a/Player.tscn b/Player.tscn index a58910c..579a573 100644 --- a/Player.tscn +++ b/Player.tscn @@ -1,32 +1,84 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://Player.gd" type="Script" id=1] -[ext_resource path="res://icon.png" type="Texture" id=2] - -[sub_resource type="SpriteFrames" id=1] -animations = [ { -"frames": [ ExtResource( 2 ) ], -"loop": true, -"name": "default", -"speed": 5.0 -} ] +[ext_resource path="res://res/sprites.png" type="Texture" id=2] [sub_resource type="CapsuleShape2D" id=2] radius = 12.8837 height = 4.07484 +[sub_resource type="Animation" id=3] +resource_name = "fly" +length = 0.4 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite1:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 0 ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Sprite2:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.1, 0.3 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ 0, 0 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Sprite3:frame") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0.2 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 0 ] +} + [node name="Player" type="Area2D"] -position = Vector2( 0.581787, 0 ) +position = Vector2( 9.25964, 6.09653 ) script = ExtResource( 1 ) __meta__ = { "_edit_group_": true } -[node name="AnimatedSprite" type="AnimatedSprite" parent="."] -scale = Vector2( 0.498334, 0.531778 ) -frames = SubResource( 1 ) - [node name="CollisionShape2D" type="CollisionShape2D" parent="."] rotation = 1.5708 shape = SubResource( 2 ) + +[node name="Node2D" type="Node2D" parent="."] +scale = Vector2( 2, 2 ) + +[node name="Sprite1" type="Sprite" parent="Node2D"] +texture = ExtResource( 2 ) +region_enabled = true +region_rect = Rect2( 3, 491, 17, 12 ) + +[node name="Sprite2" type="Sprite" parent="Node2D"] +texture = ExtResource( 2 ) +region_enabled = true +region_rect = Rect2( 31, 491, 17, 12 ) + +[node name="Sprite3" type="Sprite" parent="Node2D"] +texture = ExtResource( 2 ) +region_enabled = true +region_rect = Rect2( 59, 491, 17, 12 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Node2D"] +root_node = NodePath("../..") +autoplay = "fly" +anims/fly = SubResource( 3 ) [connection signal="body_entered" from="." to="." method="_on_Player_body_entered"] diff --git a/Tower.tscn b/Tower.tscn index 8a860e3..23ed8ad 100644 --- a/Tower.tscn +++ b/Tower.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://Tower.gd" type="Script" id=1] -[ext_resource path="res://icon.png" type="Texture" id=2] +[ext_resource path="res://res/sprites.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 29.9672, 264.93 ) @@ -12,11 +12,12 @@ script = ExtResource( 1 ) [node name="Lower" type="RigidBody2D" parent="."] position = Vector2( -32, 100 ) -[node name="TextureRect" type="TextureRect" parent="Lower"] -margin_right = 64.0 -margin_bottom = 500.0 +[node name="Sprite" type="Sprite" parent="Lower"] +position = Vector2( 30.9827, 265.322 ) +scale = Vector2( 2.55196, 3.34805 ) texture = ExtResource( 2 ) -expand = true +region_enabled = true +region_rect = Rect2( 84, 323, 26, 160 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Lower"] position = Vector2( 31.5038, 267.238 ) @@ -26,11 +27,12 @@ shape = SubResource( 1 ) position = Vector2( 32, -100 ) rotation = 3.14159 -[node name="TextureRect" type="TextureRect" parent="Upper"] -margin_right = 64.0 -margin_bottom = 500.0 +[node name="Sprite" type="Sprite" parent="Upper"] +position = Vector2( 33.3285, 264.086 ) +scale = Vector2( 2.41273, 3.32748 ) texture = ExtResource( 2 ) -expand = true +region_enabled = true +region_rect = Rect2( 84, 323, 26, 160 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Upper"] position = Vector2( 32.6698, 265.913 )