Updated cameraview

This commit is contained in:
Theamerix 2021-04-03 20:30:33 +02:00
parent 3e312b70e0
commit b5cf67a40d
23 changed files with 14 additions and 886 deletions

View File

@ -1,3 +1,3 @@
source_md5="d52598a8a89e84715fb6d546c5f39662"
source_md5="6e73154777e4e29f1f5252c68abdb0ee"
dest_md5="90266f233d8cca85b2c9efbde06cd9db"

View File

@ -1,3 +1,3 @@
source_md5="4333f44e49c639594186e2aa553e4d0c"
dest_md5="bd693a17173309ef6507e5d0cba3c8e7"
source_md5="8bfa97ff2be8ca1a927b6a4f5454e101"
dest_md5="f5e60407f6db95c40967a71f4545b910"

View File

@ -1 +1 @@
source_md5="54221ee90979b2a6778bd8491d1d6504"
source_md5="2968b4577bc43dd8adca7d7417daad5f"

View File

@ -1 +1 @@
source_md5="c54c5faceb9c96544ef64b79845cfaaf"
source_md5="b3b28d90061530d2748868eebe72c432"

View File

@ -0,0 +1 @@
source_md5="b3b28d90061530d2748868eebe72c432"

View File

@ -0,0 +1,3 @@
source_md5="256b9c7ad018bed90cd3cc46b03fc243"
dest_md5="2bc7339b012f97a282597f0d5abb7403"

View File

@ -1 +1 @@
source_md5="3af91e4cb54b04bab06143224a64c3d0"
source_md5="fe61d3487093e148e31b0d00e018566f"

View File

@ -0,0 +1,3 @@
source_md5="cc5eefcf4120bd1b2a906adfceba3ca5"
dest_md5="40f521ec201ed56eebc6bdc85733bbcf"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Plants.png-112437b827aede75aff07b4001ecaab2.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Plants.png"
dest_files=[ "res://.import/Plants.png-112437b827aede75aff07b4001ecaab2.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@ -1,28 +0,0 @@
extends Node2D
#func _draw():
# var center = Vector2(200, 200)
# var radius = 80
# var angle_from = 75
# var angle_to = 195
# var color = Color(1.0, 0.0, 0.0)
# draw_circle_arc(center, radius, angle_from, angle_to, color)
#
#func draw_circle_arc(center, radius, angle_from, angle_to, color):
# var nb_points = 32
# var points_arc = PoolVector2Array()
#
# for i in range(nb_points + 1):
# var angle_point = deg2rad(angle_from + i * (angle_to-angle_from) / nb_points - 90)
# points_arc.push_back(center + Vector2(cos(angle_point), sin(angle_point)) * radius)
#
# for index_point in range(nb_points):
# draw_line(points_arc[index_point], points_arc[index_point + 1], color)
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass

View File

@ -1,34 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://pictures/gui/backgrounds/inventory/inventory_background.png" type="Texture" id=1]
[ext_resource path="res://Scenes/Inventory_Script.gd" type="Script" id=2]
[ext_resource path="res://Scenes/Inventory.gd" type="Script" id=3]
[ext_resource path="res://Scenes/TextureRect2.gd" type="Script" id=4]
[node name="Inventory" type="Node2D"]
z_index = 1
script = ExtResource( 3 )
[node name="TextureRect" type="TextureRect" parent="."]
margin_right = 40.0
margin_bottom = 40.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="inventory_background" type="Sprite" parent="TextureRect"]
position = Vector2( 617.053, 299.964 )
scale = Vector2( 3.08457, 1.99938 )
z_index = -1
texture = ExtResource( 1 )
script = ExtResource( 2 )
[node name="TextureRect2" type="TextureRect" parent="TextureRect/inventory_background"]
margin_left = -200.045
margin_top = -150.028
margin_right = -160.045
margin_bottom = -110.028
script = ExtResource( 4 )
__meta__ = {
"_edit_use_anchors_": false
}

View File

@ -1,41 +0,0 @@
extends Sprite
var items = [1,2,3]
func draw_circle_arc(center, radius, angle_from, angle_to, color):
var nb_points = 32
var points_arc = PoolVector2Array()
for i in range(nb_points + 1):
var angle_point = deg2rad(angle_from + i * (angle_to-angle_from) / nb_points - 90)
points_arc.push_back(center + Vector2(cos(angle_point), sin(angle_point)) * radius)
for index_point in range(nb_points):
draw_line(points_arc[index_point], points_arc[index_point + 1], color)
func draw_circle_arc_poly(center, radius, angle_from, angle_to, color):
var nb_points = 32
var points_arc = PoolVector2Array()
points_arc.push_back(center)
var colors = PoolColorArray([color])
for i in range(nb_points + 1):
var angle_point = deg2rad(angle_from + i * (angle_to - angle_from) / nb_points - 90)
points_arc.push_back(center + Vector2(cos(angle_point), sin(angle_point)) * radius)
draw_polygon(points_arc, colors)
func _draw():
var center = Vector2(200, 200)
var radius = 80
var angle_from = 75
var angle_to = 195
var color = Color(1.0, 0.0, 0.0)
draw_circle_arc_poly(center, radius, angle_from, angle_to, color)
# Called when the node enters the scene tree for the first time.
func _ready():
_draw()
# for x in range(len(items)):
# _draw()
pass # Replace with function body.

View File

@ -1,41 +0,0 @@
extends TextureRect
var items = [1,2,3]
func draw_circle_arc(center, radius, angle_from, angle_to, color):
var nb_points = 32
var points_arc = PoolVector2Array()
for i in range(nb_points + 1):
var angle_point = deg2rad(angle_from + i * (angle_to-angle_from) / nb_points - 90)
points_arc.push_back(center + Vector2(cos(angle_point), sin(angle_point)) * radius)
for index_point in range(nb_points):
draw_line(points_arc[index_point], points_arc[index_point + 1], color)
func draw_circle_arc_poly(center, radius, angle_from, angle_to, color):
var nb_points = 32
var points_arc = PoolVector2Array()
points_arc.push_back(center)
var colors = PoolColorArray([color])
for i in range(nb_points + 1):
var angle_point = deg2rad(angle_from + i * (angle_to - angle_from) / nb_points - 90)
points_arc.push_back(center + Vector2(cos(angle_point), sin(angle_point)) * radius)
draw_polygon(points_arc, colors)
func _draw():
var center = Vector2(200, 200)
var radius = 80
var angle_from = 75
var angle_to = 195
var color = Color(1.0, 0.0, 0.0)
draw_circle_arc_poly(center, radius, angle_from, angle_to, color)
# Called when the node enters the scene tree for the first time.
func _ready():
_draw()
# for x in range(len(items)):
# _draw()
pass # Replace with function body.

View File

@ -58,7 +58,7 @@ func MoveCamera(x, y):
func _on_Tween_tween_completed(object, key):
print(object, key)
lockedPlayerCamera = false
func AnimateMoveCamera(source, destination, key, time):
var tween = get_node("/root/Map1/Tween")
lockedPlayerCamera = true

View File

@ -1,480 +0,0 @@
{ "columns":0,
"margin":0,
"name":"Vloer",
"spacing":0,
"tilecount":78,
"tiledversion":"1.4.2",
"tileheight":32,
"tiles":[
{
"id":0,
"image":"omgeving\/vloer32x32\/grond_gras_boven1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":1,
"image":"omgeving\/vloer32x32\/grond_gras_boven2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":2,
"image":"omgeving\/vloer32x32\/grond_gras_boven3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":3,
"image":"omgeving\/vloer32x32\/grond_gras_links1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":4,
"image":"omgeving\/vloer32x32\/grond_gras_links2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":5,
"image":"omgeving\/vloer32x32\/grond_gras_links3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":6,
"image":"omgeving\/vloer32x32\/grond_gras_rechts1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":7,
"image":"omgeving\/vloer32x32\/grond_gras_rechts2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":8,
"image":"omgeving\/vloer32x32\/grond_gras_rechts3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":9,
"image":"omgeving\/vloer32x32\/grond_met_plantjes1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":10,
"image":"omgeving\/vloer32x32\/grond_met_plantjes2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":11,
"image":"omgeving\/vloer32x32\/grond_met_plantjes3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":12,
"image":"omgeving\/vloer32x32\/grond1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":13,
"image":"omgeving\/vloer32x32\/grond2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":14,
"image":"omgeving\/vloer32x32\/grond3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":15,
"image":"omgeving\/vloer32x32\/water_zand_boven1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":16,
"image":"omgeving\/vloer32x32\/water_zand_boven2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":17,
"image":"omgeving\/vloer32x32\/water_zand_boven3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":18,
"image":"omgeving\/vloer32x32\/water_zand_links_en_boven1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":19,
"image":"omgeving\/vloer32x32\/water_zand_links_en_boven2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":20,
"image":"omgeving\/vloer32x32\/water_zand_links_en_boven3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":21,
"image":"omgeving\/vloer32x32\/water_zand_links_en_onder1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":22,
"image":"omgeving\/vloer32x32\/water_zand_links_en_onder2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":23,
"image":"omgeving\/vloer32x32\/water_zand_links_en_onder3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":24,
"image":"omgeving\/vloer32x32\/water_zand_links1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":25,
"image":"omgeving\/vloer32x32\/water_zand_links2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":26,
"image":"omgeving\/vloer32x32\/water_zand_links3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":27,
"image":"omgeving\/vloer32x32\/water_zand_onder1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":28,
"image":"omgeving\/vloer32x32\/water_zand_onder2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":29,
"image":"omgeving\/vloer32x32\/water_zand_onder3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":30,
"image":"omgeving\/vloer32x32\/water_zand_rechts_en_boven1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":31,
"image":"omgeving\/vloer32x32\/water_zand_rechts_en_boven2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":32,
"image":"omgeving\/vloer32x32\/water_zand_rechts_en_boven3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":33,
"image":"omgeving\/vloer32x32\/water_zand_rechts_en_onder1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":34,
"image":"omgeving\/vloer32x32\/water_zand_rechts_en_onder2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":35,
"image":"omgeving\/vloer32x32\/water_zand_rechts_en_onder3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":36,
"image":"omgeving\/vloer32x32\/water_zand_rechts1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":37,
"image":"omgeving\/vloer32x32\/water_zand_rechts2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":38,
"image":"omgeving\/vloer32x32\/water_zand_rechts3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":39,
"image":"omgeving\/vloer32x32\/water1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":40,
"image":"omgeving\/vloer32x32\/water2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":41,
"image":"omgeving\/vloer32x32\/water3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":42,
"image":"omgeving\/vloer32x32\/zand1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":43,
"image":"omgeving\/vloer32x32\/zand2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":44,
"image":"omgeving\/vloer32x32\/zand3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":45,
"image":"omgeving\/vloer32x32\/grond_gras_onder1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":46,
"image":"omgeving\/vloer32x32\/grond_gras_onder2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":47,
"image":"omgeving\/vloer32x32\/grond_gras_onder3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":48,
"image":"omgeving\/vloer32x32\/zand_grond_onder1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":49,
"image":"omgeving\/vloer32x32\/zand_grond_onder2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":50,
"image":"omgeving\/vloer32x32\/zand_grond_onder3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":51,
"image":"omgeving\/vloer32x32\/zand_grond_rechts_en_onder1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":52,
"image":"omgeving\/vloer32x32\/zand_grond_rechts_en_onder2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":53,
"image":"omgeving\/vloer32x32\/zand_grond_rechts_en_onder3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":54,
"image":"omgeving\/vloer32x32\/zand_grond_rechts1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":55,
"image":"omgeving\/vloer32x32\/zand_grond_rechts2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":56,
"image":"omgeving\/vloer32x32\/zand_grond_rechts3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":57,
"image":"omgeving\/vloer32x32\/zand_grond_boven1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":58,
"image":"omgeving\/vloer32x32\/zand_grond_boven2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":59,
"image":"omgeving\/vloer32x32\/zand_grond_boven3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":60,
"image":"omgeving\/vloer32x32\/zand_grond_links_en_boven1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":61,
"image":"omgeving\/vloer32x32\/zand_grond_links_en_boven2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":62,
"image":"omgeving\/vloer32x32\/zand_grond_links_en_boven3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":63,
"image":"omgeving\/vloer32x32\/zand_grond_links1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":64,
"image":"omgeving\/vloer32x32\/zand_grond_links2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":65,
"image":"omgeving\/vloer32x32\/zand_grond_links3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":66,
"image":"omgeving\/vloer32x32\/zand_grond_rechts_en_boven1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":67,
"image":"omgeving\/vloer32x32\/zand_grond_rechts_en_boven2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":68,
"image":"omgeving\/vloer32x32\/zand_grond_rechts_en_boven3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":69,
"image":"omgeving\/vloer32x32\/zand_grond_links_en_onder1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":70,
"image":"omgeving\/vloer32x32\/zand_grond_links_en_onder2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":71,
"image":"omgeving\/vloer32x32\/zand_grond_links_en_onder3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":72,
"image":"omgeving\/vloer32x32\/stenenpad1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":73,
"image":"omgeving\/vloer32x32\/stenenpad2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":74,
"image":"omgeving\/vloer32x32\/stenenpad3.png",
"imageheight":32,
"imagewidth":32
},
{
"id":75,
"image":"omgeving\/vloer32x32\/water_met_stapsteen1.png",
"imageheight":32,
"imagewidth":32
},
{
"id":76,
"image":"omgeving\/vloer32x32\/water_met_stapsteen2.png",
"imageheight":32,
"imagewidth":32
},
{
"id":77,
"image":"omgeving\/vloer32x32\/water_met_stapsteen3.png",
"imageheight":32,
"imagewidth":32
}],
"tilewidth":32,
"type":"tileset",
"version":1.4
}

View File

@ -1,20 +0,0 @@
[remap]
importer="vnen.tiled_importer"
type="PackedScene"
valid=false
[deps]
source_file="res://Vloer.json"
[params]
custom_properties=true
tile_metadata=false
uv_clip=true
image_flags=7
collision_layer=1
embed_internal_images=false
save_tiled_properties=false
add_background=true
post_import_script=""

View File

@ -109,10 +109,6 @@ pointing/emulate_touch_from_mouse=true
limits/message_queue/max_size_kb=2048
[physics]
common/physics_jitter_fix=0.5
[tiled_importer]
enable_json_format=true

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long