diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2aa9316a..f7a22aa3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: name: "${{ matrix.config.name }} ${{ matrix.cmake_build_shared_libs == 'ON' && 'Shared' || 'Static' }} ${{ matrix.cmake_build_type }}" steps: - name: Checkout - uses: nschloe/action-cached-lfs-checkout@v1 + uses: actions/checkout@v4 with: submodules: true @@ -113,7 +113,7 @@ jobs: name: "${{ matrix.config.name }} ${{ matrix.cmake_build_shared_libs == 'ON' && 'Shared' || 'Static' }} ${{ matrix.cmake_build_type }}" steps: - name: Checkout - uses: nschloe/action-cached-lfs-checkout@v1 + uses: actions/checkout@v4 with: submodules: true diff --git a/.github/workflows/lfs.yml b/.github/workflows/lfs.yml deleted file mode 100644 index afe730bb..00000000 --- a/.github/workflows/lfs.yml +++ /dev/null @@ -1,24 +0,0 @@ -# This script is there to warm up the git LFS cache every so often so that it doesn't get removed after 7 days. -# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows -name: Refresh LFS Cache -on: - workflow_dispatch: # Allow the action to be manually triggered - schedule: - # Run on Monday and Friday at 10:00 UTC - - cron: '0 10 * * 1,5' - -jobs: - refresh_lfs_cache: - runs-on: '${{ matrix.runner }}' - # We can't use a list on 'runs-on' so we declare a matrix instead.k - strategy: - matrix: - runner: [ubuntu-latest, windows-latest] - name: "Refresh git LFS cache" - steps: - # NOTE: It's important that the options specified here are the same as the common build action. - # Failing that, we'll get a different cache key and it won't work. - - name: Checkout - uses: nschloe/action-cached-lfs-checkout@v1 - with: - submodules: true diff --git a/.gitmodules b/.gitmodules index 5ca93fb3..0a9d3108 100644 --- a/.gitmodules +++ b/.gitmodules @@ -48,3 +48,6 @@ [submodule "external/google/crashpad/crashpad"] path = external/google/crashpad/crashpad url = https://chromium.googlesource.com/crashpad/crashpad.git +[submodule "res"] + path = res + url = https://github.com/Ryp/reaper-resources diff --git a/res b/res new file mode 160000 index 00000000..c17a13b9 --- /dev/null +++ b/res @@ -0,0 +1 @@ +Subproject commit c17a13b9f0984c60ffc76737ff105485a738f8d5 diff --git a/res/.gitattributes b/res/.gitattributes deleted file mode 100644 index ee438ea6..00000000 --- a/res/.gitattributes +++ /dev/null @@ -1,16 +0,0 @@ -# Models -*.gltf filter=lfs diff=lfs merge=lfs -text -*.bin filter=lfs diff=lfs merge=lfs -text -*.obj filter=lfs diff=lfs merge=lfs -text -*.blend filter=lfs diff=lfs merge=lfs -text - -# Images -*.png filter=lfs diff=lfs merge=lfs -text -*.jpg filter=lfs diff=lfs merge=lfs -text -*.jpeg filter=lfs diff=lfs merge=lfs -text -*.exr filter=lfs diff=lfs merge=lfs -text - -# Textures -*.dds filter=lfs diff=lfs merge=lfs -text -*.ktx filter=lfs diff=lfs merge=lfs -text -*.basisu filter=lfs diff=lfs merge=lfs -text diff --git a/res/model/asteroid.obj b/res/model/asteroid.obj deleted file mode 100644 index 9c045b7c..00000000 --- a/res/model/asteroid.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1aadb592bb02b34308439aff94c1bdb23e59d0cf492cb826a231aa8de1e2be31 -size 5077780 diff --git a/res/model/box.obj b/res/model/box.obj deleted file mode 100644 index 935695f9..00000000 --- a/res/model/box.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1b500f68781e26786257f7eef93ac05a69954d133680226bdbbd4e3dc1c903c -size 907 diff --git a/res/model/bunny.obj b/res/model/bunny.obj deleted file mode 100644 index 7964e731..00000000 --- a/res/model/bunny.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01791822044ada12aaea97c79408b480d2b49221322656bfdb86ee799c298d1a -size 2198091 diff --git a/res/model/dragon.obj b/res/model/dragon.obj deleted file mode 100644 index 0d35f96f..00000000 --- a/res/model/dragon.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e564ba61eaf860364b6ffc577a5bfbf63e2af6b17278470fc520f05c97bfbf8a -size 6761946 diff --git a/res/model/icosahedron.obj b/res/model/icosahedron.obj deleted file mode 100644 index 1617b850..00000000 --- a/res/model/icosahedron.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb9f2f33f78dab2d0302d1cdb1cb7b460918ba9d387a14960066ee4c1ae8ff92 -size 1394 diff --git a/res/model/quad.obj b/res/model/quad.obj deleted file mode 100644 index a47ddcc6..00000000 --- a/res/model/quad.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:654abf07b9124a86131aa0cda63033e711173c0fdd98c0861bdaaa4f26653a27 -size 162 diff --git a/res/model/sci_fi_helmet/SciFiHelmet.bin b/res/model/sci_fi_helmet/SciFiHelmet.bin deleted file mode 100644 index a55388a7..00000000 --- a/res/model/sci_fi_helmet/SciFiHelmet.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a7af42896359f8e0d9ba65260cbb7b1a1d36aa787439d3775a48aba1f9a25ba -size 3643848 diff --git a/res/model/sci_fi_helmet/SciFiHelmet.gltf b/res/model/sci_fi_helmet/SciFiHelmet.gltf deleted file mode 100644 index f06e55ef..00000000 --- a/res/model/sci_fi_helmet/SciFiHelmet.gltf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b9e64c5337ddaba5b44821d76786bcad3b5b78f877cf034ec6163dc8baca35a -size 4461 diff --git a/res/model/sci_fi_helmet/SciFiHelmet_AmbientOcclusion.png b/res/model/sci_fi_helmet/SciFiHelmet_AmbientOcclusion.png deleted file mode 100644 index 50a7303c..00000000 --- a/res/model/sci_fi_helmet/SciFiHelmet_AmbientOcclusion.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95823e77b0a6e45308b53be4fdf1b7a7b6ac085c190dc1c5ef47097d0e35eb2f -size 3919556 diff --git a/res/model/sci_fi_helmet/SciFiHelmet_BaseColor.png b/res/model/sci_fi_helmet/SciFiHelmet_BaseColor.png deleted file mode 100644 index 6cc74345..00000000 --- a/res/model/sci_fi_helmet/SciFiHelmet_BaseColor.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bda08dd029775ea0964d5721b779a639da091222eaa750233ba34e01e3eeace2 -size 7841138 diff --git a/res/model/sci_fi_helmet/SciFiHelmet_MetallicRoughness.png b/res/model/sci_fi_helmet/SciFiHelmet_MetallicRoughness.png deleted file mode 100644 index 61ba1701..00000000 --- a/res/model/sci_fi_helmet/SciFiHelmet_MetallicRoughness.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f38f025af3201697679e2a04ba4cf01b4506e68ce4e0e0f09c268a7dfb80b2c3 -size 9488811 diff --git a/res/model/sci_fi_helmet/SciFiHelmet_Normal.png b/res/model/sci_fi_helmet/SciFiHelmet_Normal.png deleted file mode 100644 index 08c50dc4..00000000 --- a/res/model/sci_fi_helmet/SciFiHelmet_Normal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25805ae14ebaa9a25c7d26421bbffbdb5f3ab8df9d630c540301e804cc222904 -size 9019058 diff --git a/res/model/ship.obj b/res/model/ship.obj deleted file mode 100644 index dc8f60e0..00000000 --- a/res/model/ship.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a1d027d453c804083c6e0409958793f1df89c34f0ceac0e7a41d65c84fa406e -size 4623236 diff --git a/res/model/track_chunk_simple.obj b/res/model/track_chunk_simple.obj deleted file mode 100644 index cc0ece2f..00000000 --- a/res/model/track_chunk_simple.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c08642157ebb0df08c81b0604ae7f2c250289d7329c155a54525e8dbd66b992 -size 39525 diff --git a/res/texture/default_standard_material/albedo.png b/res/texture/default_standard_material/albedo.png deleted file mode 100644 index ba94ea83..00000000 --- a/res/texture/default_standard_material/albedo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a49c1efd3ba9f65a38e90796000b0eee59a35fc7b25b0eaf02c0652d7e07b670 -size 626 diff --git a/res/texture/default_standard_material/ao.png b/res/texture/default_standard_material/ao.png deleted file mode 100644 index 5acd1992..00000000 --- a/res/texture/default_standard_material/ao.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19922c852299c7c447916bd1f6b12eb7caafa2c6ec761ca100bfcf241acdd261 -size 580 diff --git a/res/texture/default_standard_material/metalness_roughness.png b/res/texture/default_standard_material/metalness_roughness.png deleted file mode 100644 index 521b8e62..00000000 --- a/res/texture/default_standard_material/metalness_roughness.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e68e50ff25779218a9419a2983264ddf56c8c9ee14ca922e5696703b3ddbe958 -size 579 diff --git a/res/texture/default_standard_material/normal.png b/res/texture/default_standard_material/normal.png deleted file mode 100644 index 30e3e845..00000000 --- a/res/texture/default_standard_material/normal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:702b6e4a3ed469d6f4f4c7fd21a8ce72c56570b2a46638048fcadacc38bad1d9 -size 579