From 1317c73942686c0eaef914666840366391fa6d97 Mon Sep 17 00:00:00 2001 From: Leon Palluch Date: Sat, 25 Jan 2020 19:07:51 +0100 Subject: [PATCH 1/2] mmhh 1 wall for inside factory --- Global/Daytime.gd | 2 +- Level/InFactory.tscn | 77 ++++++++++++++++++++++++++++++ Level/Interactables/Door/Door.gd | 7 ++- Level/Interactables/Door/Door.tscn | 2 +- Level/World.tscn | 1 - 5 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 Level/InFactory.tscn diff --git a/Global/Daytime.gd b/Global/Daytime.gd index 8084d43..7f7b92d 100644 --- a/Global/Daytime.gd +++ b/Global/Daytime.gd @@ -1,6 +1,6 @@ extends Node -const _increase_per_second: float = 100.0 #0.5 +const _increase_per_second: float = 0.0 #0.5 const _max: int = 1440 # 24 hour + 60 mins var _time: float setget _set_time, get_time diff --git a/Level/InFactory.tscn b/Level/InFactory.tscn new file mode 100644 index 0000000..51d423a --- /dev/null +++ b/Level/InFactory.tscn @@ -0,0 +1,77 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://Level/Interactables/Door/Door.tscn" type="PackedScene" id=1] +[ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=2] + +[sub_resource type="CubeMesh" id=4] + +[sub_resource type="BoxShape" id=5] + +[sub_resource type="BoxShape" id=6] + +[sub_resource type="CubeMesh" id=7] + +[node name="InFactory" type="Spatial"] + +[node name="Architecture" type="Spatial" parent="."] + +[node name="EntryHall" type="Spatial" parent="Architecture"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2 ) + +[node name="WallPart1" type="StaticBody" parent="Architecture/EntryHall"] +transform = Transform( 2, 0, 0, 0, 1.5, 0, 0, 0, 0.2, -4, 1.5, 0 ) +collision_layer = 3 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/EntryHall/WallPart1"] +layers = 3 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/EntryHall/WallPart1"] +shape = SubResource( 5 ) + +[node name="WallPart2" type="StaticBody" parent="Architecture/EntryHall"] +transform = Transform( 2, 0, 0, 0, 1.5, 0, 0, 0, 0.2, 4, 1.5, 0 ) +collision_layer = 3 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/EntryHall/WallPart2"] +layers = 3 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/EntryHall/WallPart2"] +shape = SubResource( 5 ) + +[node name="WallPart3" type="StaticBody" parent="Architecture/EntryHall"] +transform = Transform( 6, 0, 0, 0, 1, 0, 0, 0, 0.2, 0, 4, 0 ) +collision_layer = 3 + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/EntryHall/WallPart3"] +layers = 3 +mesh = SubResource( 4 ) +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/EntryHall/WallPart3"] +shape = SubResource( 5 ) + +[node name="Door" parent="Architecture/EntryHall" instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1.5, 0 ) + +[node name="Door2" parent="Architecture/EntryHall" instance=ExtResource( 1 )] +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 2, 1.5, 0 ) +invert_open = true + +[node name="Floor" type="StaticBody" parent="Architecture"] +transform = Transform( 100, 0, 0, 0, 1, 0, 0, 0, 100, 0, -1, 0 ) +collision_layer = 3 + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Floor"] +shape = SubResource( 6 ) + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Floor"] +layers = 3 +mesh = SubResource( 7 ) +material/0 = null + +[node name="Player" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0 ) diff --git a/Level/Interactables/Door/Door.gd b/Level/Interactables/Door/Door.gd index 04dc5e8..0c684c1 100644 --- a/Level/Interactables/Door/Door.gd +++ b/Level/Interactables/Door/Door.gd @@ -1,6 +1,7 @@ extends KinematicBody # export variables +export(bool) var invert_open export(bool) var card_door export(int) var door_lvl @@ -14,11 +15,15 @@ var _startingRotY : float var _isMoving = false var _isOpening = false var _degrees = 0 +var _opening_dir = 1 # Called when the node enters the scene tree for the first time. func _ready(): _startingRotY = global_transform.basis.get_euler().y outline = get_node("DoorMesh/Outline") as MeshInstance + + if invert_open: + _opening_dir = -1 # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): @@ -56,4 +61,4 @@ func _door_move(delta): _degrees = 0 _isMoving = false - rotate_y(_degrees * PI/180 - global_transform.basis.get_euler().y + _startingRotY) + rotate_y(_degrees * _opening_dir * PI/180 - global_transform.basis.get_euler().y + _startingRotY) diff --git a/Level/Interactables/Door/Door.tscn b/Level/Interactables/Door/Door.tscn index 06b323d..847e7c2 100644 --- a/Level/Interactables/Door/Door.tscn +++ b/Level/Interactables/Door/Door.tscn @@ -28,7 +28,7 @@ surfaces/0 = { script = ExtResource( 1 ) [node name="DoorMesh" type="MeshInstance" parent="."] -transform = Transform( 1, 0, 0, 0, 2, 0, 0, 0, 0.1, 1, 0, 0 ) +transform = Transform( 1, 0, 0, 0, 1.5, 0, 0, 0, 0.1, 1, 0, 0 ) layers = 3 mesh = SubResource( 1 ) material/0 = null diff --git a/Level/World.tscn b/Level/World.tscn index de6f41c..c1922db 100644 --- a/Level/World.tscn +++ b/Level/World.tscn @@ -243,7 +243,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 73, 0, -88 ) [node name="Factory" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 9 )] [node name="Ground" type="MeshInstance" parent="NavigationMeshInstance"] -editor/display_folded = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -83.9196, -0.0216179, -105.861 ) layers = 3 mesh = SubResource( 3 ) From f21e5855b9c4e3924ae4aaac1abed605184a97d3 Mon Sep 17 00:00:00 2001 From: Ententerminator Date: Sat, 25 Jan 2020 19:21:28 +0100 Subject: [PATCH 2/2] grobe daytime visuals graphics oder so --- Characters/Player/Player.tscn | 5 ++-- Characters/Player/UI/UI.gd | 6 ++++- Characters/Player/UI/UI.tscn | 18 ++++++++++--- Level/World.tscn | 5 ++-- Resources/Textures/daytimeUI.png | Bin 0 -> 4953 bytes Resources/Textures/daytimeUI.png.import | 34 ++++++++++++++++++++++++ 6 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/daytimeUI.png create mode 100644 Resources/Textures/daytimeUI.png.import diff --git a/Characters/Player/Player.tscn b/Characters/Player/Player.tscn index 92c2b10..b8407f9 100644 --- a/Characters/Player/Player.tscn +++ b/Characters/Player/Player.tscn @@ -176,7 +176,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0461721, 1.84617, 0 ) script = ExtResource( 2 ) [node name="LookingAt" type="RayCast" parent="Body/PillCameras"] -transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 ) +transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, 0 ) enabled = true cast_to = Vector3( 0, 0, 2 ) @@ -261,14 +261,13 @@ unit_db = -25.0 pitch_scale = 1.5 [node name="HUD" parent="." instance=ExtResource( 10 )] -editor/display_folded = true [node name="PillTaker" type="Spatial" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) script = ExtResource( 11 ) [node name="Pills" parent="PillTaker" instance=ExtResource( 12 )] -transform = Transform( 0.1, 0, 0, 0, -4.37114e-09, 0.1, 0, -0.1, -4.37114e-09, 0, 0.7, 0 ) +transform = Transform( 0.1, 0, 0, 0, -4.37114e-009, 0.1, 0, -0.1, -4.37114e-009, 0, 0.7, 0 ) visible = false [node name="InteractArea" type="Area" parent="."] diff --git a/Characters/Player/UI/UI.gd b/Characters/Player/UI/UI.gd index 528b0df..92f30cd 100644 --- a/Characters/Player/UI/UI.gd +++ b/Characters/Player/UI/UI.gd @@ -5,6 +5,7 @@ var _labelPillLevel: Label var _pillLevel: TextureProgress var _labelDayTime: Label var _dayTime: ProgressBar +var _dayTimeVisual: TextureRect onready var _keyTexture = load("res://Resources/Models/key/key.png") onready var _cardTexture = load("res://Resources/Models/keycard/keycard.png") @@ -16,6 +17,7 @@ func _ready(): _pillLevel = get_node("PillProgress") _labelDayTime = get_node("DayTime") _dayTime = get_node("DayTimeProgress") + _dayTimeVisual = get_node("DayTimeVisual") # TODO: may use global values in Inspector? _pillLevel.max_value = Pills.get_max() @@ -42,4 +44,6 @@ func _process(_delta): _pillLevel.value = Pills.get_level() var val = int(Daytime.get_time()) _labelDayTime.text = "dayTime: " + String(val) + " - %02d:%02d" % [val/60%24, val%60] - _dayTime.value = Daytime.get_time() \ No newline at end of file + _dayTime.value = Daytime.get_time() + + _dayTimeVisual.rect_rotation = (val/_dayTime.max_value) * 360 #pivot offset x=67, y = 7 \ No newline at end of file diff --git a/Characters/Player/UI/UI.tscn b/Characters/Player/UI/UI.tscn index f890ae0..d409f90 100644 --- a/Characters/Player/UI/UI.tscn +++ b/Characters/Player/UI/UI.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Characters/Player/UI/UI.gd" type="Script" id=1] [ext_resource path="res://Resources/Fonts/MainFont.tres" type="DynamicFont" id=2] [ext_resource path="res://Resources/Textures/pillLevel_fill.png" type="Texture" id=3] -[ext_resource path="res://Resources/Textures/crosshair.png" type="Texture" id=4] +[ext_resource path="res://Resources/Textures/daytimeUI.png" type="Texture" id=4] +[ext_resource path="res://Resources/Textures/crosshair.png" type="Texture" id=5] [node name="HUD" type="Control"] anchor_right = 1.0 @@ -60,6 +61,17 @@ margin_left = 850.901 margin_top = 30.7722 margin_right = 988.901 margin_bottom = 44.7722 +rect_pivot_offset = Vector2( 67.8153, 7.2278 ) + +[node name="DayTimeVisual" type="TextureRect" parent="."] +margin_left = 466.0 +margin_top = -82.0 +margin_right = 646.0 +margin_bottom = 98.0 +rect_pivot_offset = Vector2( 90, 90 ) +texture = ExtResource( 4 ) +expand = true +stretch_mode = 1 [node name="CrossHair" type="Control" parent="."] anchor_left = 0.5 @@ -80,6 +92,6 @@ margin_left = -20.0 margin_top = -20.0 margin_right = 20.0 margin_bottom = 20.0 -texture = ExtResource( 4 ) +texture = ExtResource( 5 ) expand = true stretch_mode = 4 diff --git a/Level/World.tscn b/Level/World.tscn index de6f41c..d140008 100644 --- a/Level/World.tscn +++ b/Level/World.tscn @@ -45,6 +45,7 @@ _data = { transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 7 ) [node name="Collectibles" type="Spatial" parent="."] +editor/display_folded = true transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 15.0831, 1.63203, 13.0809 ) [node name="Keycard" parent="Collectibles" groups=[ @@ -84,6 +85,7 @@ navmesh = SubResource( 2 ) transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0, 14 ) [node name="BuildingBlocks" type="Spatial" parent="NavigationMeshInstance"] +editor/display_folded = true [node name="BuildingBlock" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 7 )] transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -13 ) @@ -257,13 +259,12 @@ collision_mask = 7 shape = SubResource( 4 ) [node name="Environment" type="Spatial" parent="."] -editor/display_folded = true [node name="WorldEnvironment" type="WorldEnvironment" parent="Environment"] environment = SubResource( 6 ) [node name="DirectionalLight" type="DirectionalLight" parent="Environment"] -transform = Transform( 0.642788, -0.262003, -0.719846, 0, -0.939693, 0.34202, -0.766044, -0.219846, -0.604023, 0, 7, 0 ) +transform = Transform( 0.642788, -0.262003, -0.719846, -8.21505e-008, -0.939693, 0.34202, -0.766044, -0.219847, -0.604023, 0, 7, 0 ) layers = 3 shadow_enabled = true diff --git a/Resources/Textures/daytimeUI.png b/Resources/Textures/daytimeUI.png new file mode 100644 index 0000000000000000000000000000000000000000..5bfcc4dddc0e94a952f9510979cbcf41b6e70b1f GIT binary patch literal 4953 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 Q_3OhFa>J<7z%}Z>0H;3dng9R* literal 0 HcmV?d00001 diff --git a/Resources/Textures/daytimeUI.png.import b/Resources/Textures/daytimeUI.png.import new file mode 100644 index 0000000..1db0744 --- /dev/null +++ b/Resources/Textures/daytimeUI.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/daytimeUI.png-a89afbe1a4ac4d3196050a6f27e3eb5a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Resources/Textures/daytimeUI.png" +dest_files=[ "res://.import/daytimeUI.png-a89afbe1a4ac4d3196050a6f27e3eb5a.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