NeonTea/gmtk24
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove BuildingBlockCreator (fixes main structure collisions)

Browse Source
This commit is contained in:
Jens Pitkänen 2024-08-18 19:42:24 +03:00
parent c584dd1f92
commit f01ea42327
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scenes/demo/demo.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=113 format=4 uid="uid://8po7ftboqq4k"] [gd_scene load_steps=111 format=4 uid="uid://8po7ftboqq4k"]
[ext_resource type="CameraAttributesPhysical" uid="uid://cxyj2tvfksjl6" path="res://scenes/hazy_env_camera_attrs.tres" id="1_r2j1d"] [ext_resource type="CameraAttributesPhysical" uid="uid://cxyj2tvfksjl6" path="res://scenes/hazy_env_camera_attrs.tres" id="1_r2j1d"]
[ext_resource type="LightmapGIData" uid="uid://bp05p4yab2ukx" path="res://scenes/demo/demo.lmbake" id="2_2ehlo"] [ext_resource type="LightmapGIData" uid="uid://bp05p4yab2ukx" path="res://scenes/demo/demo.lmbake" id="2_2ehlo"]
@ -8,10 +8,8 @@
[ext_resource type="Material" uid="uid://cobb5bm4y7nk7" path="res://textures/steel.tres" id="6_gip8a"] [ext_resource type="Material" uid="uid://cobb5bm4y7nk7" path="res://textures/steel.tres" id="6_gip8a"]
[ext_resource type="Material" uid="uid://bpikku6t3gxi5" path="res://textures/white.tres" id="7_70h1h"] [ext_resource type="Material" uid="uid://bpikku6t3gxi5" path="res://textures/white.tres" id="7_70h1h"]
[ext_resource type="Material" uid="uid://dgf570wtqn17j" path="res://textures/steel_fence.tres" id="8_dovc4"] [ext_resource type="Material" uid="uid://dgf570wtqn17j" path="res://textures/steel_fence.tres" id="8_dovc4"]
[ext_resource type="Script" path="res://scripts/BuildingBlockCreator.cs" id="9_3oghc"]
[ext_resource type="PackedScene" uid="uid://wjbuh7jk50nm" path="res://scenes/player.tscn" id="10_3xiy2"] [ext_resource type="PackedScene" uid="uid://wjbuh7jk50nm" path="res://scenes/player.tscn" id="10_3xiy2"]
[ext_resource type="PackedScene" uid="uid://c670g1qg5gaug" path="res://scenes/interface/pause_menu.tscn" id="11_lav3p"] [ext_resource type="PackedScene" uid="uid://c670g1qg5gaug" path="res://scenes/interface/pause_menu.tscn" id="11_lav3p"]
[ext_resource type="Material" uid="uid://bq5oqyuwekryv" path="res://textures/building_block.tres" id="11_riqpg"]
[sub_resource type="ArrayMesh" id="ArrayMesh_kaiip"] [sub_resource type="ArrayMesh" id="ArrayMesh_kaiip"]
lightmap_size_hint = Vector2i(1030, 566) lightmap_size_hint = Vector2i(1030, 566)
@ -1021,12 +1019,6 @@ shape = SubResource("ConvexPolygonShape3D_ldbum")
[node name="entity_17_brush_6_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_17_func_buildingblock"] [node name="entity_17_brush_6_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_17_func_buildingblock"]
shape = SubResource("ConvexPolygonShape3D_i1n6v") shape = SubResource("ConvexPolygonShape3D_i1n6v")
[node name="BuildingBlockCreator" type="Node3D" parent="." node_paths=PackedStringArray("TrenchbroomMap")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, -7.84902)
script = ExtResource("9_3oghc")
TrenchbroomMap = NodePath("../FuncGodotMap")
BuildingBlockMaterial = ExtResource("11_riqpg")
[node name="ReflectionProbes" type="Node3D" parent="."] [node name="ReflectionProbes" type="Node3D" parent="."]
[node name="ReflectionProbe" type="ReflectionProbe" parent="ReflectionProbes"] [node name="ReflectionProbe" type="ReflectionProbe" parent="ReflectionProbes"]

1
scenes/player.tscn
View File

@ -7,7 +7,6 @@ height = 1.9
radius = 0.3 radius = 0.3
[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("Eye")] [node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("Eye")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.51124, 0)
script = ExtResource("1_aff2a") script = ExtResource("1_aff2a")
Eye = NodePath("PlayerEyeCamera") Eye = NodePath("PlayerEyeCamera")

4
scripts/Player.cs
View File

@ -17,10 +17,6 @@ namespace Gmtk24 {
private float CurrentPitch = 0; private float CurrentPitch = 0;
private float JumpBufferTime = 0; private float JumpBufferTime = 0;
public override void _Ready() {
Input.MouseMode = Input.MouseModeEnum.Captured;
}
public override void _UnhandledInput(InputEvent @event) { public override void _UnhandledInput(InputEvent @event) {
if (@event is InputEventMouseMotion ev && Input.MouseMode == Input.MouseModeEnum.Captured) { if (@event is InputEventMouseMotion ev && Input.MouseMode == Input.MouseModeEnum.Captured) {
var cameraSensitivityX = 2f; // FIXME: use camera sensitivity and invert settings var cameraSensitivityX = 2f; // FIXME: use camera sensitivity and invert settings