From c91e91f5c3946dba1311777fe1d0163db1cb1d48 Mon Sep 17 00:00:00 2001 From: Minimata Date: Tue, 20 May 2025 18:05:42 +0200 Subject: [PATCH] fix: export settings and custom player scene --- .gitea/workflows/main.yaml | 18 +++++++++--------- .../GridTexture/Dark/texture_01.png.import | 5 +++-- .../GridTexture/Green/texture_01.png.import | 5 +++-- .../GridTexture/Light/texture_01.png.import | 5 +++-- .../GridTexture/Orange/texture_01.png.import | 5 +++-- .../GridTexture/Red/texture_01.png.import | 5 +++-- .../PerlinNoise/Gabor 1 - 512x512.png.import | 5 +++-- .../kenney-green-checkerboar-cc0.png.import | 5 +++-- main.tscn | 6 +++--- project.godot | 4 ++++ scenes/player.tscn | 8 ++++++++ 11 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 scenes/player.tscn diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 55fb63b..b01a0c7 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -68,15 +68,15 @@ jobs: mkdir -v -p build/mac godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip zip -r Mac.zip build/mac - - name: Upload to release - uses: akkuman/gitea-release-action@v1 - with: - name: Running release - tag_name: ${{ needs.BumpTag.outputs.tag_name }} - files: |- - Windows.zip - Linux.zip - Mac.zip +# - name: Upload to release +# uses: akkuman/gitea-release-action@v1 +# with: +# name: Running release +# tag_name: ${{ needs.BumpTag.outputs.tag_name }} +# files: |- +# Windows.zip +# Linux.zip +# Mac.zip # - name: Upload to Itch # uses: KikimoraGames/itch-publish@v0.0.3 # with: diff --git a/addons/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import b/addons/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import index 16775e5..64d7e14 100644 --- a/addons/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import +++ b/addons/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://boasm0g587eov" path.s3tc="res://.godot/imported/texture_01.png-f86b77e8e778f8e66d133f3c07e2add2.s3tc.ctex" +path.etc2="res://.godot/imported/texture_01.png-f86b77e8e778f8e66d133f3c07e2add2.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-f86b77e8e778f8e66d133f3c07e2add2.s3tc.ctex"] +dest_files=["res://.godot/imported/texture_01.png-f86b77e8e778f8e66d133f3c07e2add2.s3tc.ctex", "res://.godot/imported/texture_01.png-f86b77e8e778f8e66d133f3c07e2add2.etc2.ctex"] [params] diff --git a/addons/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import b/addons/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import index cb27ef2..893231e 100644 --- a/addons/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import +++ b/addons/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://3e1klega6uye" path.s3tc="res://.godot/imported/texture_01.png-1b1a923d0728a43f833278bf7eb79bfb.s3tc.ctex" +path.etc2="res://.godot/imported/texture_01.png-1b1a923d0728a43f833278bf7eb79bfb.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/player_controller/Assets/Textures/GridTexture/Green/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-1b1a923d0728a43f833278bf7eb79bfb.s3tc.ctex"] +dest_files=["res://.godot/imported/texture_01.png-1b1a923d0728a43f833278bf7eb79bfb.s3tc.ctex", "res://.godot/imported/texture_01.png-1b1a923d0728a43f833278bf7eb79bfb.etc2.ctex"] [params] diff --git a/addons/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import b/addons/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import index d203539..92d3774 100644 --- a/addons/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import +++ b/addons/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://0t6ie0fkv2op" path.s3tc="res://.godot/imported/texture_01.png-cd2b8bf140c981c55022c05f53c9ebae.s3tc.ctex" +path.etc2="res://.godot/imported/texture_01.png-cd2b8bf140c981c55022c05f53c9ebae.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/player_controller/Assets/Textures/GridTexture/Light/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-cd2b8bf140c981c55022c05f53c9ebae.s3tc.ctex"] +dest_files=["res://.godot/imported/texture_01.png-cd2b8bf140c981c55022c05f53c9ebae.s3tc.ctex", "res://.godot/imported/texture_01.png-cd2b8bf140c981c55022c05f53c9ebae.etc2.ctex"] [params] diff --git a/addons/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import b/addons/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import index a5ab572..4ac3923 100644 --- a/addons/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import +++ b/addons/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://t10lfkxrg7ay" path.s3tc="res://.godot/imported/texture_01.png-774e9c350ec0a4fa95aaae0c1fc872bd.s3tc.ctex" +path.etc2="res://.godot/imported/texture_01.png-774e9c350ec0a4fa95aaae0c1fc872bd.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-774e9c350ec0a4fa95aaae0c1fc872bd.s3tc.ctex"] +dest_files=["res://.godot/imported/texture_01.png-774e9c350ec0a4fa95aaae0c1fc872bd.s3tc.ctex", "res://.godot/imported/texture_01.png-774e9c350ec0a4fa95aaae0c1fc872bd.etc2.ctex"] [params] diff --git a/addons/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import b/addons/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import index e0aa9e8..fbd57e8 100644 --- a/addons/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import +++ b/addons/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://dgix86l87u86s" path.s3tc="res://.godot/imported/texture_01.png-81329dd7fcb234667373715adf5a7ca1.s3tc.ctex" +path.etc2="res://.godot/imported/texture_01.png-81329dd7fcb234667373715adf5a7ca1.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/player_controller/Assets/Textures/GridTexture/Red/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-81329dd7fcb234667373715adf5a7ca1.s3tc.ctex"] +dest_files=["res://.godot/imported/texture_01.png-81329dd7fcb234667373715adf5a7ca1.s3tc.ctex", "res://.godot/imported/texture_01.png-81329dd7fcb234667373715adf5a7ca1.etc2.ctex"] [params] diff --git a/addons/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import b/addons/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import index 53bbf0c..b94c99f 100644 --- a/addons/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import +++ b/addons/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://woq2hudxhckr" path.s3tc="res://.godot/imported/Gabor 1 - 512x512.png-2e1d6fe9207cf3d9cbb344f0f1ad8365.s3tc.ctex" +path.etc2="res://.godot/imported/Gabor 1 - 512x512.png-2e1d6fe9207cf3d9cbb344f0f1ad8365.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png" -dest_files=["res://.godot/imported/Gabor 1 - 512x512.png-2e1d6fe9207cf3d9cbb344f0f1ad8365.s3tc.ctex"] +dest_files=["res://.godot/imported/Gabor 1 - 512x512.png-2e1d6fe9207cf3d9cbb344f0f1ad8365.s3tc.ctex", "res://.godot/imported/Gabor 1 - 512x512.png-2e1d6fe9207cf3d9cbb344f0f1ad8365.etc2.ctex"] [params] diff --git a/addons/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import b/addons/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import index eab7fcd..0e3f4ed 100644 --- a/addons/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import +++ b/addons/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://lp2pt8mtj7ty" path.s3tc="res://.godot/imported/kenney-green-checkerboar-cc0.png-4ac2e5feb60f311b4007a29bfb713529.s3tc.ctex" +path.etc2="res://.godot/imported/kenney-green-checkerboar-cc0.png-4ac2e5feb60f311b4007a29bfb713529.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png" -dest_files=["res://.godot/imported/kenney-green-checkerboar-cc0.png-4ac2e5feb60f311b4007a29bfb713529.s3tc.ctex"] +dest_files=["res://.godot/imported/kenney-green-checkerboar-cc0.png-4ac2e5feb60f311b4007a29bfb713529.s3tc.ctex", "res://.godot/imported/kenney-green-checkerboar-cc0.png-4ac2e5feb60f311b4007a29bfb713529.etc2.ctex"] [params] diff --git a/main.tscn b/main.tscn index 9ea2f08..59276c3 100644 --- a/main.tscn +++ b/main.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://cxbskue0lj2gv"] -[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://addons/player_controller/PlayerController.tscn" id="1_ig7tw"] +[ext_resource type="PackedScene" uid="uid://cdac2xuvak0bb" path="res://scenes/player.tscn" id="1_ig7tw"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"] sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1) @@ -27,7 +27,7 @@ shadow_enabled = true [node name="CSGBox3D" type="CSGBox3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09619, -0.472656, -0.958893) use_collision = true -size = Vector3(10, 1, 10) +size = Vector3(100, 1, 100) [node name="Player" parent="." instance=ExtResource("1_ig7tw")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.46733, 0.0273433, 0.0806665) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.03971, 0.0273442, -0.249186) diff --git a/project.godot b/project.godot index d7c3ffa..73e13ff 100644 --- a/project.godot +++ b/project.godot @@ -60,3 +60,7 @@ sprint={ [physics] 3d/physics_engine="Jolt Physics" + +[rendering] + +textures/vram_compression/import_etc2_astc=true diff --git a/scenes/player.tscn b/scenes/player.tscn new file mode 100644 index 0000000..0b499ee --- /dev/null +++ b/scenes/player.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=3 uid="uid://cdac2xuvak0bb"] + +[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://addons/player_controller/PlayerController.tscn" id="1_3vyb7"] + +[node name="Player" instance=ExtResource("1_3vyb7")] + +[node name="Stamina" parent="." index="4"] +MaxRunTime = 0.0