Rename to Kaizen internally

This commit is contained in:
SimoneN64
2023-06-04 21:34:14 +02:00
parent 94ce40429f
commit 1ed2506523
7 changed files with 28 additions and 28 deletions

View File

@@ -17,7 +17,7 @@ jobs:
cmake -B build cmake -B build
cd build cd build
sudo make install sudo make install
- name: Build Gadolinium - name: Build Kaizen
run: | run: |
cmake \ cmake \
-G Ninja \ -G Ninja \
@@ -28,11 +28,11 @@ jobs:
- name: Collect artifacts - name: Collect artifacts
run: | run: |
mkdir upload mkdir upload
cp -r build/{gadolinium,resources} upload cp -r build/{kaizen,resources} upload
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@master uses: actions/upload-artifact@master
with: with:
name: gadolinium-linux name: kaizen-linux
path: upload path: upload
if-no-files-found: error if-no-files-found: error
build-windows: build-windows:
@@ -46,14 +46,14 @@ jobs:
vcpkg install sdl2[vulkan]:x64-windows vcpkg install sdl2[vulkan]:x64-windows
vcpkg install fmt:x64-windows vcpkg install fmt:x64-windows
vcpkg install nlohmann-json:x64-windows vcpkg install nlohmann-json:x64-windows
- name: Build Gadolinium - name: Build Kaizen
run: | run: |
cmake -B build -T clangcl -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -S src cmake -B build -T clangcl -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -S src
cmake --build build --config Release cmake --build build --config Release
- name: Collect artifacts - name: Collect artifacts
run: | run: |
mkdir upload mkdir upload
cp build/Release/gadolinium.exe upload cp build/Release/kaizen.exe upload
mkdir upload/resources mkdir upload/resources
cp build/resources/* upload/resources cp build/resources/* upload/resources
cp build/Release/SDL2.dll upload cp build/Release/SDL2.dll upload
@@ -61,6 +61,6 @@ jobs:
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@master uses: actions/upload-artifact@master
with: with:
name: gadolinium-windows name: kaizen-windows
path: upload path: upload
if-no-files-found: error if-no-files-found: error

View File

@@ -1,7 +1,7 @@
# Gadolinium # Kaizen
[![CodeFactor](https://www.codefactor.io/repository/github/SimoneN64/Gadolinium/badge/master)](https://www.codefactor.io/repository/github/SimoneN64/Gadolinium/overview/master) [![CodeFactor](https://www.codefactor.io/repository/github/SimoneN64/Kaizen/badge/master)](https://www.codefactor.io/repository/github/SimoneN64/Kaizen/overview/master)
[![build](https://github.com/SimoneN64/Gadolinium/actions/workflows/build.yml/badge.svg)](https://github.com/SimoneN64/Gadolinium/actions/workflows/build.yml) [![build](https://github.com/SimoneN64/Kaizen/actions/workflows/build.yml/badge.svg)](https://github.com/SimoneN64/Kaizen/actions/workflows/build.yml)
Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/SimoneN64/shibumi)". Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/SimoneN64/shibumi)".
@@ -9,13 +9,13 @@ Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/SimoneN64/shibu
## Pre-built binaries ## Pre-built binaries
| Release | | Release |
|------------------------------------------------------------------------------------------------------| |--------------------------------------------------------------------------------------------|
| [Windows](https://nightly.link/SimoneN64/Gadolinium/workflows/build/master/gadolinium-windows.zip) | | [Windows](https://nightly.link/SimoneN64/Kaizen/workflows/build/master/kaizen-windows.zip) |
| [ Linux ](https://nightly.link/SimoneN64/Gadolinium/workflows/build/master/gadolinium-linux.zip) | | [ Linux ](https://nightly.link/SimoneN64/Kaizen/workflows/build/master/kaizen-linux.zip) |
## Build instructions: ## Build instructions:
First clone the repository: `git clone --recursive https://github.com/SimoneN64/Gadolinium` First clone the repository: `git clone --recursive https://github.com/SimoneN64/Kaizen`
### Windows ### Windows
@@ -28,7 +28,7 @@ Dependencies:
- nlohmann-json (install it by making sure that you're choosing the x64-windows triplet: `vcpkg install nlohmann-json:x64-windows`) - nlohmann-json (install it by making sure that you're choosing the x64-windows triplet: `vcpkg install nlohmann-json:x64-windows`)
``` ```
cd path/to/gadolinium cd path/to/kaizen
mkdir build mkdir build
cd build cd build
cmake -T clangcl -DCMAKE_TOOLCHAIN_FILE=path/to/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -S ../src cmake -T clangcl -DCMAKE_TOOLCHAIN_FILE=path/to/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -S ../src
@@ -46,7 +46,7 @@ Dependencies:
- nlohmann-json - nlohmann-json
``` ```
cd path/to/gadolinium cd path/to/kaizen
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_BUILD_TYPE=Release -S ../src cmake -DCMAKE_BUILD_TYPE=Release -S ../src
@@ -55,7 +55,7 @@ cmake --build . --config Release
## Running: ## Running:
``` ```
./path/to/gadolinium [ROM] [Mupen Movie] ./path/to/kaizen [ROM] [Mupen Movie]
``` ```
Your GPU needs to support Vulkan 1.1+, because the RDP is implemented via [ParaLLEl-RDP](https://github.com/Themaister/parallel-rdp). Your GPU needs to support Vulkan 1.1+, because the RDP is implemented via [ParaLLEl-RDP](https://github.com/Themaister/parallel-rdp).

View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
project(gadolinium) project(kaizen)
set(BUILD_SHARED_LIBS OFF) set(BUILD_SHARED_LIBS OFF)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
@@ -59,7 +59,7 @@ add_subdirectory(../external/imgui imgui)
add_subdirectory(../external/nativefiledialog-extended nfd) add_subdirectory(../external/nativefiledialog-extended nfd)
add_subdirectory(../external/parallel-rdp parallel-rdp) add_subdirectory(../external/parallel-rdp parallel-rdp)
add_executable(gadolinium main.cpp) add_executable(kaizen main.cpp)
file(COPY ${PROJECT_SOURCE_DIR}/../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/) file(COPY ${PROJECT_SOURCE_DIR}/../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/)
file(REMOVE file(REMOVE
@@ -67,11 +67,11 @@ file(REMOVE
${PROJECT_BINARY_DIR}/resources/shader.frag ${PROJECT_BINARY_DIR}/resources/shader.frag
${PROJECT_BINARY_DIR}/resources/shader.vert) ${PROJECT_BINARY_DIR}/resources/shader.vert)
target_link_libraries(gadolinium PUBLIC frontend frontend-imgui target_link_libraries(kaizen PUBLIC frontend frontend-imgui
discord-rpc imgui nfd parallel-rdp backend fmt::fmt nlohmann_json::nlohmann_json core jit registers interpreter mmio rsp SDL2::SDL2main SDL2::SDL2) discord-rpc imgui nfd parallel-rdp backend fmt::fmt nlohmann_json::nlohmann_json core jit registers interpreter mmio rsp SDL2::SDL2main SDL2::SDL2)
if(WIN32) if(WIN32)
target_compile_definitions(gadolinium PUBLIC NOMINMAX _CRT_SECURE_NO_WARNINGS) target_compile_definitions(kaizen PUBLIC NOMINMAX _CRT_SECURE_NO_WARNINGS)
if(MSVC) if(MSVC)
target_compile_options(parallel-rdp PUBLIC /EHa) target_compile_options(parallel-rdp PUBLIC /EHa)
endif() endif()

View File

@@ -31,7 +31,7 @@ inline void UpdateRPC(State state, const std::string& game = "") {
presence.details = textDetails.c_str(); presence.details = textDetails.c_str();
presence.state = textState.c_str(); presence.state = textState.c_str();
presence.startTimestamp = time(nullptr); presence.startTimestamp = time(nullptr);
presence.largeImageText = "Gadolinium"; presence.largeImageText = "Kaizen";
presence.largeImageKey = "logo"; presence.largeImageKey = "logo";
Discord_UpdatePresence(&presence); Discord_UpdatePresence(&presence);
} }

View File

@@ -31,9 +31,9 @@ void Window::InitSDL() {
SDL_Init(SDL_INIT_EVERYTHING); SDL_Init(SDL_INIT_EVERYTHING);
n64::InitAudio(); n64::InitAudio();
windowTitle = "Gadolinium"; windowTitle = "Kaizen";
window = SDL_CreateWindow( window = SDL_CreateWindow(
"Gadolinium", "Kaizen",
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
1024, 768, 1024, 768,
@@ -159,7 +159,7 @@ void Window::LoadROM(n64::Core& core, const std::string &path) {
} }
Util::UpdateRPC(Util::Playing, gameName); Util::UpdateRPC(Util::Playing, gameName);
windowTitle = "Gadolinium - " + gameName; windowTitle = "Kaizen - " + gameName;
shadowWindowTitle = windowTitle; shadowWindowTitle = windowTitle;
SDL_SetWindowTitle(window, windowTitle.c_str()); SDL_SetWindowTitle(window, windowTitle.c_str());
@@ -199,7 +199,7 @@ void Window::RenderMainMenuBar(n64::Core &core) {
LoadROM(core, core.rom); LoadROM(core, core.rom);
} }
if (ImGui::MenuItem("Stop")) { if (ImGui::MenuItem("Stop")) {
windowTitle = "Gadolinium"; windowTitle = "Kaizen";
core.rom.clear(); core.rom.clear();
Util::UpdateRPC(Util::Idling); Util::UpdateRPC(Util::Idling);
SDL_SetWindowTitle(window, windowTitle.c_str()); SDL_SetWindowTitle(window, windowTitle.c_str());

View File

@@ -20,7 +20,7 @@ struct Window {
private: private:
bool showSettings = false; bool showSettings = false;
SDL_Window* window{}; SDL_Window* window{};
std::string windowTitle{"Gadolinium"}; std::string windowTitle{"Kaizen"};
std::string shadowWindowTitle{windowTitle}; std::string shadowWindowTitle{windowTitle};
std::string gameName{}; std::string gameName{};
void InitSDL(); void InitSDL();