From b09e323229a6612f9ebb826bdb3729774001ee20 Mon Sep 17 00:00:00 2001 From: Metehan Gezer Date: Sat, 20 Apr 2024 16:44:30 +0300 Subject: [PATCH] rename the game --- .idea/.gitignore | 2 ++ .idea/.name | 2 +- .idea/vcs.xml | 4 +++ CMakeLists.txt | 70 ++++++++++++++++++-------------------- src/app/main.cpp | 6 ++-- src/canvas/menu_canvas.cpp | 2 +- znet | 2 +- 7 files changed, 47 insertions(+), 41 deletions(-) diff --git a/.idea/.gitignore b/.idea/.gitignore index 26d3352..8f00030 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,3 +1,5 @@ # Default ignored files /shelf/ /workspace.xml +# GitHub Copilot persisted chat sessions +/copilot/chatSessions diff --git a/.idea/.name b/.idea/.name index f851d64..f4aa7fe 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -ChessTacos \ No newline at end of file +PixelChess \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 77ad88a..be1ec24 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,10 @@ + + + + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c765071..e4dad50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,12 +4,13 @@ set(GLIST_CXX_STANDARD 20) set(GLIST_CXX_STANDARD_REQUIRED True) ########## PROJECT NAME ########## -set(APP_NAME ChessTacos) +set(APP_NAME PixelChess) ########## USED PLUGINS LIST ########## -set(PLUGINS) - +if(EMSCRIPTEN) +set(PLUGINS gipWeb) +endif() ################################################## # DO NOT CHANGE BELOW @@ -21,49 +22,46 @@ if(NOT DEFINED CMAKE_SUPPRESS_DEVELOPER_WARNINGS) endif() -########## WINDOWS COMPILER PATH ########## +########## ENGINE CONFIGURATION ########## +EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE DEVICEARCHITECTURE ) +message( STATUS "Architecture: ${DEVICEARCHITECTURE}" ) + +set(GLIST_CXX_FLAGS_RELEASE) +set(GLIST_CXX_FLAGS_DEBUG) + # Clang compiler definition for Windows. Do not change this value for other OS. # For UNIX like systems, configure the compiler via OS commands. -if(WIN32) +if(WIN32 AND NOT DEFINED EMSCRIPTEN) if(NOT DEFINED CMAKE_C_COMPILER) - set(CMAKE_C_COMPILER "${CMAKE_SOURCE_DIR}/../../zbin/glistzbin-win64/clang64/bin/clang.exe") + set(CMAKE_C_COMPILER "${CMAKE_SOURCE_DIR}/../../zbin/glistzbin-win64/clang64/bin/clang.exe") endif() if(NOT DEFINED CMAKE_CXX_COMPILER) - set(CMAKE_CXX_COMPILER "${CMAKE_SOURCE_DIR}/../../zbin/glistzbin-win64/clang64/bin/clang++.exe") + set(CMAKE_CXX_COMPILER "${CMAKE_SOURCE_DIR}/../../zbin/glistzbin-win64/clang64/bin/clang++.exe") endif() endif(WIN32) - -########## MACOS ARCHITECTURE ########## -EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE DEVICEARCHITECTURE ) -message( STATUS "Architecture: ${DEVICEARCHITECTURE}" ) - -set(GLIST_CXX_FLAGS_RELEASE) -set(GLIST_CXX_FLAGS_DEBUG) - -if(APPLE) -if(NOT ${DEVICEARCHITECTURE} STREQUAL "arm64") - set(GLIST_CXX_FLAGS_RELEASE "-march=x86-64") - set(GLIST_CXX_FLAGS_DEBUG "-march=x86-64") - set(SYS_NAME "macos-x86_64") - set(SYS_PATH "/usr/local") - set(BREW_PATH "${SYS_PATH}/opt") - set(SYS_INC_PATH "${SYS_PATH}/include") - set(CMAKE_C_COMPILER "/usr/local/bin/clang") - set(CMAKE_CXX_COMPILER "/usr/local/bin/clang++") - set(ENGINE_USE_SYMLINKS ON) -else() - set(SYS_NAME "macos") - set(SYS_PATH "/opt/homebrew") - set(BREW_PATH "${SYS_PATH}/opt") - set(SYS_INC_PATH "${SYS_PATH}/include") - set(CMAKE_C_COMPILER "${BREW_PATH}/llvm/bin/clang") - set(CMAKE_CXX_COMPILER "${BREW_PATH}/llvm/bin/clang++") - set(ENGINE_USE_SYMLINKS ON) -endif() +if(APPLE AND NOT DEFINED EMSCRIPTEN) + if(NOT ${DEVICEARCHITECTURE} STREQUAL "arm64") + set(GLIST_CXX_FLAGS_RELEASE "-march=x86-64") + set(GLIST_CXX_FLAGS_DEBUG "-march=x86-64") + set(SYS_NAME "macos-x86_64") + set(SYS_PATH "/usr/local") + set(BREW_PATH "${SYS_PATH}/opt") + set(SYS_INC_PATH "${SYS_PATH}/include") + set(CMAKE_C_COMPILER "/usr/local/bin/clang") + set(CMAKE_CXX_COMPILER "/usr/local/bin/clang++") + set(ENGINE_USE_SYMLINKS ON) + else() + set(SYS_NAME "macos") + set(SYS_PATH "/opt/homebrew") + set(BREW_PATH "${SYS_PATH}/opt") + set(SYS_INC_PATH "${SYS_PATH}/include") + set(CMAKE_C_COMPILER "${BREW_PATH}/llvm/bin/clang") + set(CMAKE_CXX_COMPILER "${BREW_PATH}/llvm/bin/clang++") + set(ENGINE_USE_SYMLINKS ON) + endif() endif(APPLE) - ########## PATHS AND VARIABLES ########## set(APP_DIR ${CMAKE_SOURCE_DIR}) project (${APP_NAME}) diff --git a/src/app/main.cpp b/src/app/main.cpp index 0284ca3..4d77a5e 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -21,12 +21,14 @@ #include int WINAPI WinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpszArgument, int nFunsterStil) { - gStartEngine(new gApp(), "Chess Tacos (Windows)", G_WINDOWMODE_APP, 1280, 720); + gStartEngine(new gApp(), "Pixel Chess (Windows)", G_WINDOWMODE_APP, 1280, 720); return 0; } #else + + int main(int argc, char **argv) { - gStartEngine(new gApp(argc, argv), "Chess Tacos", G_WINDOWMODE_APP, 1280, 720); + gStartEngine(new gApp(argc, argv), "Pixel Chess", G_WINDOWMODE_APP, 1280, 720); return 0; } #endif diff --git a/src/canvas/menu_canvas.cpp b/src/canvas/menu_canvas.cpp index 3cf5d3c..66f7d78 100644 --- a/src/canvas/menu_canvas.cpp +++ b/src/canvas/menu_canvas.cpp @@ -67,7 +67,7 @@ void MenuCanvas::draw() { host_button_->Draw(); quit_button_->Draw(); // logo - RenderUtil::DrawFont(&logo_font_, "Chess Tacos", getWidth() / 2 - logo_font_.getStringWidth("Chess Tacos") / 2, 150, 8); + RenderUtil::DrawFont(&logo_font_, "Pixel Chess", getWidth() / 2 - logo_font_.getStringWidth("Pixel Chess") / 2, 150, 8); RenderUtil::DrawFont(RenderUtil::font_, kVersion, 0, getHeight() - 10, 0, {1.0f, 1.0f, 1.0f, 0.8f}); setColor(og_color); root_->DrawCursor(); diff --git a/znet b/znet index c9b24e8..dbfd6aa 160000 --- a/znet +++ b/znet @@ -1 +1 @@ -Subproject commit c9b24e8cd929a2f60715d001baacd76ccbf4d0bc +Subproject commit dbfd6aafd60c43f53ad846da29dc977dcbba64ee