backend-infra-engineer: Release 0.2.2 snapshot

Author: scawful

.gitignore

@@ -4,19 +4,7 @@ build/
 .vscode/
 disasm/
 src/etc
-src/lib/SDL2
-src/lib/cmake
-src/lib/GL
-src/lib/abseil-cpp
-src/lib/libGLEW.2.2.0.dylib
-src/lib/libGLEW.2.2.dylib
-src/lib/libGLEW.a
-src/lib/libGLEW.dylib
-src/lib/libSDL2_test.a
-src/lib/libSDL2-2.0.0.dylib
-src/lib/libSDL2.a
-src/lib/libSDL2.dylib
-src/lib/libSDL2main.a
+src/lib/
 checks.json
 assets/lib/libasar.dll
 cmake/yaze.plist.in
@@ -29,4 +17,5 @@ assets/asm/EditorCore.asm
 src/app/emu/cpu/internal/old_cpu.cc
 build-windows
 src/lib/libpng
-src/lib/zlib
+src/lib/zlib
+assets/layouts/ow_toolset.zeml

.gitmodules

@@ -1,12 +1,6 @@
 [submodule "src/lib/imgui"]
 	path = src/lib/imgui
 	url = https://github.com/ocornut/imgui.git
-[submodule "src/lib/ImGuiFileDialog"]
-	path = src/lib/ImGuiFileDialog
-	url = https://github.com/aiekick/ImGuiFileDialog.git
-[submodule "src/lib/ImGuiColorTextEdit"]
-	path = src/lib/ImGuiColorTextEdit
-	url = https://github.com/BalazsJako/ImGuiColorTextEdit.git
 [submodule "assets/asm/alttp-hacker-workspace"]
 	path = assets/asm/alttp-hacker-workspace
 	url = https://github.com/scawful/alttp-hacker-workspace.git

CMakeLists.txt

@@ -1,9 +1,10 @@
 # Yet Another Zelda3 Editor
 # by scawful
 cmake_minimum_required(VERSION 3.10)
-project(yaze VERSION 0.2.0
+project(yaze VERSION 0.2.2
              DESCRIPTION "Yet Another Zelda3 Editor"
              LANGUAGES CXX)
+configure_file(src/yaze_config.h.in yaze_config.h)
 
 # Build Flags
 set(YAZE_BUILD_APP ON)
@@ -18,7 +19,7 @@ set(YAZE_INSTALL_LIB OFF)
 add_definitions("-DYAZE_LIB_PNG=1")
 
 # C++ Standard and CMake Specifications
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -28,11 +29,19 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 set(BUILD_SHARED_LIBS OFF)
 set(CMAKE_FIND_FRAMEWORK LAST)
 set(CMAKE_SHARED_MODULE_PREFIX "")
+
+if (UNIX)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dlinux -Dstricmp=strcasecmp")
+endif()
+
 if (MACOS)
   set(CMAKE_INSTALL_PREFIX /usr/local)
 endif()
 
+if (WIN32)
+  include(cmake/vcpkg.cmake)
+endif()
+
 # Abseil Standard Specifications
 include(cmake/absl.cmake)
 

Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = "yaze"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "0.2.0"
+PROJECT_NUMBER         = "0.2.2"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1284,7 +1284,7 @@ ALPHABETICAL_INDEX     = YES
 # after removing the prefix.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
-IGNORE_PREFIX          =
+IGNORE_PREFIX          = googletest
 
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output

cmake/absl.cmake

@@ -1,14 +1,14 @@
 if (MINGW)
   add_subdirectory(src/lib/abseil-cpp)
 else()
-find_package(absl)
+  find_package(absl)
 endif()
 set(ABSL_PROPAGATE_CXX_STD ON)
 set(ABSL_CXX_STANDARD 17)
 set(ABSL_USE_GOOGLETEST_HEAD ON)
 set(ABSL_ENABLE_INSTALL ON)
 set(
-  ABSL_TARGETS   
+  ABSL_TARGETS
   absl::strings
   absl::flags
   absl::status
@@ -21,4 +21,4 @@ set(
   absl::raw_logging_internal
   absl::failure_signal_handler
   absl::flat_hash_map
-)
+)

cmake/imgui.cmake

@@ -4,19 +4,9 @@ file(GLOB IMGUI_SOURCES ${IMGUI_PATH}/*.cpp)
 add_library("ImGui" STATIC ${IMGUI_SOURCES})
 target_include_directories("ImGui" PUBLIC ${IMGUI_PATH})
 target_include_directories(ImGui PUBLIC ${SDL2_INCLUDE_DIR})
-target_compile_definitions(ImGui PUBLIC 
+target_compile_definitions(ImGui PUBLIC
   IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h>  GL_GLEXT_PROTOTYPES=1)
 
-set(IMGUI_FILE_DLG_PATH ${CMAKE_SOURCE_DIR}/src/lib/ImGuiFileDialog)
-file(GLOB IMGUI_FILE_DLG_SOURCES ${IMGUI_FILE_DLG_PATH}/*.cpp)
-add_library("ImGuiFileDialog" STATIC ${IMGUI_FILE_DLG_SOURCES})
-target_include_directories(ImGuiFileDialog PUBLIC ${IMGUI_PATH}  ${CMAKE_SOURCE_DIR}/src/lib)
-
-set(IMGUI_COLOR_TEXT_EDIT_PATH ${CMAKE_SOURCE_DIR}/src/lib/ImGuiColorTextEdit)
-file(GLOB IMGUI_COLOR_TEXT_EDIT_SOURCES ${IMGUI_COLOR_TEXT_EDIT_PATH}/*.cpp)
-add_library("ImGuiColorTextEdit" STATIC ${IMGUI_COLOR_TEXT_EDIT_SOURCES})
-target_include_directories(ImGuiColorTextEdit PUBLIC ${IMGUI_PATH} ${CMAKE_SOURCE_DIR}/src/lib)
-
 set(IMGUI_TEST_ENGINE_PATH ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine/imgui_test_engine)
 file(GLOB IMGUI_TEST_ENGINE_SOURCES ${IMGUI_TEST_ENGINE_PATH}/*.cpp)
 add_library("ImGuiTestEngine" STATIC ${IMGUI_TEST_ENGINE_SOURCES})
@@ -25,16 +15,14 @@ target_link_libraries(ImGuiTestEngine PUBLIC ImGui)
 
 set(
   IMGUI_SRC
-  ${IMGUI_PATH}/imgui.cpp 
+  ${IMGUI_PATH}/imgui.cpp
   ${IMGUI_PATH}/imgui_demo.cpp
-  ${IMGUI_PATH}/imgui_draw.cpp 
+  ${IMGUI_PATH}/imgui_draw.cpp
   ${IMGUI_PATH}/imgui_widgets.cpp
   ${IMGUI_PATH}/backends/imgui_impl_sdl2.cpp
-  ${IMGUI_PATH}/backends/imgui_impl_sdlrenderer2.cpp 
+  ${IMGUI_PATH}/backends/imgui_impl_sdlrenderer2.cpp
   ${IMGUI_PATH}/misc/cpp/imgui_stdlib.cpp
-  ${IMGUI_FILE_DLG_PATH}/ImGuiFileDialog.cpp
-  ${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp
 )
 
 # For integration test
-add_definitions("-DIMGUI_ENABLE_TEST_ENGINE -DIMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL=1")
+add_definitions("-DIMGUI_ENABLE_TEST_ENGINE -DIMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL=1")

cmake/sdl2.cmake

@@ -9,19 +9,8 @@ set(SDL_TARGETS SDL2::SDL2)
 
 if(WIN32 OR MINGW)
     list(PREPEND SDL_TARGETS SDL2::SDL2main ws2_32)
-    add_definitions(-DSDL_MAIN_HANDLED)
+    add_definitions("-DSDL_MAIN_HANDLED")
 endif()
 
 # libpng
-if (MINGW)
-  set(ZLIB_ROOT ${CMAKE_SOURCE_DIR}/build-windows/src/lib/zlib)
-  set(ZLIB_LIBRARY ${CMAKE_SOURCE_DIR}/build-windows/lib/libzlib.dll.a)
-  include_directories(${CMAKE_SOURCE_DIR}/src/lib/zlib ${CMAKE_SOURCE_DIR}/src/lib/libpng)
-  set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/lib/zlib)
-  set(YAZE_BUILD_PYTHON OFF)
-  set(YAZE_BUILD_EXTENSIONS OFF)
-  add_subdirectory(src/lib/zlib)
-  add_subdirectory(src/lib/libpng)
-else()
-  find_package(PNG REQUIRED)
-endif()
+find_package(PNG REQUIRED)

cmake/vcpkg.cmake

@@ -0,0 +1,6 @@
+
+add_definitions("-DMICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS=0")
+
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE dynamic)

docs/asm-style-guide.md

@@ -23,13 +23,12 @@ Custom assembly code applied to the game should be included through the `yaze.as
 ## File Structure
 
 - **File Extension**: Use `.asm` as the file extension for 65816 assembly files.
-- **Header Comments**: Include a header comment at the beginning of each file describing its purpose and the author. 
+- **Header Comments**: Include a header comment at the beginning of each file describing its purpose and the author.
 
 Example:
 
 ```asm
 ; =========================================================
-; File: my_file.asm
 ; Purpose: [Brief description of the file’s functionality]
 ; Author: [Your Name]
 ; =========================================================
@@ -68,11 +67,10 @@ Sprite_Minecart_Main:
 }
 ```
 
-
 ## Comments
 
 - **Purpose**: Comments should explain why the code exists and what it is intended to do, especially for complex logic.
-- **Placement**: 
+- **Placement**:
   - Comments can be placed above the code block they describe for longer explanations.
   - Inline comments can be used for single lines of code where the purpose might not be immediately clear.
 - **Clarity**: Avoid stating the obvious. Focus on explaining the logic rather than restating the code.
@@ -83,22 +81,6 @@ Example:
 LDA $22 : SEC : SBC $3F : STA $31   ; Adjust X position for camera movement
 ```
 
-## Directives
-
-- **Organization**: Use `%macro`, `include`, and other Asar directives in a structured manner, keeping related directives grouped together.
-- **Usage**: Ensure all directives are used consistently throughout the codebase, following the naming conventions and formatting rules established.
-
-Example:
-
-```asm
-%macro InitMovement
-    LDA.b $22 : STA.b $3F
-    LDA.b $23 : STA.b $41
-    LDA.b $20 : STA.b $3E
-    LDA.b $21 : STA.b $40
-endmacro
-```
-
 ## Instructions
 
 - **Single Line Instructions**: Combine multiple instructions on a single line using colons (`:`) where appropriate for related operations.
@@ -121,11 +103,11 @@ Example:
 
 ```asm
 %macro HandlePlayerCamera
-    LDA $22 : SEC : SBC $3F : STA $31
-    LDA $20 : SEC : SBC $3E : STA $30
-    JSL Link_HandleMovingAnimation_FullLongEntry
-    JSL HandleIndoorCameraAndDoors
-    RTS
+  LDA $22 : SEC : SBC $3F : STA $31
+  LDA $20 : SEC : SBC $3E : STA $30
+  JSL Link_HandleMovingAnimation_FullLongEntry
+  JSL HandleIndoorCameraAndDoors
+  RTS
 endmacro
 ```
 
@@ -137,12 +119,12 @@ endmacro
 Example:
 
 ```asm
-.loop_start
-    LDA $00 : CMP #$10 : BEQ .end_loop
+  .loop_start
+  LDA $00 : CMP #$10 : BEQ .end_loop
     INC $00
     BRA .loop_start
-.end_loop
-    RTS
+  .end_loop
+  RTS
 ```
 
 ## Data Structures
@@ -155,10 +137,10 @@ Example:
 ```asm
 .DirectionTileLookup
 {
-    db $02, $00, $04, $00 ; North
-    db $00, $00, $03, $01 ; East
-    db $00, $02, $00, $04 ; South
-    db $03, $01, $00, $00 ; West
+  db $02, $00, $04, $00 ; North
+  db $00, $00, $03, $01 ; East
+  db $00, $02, $00, $04 ; South
+  db $03, $01, $00, $00 ; West
 }
 ```
 
@@ -206,7 +188,6 @@ AncillaAdd_Hookshot:
 - **Logical Grouping**: Organize code into logical sections, with related routines and macros grouped together.
 - **Separation of Concerns**: Ensure that each section of code is responsible for a specific task or set of related tasks, avoiding tightly coupled code.
 - **Modularity**: Write code in a modular way, making it easier to reuse and maintain.
-- **Status Registers and Stack Operations**: Indent code blocks when using status register operations (REP, SEP, PHX, PLX, etc.) to improve readability.
 
 Example:
 
@@ -216,22 +197,20 @@ Example:
 ; =========================================================
 Sprite_Minecart_Main:
 {
-    JSR HandleTileDirections
-    JSR HandleDynamicSwitchTileDirections
-    PHX
-      JSR HandleMinecartMovement
-    PLX
-
-    REP #$20
-      LDA !SpriteDirection : STA $00
-    SEP #$20
-    RTS
+  PHX
+  JSR HandleMinecartMovement
+  PLX
+
+  REP #$20
+  LDA !SpriteDirection : STA $00
+  SEP #$20
+  RTS
 }
 ```
 
 ## Custom Code
 
-- **Integration**: Include custom assembly code in the `yaze.asm` file to ensure it is applied correctly to the ROM. The module should include a define and conditional statement to allow users to disable the module if needed. 
+- **Integration**: Include custom assembly code in the `yaze.asm` file to ensure it is applied correctly to the ROM. The module should include a define and conditional statement to allow users to disable the module if needed.
 
 Example:
 
@@ -241,4 +220,4 @@ Example:
 if !YAZE_CUSTOM_MOSAIC != 0
   incsrc "mosaic_change.asm"
 endif
-```
+```