This commit is contained in:
2022-12-11 09:01:14 +01:00
20 changed files with 175 additions and 21 deletions

Binary file not shown.

View File

@@ -3,13 +3,13 @@
importer="scene" importer="scene"
importer_version=1 importer_version=1
type="PackedScene" type="PackedScene"
uid="uid://byt7ioadks813" uid="uid://dhe41jox6id7r"
path="res://.godot/imported/geodreieck.glb-e684d1d1e32583a976e36ba7a2f7eaf7.scn" path="res://.godot/imported/bild_deko.glb-0a06b51f0022371b9130f405c59bfce9.scn"
[deps] [deps]
source_file="res://Assets/Model/MainMenuObjects/geodreieck.glb" source_file="res://Assets/Model/MainMenuObjects/bild_deko.glb"
dest_files=["res://.godot/imported/geodreieck.glb-e684d1d1e32583a976e36ba7a2f7eaf7.scn"] dest_files=["res://.godot/imported/bild_deko.glb-0a06b51f0022371b9130f405c59bfce9.scn"]
[params] [params]

Binary file not shown.

View File

@@ -0,0 +1,30 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dg82ywjh8sc0k"
path="res://.godot/imported/dreieck.glb-f93304e2cc44e7de091fa08a73cb21a5.scn"
[deps]
source_file="res://Assets/Model/MainMenuObjects/dreieck.glb"
dest_files=["res://.godot/imported/dreieck.glb-f93304e2cc44e7de091fa08a73cb21a5.scn"]
[params]
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
import_script/path=""
_subresources={}

Binary file not shown.

View File

@@ -3,13 +3,13 @@
importer="scene" importer="scene"
importer_version=1 importer_version=1
type="PackedScene" type="PackedScene"
uid="uid://dj6e887lur0mb" uid="uid://cfs0mfmyps1si"
path="res://.godot/imported/papierrolle flach.glb-1b5a54b498af32986eb33862518a95bb.scn" path="res://.godot/imported/papierrolle_flach.glb-abc974b889385d697b184e0c176b2837.scn"
[deps] [deps]
source_file="res://Assets/Model/MainMenuObjects/papierrolle flach.glb" source_file="res://Assets/Model/MainMenuObjects/papierrolle_flach.glb"
dest_files=["res://.godot/imported/papierrolle flach.glb-1b5a54b498af32986eb33862518a95bb.scn"] dest_files=["res://.godot/imported/papierrolle_flach.glb-abc974b889385d697b184e0c176b2837.scn"]
[params] [params]

View File

@@ -3,13 +3,13 @@
importer="scene" importer="scene"
importer_version=1 importer_version=1
type="PackedScene" type="PackedScene"
uid="uid://q8evwxqmmlry" uid="uid://b6ftkalbyl77o"
path="res://.godot/imported/papierrolle knick.glb-e48c0ce10d817869e0c7adc92d0cf360.scn" path="res://.godot/imported/papierrolle_knick.glb-4dc8bf27e3609370c87b94657cc7bf18.scn"
[deps] [deps]
source_file="res://Assets/Model/MainMenuObjects/papierrolle knick.glb" source_file="res://Assets/Model/MainMenuObjects/papierrolle_knick.glb"
dest_files=["res://.godot/imported/papierrolle knick.glb-e48c0ce10d817869e0c7adc92d0cf360.scn"] dest_files=["res://.godot/imported/papierrolle_knick.glb-4dc8bf27e3609370c87b94657cc7bf18.scn"]
[params] [params]

View File

@@ -3,13 +3,13 @@
importer="scene" importer="scene"
importer_version=1 importer_version=1
type="PackedScene" type="PackedScene"
uid="uid://bb2s75f7j1r01" uid="uid://dl5er7ybhbjx4"
path="res://.godot/imported/zahnrad gross.glb-8bdd5dd2300c9854d8b395847f5483a8.scn" path="res://.godot/imported/zahnrad_gross.glb-b642dd9342f8b34114f917bdcc6c8e3b.scn"
[deps] [deps]
source_file="res://Assets/Model/MainMenuObjects/zahnrad gross.glb" source_file="res://Assets/Model/MainMenuObjects/zahnrad_gross.glb"
dest_files=["res://.godot/imported/zahnrad gross.glb-8bdd5dd2300c9854d8b395847f5483a8.scn"] dest_files=["res://.godot/imported/zahnrad_gross.glb-b642dd9342f8b34114f917bdcc6c8e3b.scn"]
[params] [params]

View File

@@ -3,13 +3,13 @@
importer="scene" importer="scene"
importer_version=1 importer_version=1
type="PackedScene" type="PackedScene"
uid="uid://cjai3eplxe605" uid="uid://dsj0fslwga5xl"
path="res://.godot/imported/zahnrad klein.glb-523736bf5e0ee4423619688858e2bc63.scn" path="res://.godot/imported/zahnrad_klein.glb-bb427a376c78487e4530545f0de837d7.scn"
[deps] [deps]
source_file="res://Assets/Model/MainMenuObjects/zahnrad klein.glb" source_file="res://Assets/Model/MainMenuObjects/zahnrad_klein.glb"
dest_files=["res://.godot/imported/zahnrad klein.glb-523736bf5e0ee4423619688858e2bc63.scn"] dest_files=["res://.godot/imported/zahnrad_klein.glb-bb427a376c78487e4530545f0de837d7.scn"]
[params] [params]

Binary file not shown.

View File

@@ -0,0 +1,30 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://crg01h82ww1m6"
path="res://.godot/imported/zahnrad_mittel.glb-1e9f6bf8e3c051ba7a90756256766a74.scn"
[deps]
source_file="res://Assets/Model/MainMenuObjects/zahnrad_mittel.glb"
dest_files=["res://.godot/imported/zahnrad_mittel.glb-1e9f6bf8e3c051ba7a90756256766a74.scn"]
[params]
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
import_script/path=""
_subresources={}

75
Nodes/MainMenu3D.tscn Normal file
View File

@@ -0,0 +1,75 @@
[gd_scene load_steps=16 format=3 uid="uid://c4njs3xp5s582"]
[ext_resource type="PackedScene" uid="uid://bn42ap8pnv34r" path="res://Assets/Model/MainMenuObjects/tischplatte.glb" id="1_x1eq8"]
[ext_resource type="PackedScene" uid="uid://fpl3qyhc3e6m" path="res://Assets/Model/MainMenuObjects/blueprint untergrund.glb" id="2_l7bb1"]
[ext_resource type="PackedScene" uid="uid://c1xtm0rjm034k" path="res://Assets/Model/MainMenuObjects/hammer.glb" id="3_hh122"]
[ext_resource type="PackedScene" uid="uid://1gblistqsgi0" path="res://Assets/Model/MainMenuObjects/naegel.glb" id="4_ntrhn"]
[ext_resource type="PackedScene" uid="uid://b1ubp6objx25w" path="res://Assets/Model/MainMenuObjects/stift.glb" id="5_thrx4"]
[ext_resource type="PackedScene" uid="uid://dg82ywjh8sc0k" path="res://Assets/Model/MainMenuObjects/dreieck.glb" id="6_nj0l7"]
[ext_resource type="PackedScene" uid="uid://cfs0mfmyps1si" path="res://Assets/Model/MainMenuObjects/papierrolle_flach.glb" id="7_32tfv"]
[ext_resource type="Script" path="res://scripts/3DUI/dreieck.gd" id="7_jf0cx"]
[ext_resource type="PackedScene" uid="uid://b6ftkalbyl77o" path="res://Assets/Model/MainMenuObjects/papierrolle_knick.glb" id="8_dcfhc"]
[ext_resource type="PackedScene" uid="uid://dl5er7ybhbjx4" path="res://Assets/Model/MainMenuObjects/zahnrad_gross.glb" id="9_040k3"]
[ext_resource type="PackedScene" uid="uid://dsj0fslwga5xl" path="res://Assets/Model/MainMenuObjects/zahnrad_klein.glb" id="10_4uhdl"]
[ext_resource type="PackedScene" uid="uid://crg01h82ww1m6" path="res://Assets/Model/MainMenuObjects/zahnrad_mittel.glb" id="11_lokvi"]
[ext_resource type="PackedScene" uid="uid://d2k8qu46g6ono" path="res://Assets/Model/MainMenuObjects/blueprint deko.glb" id="12_67wtp"]
[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="13_smxpv"]
[ext_resource type="PackedScene" uid="uid://dhe41jox6id7r" path="res://Assets/Model/MainMenuObjects/bild_deko.glb" id="14_gbsgf"]
[node name="MainMenu3D" type="Node3D"]
[node name="tischplatte" parent="." instance=ExtResource("1_x1eq8")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15)
[node name="blueprint untergrund" parent="." instance=ExtResource("2_l7bb1")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15)
[node name="hammer" parent="." instance=ExtResource("3_hh122")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15)
[node name="naegel" parent="." instance=ExtResource("4_ntrhn")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15)
[node name="stift" parent="." instance=ExtResource("5_thrx4")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15)
[node name="tischplatte2" parent="." instance=ExtResource("1_x1eq8")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15)
[node name="dreieck" parent="." instance=ExtResource("6_nj0l7")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.09993, 0.453593, 1.26143)
script = ExtResource("7_jf0cx")
[node name="Area3D" type="Area3D" parent="dreieck"]
[node name="CollisionPolygon3D" type="CollisionPolygon3D" parent="dreieck/Area3D"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0)
polygon = PackedVector2Array(0.351274, -1.7499, -1.21959, 0.121159, 0.67798, 1.71333)
[node name="papierrolle_flach" parent="." instance=ExtResource("7_32tfv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.597003, 0.758382, -5.10524)
[node name="papierrolle_knick" parent="." instance=ExtResource("8_dcfhc")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.597003, 0.758382, -5.10524)
[node name="zahnrad_gross" parent="." instance=ExtResource("9_040k3")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.05736, 0.693096, 2.90686)
[node name="zahnrad_klein" parent="." instance=ExtResource("10_4uhdl")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.50923, 0.693096, -0.103418)
[node name="zahnrad_mittel" parent="." instance=ExtResource("11_lokvi")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.02981, 0.829658, 2.1212)
[node name="blueprint deko" parent="." instance=ExtResource("12_67wtp")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15)
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(-1, 8.74228e-08, 3.82137e-15, 0, -4.37114e-08, 1, 8.74228e-08, 1, 4.37114e-08, 0, 8, 0)
[node name="LightSetup" parent="." instance=ExtResource("13_smxpv")]
[node name="bild_deko" parent="." instance=ExtResource("14_gbsgf")]
transform = Transform3D(-0.841511, 0, -0.54024, 0, 1, 0, 0.54024, 0, -0.841511, 8.97174, 0.481874, -0.545207)
[connection signal="input_event" from="dreieck/Area3D" to="dreieck" method="_on_area_3d_input_event"]

7
cannonball.tscn Normal file
View File

@@ -0,0 +1,7 @@
[gd_scene load_steps=2 format=3 uid="uid://4vfvxfpy4wn2"]
[ext_resource type="PackedScene" uid="uid://bj6bw54a873im" path="res://Assets/Model/Objects/CanonBall.glb" id="1_b7tpd"]
[node name="CANNONBALL" type="Node3D"]
[node name="CanonBall" parent="." instance=ExtResource("1_b7tpd")]

7
scripts/3DUI/dreieck.gd Normal file
View File

@@ -0,0 +1,7 @@
extends Node3D
func _on_area_3d_input_event(camera, event, position, normal, shape_idx):
if event is InputEventMouseButton:
if event.button_index == MOUSE_BUTTON_LEFT and event.pressed == true:
print("Start Game")

View File

@@ -55,9 +55,14 @@ func shoot():
currentStashValue -= 1 currentStashValue -= 1
currentPowderStashValue = 0 currentPowderStashValue = 0
currentState = STATE.INACTIVE currentState = STATE.INACTIVE
var bullet = preload("res://cannonball.tscn").instantiate()
add_child(bullet)
print(bullet.position)
var tween = bullet.create_tween()
tween.tween_property(bullet,"position",Vector3(70,0,0),0.5)
tween.tween_callback(bullet.queue_free)
$AudioStreamPlayer.play(0) $AudioStreamPlayer.play(0)
return true return true
if currentStashValue >= 1 and currentPowderStashValue >= 2 and currentState == STATE.INACTIVE and ammoType == 1: if currentStashValue >= 1 and currentPowderStashValue >= 2 and currentState == STATE.INACTIVE and ammoType == 1:
currentState = STATE.SHOOTING currentState = STATE.SHOOTING
currentStashValue -= 1 currentStashValue -= 1