3d models and stuff

This commit is contained in:
2024-01-25 15:22:01 +01:00
parent 649c83030d
commit a72973d28a
41 changed files with 325 additions and 51 deletions

BIN
assets/fonts/rx100.otf Normal file

Binary file not shown.

View File

@@ -0,0 +1,33 @@
[remap]
importer="font_data_dynamic"
type="FontFile"
uid="uid://dh70yvcfcfcsr"
path="res://.godot/imported/rx100.otf-c964959cafad48343886d74e7ced6fef.fontdata"
[deps]
source_file="res://assets/fonts/rx100.otf"
dest_files=["res://.godot/imported/rx100.otf-c964959cafad48343886d74e7ced6fef.fontdata"]
[params]
Rendering=null
antialiasing=1
generate_mipmaps=false
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=0.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}

Binary file not shown.

View File

@@ -0,0 +1,33 @@
[remap]
importer="font_data_dynamic"
type="FontFile"
uid="uid://cr7a85ntk0t0k"
path="res://.godot/imported/spacegrotesk_bold.ttf-6664f60d612dc9aed1051f4dbfd06d15.fontdata"
[deps]
source_file="res://assets/fonts/spacegrotesk_bold.ttf"
dest_files=["res://.godot/imported/spacegrotesk_bold.ttf-6664f60d612dc9aed1051f4dbfd06d15.fontdata"]
[params]
Rendering=null
antialiasing=1
generate_mipmaps=false
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=0.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}

BIN
assets/fonts/titanone.ttf Normal file

Binary file not shown.

View File

@@ -0,0 +1,33 @@
[remap]
importer="font_data_dynamic"
type="FontFile"
uid="uid://l7ve58avtuc8"
path="res://.godot/imported/titanone.ttf-8363af9045439c74a8c26123c8e5a17c.fontdata"
[deps]
source_file="res://assets/fonts/titanone.ttf"
dest_files=["res://.godot/imported/titanone.ttf-8363af9045439c74a8c26123c8e5a17c.fontdata"]
[params]
Rendering=null
antialiasing=1
generate_mipmaps=false
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=0.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}

Binary file not shown.

View File

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

View File

@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bjx2i53wtjair"
path="res://.godot/imported/crosshair.png-7b9b3cce756e3b3f3f4ae9c834fb72cf.ctex"
path="res://.godot/imported/crosshair.png-fb1200d6001197c905c408a10f7eaf5e.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/textures/crosshair.png"
dest_files=["res://.godot/imported/crosshair.png-7b9b3cce756e3b3f3f4ae9c834fb72cf.ctex"]
source_file="res://assets/textures/gui/crosshair.png"
dest_files=["res://.godot/imported/crosshair.png-fb1200d6001197c905c408a10f7eaf5e.ctex"]
[params]

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://drg0qhwicg2df"
path="res://.godot/imported/logo.png-55f2b57192982ac2d31383be3614d7f4.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/textures/gui/logo.png"
dest_files=["res://.godot/imported/logo.png-55f2b57192982ac2d31383be3614d7f4.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 28 KiB

View File

@@ -2,16 +2,16 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://daqrj72cqovyo"
path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
uid="uid://cof077njjsmt4"
path="res://.godot/imported/pte_icon.svg-dc41321645fbfb80eeb8a275354991bd.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://icon.svg"
dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
source_file="res://assets/textures/gui/pte_icon.svg"
dest_files=["res://.godot/imported/pte_icon.svg-dc41321645fbfb80eeb8a275354991bd.ctex"]
[params]

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dq2r0xndibo3w"
path="res://.godot/imported/settings_icon.svg-3db535875a9596cf38cb2a78efa1c021.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/textures/gui/settings_icon.svg"
dest_files=["res://.godot/imported/settings_icon.svg-3db535875a9596cf38cb2a78efa1c021.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false

View File

@@ -1 +0,0 @@
<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><rect x="2" y="2" width="124" height="124" rx="14" fill="#363d52" stroke="#212532" stroke-width="4"/><g transform="scale(.101) translate(122 122)"><g fill="#fff"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 813 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H447l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c3 34 55 34 58 0v-86c-3-34-55-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></g></svg>

Before

Width:  |  Height:  |  Size: 950 B

View File

@@ -16,7 +16,7 @@ config/auto_accept_quit=false
config/features=PackedStringArray("4.2", "Forward Plus")
boot_splash/bg_color=Color(0, 0, 0, 1)
boot_splash/show_image=false
config/icon="res://icon.svg"
config/icon="res://assets/textures/gui/pte_icon.svg"
[autoload]
@@ -24,6 +24,10 @@ WindowManager="*res://scripts/autoloads/window_manager.gd"
[display]
window/size/viewport_width=1980
window/size/viewport_height=1080
window/size/window_width_override=1188
window/size/window_height_override=648
window/stretch/mode="canvas_items"
window/size/mode.release=4
@@ -47,6 +51,7 @@ folder_colors={
[gui]
theme/custom="res://resources/main_theme.tres"
theme/custom_font="res://assets/fonts/rx100.otf"
[input]

View File

@@ -5,8 +5,8 @@
[ext_resource type="Environment" uid="uid://drn5fwa4uhv4m" path="res://resources/environment.tres" id="1_vtn44"]
[ext_resource type="Material" uid="uid://b6r8e4302xg1d" path="res://assets/materials/dark_metal.material" id="2_qrl87"]
[ext_resource type="Shader" path="res://shaders/pbr_glass.gdshader" id="3_aeppb"]
[ext_resource type="Texture2D" uid="uid://bjx2i53wtjair" path="res://assets/textures/crosshair.png" id="7_4s8bm"]
[ext_resource type="Texture2D" uid="uid://b4en3dw3q324p" path="res://assets/textures/circle.png" id="8_al3c7"]
[ext_resource type="Texture2D" uid="uid://b4en3dw3q324p" path="res://assets/textures/circle.png" id="6_bmyqq"]
[ext_resource type="Texture2D" uid="uid://bjx2i53wtjair" path="res://assets/textures/gui/crosshair.png" id="7_2qfex"]
[sub_resource type="World3D" id="World3D_wp4pn"]
environment = ExtResource("1_vtn44")
@@ -66,7 +66,7 @@ collision_use_scale = true
transparency = 2
alpha_scissor_threshold = 0.9
alpha_antialiasing_mode = 0
albedo_texture = ExtResource("8_al3c7")
albedo_texture = ExtResource("6_bmyqq")
emission_enabled = true
emission = Color(0.784314, 0.396078, 0, 1)
emission_energy_multiplier = 16.0
@@ -135,7 +135,7 @@ transparent_bg = true
handle_input_locally = false
scaling_3d_scale = 2.0
sdf_scale = 0
size = Vector2i(1152, 648)
size = Vector2i(1980, 1080)
size_2d_override_stretch = true
render_target_update_mode = 4
script = SubResource("GDScript_sr7lp")
@@ -215,6 +215,6 @@ grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 4
size_flags_vertical = 4
texture = ExtResource("7_4s8bm")
texture = ExtResource("7_2qfex")
[connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"]

View File

@@ -1,9 +1,11 @@
[gd_scene load_steps=5 format=3 uid="uid://dji1rniuusnmy"]
[gd_scene load_steps=8 format=3 uid="uid://dji1rniuusnmy"]
[ext_resource type="Script" path="res://scripts/menus/main_menu.gd" id="1_1osxu"]
[ext_resource type="PackedScene" uid="uid://ckad8stc13n83" path="res://scenes/levels/lvl_1.tscn" id="2_pnids"]
[ext_resource type="Texture2D" uid="uid://drg0qhwicg2df" path="res://assets/textures/gui/logo.png" id="3_a5ih4"]
[ext_resource type="FontFile" uid="uid://cr7a85ntk0t0k" path="res://assets/fonts/spacegrotesk_bold.ttf" id="4_26y7w"]
[sub_resource type="LabelSettings" id="LabelSettings_yh38l"]
font_size = 40
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sr4tr"]
[sub_resource type="InputEventAction" id="InputEventAction_bc05y"]
action = &"ui_accept"
@@ -20,44 +22,94 @@ grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_1osxu")
[node name="LogoContainer" type="VBoxContainer" parent="."]
[node name="SubViewportContainer" type="SubViewportContainer" parent="."]
self_modulate = Color(0.356863, 0.356863, 0.356863, 1)
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -197.0
offset_top = -88.5
offset_right = 197.0
offset_bottom = 88.5
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
metadata/_edit_lock_ = true
[node name="Title" type="Label" parent="LogoContainer"]
layout_mode = 2
size_flags_horizontal = 4
text = "Project
Thought Experiment"
label_settings = SubResource("LabelSettings_yh38l")
horizontal_alignment = 1
[node name="SubViewport" type="SubViewport" parent="SubViewportContainer"]
handle_input_locally = false
size = Vector2i(1980, 1080)
render_target_update_mode = 4
[node name="StartGame" type="Button" parent="."]
[node name="LVL1" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_pnids")]
[node name="Camera3D" parent="SubViewportContainer/SubViewport/LVL1/Player" index="1"]
current = false
[node name="SpringArm3D" parent="SubViewportContainer/SubViewport/LVL1/Player/Camera3D" index="1"]
visible = false
[node name="AudioListener3D" parent="SubViewportContainer/SubViewport/LVL1/Player/Camera3D" index="3"]
current = true
[node name="GravityGunLayer" parent="SubViewportContainer/SubViewport/LVL1/Player" index="2"]
visible = false
[node name="SubViewport" parent="SubViewportContainer/SubViewport/LVL1/Player/GravityGunLayer/SubViewportContainer" index="0"]
render_target_update_mode = 0
[node name="Camera3D" parent="SubViewportContainer/SubViewport/LVL1" index="12"]
current = true
[node name="TextureRect" type="TextureRect" parent="."]
custom_minimum_size = Vector2(265, 95.4)
layout_mode = 0
offset_left = 128.0
offset_top = 12.0
offset_right = 393.0
offset_bottom = 171.0
texture = ExtResource("3_a5ih4")
expand_mode = 1
metadata/_edit_lock_ = true
[node name="ButtonCOntainer" type="VBoxContainer" parent="."]
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -53.0
offset_top = -93.0
offset_right = 53.0
offset_bottom = -62.0
grow_horizontal = 2
grow_vertical = 0
anchors_preset = 6
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -783.0
offset_top = -190.0
offset_right = -128.0
offset_bottom = 190.0
grow_horizontal = 0
grow_vertical = 2
[node name="StartGame" type="Button" parent="ButtonCOntainer"]
layout_mode = 2
focus_mode = 0
theme_override_fonts/font = ExtResource("4_26y7w")
theme_override_font_sizes/font_size = 96
theme_override_styles/normal = SubResource("StyleBoxEmpty_sr4tr")
shortcut = SubResource("Shortcut_fasub")
shortcut_in_tooltip = false
text = "Spiel starten"
[connection signal="pressed" from="StartGame" to="." method="_on_start_game_pressed"]
[node name="Levelselect" type="Button" parent="ButtonCOntainer"]
layout_mode = 2
theme_override_fonts/font = ExtResource("4_26y7w")
theme_override_font_sizes/font_size = 96
theme_override_styles/normal = SubResource("StyleBoxEmpty_sr4tr")
text = "Levelauswahl"
[node name="QuitGame" type="Button" parent="ButtonCOntainer"]
layout_mode = 2
theme_override_fonts/font = ExtResource("4_26y7w")
theme_override_font_sizes/font_size = 96
theme_override_styles/normal = SubResource("StyleBoxEmpty_sr4tr")
text = "Spiel beenden"
[connection signal="pressed" from="ButtonCOntainer/StartGame" to="." method="_on_start_game_pressed"]
[editable path="SubViewportContainer/SubViewport/LVL1"]
[editable path="SubViewportContainer/SubViewport/LVL1/interior"]
[editable path="SubViewportContainer/SubViewport/LVL1/Player"]
[editable path="SubViewportContainer/SubViewport/LVL1/Player/GravityGunLayer"]
[editable path="SubViewportContainer/SubViewport/LVL1/AudioSubtitleSystem"]

View File

@@ -37,26 +37,29 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -20.0
offset_top = -20.0
offset_right = 20.0
offset_bottom = 20.0
offset_left = -262.0
offset_top = -101.5
offset_right = 262.0
offset_bottom = 101.5
grow_horizontal = 2
grow_vertical = 2
[node name="Continue" type="Button" parent="VBoxContainer"]
process_mode = 3
layout_mode = 2
theme_override_font_sizes/font_size = 46
text = "Weiter spielen"
[node name="RestartLevel" type="Button" parent="VBoxContainer"]
process_mode = 3
layout_mode = 2
theme_override_font_sizes/font_size = 46
text = "Level neu starten"
[node name="CloseLevel" type="Button" parent="VBoxContainer"]
process_mode = 3
layout_mode = 2
theme_override_font_sizes/font_size = 46
text = "Beenden"
[connection signal="pressed" from="VBoxContainer/Continue" to="." method="_on_continue_pressed"]

View File

@@ -98,6 +98,9 @@ shape = SubResource("BoxShape3D_lygjd")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.27434, 3)
voice_lines = Array[ExtResource("18_jxpoe")]([SubResource("Resource_u3j5u"), SubResource("Resource_3g4yn"), SubResource("Resource_6wqks"), SubResource("Resource_im7qv")])
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, 3, 6)
[connection signal="lock" from="CompletionCounter" to="Door" method="close"]
[connection signal="unlock" from="CompletionCounter" to="Door" method="open"]

View File

@@ -1,5 +1,8 @@
extends Control
class_name MainMenu
func _ready() -> void:
Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
func _on_start_game_pressed() -> void:
get_tree().change_scene_to_file("res://scenes/levels/lvl_1.tscn")

View File

@@ -16,6 +16,8 @@ var camera_senitivity: float = 0.5
@onready var spring_arm: SpringArm3D = $Camera3D/SpringArm3D
func _ready() -> void:
if get_tree().current_scene is MainMenu:
queue_free()
capture()
camera.make_current()
$Camera3D/DDOF.show() # Würde den spieler im editor unsichtbar machen

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.