diff --git a/Amanda/furni/Images/table1_diffuse.jpg.import b/Amanda/furni/Images/table1_diffuse.jpg.import index 4ec992d..b140651 100644 --- a/Amanda/furni/Images/table1_diffuse.jpg.import +++ b/Amanda/furni/Images/table1_diffuse.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://xayi0628a8c" -path="res://.godot/imported/table1_diffuse.jpg-f15c1f3586d4997b2e98d840a2ad18c4.ctex" +path.s3tc="res://.godot/imported/table1_diffuse.jpg-f15c1f3586d4997b2e98d840a2ad18c4.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Amanda/furni/Images/table1_diffuse.jpg" -dest_files=["res://.godot/imported/table1_diffuse.jpg-f15c1f3586d4997b2e98d840a2ad18c4.ctex"] +dest_files=["res://.godot/imported/table1_diffuse.jpg-f15c1f3586d4997b2e98d840a2ad18c4.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 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/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ 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 +detect_3d/compress_to=0 diff --git a/Amanda/furni/Images/table_bump.jpg.import b/Amanda/furni/Images/table_bump.jpg.import index a173a8f..93a4c83 100644 --- a/Amanda/furni/Images/table_bump.jpg.import +++ b/Amanda/furni/Images/table_bump.jpg.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://ibe5gkf5p4s6" -path="res://.godot/imported/table_bump.jpg-053b3254eb4eb3aedfb9ed9c6a7668df.ctex" +path.s3tc="res://.godot/imported/table_bump.jpg-053b3254eb4eb3aedfb9ed9c6a7668df.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Amanda/furni/Images/table_bump.jpg" -dest_files=["res://.godot/imported/table_bump.jpg-053b3254eb4eb3aedfb9ed9c6a7668df.ctex"] +dest_files=["res://.godot/imported/table_bump.jpg-053b3254eb4eb3aedfb9ed9c6a7668df.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://Amanda/furni/Images/table_bump.jpg" 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 +detect_3d/compress_to=0 diff --git a/Amanda/furni/Images/table_diffuse.jpg.import b/Amanda/furni/Images/table_diffuse.jpg.import index 06e3564..adc0681 100644 --- a/Amanda/furni/Images/table_diffuse.jpg.import +++ b/Amanda/furni/Images/table_diffuse.jpg.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://cd1v04y3nf1dv" -path="res://.godot/imported/table_diffuse.jpg-5bb9662da09d16e931ed19325f9debfc.ctex" +path.s3tc="res://.godot/imported/table_diffuse.jpg-5bb9662da09d16e931ed19325f9debfc.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Amanda/furni/Images/table_diffuse.jpg" -dest_files=["res://.godot/imported/table_diffuse.jpg-5bb9662da09d16e931ed19325f9debfc.ctex"] +dest_files=["res://.godot/imported/table_diffuse.jpg-5bb9662da09d16e931ed19325f9debfc.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 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/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ 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 +detect_3d/compress_to=0 diff --git a/Florian/Entity/People/waitress.tscn b/Florian/Entity/People/waitress.tscn index df1acce..fd9f26a 100644 --- a/Florian/Entity/People/waitress.tscn +++ b/Florian/Entity/People/waitress.tscn @@ -53,6 +53,7 @@ shaded = true alpha_cut = 2 texture_filter = 0 sprite_frames = SubResource("SpriteFrames_jd5bi") +autoplay = "default" frame_progress = 0.97673 [node name="PointThing" parent="." instance=ExtResource("2_18dwx")] diff --git a/Florian/Map/Oktoberfest.tscn b/Florian/Map/Oktoberfest.tscn index 1255d90..95b3204 100644 --- a/Florian/Map/Oktoberfest.tscn +++ b/Florian/Map/Oktoberfest.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=14 format=3 uid="uid://by5cq6m32hbor"] +[gd_scene load_steps=18 format=3 uid="uid://by5cq6m32hbor"] [ext_resource type="Texture2D" uid="uid://dv401srtwuvtg" path="res://icon.svg" id="1_6v0xc"] +[ext_resource type="Texture2D" uid="uid://cd1v04y3nf1dv" path="res://Amanda/furni/Images/table_diffuse.jpg" id="1_tre0f"] [ext_resource type="PackedScene" uid="uid://crrco762ow56c" path="res://Florian/Player/PlayerRigidbody.tscn" id="2_82wr0"] -[ext_resource type="PackedScene" uid="uid://dvrnfjtmupucv" path="res://Florian/Props/table.tscn" id="3_tw6g5"] [ext_resource type="PackedScene" uid="uid://bobfhgsydmmr2" path="res://Florian/pyro.tscn" id="4_h8052"] [ext_resource type="PackedScene" uid="uid://byhsp6ujjsh8m" path="res://Florian/Entity/interactable.tscn" id="5_ygtpi"] [ext_resource type="PackedScene" uid="uid://c8gnb0kut2n5h" path="res://Florian/PointsLogic/point_thing.tscn" id="6_miqpv"] @@ -10,6 +10,10 @@ [ext_resource type="PackedScene" uid="uid://c5552lenumx2j" path="res://Florian/Entity/People/saxophone.tscn" id="7_miqpv"] [ext_resource type="PackedScene" uid="uid://bybsn53hd1mge" path="res://Florian/Entity/People/guys.tscn" id="9_3box6"] [ext_resource type="PackedScene" uid="uid://k3ij7wrtwpms" path="res://Florian/table_0.tscn" id="10_ubr03"] +[ext_resource type="PackedScene" uid="uid://lrf6ltd1wwg1" path="res://Florian/Entity/People/waitress_path.tscn" id="12_g561u"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_g561u"] +albedo_texture = ExtResource("1_tre0f") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_eral8"] albedo_texture = ExtResource("1_6v0xc") @@ -21,9 +25,20 @@ size = Vector2(500, 500) [sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_tw6g5"] +[sub_resource type="Curve3D" id="Curve3D_4etk5"] +closed = true +_data = { +"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 12), +"tilts": PackedFloat32Array(0, 0, 0, 0) +} +point_count = 4 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tre0f"] + [node name="Oktoberfest" type="Node3D"] [node name="Floor" type="MeshInstance3D" parent="."] +material_override = SubResource("StandardMaterial3D_g561u") mesh = SubResource("PlaneMesh_82wr0") [node name="StaticBody3D" type="StaticBody3D" parent="Floor"] @@ -35,9 +50,6 @@ shape = SubResource("WorldBoundaryShape3D_tw6g5") [node name="PlayerRigidbody" parent="." instance=ExtResource("2_82wr0")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 2) -[node name="Table2" parent="." instance=ExtResource("3_tw6g5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 1, 1) - [node name="Stage" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -8) @@ -133,8 +145,92 @@ shadow_enabled = true [node name="Backstage" type="Node3D" parent="."] -[node name="table0" parent="." instance=ExtResource("10_ubr03")] -transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, 0, 0, 3) +[node name="Tables" type="Node3D" parent="."] + +[node name="table0" parent="Tables" instance=ExtResource("10_ubr03")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 3) + +[node name="guys2" parent="Tables/table0" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.927208, 0.87, -0.127208) +billboard = 0 + +[node name="guys3" parent="Tables/table0" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.27279, 0.87, -0.127208) +billboard = 0 + +[node name="table1" parent="Tables" instance=ExtResource("10_ubr03")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 6) + +[node name="guys2" parent="Tables/table1" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.927208, 0.87, -0.127208) +billboard = 0 + +[node name="guys3" parent="Tables/table1" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.27279, 0.87, -0.127208) +billboard = 0 + +[node name="table2" parent="Tables" instance=ExtResource("10_ubr03")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 9) + +[node name="guys2" parent="Tables/table2" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.927208, 0.87, -0.127208) +billboard = 0 + +[node name="guys3" parent="Tables/table2" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.27279, 0.87, -0.127208) +billboard = 0 + +[node name="table3" parent="Tables" instance=ExtResource("10_ubr03")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, 3) + +[node name="guys2" parent="Tables/table3" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.927208, 0.87, -0.127208) +billboard = 0 + +[node name="guys3" parent="Tables/table3" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.27279, 0.87, -0.127208) +billboard = 0 + +[node name="table4" parent="Tables" instance=ExtResource("10_ubr03")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, 6) + +[node name="guys2" parent="Tables/table4" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.927208, 0.87, -0.127208) +billboard = 0 + +[node name="guys3" parent="Tables/table4" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.27279, 0.87, -0.127208) +billboard = 0 + +[node name="table5" parent="Tables" instance=ExtResource("10_ubr03")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, 9) + +[node name="guys2" parent="Tables/table5" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.927208, 0.87, -0.127208) +billboard = 0 + +[node name="guys3" parent="Tables/table5" instance=ExtResource("9_3box6")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.27279, 0.87, -0.127208) +billboard = 0 + +[node name="Path3D" type="Path3D" parent="Tables"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.6, 1.2, 0) +curve = SubResource("Curve3D_4etk5") + +[node name="WaitressPath" parent="Tables/Path3D" node_paths=PackedStringArray("path") instance=ExtResource("12_g561u")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 0) +path = NodePath("..") + +[node name="CSGBox3D" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 3, 6) +use_collision = true +size = Vector3(1, 7, 13) +material = SubResource("StandardMaterial3D_tre0f") + +[node name="Decal" type="Decal" parent="CSGBox3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1, -1) +size = Vector3(2, 4, 6) +texture_albedo = ExtResource("1_6v0xc") [connection signal="interact" from="Stage/Interactable" to="Stage/Pyro" method="_turn_on_off"] [connection signal="interact" from="Stage/Interactable" to="Stage/Pyro2" method="_turn_on_off"] diff --git a/Florian/Player/cool_camera.gd b/Florian/Player/cool_camera.gd index cea1339..52bacc2 100644 --- a/Florian/Player/cool_camera.gd +++ b/Florian/Player/cool_camera.gd @@ -23,14 +23,35 @@ func _calculate_points(): _calculate_picture_spots() label.text = "%s\nTotal points: %d x %.2f = %.2f" % [points_string, total_points, total_points_multipliers, total_points * total_points_multipliers] +var acceptable_length = 0.1 + func _calculate_picture_objects(): for takeable in PictureTakeablesArray.picture_takables: - print("Checking takeable") + #print("Checking takeable") if takeable.picture_taken(): + var raycast = RayCast3D.new() + raycast.top_level = true + add_child(raycast) + raycast.global_position = get_viewport().get_camera_3d().global_position + + raycast.target_position = takeable.global_position - self.global_position + raycast.force_raycast_update() + raycast.collide_with_bodies = true + raycast.debug_shape_thickness = 2 + if raycast.is_colliding(): + print("raycast hit") + var raycast_hit = raycast.get_collision_point() + print(str((raycast_hit - self.global_position).length())) + if (raycast_hit - self.global_position).length() > acceptable_length: + print("Not in range!") + raycast.queue_free() + continue + raycast.queue_free() points_string += "{name} {points}\n".format({"name" : takeable.points_name, "points": str(takeable.points_worth)}) total_points += takeable.points_worth total_points_multipliers *= takeable.points_multiplier + takeable.show_red_cicle() func _calculate_picture_spots(): for spot in PictureTakeablesArray.picture_spots: diff --git a/Florian/PointsLogic/point_thing.gd b/Florian/PointsLogic/point_thing.gd index cf09551..61c6b43 100644 --- a/Florian/PointsLogic/point_thing.gd +++ b/Florian/PointsLogic/point_thing.gd @@ -12,17 +12,15 @@ func _ready() -> void: func picture_taken() -> bool: var in_picture = on_screen.is_on_screen() - print(in_picture) - if in_picture: - show_red_cicle() - else: - hide_red_circle() + hide_red_circle() + #print(in_picture) + return in_picture func show_red_cicle(): - print("Showing red circle") + #print("Showing red circle") red_circle.show() func hide_red_circle(): - print("Hiding red circle") + #print("Hiding red circle") red_circle.hide() diff --git a/Florian/table_0.tscn b/Florian/table_0.tscn index fd02192..644e21c 100644 --- a/Florian/table_0.tscn +++ b/Florian/table_0.tscn @@ -1,9 +1,30 @@ -[gd_scene load_steps=2 format=3 uid="uid://k3ij7wrtwpms"] +[gd_scene load_steps=6 format=3 uid="uid://k3ij7wrtwpms"] [ext_resource type="PackedScene" uid="uid://olc70hg5v5ou" path="res://Amanda/furni/table0.blend" id="1_xylfr"] +[ext_resource type="Texture2D" uid="uid://cd1v04y3nf1dv" path="res://Amanda/furni/Images/table_diffuse.jpg" id="2_kmspu"] +[ext_resource type="Texture2D" uid="uid://ibe5gkf5p4s6" path="res://Amanda/furni/Images/table_bump.jpg" id="3_qvbmv"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qvbmv"] +albedo_texture = ExtResource("2_kmspu") +roughness_texture = ExtResource("3_qvbmv") +roughness_texture_channel = 3 +normal_enabled = true +normal_texture = ExtResource("3_qvbmv") + +[sub_resource type="BoxShape3D" id="BoxShape3D_xylfr"] +size = Vector3(1, 1, 2.2) [node name="table0" instance=ExtResource("1_xylfr")] -transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) [node name="Point" parent="." index="0"] visible = false + +[node name="Table" parent="." index="1"] +transform = Transform3D(-2.62268e-08, -0.6, 2.62268e-08, 0, -2.62268e-08, -0.6, 0.6, -2.62268e-08, 1.14641e-15, 0, 0, 0) +surface_material_override/0 = SubResource("StandardMaterial3D_qvbmv") + +[node name="StaticBody3D" type="StaticBody3D" parent="." index="2"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.4, -2.98023e-08) +shape = SubResource("BoxShape3D_xylfr")