Skip to content

Commit 714c483

Browse files
shg8shg8
authored
Rename and refactor project (#23)
1 parent 93dec81 commit 714c483

11 files changed

Lines changed: 31 additions & 33 deletions

File tree

‎.github/workflows/cmake-multi-platform.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,36 +64,34 @@ jobs:
6464
shell: bash
6565
run: |
6666
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
67-
echo "vulkan-sdk-dir=${{ github.workspace }}/VULKAN_SDK" >> "$GITHUB_OUTPUT"
68-
echo "artifact-name=vulkan_splatting_viewer-${{ matrix.os }}-${{ matrix.arch }}-nightly" >> "$GITHUB_OUTPUT"
67+
# echo "vulkan-sdk-dir=${{ github.workspace }}/VULKAN_SDK" >> "$GITHUB_OUTPUT"
68+
echo "artifact-name=3dgs_cpp_viewer-${{ matrix.os }}-${{ matrix.arch }}-nightly" >> "$GITHUB_OUTPUT"
6969
7070
- name: Set artifact path (Windows)
7171
shell: bash
72-
run: echo "ARTIFACT_PATH=${{ github.workspace }}/build/apps/viewer/Release/vulkan_splatting_viewer.exe" >> "$GITHUB_ENV"
72+
run: echo "ARTIFACT_PATH=${{ github.workspace }}/build/apps/viewer/Release/3dgs_cpp_viewer.exe" >> "$GITHUB_ENV"
7373
if: runner.os == 'Windows'
7474

7575
- name: Set artifact path (POSIX)
7676
shell: bash
77-
run: echo "ARTIFACT_PATH=${{ github.workspace }}/build/apps/viewer/vulkan_splatting_viewer" >> "$GITHUB_ENV"
77+
run: echo "ARTIFACT_PATH=${{ github.workspace }}/build/apps/viewer/3dgs_cpp_viewer" >> "$GITHUB_ENV"
7878
if: runner.os != 'Windows'
7979

8080
- name: Install dependencies
8181
if: matrix.os == 'ubuntu-latest'
8282
run: sudo apt-get update && sudo apt-get install -y libglfw3-dev libglm-dev
8383

84-
- name: Prepare Vulkan SDK
85-
uses: humbletim/setup-vulkan-sdk@v1.2.0
84+
- name: Install Vulkan SDK
85+
uses: humbletim/install-vulkan-sdk@v1.1.1
8686
with:
87-
vulkan-query-version: latest
88-
vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang, SPIRV-Tools
89-
vulkan-use-cache: true
87+
version: latest
88+
cache: true
9089

9190
- name: Configure CMake
9291
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
9392
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
9493
run: >
9594
cmake -B ${{ steps.strings.outputs.build-output-dir }}
96-
-DVULKAN_SDK=${{ steps.strings.outputs.vulkan-sdk-dir }}
9795
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
9896
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
9997
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.26)
2-
project(vulkan_splatting_root)
2+
project(3dgs_cpp_root)
33

44
include(FetchContent)
55

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ with support for warp-level primitives (subgroups).
1414
![3DGS.cpp Demo macOS](https://github.com/shg8/3DGS.cpp/assets/38004233/66542056-ce30-4998-a612-dd4f6792599e)
1515

1616
## Downloads
17-
* [Windows](https://github.com/shg8/3DGS.cpp/releases/download/nightly/vulkan_splatting_viewer-windows-latest-amd64-nightly)
18-
* [macOS (arm64)](https://github.com/shg8/3DGS.cpp/releases/download/nightly/vulkan_splatting_viewer-macos-14-arm64-nightly)
19-
* [Linux](https://github.com/shg8/3DGS.cpp/releases/download/nightly/vulkan_splatting_viewer-ubuntu-latest-amd64-nightly)
17+
* [Windows](https://github.com/shg8/3DGS.cpp/releases/download/nightly/3dgs_cpp_viewer-windows-latest-amd64-nightly)
18+
* [macOS (arm64)](https://github.com/shg8/3DGS.cpp/releases/download/nightly/3dgs_cpp_viewer-macos-14-arm64-nightly)
19+
* [Linux](https://github.com/shg8/3DGS.cpp/releases/download/nightly/3dgs_cpp_viewer-ubuntu-latest-amd64-nightly)
2020
* iOS, iPad OS, visionOS (as an iPad app) on [TestFlight](https://testflight.apple.com/join/0WzabeP7)
2121

2222
## Command Line Viewer
2323

2424
```
25-
./vulkan_splatting_viewer {OPTIONS} [scene]
25+
./3dgs_cpp_viewer {OPTIONS} [scene]
2626
2727
Vulkan Splatting
2828

‎apps/apple/VulkanSplatting/VulkanSplatting-Bridging-Header.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use this file to import your target's public headers that you would like to expose to Swift.
33
//
44

5-
#include "VulkanSplatting.h"
5+
#include "3dgs.h"
66
#include <memory>
77
#include <iostream>
88

‎apps/apple/VulkanSplatting/VulkanSplatting.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
B0EA8AA72BA302E6003B92F7 /* QueryManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryManager.cpp; sourceTree = "<group>"; };
9191
B0EA8AA82BA302E6003B92F7 /* DescriptorSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DescriptorSet.h; sourceTree = "<group>"; };
9292
B0EA8AA92BA302E6003B92F7 /* VulkanContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VulkanContext.cpp; sourceTree = "<group>"; };
93-
B0EA8AC82BA3034B003B92F7 /* VulkanSplatting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VulkanSplatting.h; path = ../../../include/vulkan_splatting/VulkanSplatting.h; sourceTree = "<group>"; };
93+
B0EA8AC82BA3034B003B92F7 /* 3dgs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 3dgs.h; path = ../../../include/vulkan_splatting/3dgs.h; sourceTree = "<group>"; };
9494
B0EA8ACB2BA30665003B92F7 /* shaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shaders.h; sourceTree = "<group>"; };
9595
B0EA8DC52BA30916003B92F7 /* MoltenVK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MoltenVK.xcframework; path = ../MoltenVK/dynamic/MoltenVK.xcframework; sourceTree = "<group>"; };
9696
B0EA900A2BA30CED003B92F7 /* vec4.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vec4.hpp; sourceTree = "<group>"; };
@@ -594,7 +594,7 @@
594594
B0608E4E2BA55BBB00CE9114 /* VulkanSplatting.cpp */,
595595
B0EA924B2BA30EA2003B92F7 /* DummyGUIManager.cpp */,
596596
B0EA8ACB2BA30665003B92F7 /* shaders.h */,
597-
B0EA8AC82BA3034B003B92F7 /* VulkanSplatting.h */,
597+
B0EA8AC82BA3034B003B92F7 /* 3dgs.h */,
598598
B0EA8A772BA302E6003B92F7 /* GSScene.cpp */,
599599
B0EA8A7A2BA302E6003B92F7 /* GSScene.h */,
600600
B0EA8A792BA302E6003B92F7 /* GUIManager.h */,

‎apps/viewer/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cmake_minimum_required(VERSION 3.26)
2-
project(vulkan_splatting_viewer)
2+
project(3dgs_cpp_viewer)
33

4-
add_executable(vulkan_splatting_viewer main.cpp)
4+
add_executable(3dgs_cpp_viewer main.cpp)
55

6-
target_include_directories(vulkan_splatting_viewer PRIVATE third_party)
6+
target_include_directories(3dgs_cpp_viewer PRIVATE third_party)
77

8-
target_link_libraries(vulkan_splatting_viewer PRIVATE
8+
target_link_libraries(3dgs_cpp_viewer PRIVATE
99
libenvpp::libenvpp
10-
vulkan_splatting)
10+
3dgs_cpp)

‎apps/viewer/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <iostream>
33
#include <libenvpp/env.hpp>
44

5-
#include "VulkanSplatting.h"
5+
#include "3dgs.h"
66
#include "args.hxx"
77
#include "spdlog/spdlog.h"
88

include/vulkan_splatting/VulkanSplatting.h renamed to include/3dgs/3dgs.h

File renamed without changes.

src/VulkanSplatting.cpp renamed to src/3dgs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "VulkanSplatting.h"
1+
#include "3dgs.h"
22
#include "Renderer.h"
33

44
#ifdef VKGS_ENABLE_GLFW

‎src/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.26)
2-
project(vulkan_splatting)
2+
project(3dgs_cpp)
33

44
add_subdirectory(shaders)
55

@@ -21,14 +21,14 @@ file(GLOB SOURCE
2121
# Remove DummyGUIManager.cpp from source list
2222
list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/DummyGUIManager.cpp)
2323

24-
add_library(vulkan_splatting STATIC
24+
add_library(3dgs_cpp STATIC
2525
${SOURCE}
2626
${EXTERNAL_SOURCE}
2727
)
2828

29-
target_include_directories(vulkan_splatting
29+
target_include_directories(3dgs_cpp
3030
PUBLIC
31-
${CMAKE_SOURCE_DIR}/include/vulkan_splatting
31+
${CMAKE_SOURCE_DIR}/include/3dgs
3232
PRIVATE
3333
third_party
3434
${Vulkan_INCLUDE_DIRS}
@@ -40,9 +40,9 @@ target_include_directories(vulkan_splatting
4040
${CMAKE_BINARY_DIR}/shaders
4141
)
4242

43-
add_dependencies(vulkan_splatting shaders)
43+
add_dependencies(3dgs_cpp shaders)
4444

45-
target_link_libraries(vulkan_splatting PUBLIC Vulkan::Vulkan glfw spdlog::spdlog)
45+
target_link_libraries(3dgs_cpp PUBLIC Vulkan::Vulkan glfw spdlog::spdlog)
4646
if (UNIX)
47-
target_link_libraries(vulkan_splatting PUBLIC ${CMAKE_DL_LIBS})
47+
target_link_libraries(3dgs_cpp PUBLIC ${CMAKE_DL_LIBS})
4848
endif ()

0 commit comments

Comments
 (0)