diff --git a/.gitignore b/.gitignore index 7b661af..8072825 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,25 @@ !/engine/debug.tscn !/engine/title.tscn +# /engine/assets +!/engine/assets/ +/engine/assets/* + +# /engine/assets/material +!/engine/assets/material/ +/engine/assets/material/* + +# /engine/assets/material/concrete_wet +!/engine/assets/material/concrete_wet/ +/engine/assets/material/concrete_wet/* + +!/engine/assets/material/concrete_wet/concrete_wet.blend +!/engine/assets/material/concrete_wet/concrete_wet.blend1 + +# /engine/assets/material/metal_pipe +!/engine/assets/material/metal_pipe/ +/engine/assets/material/metal_pipe/* + # /engine/bin !/engine/bin/ /engine/bin/* diff --git a/engine/assets/material/concrete_wet/concrete_wet.blend b/engine/assets/material/concrete_wet/concrete_wet.blend new file mode 100644 index 0000000..81cf068 Binary files /dev/null and b/engine/assets/material/concrete_wet/concrete_wet.blend differ diff --git a/engine/assets/material/concrete_wet/concrete_wet.blend1 b/engine/assets/material/concrete_wet/concrete_wet.blend1 new file mode 100644 index 0000000..9d0ca33 Binary files /dev/null and b/engine/assets/material/concrete_wet/concrete_wet.blend1 differ diff --git a/engine/bin/libsb.gdextension b/engine/bin/libsb.gdextension index 2038d17..a113978 100644 --- a/engine/bin/libsb.gdextension +++ b/engine/bin/libsb.gdextension @@ -5,9 +5,9 @@ compatibility_minimum = "4.4" [libraries] -linux.amd64 = "res://../bld/obj/.libs/libbind.so" -linux.amd64 = "res://../bld/obj/.libs/libsb.so" -darwin.amd64 = "res://../bld/obj/.libs/libbind.dylib" -darwin.amd64 = "res://../bld/obj/.libs/libsb.dylib" -windows.amd64 = "res://../bld/obj/.libs/libbind.dll" -windows.amd64 = "res://../bld/obj/.libs/libsb.dll" +linux.x86_64 = "res://../bld/obj/.libs/libbind.so" +linux.x86_64 = "res://../bld/obj/.libs/libsb.so" +darwin.x86_64 = "res://../bld/obj/.libs/libbind.dylib" +darwin.x86_64 = "res://../bld/obj/.libs/libsb.dylib" +windows.x86_64 = "res://../bld/obj/.libs/libbind.dll" +windows.x86_64 = "res://../bld/obj/.libs/libsb.dll" diff --git a/engine/debug.tscn b/engine/debug.tscn index 1d61cd2..b7fe040 100644 --- a/engine/debug.tscn +++ b/engine/debug.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=5 format=3 uid="uid://cg5vtf37cafsd"] -[ext_resource type="Texture2D" uid="uid://tpwobjqbudqn" path="res://img/sky.hdr" id="1_cqrla"] +[ext_resource type="Texture2D" uid="uid://cg7gvce3y7ca0" path="res://img/sky.hdr" id="1_cqrla"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_owhq0"] panorama = ExtResource("1_cqrla") -[sub_resource type="Sky" id="Sky_70g61"] +[sub_resource type="Sky" id="Sky_1uwqr"] sky_material = SubResource("PanoramaSkyMaterial_owhq0") [sub_resource type="Environment" id="Environment_yt03y"] background_mode = 2 -sky = SubResource("Sky_70g61") +sky = SubResource("Sky_1uwqr") [node name="Node3D" type="Node3D"] diff --git a/engine/project.godot b/engine/project.godot index d1e4413..592a85a 100644 --- a/engine/project.godot +++ b/engine/project.godot @@ -23,6 +23,10 @@ window/size/mode=4 window/stretch/mode="canvas_items" window/stretch/aspect="expand" +[filesystem] + +import/blender/enabled=false + [physics] 3d/physics_engine="JoltPhysics3D" diff --git a/engine/title.tscn b/engine/title.tscn index f31edbf..effee64 100644 --- a/engine/title.tscn +++ b/engine/title.tscn @@ -1,13 +1,27 @@ -[gd_scene load_steps=2 format=3 uid="uid://b827xc3j75sb6"] +[gd_scene load_steps=6 format=3 uid="uid://b827xc3j75sb6"] + +[ext_resource type="Texture2D" uid="uid://cg7gvce3y7ca0" path="res://img/sky.hdr" id="1_y7k74"] [sub_resource type="Theme" id="Theme_1d1pm"] +[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_oyqm6"] +panorama = ExtResource("1_y7k74") + +[sub_resource type="Sky" id="Sky_70g61"] +sky_material = SubResource("PanoramaSkyMaterial_oyqm6") + +[sub_resource type="Environment" id="Environment_kpexm"] +background_mode = 2 +sky = SubResource("Sky_70g61") + [node name="Node3D" type="Node3D"] [node name="Camera3D" type="Camera3D" parent="."] [node name="CanvasLayer" type="CanvasLayer" parent="Camera3D"] +[node name="ParallaxBackground" type="ParallaxBackground" parent="Camera3D/CanvasLayer"] + [node name="Disclaimer" type="Label" parent="Camera3D/CanvasLayer"] offset_right = 1151.0 offset_bottom = 650.0 @@ -122,3 +136,6 @@ grow_vertical = 0 text = "Information SVG here for copyright notices." horizontal_alignment = 1 vertical_alignment = 1 + +[node name="WorldEnvironment" type="WorldEnvironment" parent="Camera3D"] +environment = SubResource("Environment_kpexm")