From 5240e2ad0dbd699e195020c0f3120361878b724d Mon Sep 17 00:00:00 2001 From: somedevfox Date: Mon, 13 Dec 2021 07:16:36 +0000 Subject: [PATCH] sort things as much as i could(src/ folder) --- CMakeLists.txt | 183 +++++++++++------- assets/AppRun | 0 binding-mri/otherview-binding.cpp | 7 + conanfile.py | 2 +- journal/unix/macOS/Python | Bin patches/mac/CreateBundle.sh | 0 patches/mac/Info.plist.in | 0 patches/mac/oneshot.sh | 0 libraries.rb => scripts/ruby/libraries.rb | 0 mklang.rb => scripts/ruby/mklang.rb | 0 mklangsrc.rb => scripts/ruby/mklangsrc.rb | 0 rpgscript.rb => scripts/ruby/rpgscript.rb | 0 .../shell/build-entrypoint-linux.sh | 0 .../shell/build-entrypoint-windows.bat | 0 cleanup.sh => scripts/shell/cleanup.sh | 0 .../shell/install.command | 0 .../shell/make-appimage.sh | 0 .../shell/make-journal-linux.sh | 0 .../shell/make-linux-dist.sh | 0 .../shell/make-oneshot-linux.sh | 0 .../shell/make-oneshot-mac.command | 0 oclint.sh => scripts/shell/oclint.sh | 0 src/{ => audio/headers}/al-util.h | 0 src/{ => audio/headers}/aldatasource.h | 0 src/{ => audio/headers}/alstream.h | 0 src/{ => audio/headers}/audio.h | 0 src/{ => audio/headers}/audiochannels.h | 0 src/{ => audio/headers}/audiostream.h | 0 src/{ => audio/headers}/soundemitter.h | 0 src/{ => audio/source}/alstream.cpp | 0 src/{ => audio/source}/audio.cpp | 0 src/{ => audio/source}/audiochannels.cpp | 0 src/{ => audio/source}/audiostream.cpp | 0 src/{ => audio/source}/sdlsoundsource.cpp | 0 src/{ => audio/source}/soundemitter.cpp | 0 src/{ => audio/source}/vorbissource.cpp | 0 src/crash-handler.cpp | 59 ++++++ src/crash-handler.h | 11 ++ src/{ => filesystem/headers}/filesystem.h | 0 src/{ => filesystem/headers}/rgssad.h | 0 src/{ => filesystem/source}/filesystem.cpp | 0 src/{ => filesystem/source}/rgssad.cpp | 0 src/{ => graphics/headers}/bitmap.h | 0 src/{ => graphics/headers}/disposable.h | 0 src/{ => graphics/headers}/flashable.h | 0 src/{ => graphics/headers}/font.h | 0 src/{ => graphics/headers}/graphics.h | 0 src/{ => graphics/headers}/scene.h | 0 src/{ => graphics/headers}/sprite.h | 0 src/{ => graphics/headers}/tileatlas.h | 0 src/{ => graphics/headers}/tilemap-common.h | 0 src/{ => graphics/headers}/tilemap.h | 0 src/{ => graphics/source}/autotiles.cpp | 0 src/{ => graphics/source}/bitmap.cpp | 0 src/{ => graphics/source}/font.cpp | 0 src/{ => graphics/source}/graphics.cpp | 0 src/{ => graphics/source}/scene.cpp | 0 src/{ => graphics/source}/sprite.cpp | 0 src/{ => graphics/source}/tileatlas.cpp | 0 src/{ => graphics/source}/tilemap.cpp | 0 src/{ => input/headers}/input.h | 0 src/{ => input/headers}/keybindings.h | 0 src/{ => input/source}/input.cpp | 0 src/{ => input/source}/keybindings.cpp | 0 src/{ => opengl/headers}/gl-debug.h | 0 src/{ => opengl/headers}/gl-fun.h | 0 src/{ => opengl/headers}/gl-meta.h | 0 src/{ => opengl/headers}/gl-util.h | 0 src/{ => opengl/headers}/glstate.h | 0 src/{ => opengl/headers}/plane.h | 0 src/{ => opengl/headers}/quad.h | 0 src/{ => opengl/headers}/quadarray.h | 0 src/{ => opengl/headers}/sdl-util.h | 0 src/{ => opengl/headers}/shader.h | 0 src/{ => opengl/headers}/table.h | 0 src/{ => opengl/headers}/texpool.h | 0 src/{ => opengl/headers}/tilequad.h | 0 src/{ => opengl/headers}/transform.h | 0 src/{ => opengl/headers}/vertex.h | 0 src/{ => opengl/headers}/viewport.h | 0 src/{ => opengl/headers}/window.h | 0 src/{ => opengl/source}/gl-debug.cpp | 0 src/{ => opengl/source}/gl-fun.cpp | 0 src/{ => opengl/source}/gl-meta.cpp | 0 src/{ => opengl/source}/glstate.cpp | 0 src/{ => opengl/source}/plane.cpp | 0 src/{ => opengl/source}/screen.cpp | 0 src/{ => opengl/source}/shader.cpp | 0 src/{ => opengl/source}/table.cpp | 0 src/{ => opengl/source}/texpool.cpp | 0 src/{ => opengl/source}/tilequad.cpp | 0 src/{ => opengl/source}/vertex.cpp | 0 src/{ => opengl/source}/viewport.cpp | 0 src/{ => opengl/source}/window.cpp | 0 src/{ => steam}/steam.cpp | 0 src/{ => steam}/steam.h | 0 src/trstr.h | 54 ------ 97 files changed, 190 insertions(+), 126 deletions(-) mode change 100755 => 100644 assets/AppRun mode change 100755 => 100644 journal/unix/macOS/Python mode change 100755 => 100644 patches/mac/CreateBundle.sh mode change 100755 => 100644 patches/mac/Info.plist.in mode change 100755 => 100644 patches/mac/oneshot.sh rename libraries.rb => scripts/ruby/libraries.rb (100%) rename mklang.rb => scripts/ruby/mklang.rb (100%) mode change 100755 => 100644 rename mklangsrc.rb => scripts/ruby/mklangsrc.rb (100%) mode change 100755 => 100644 rename rpgscript.rb => scripts/ruby/rpgscript.rb (100%) mode change 100755 => 100644 rename build-entrypoint-linux.sh => scripts/shell/build-entrypoint-linux.sh (100%) mode change 100755 => 100644 rename build-entrypoint-windows.bat => scripts/shell/build-entrypoint-windows.bat (100%) rename cleanup.sh => scripts/shell/cleanup.sh (100%) mode change 100755 => 100644 rename install.command => scripts/shell/install.command (100%) mode change 100755 => 100644 rename make-appimage.sh => scripts/shell/make-appimage.sh (100%) mode change 100755 => 100644 rename make-journal-linux.sh => scripts/shell/make-journal-linux.sh (100%) mode change 100755 => 100644 rename make-linux-dist.sh => scripts/shell/make-linux-dist.sh (100%) mode change 100755 => 100644 rename make-oneshot-linux.sh => scripts/shell/make-oneshot-linux.sh (100%) mode change 100755 => 100644 rename make-oneshot-mac.command => scripts/shell/make-oneshot-mac.command (100%) mode change 100755 => 100644 rename oclint.sh => scripts/shell/oclint.sh (100%) mode change 100755 => 100644 rename src/{ => audio/headers}/al-util.h (100%) rename src/{ => audio/headers}/aldatasource.h (100%) rename src/{ => audio/headers}/alstream.h (100%) rename src/{ => audio/headers}/audio.h (100%) rename src/{ => audio/headers}/audiochannels.h (100%) rename src/{ => audio/headers}/audiostream.h (100%) rename src/{ => audio/headers}/soundemitter.h (100%) rename src/{ => audio/source}/alstream.cpp (100%) rename src/{ => audio/source}/audio.cpp (100%) rename src/{ => audio/source}/audiochannels.cpp (100%) rename src/{ => audio/source}/audiostream.cpp (100%) rename src/{ => audio/source}/sdlsoundsource.cpp (100%) rename src/{ => audio/source}/soundemitter.cpp (100%) rename src/{ => audio/source}/vorbissource.cpp (100%) create mode 100644 src/crash-handler.cpp create mode 100644 src/crash-handler.h rename src/{ => filesystem/headers}/filesystem.h (100%) rename src/{ => filesystem/headers}/rgssad.h (100%) rename src/{ => filesystem/source}/filesystem.cpp (100%) rename src/{ => filesystem/source}/rgssad.cpp (100%) rename src/{ => graphics/headers}/bitmap.h (100%) rename src/{ => graphics/headers}/disposable.h (100%) rename src/{ => graphics/headers}/flashable.h (100%) rename src/{ => graphics/headers}/font.h (100%) rename src/{ => graphics/headers}/graphics.h (100%) rename src/{ => graphics/headers}/scene.h (100%) rename src/{ => graphics/headers}/sprite.h (100%) rename src/{ => graphics/headers}/tileatlas.h (100%) rename src/{ => graphics/headers}/tilemap-common.h (100%) rename src/{ => graphics/headers}/tilemap.h (100%) rename src/{ => graphics/source}/autotiles.cpp (100%) rename src/{ => graphics/source}/bitmap.cpp (100%) rename src/{ => graphics/source}/font.cpp (100%) rename src/{ => graphics/source}/graphics.cpp (100%) rename src/{ => graphics/source}/scene.cpp (100%) rename src/{ => graphics/source}/sprite.cpp (100%) rename src/{ => graphics/source}/tileatlas.cpp (100%) rename src/{ => graphics/source}/tilemap.cpp (100%) rename src/{ => input/headers}/input.h (100%) rename src/{ => input/headers}/keybindings.h (100%) rename src/{ => input/source}/input.cpp (100%) rename src/{ => input/source}/keybindings.cpp (100%) rename src/{ => opengl/headers}/gl-debug.h (100%) rename src/{ => opengl/headers}/gl-fun.h (100%) rename src/{ => opengl/headers}/gl-meta.h (100%) rename src/{ => opengl/headers}/gl-util.h (100%) rename src/{ => opengl/headers}/glstate.h (100%) rename src/{ => opengl/headers}/plane.h (100%) rename src/{ => opengl/headers}/quad.h (100%) rename src/{ => opengl/headers}/quadarray.h (100%) rename src/{ => opengl/headers}/sdl-util.h (100%) rename src/{ => opengl/headers}/shader.h (100%) rename src/{ => opengl/headers}/table.h (100%) rename src/{ => opengl/headers}/texpool.h (100%) rename src/{ => opengl/headers}/tilequad.h (100%) rename src/{ => opengl/headers}/transform.h (100%) rename src/{ => opengl/headers}/vertex.h (100%) rename src/{ => opengl/headers}/viewport.h (100%) rename src/{ => opengl/headers}/window.h (100%) rename src/{ => opengl/source}/gl-debug.cpp (100%) rename src/{ => opengl/source}/gl-fun.cpp (100%) rename src/{ => opengl/source}/gl-meta.cpp (100%) rename src/{ => opengl/source}/glstate.cpp (100%) rename src/{ => opengl/source}/plane.cpp (100%) rename src/{ => opengl/source}/screen.cpp (100%) rename src/{ => opengl/source}/shader.cpp (100%) rename src/{ => opengl/source}/table.cpp (100%) rename src/{ => opengl/source}/texpool.cpp (100%) rename src/{ => opengl/source}/tilequad.cpp (100%) rename src/{ => opengl/source}/vertex.cpp (100%) rename src/{ => opengl/source}/viewport.cpp (100%) rename src/{ => opengl/source}/window.cpp (100%) rename src/{ => steam}/steam.cpp (100%) rename src/{ => steam}/steam.h (100%) delete mode 100644 src/trstr.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fb1c6b9..723a8205 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,61 +20,85 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) ## Setup main source ## +set(SRC_AUDIO_HEADER_PATH src/audio/headers) +set(SRC_GRAPHICS_HEADER_PATH src/graphics/headers) +set(SRC_OPENGL_HEADER_PATH src/opengl/headers) +set(SRC_INPUT_HEADER_PATH src/input/headers) +set(SRC_FS_HEADER_PATH src/filesystem/headers) + +set(SRC_AUDIO_SOURCE_PATH src/audio/source) +set(SRC_GRAPHICS_SOURCE_PATH src/graphics/source) +set(SRC_OPENGL_SOURCE_PATH src/opengl/source) +set(SRC_INPUT_SOURCE_PATH src/input/source) +set(SRC_FS_SOURCE_PATH src/filesystem/source) + +set(SRC_STEAM_PATH src/steam) + set(MAIN_HEADERS - src/quadarray.h - src/audio.h + # Audio + ${SRC_AUDIO_HEADER_PATH}/audio.h + ${SRC_AUDIO_HEADER_PATH}/al-util.h + ${SRC_AUDIO_HEADER_PATH}/aldatasource.h + ${SRC_AUDIO_HEADER_PATH}/alstream.h + ${SRC_AUDIO_HEADER_PATH}/audiostream.h + ${SRC_AUDIO_HEADER_PATH}/audiochannels.h + ${SRC_AUDIO_HEADER_PATH}/soundemitter.h + + # Graphics + ${SRC_GRAPHICS_HEADER_PATH}/bitmap.h + ${SRC_GRAPHICS_HEADER_PATH}/graphics.h + ${SRC_GRAPHICS_HEADER_PATH}/disposable.h + ${SRC_GRAPHICS_HEADER_PATH}/font.h + ${SRC_GRAPHICS_HEADER_PATH}/sprite.h + ${SRC_GRAPHICS_HEADER_PATH}/scene.h + ${SRC_GRAPHICS_HEADER_PATH}/tilemap.h + ${SRC_GRAPHICS_HEADER_PATH}/tilemap-common.h + ${SRC_GRAPHICS_HEADER_PATH}/tileatlas.h + + # OpenGL + ${SRC_OPENGL_HEADER_PATH}/glstate.h + ${SRC_OPENGL_HEADER_PATH}/gl-debug.h + ${SRC_OPENGL_HEADER_PATH}/gl-util.h + ${SRC_OPENGL_HEADER_PATH}/gl-fun.h + ${SRC_OPENGL_HEADER_PATH}/gl-meta.h + ${SRC_OPENGL_HEADER_PATH}/quadarray.h + ${SRC_OPENGL_HEADER_PATH}/plane.h + ${SRC_OPENGL_HEADER_PATH}/shader.h + ${SRC_OPENGL_HEADER_PATH}/quad.h + ${SRC_OPENGL_HEADER_PATH}/texpool.h + ${SRC_OPENGL_HEADER_PATH}/tilequad.h + ${SRC_OPENGL_HEADER_PATH}/vertex.h + ${SRC_OPENGL_HEADER_PATH}/window.h + ${SRC_OPENGL_HEADER_PATH}/sdl-util.h + ${SRC_OPENGL_HEADER_PATH}/viewport.h + ${SRC_OPENGL_HEADER_PATH}/table.h + ${SRC_OPENGL_HEADER_PATH}/transform.h + + # Input + ${SRC_INPUT_HEADER_PATH}/input.h + ${SRC_INPUT_HEADER_PATH}/keybindings.h + + # Filesystem + ${SRC_FS_HEADER_PATH}/filesystem.h + ${SRC_FS_HEADER_PATH}/rgssad.h + src/binding.h - src/bitmap.h - src/disposable.h src/etc.h src/etc-internal.h src/eventthread.h src/flashable.h - src/font.h - src/input.h - src/plane.h - src/scene.h - src/sprite.h - src/table.h - src/texpool.h - src/tilequad.h - src/transform.h - src/viewport.h - src/window.h src/serializable.h - src/shader.h - src/glstate.h - src/quad.h - src/tilemap.h - src/tilemap-common.h - src/graphics.h - src/gl-debug.h src/global-ibo.h src/exception.h - src/filesystem.h src/serial-util.h src/intrulist.h src/binding.h - src/gl-util.h src/util.h src/config.h src/settingsmenu.h - src/keybindings.h - src/tileatlas.h src/sharedstate.h - src/al-util.h src/boost-hash.h src/debugwriter.h - src/gl-fun.h - src/gl-meta.h - src/vertex.h - src/soundemitter.h - src/aldatasource.h - src/alstream.h - src/audiostream.h - src/audiochannels.h - src/rgssad.h - src/sdl-util.h src/oneshot.h src/pipe.h chromasdk/RzChromaSDKDefines.h @@ -83,50 +107,62 @@ set(MAIN_HEADERS chromasdk/ChromaApi.h src/i18n.h src/otherview-message.h + src/crash-handler.h ) set(MAIN_SOURCE + # Audio + ${SRC_AUDIO_SOURCE_PATH}/alstream.cpp + ${SRC_AUDIO_SOURCE_PATH}/audiostream.cpp + ${SRC_AUDIO_SOURCE_PATH}/audiochannels.cpp + ${SRC_AUDIO_SOURCE_PATH}/audio.cpp + ${SRC_AUDIO_SOURCE_PATH}/soundemitter.cpp + ${SRC_AUDIO_SOURCE_PATH}/sdlsoundsource.cpp + ${SRC_AUDIO_SOURCE_PATH}/vorbissource.cpp + + # Graphics + ${SRC_GRAPHICS_SOURCE_PATH}/autotiles.cpp + ${SRC_GRAPHICS_SOURCE_PATH}/bitmap.cpp + ${SRC_GRAPHICS_SOURCE_PATH}/graphics.cpp + ${SRC_GRAPHICS_SOURCE_PATH}/font.cpp + ${SRC_GRAPHICS_SOURCE_PATH}/sprite.cpp + ${SRC_GRAPHICS_SOURCE_PATH}/scene.cpp + ${SRC_GRAPHICS_SOURCE_PATH}/tilemap.cpp + ${SRC_GRAPHICS_SOURCE_PATH}/tileatlas.cpp + + # OpenGL + ${SRC_OPENGL_SOURCE_PATH}/glstate.cpp + ${SRC_OPENGL_SOURCE_PATH}/gl-debug.cpp + ${SRC_OPENGL_SOURCE_PATH}/gl-fun.cpp + ${SRC_OPENGL_SOURCE_PATH}/gl-meta.cpp + ${SRC_OPENGL_SOURCE_PATH}/plane.cpp + ${SRC_OPENGL_SOURCE_PATH}/shader.cpp + ${SRC_OPENGL_SOURCE_PATH}/texpool.cpp + ${SRC_OPENGL_SOURCE_PATH}/vertex.cpp + ${SRC_OPENGL_SOURCE_PATH}/tilequad.cpp + ${SRC_OPENGL_SOURCE_PATH}/window.cpp + ${SRC_OPENGL_SOURCE_PATH}/screen.cpp + ${SRC_OPENGL_SOURCE_PATH}/viewport.cpp + ${SRC_OPENGL_SOURCE_PATH}/table.cpp + + # Input + ${SRC_INPUT_SOURCE_PATH}/input.cpp + ${SRC_INPUT_SOURCE_PATH}/keybindings.cpp + + # Filesystem + ${SRC_FS_SOURCE_PATH}/filesystem.cpp + ${SRC_FS_SOURCE_PATH}/rgssad.cpp + src/main.cpp - src/audio.cpp - src/bitmap.cpp src/eventthread.cpp - src/filesystem.cpp - src/font.cpp - src/input.cpp - src/plane.cpp - src/scene.cpp - src/sprite.cpp - src/table.cpp - src/tilequad.cpp - src/viewport.cpp - src/window.cpp - src/texpool.cpp - src/shader.cpp - src/glstate.cpp - src/tilemap.cpp - src/autotiles.cpp - src/graphics.cpp - src/gl-debug.cpp src/etc.cpp src/config.cpp src/settingsmenu.cpp - src/keybindings.cpp - src/tileatlas.cpp src/sharedstate.cpp - src/gl-fun.cpp - src/gl-meta.cpp - src/vertex.cpp - src/soundemitter.cpp - src/sdlsoundsource.cpp - src/alstream.cpp - src/audiostream.cpp - src/audiochannels.cpp - src/rgssad.cpp - src/vorbissource.cpp src/oneshot.cpp - src/screen.cpp src/i18n.cpp src/otherview-message.cpp + src/crash-handler.cpp ) if(WIN32) @@ -151,11 +187,11 @@ endif() if (STEAM) list(APPEND MAIN_HEADERS - src/steam.h + ${SRC_STEAM_PATH}/steam.h steamshim/steamshim_child.h ) list(APPEND MAIN_SOURCE - src/steam.cpp + ${SRC_STEAM_PATH}/steam.cpp steamshim/steamshim_child.c ) list(APPEND DEFINES @@ -308,6 +344,11 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE WIN32 target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINES}) target_include_directories(${PROJECT_NAME} PRIVATE src) +target_include_directories(${PROJECT_NAME} PRIVATE ${SRC_AUDIO_HEADER_PATH}) +target_include_directories(${PROJECT_NAME} PRIVATE ${SRC_GRAPHICS_HEADER_PATH}) +target_include_directories(${PROJECT_NAME} PRIVATE ${SRC_OPENGL_HEADER_PATH}) +target_include_directories(${PROJECT_NAME} PRIVATE ${SRC_INPUT_HEADER_PATH}) +target_include_directories(${PROJECT_NAME} PRIVATE ${SRC_FS_HEADER_PATH}) target_link_libraries(${PROJECT_NAME} CONAN_PKG::boost CONAN_PKG::openal diff --git a/assets/AppRun b/assets/AppRun old mode 100755 new mode 100644 diff --git a/binding-mri/otherview-binding.cpp b/binding-mri/otherview-binding.cpp index 0ce580eb..8dd6f95b 100644 --- a/binding-mri/otherview-binding.cpp +++ b/binding-mri/otherview-binding.cpp @@ -88,6 +88,12 @@ RB_METHOD(sendMessage) return Qnil; } +RB_METHOD(readMessage) +{ + OtherViewMessager &messager = shState->otherView(); + VALUE rtn = rb_str_new_cstr(messager.getMsg().c_str()); + return rtn; +} RB_METHOD(openOneShot) { @@ -105,5 +111,6 @@ void otherviewBindingInit() _rb_define_module_function(module, "subscribers", returnSubscribers); _rb_define_module_function(module, "update", otherViewUpdate); _rb_define_module_function(module, "send", sendMessage); + _rb_define_module_function(module, "read", readMessage); _rb_define_module_function(module, "openOneShot", openOneShot); } \ No newline at end of file diff --git a/conanfile.py b/conanfile.py index 8a5e04bd..27a6c7cd 100644 --- a/conanfile.py +++ b/conanfile.py @@ -20,7 +20,7 @@ class MkxpConan(ConanFile): generators = "cmake" exports_sources = "*" requires = ( - "boost/1.77.0@astrabit/testing", + "boost/1.77.0", "openal/1.18.2@bincrafters/stable", "physfs/3.0.1@astrabit/testing", "pixman/0.34.0@astrabit/testing", diff --git a/journal/unix/macOS/Python b/journal/unix/macOS/Python old mode 100755 new mode 100644 diff --git a/patches/mac/CreateBundle.sh b/patches/mac/CreateBundle.sh old mode 100755 new mode 100644 diff --git a/patches/mac/Info.plist.in b/patches/mac/Info.plist.in old mode 100755 new mode 100644 diff --git a/patches/mac/oneshot.sh b/patches/mac/oneshot.sh old mode 100755 new mode 100644 diff --git a/libraries.rb b/scripts/ruby/libraries.rb similarity index 100% rename from libraries.rb rename to scripts/ruby/libraries.rb diff --git a/mklang.rb b/scripts/ruby/mklang.rb old mode 100755 new mode 100644 similarity index 100% rename from mklang.rb rename to scripts/ruby/mklang.rb diff --git a/mklangsrc.rb b/scripts/ruby/mklangsrc.rb old mode 100755 new mode 100644 similarity index 100% rename from mklangsrc.rb rename to scripts/ruby/mklangsrc.rb diff --git a/rpgscript.rb b/scripts/ruby/rpgscript.rb old mode 100755 new mode 100644 similarity index 100% rename from rpgscript.rb rename to scripts/ruby/rpgscript.rb diff --git a/build-entrypoint-linux.sh b/scripts/shell/build-entrypoint-linux.sh old mode 100755 new mode 100644 similarity index 100% rename from build-entrypoint-linux.sh rename to scripts/shell/build-entrypoint-linux.sh diff --git a/build-entrypoint-windows.bat b/scripts/shell/build-entrypoint-windows.bat similarity index 100% rename from build-entrypoint-windows.bat rename to scripts/shell/build-entrypoint-windows.bat diff --git a/cleanup.sh b/scripts/shell/cleanup.sh old mode 100755 new mode 100644 similarity index 100% rename from cleanup.sh rename to scripts/shell/cleanup.sh diff --git a/install.command b/scripts/shell/install.command old mode 100755 new mode 100644 similarity index 100% rename from install.command rename to scripts/shell/install.command diff --git a/make-appimage.sh b/scripts/shell/make-appimage.sh old mode 100755 new mode 100644 similarity index 100% rename from make-appimage.sh rename to scripts/shell/make-appimage.sh diff --git a/make-journal-linux.sh b/scripts/shell/make-journal-linux.sh old mode 100755 new mode 100644 similarity index 100% rename from make-journal-linux.sh rename to scripts/shell/make-journal-linux.sh diff --git a/make-linux-dist.sh b/scripts/shell/make-linux-dist.sh old mode 100755 new mode 100644 similarity index 100% rename from make-linux-dist.sh rename to scripts/shell/make-linux-dist.sh diff --git a/make-oneshot-linux.sh b/scripts/shell/make-oneshot-linux.sh old mode 100755 new mode 100644 similarity index 100% rename from make-oneshot-linux.sh rename to scripts/shell/make-oneshot-linux.sh diff --git a/make-oneshot-mac.command b/scripts/shell/make-oneshot-mac.command old mode 100755 new mode 100644 similarity index 100% rename from make-oneshot-mac.command rename to scripts/shell/make-oneshot-mac.command diff --git a/oclint.sh b/scripts/shell/oclint.sh old mode 100755 new mode 100644 similarity index 100% rename from oclint.sh rename to scripts/shell/oclint.sh diff --git a/src/al-util.h b/src/audio/headers/al-util.h similarity index 100% rename from src/al-util.h rename to src/audio/headers/al-util.h diff --git a/src/aldatasource.h b/src/audio/headers/aldatasource.h similarity index 100% rename from src/aldatasource.h rename to src/audio/headers/aldatasource.h diff --git a/src/alstream.h b/src/audio/headers/alstream.h similarity index 100% rename from src/alstream.h rename to src/audio/headers/alstream.h diff --git a/src/audio.h b/src/audio/headers/audio.h similarity index 100% rename from src/audio.h rename to src/audio/headers/audio.h diff --git a/src/audiochannels.h b/src/audio/headers/audiochannels.h similarity index 100% rename from src/audiochannels.h rename to src/audio/headers/audiochannels.h diff --git a/src/audiostream.h b/src/audio/headers/audiostream.h similarity index 100% rename from src/audiostream.h rename to src/audio/headers/audiostream.h diff --git a/src/soundemitter.h b/src/audio/headers/soundemitter.h similarity index 100% rename from src/soundemitter.h rename to src/audio/headers/soundemitter.h diff --git a/src/alstream.cpp b/src/audio/source/alstream.cpp similarity index 100% rename from src/alstream.cpp rename to src/audio/source/alstream.cpp diff --git a/src/audio.cpp b/src/audio/source/audio.cpp similarity index 100% rename from src/audio.cpp rename to src/audio/source/audio.cpp diff --git a/src/audiochannels.cpp b/src/audio/source/audiochannels.cpp similarity index 100% rename from src/audiochannels.cpp rename to src/audio/source/audiochannels.cpp diff --git a/src/audiostream.cpp b/src/audio/source/audiostream.cpp similarity index 100% rename from src/audiostream.cpp rename to src/audio/source/audiostream.cpp diff --git a/src/sdlsoundsource.cpp b/src/audio/source/sdlsoundsource.cpp similarity index 100% rename from src/sdlsoundsource.cpp rename to src/audio/source/sdlsoundsource.cpp diff --git a/src/soundemitter.cpp b/src/audio/source/soundemitter.cpp similarity index 100% rename from src/soundemitter.cpp rename to src/audio/source/soundemitter.cpp diff --git a/src/vorbissource.cpp b/src/audio/source/vorbissource.cpp similarity index 100% rename from src/vorbissource.cpp rename to src/audio/source/vorbissource.cpp diff --git a/src/crash-handler.cpp b/src/crash-handler.cpp new file mode 100644 index 00000000..2ca44cbc --- /dev/null +++ b/src/crash-handler.cpp @@ -0,0 +1,59 @@ +#include "crash-handler.h" +#include + +#include "debugwriter.h" + +#include + +using boost::asio::ip::tcp; + +void LowLevelCrashHandler::GenerateCrashReport(exception ex) { + +} + +void LowLevelCrashHandler::upload(char* message) { + Debug() << "[Crash Handler] Uploading crash to Discord..."; + try { + boost::asio::io_service ioService; + + tcp::resolver resolver(ioService); + tcp::resolver::query query("discord.com", "http"); // Get Discord's IP. + tcp::resolver::iterator endpointIterator = resolver.resolve(query); // -resolve it. + + tcp::socket socket(ioService); // Create socket. + boost::asio::connect(socket, endpointIterator); // Connect to Discord. + + // Sending a request. + boost::asio::streambuf request; + ostream requestStream(&request); + requestStream << "POST /api/webhooks/842787202957836329/-tHKhNJPkTgnO1Nz14_BPJWRimeAmgkOIc2ZLaSrlpcUQl_WkZsN2F05mAHs9-UAHvWV HTTP/1.1\r\n"; + requestStream << "Host: discord.com\r\n"; + requestStream << "Accept: */*\r\n"; + requestStream << "Connection: close\r\n"; + requestStream << "{\"avatar_url\": \"https://raw.githubusercontent.com/Speak2Erase/OSFM-Crash-Messages/main/pfps/10.png\" \"content\": \"Something weird happened, MKXP has crashed.\nPlease, inform `Pancakes#9697` if it was your crash, he may be able to assist you.\", \"embeds\": [{ \"title\": \"C++ Side StackTrace:\", \"description\": \"```" << message << "```\" }] }\r\n"; + + boost::asio::write(socket, request); + + // Getting response. + boost::asio::streambuf response; + istream responseStream(&response); + string httpver; + responseStream >> httpver; + unsigned int statuscode; + responseStream >> statuscode; + string statusmessage; + getline(responseStream, statusmessage); + if(!responseStream || httpver.substr(0,5) != "HTTP/") { + Debug() << "[Crash Handler] ...server sent invalid response."; + } + Debug() << "[Crash Handler] Response Code: " << statuscode; + + boost::asio::read_until(socket, response, "\r\n\r\n"); + string header; + while(getline(responseStream, header) && header != "\r") + Debug() << header; + } catch(exception ex) { + // Debug() << ex.what(); + Debug() << "[Crash Handler] Socket has experienced failure."; + } +} \ No newline at end of file diff --git a/src/crash-handler.h b/src/crash-handler.h new file mode 100644 index 00000000..4f0692cb --- /dev/null +++ b/src/crash-handler.h @@ -0,0 +1,11 @@ +#pragma once + +#include + +using namespace std; + +class LowLevelCrashHandler { + public: + static void GenerateCrashReport(exception ex); + static void upload(char* message); +}; \ No newline at end of file diff --git a/src/filesystem.h b/src/filesystem/headers/filesystem.h similarity index 100% rename from src/filesystem.h rename to src/filesystem/headers/filesystem.h diff --git a/src/rgssad.h b/src/filesystem/headers/rgssad.h similarity index 100% rename from src/rgssad.h rename to src/filesystem/headers/rgssad.h diff --git a/src/filesystem.cpp b/src/filesystem/source/filesystem.cpp similarity index 100% rename from src/filesystem.cpp rename to src/filesystem/source/filesystem.cpp diff --git a/src/rgssad.cpp b/src/filesystem/source/rgssad.cpp similarity index 100% rename from src/rgssad.cpp rename to src/filesystem/source/rgssad.cpp diff --git a/src/bitmap.h b/src/graphics/headers/bitmap.h similarity index 100% rename from src/bitmap.h rename to src/graphics/headers/bitmap.h diff --git a/src/disposable.h b/src/graphics/headers/disposable.h similarity index 100% rename from src/disposable.h rename to src/graphics/headers/disposable.h diff --git a/src/flashable.h b/src/graphics/headers/flashable.h similarity index 100% rename from src/flashable.h rename to src/graphics/headers/flashable.h diff --git a/src/font.h b/src/graphics/headers/font.h similarity index 100% rename from src/font.h rename to src/graphics/headers/font.h diff --git a/src/graphics.h b/src/graphics/headers/graphics.h similarity index 100% rename from src/graphics.h rename to src/graphics/headers/graphics.h diff --git a/src/scene.h b/src/graphics/headers/scene.h similarity index 100% rename from src/scene.h rename to src/graphics/headers/scene.h diff --git a/src/sprite.h b/src/graphics/headers/sprite.h similarity index 100% rename from src/sprite.h rename to src/graphics/headers/sprite.h diff --git a/src/tileatlas.h b/src/graphics/headers/tileatlas.h similarity index 100% rename from src/tileatlas.h rename to src/graphics/headers/tileatlas.h diff --git a/src/tilemap-common.h b/src/graphics/headers/tilemap-common.h similarity index 100% rename from src/tilemap-common.h rename to src/graphics/headers/tilemap-common.h diff --git a/src/tilemap.h b/src/graphics/headers/tilemap.h similarity index 100% rename from src/tilemap.h rename to src/graphics/headers/tilemap.h diff --git a/src/autotiles.cpp b/src/graphics/source/autotiles.cpp similarity index 100% rename from src/autotiles.cpp rename to src/graphics/source/autotiles.cpp diff --git a/src/bitmap.cpp b/src/graphics/source/bitmap.cpp similarity index 100% rename from src/bitmap.cpp rename to src/graphics/source/bitmap.cpp diff --git a/src/font.cpp b/src/graphics/source/font.cpp similarity index 100% rename from src/font.cpp rename to src/graphics/source/font.cpp diff --git a/src/graphics.cpp b/src/graphics/source/graphics.cpp similarity index 100% rename from src/graphics.cpp rename to src/graphics/source/graphics.cpp diff --git a/src/scene.cpp b/src/graphics/source/scene.cpp similarity index 100% rename from src/scene.cpp rename to src/graphics/source/scene.cpp diff --git a/src/sprite.cpp b/src/graphics/source/sprite.cpp similarity index 100% rename from src/sprite.cpp rename to src/graphics/source/sprite.cpp diff --git a/src/tileatlas.cpp b/src/graphics/source/tileatlas.cpp similarity index 100% rename from src/tileatlas.cpp rename to src/graphics/source/tileatlas.cpp diff --git a/src/tilemap.cpp b/src/graphics/source/tilemap.cpp similarity index 100% rename from src/tilemap.cpp rename to src/graphics/source/tilemap.cpp diff --git a/src/input.h b/src/input/headers/input.h similarity index 100% rename from src/input.h rename to src/input/headers/input.h diff --git a/src/keybindings.h b/src/input/headers/keybindings.h similarity index 100% rename from src/keybindings.h rename to src/input/headers/keybindings.h diff --git a/src/input.cpp b/src/input/source/input.cpp similarity index 100% rename from src/input.cpp rename to src/input/source/input.cpp diff --git a/src/keybindings.cpp b/src/input/source/keybindings.cpp similarity index 100% rename from src/keybindings.cpp rename to src/input/source/keybindings.cpp diff --git a/src/gl-debug.h b/src/opengl/headers/gl-debug.h similarity index 100% rename from src/gl-debug.h rename to src/opengl/headers/gl-debug.h diff --git a/src/gl-fun.h b/src/opengl/headers/gl-fun.h similarity index 100% rename from src/gl-fun.h rename to src/opengl/headers/gl-fun.h diff --git a/src/gl-meta.h b/src/opengl/headers/gl-meta.h similarity index 100% rename from src/gl-meta.h rename to src/opengl/headers/gl-meta.h diff --git a/src/gl-util.h b/src/opengl/headers/gl-util.h similarity index 100% rename from src/gl-util.h rename to src/opengl/headers/gl-util.h diff --git a/src/glstate.h b/src/opengl/headers/glstate.h similarity index 100% rename from src/glstate.h rename to src/opengl/headers/glstate.h diff --git a/src/plane.h b/src/opengl/headers/plane.h similarity index 100% rename from src/plane.h rename to src/opengl/headers/plane.h diff --git a/src/quad.h b/src/opengl/headers/quad.h similarity index 100% rename from src/quad.h rename to src/opengl/headers/quad.h diff --git a/src/quadarray.h b/src/opengl/headers/quadarray.h similarity index 100% rename from src/quadarray.h rename to src/opengl/headers/quadarray.h diff --git a/src/sdl-util.h b/src/opengl/headers/sdl-util.h similarity index 100% rename from src/sdl-util.h rename to src/opengl/headers/sdl-util.h diff --git a/src/shader.h b/src/opengl/headers/shader.h similarity index 100% rename from src/shader.h rename to src/opengl/headers/shader.h diff --git a/src/table.h b/src/opengl/headers/table.h similarity index 100% rename from src/table.h rename to src/opengl/headers/table.h diff --git a/src/texpool.h b/src/opengl/headers/texpool.h similarity index 100% rename from src/texpool.h rename to src/opengl/headers/texpool.h diff --git a/src/tilequad.h b/src/opengl/headers/tilequad.h similarity index 100% rename from src/tilequad.h rename to src/opengl/headers/tilequad.h diff --git a/src/transform.h b/src/opengl/headers/transform.h similarity index 100% rename from src/transform.h rename to src/opengl/headers/transform.h diff --git a/src/vertex.h b/src/opengl/headers/vertex.h similarity index 100% rename from src/vertex.h rename to src/opengl/headers/vertex.h diff --git a/src/viewport.h b/src/opengl/headers/viewport.h similarity index 100% rename from src/viewport.h rename to src/opengl/headers/viewport.h diff --git a/src/window.h b/src/opengl/headers/window.h similarity index 100% rename from src/window.h rename to src/opengl/headers/window.h diff --git a/src/gl-debug.cpp b/src/opengl/source/gl-debug.cpp similarity index 100% rename from src/gl-debug.cpp rename to src/opengl/source/gl-debug.cpp diff --git a/src/gl-fun.cpp b/src/opengl/source/gl-fun.cpp similarity index 100% rename from src/gl-fun.cpp rename to src/opengl/source/gl-fun.cpp diff --git a/src/gl-meta.cpp b/src/opengl/source/gl-meta.cpp similarity index 100% rename from src/gl-meta.cpp rename to src/opengl/source/gl-meta.cpp diff --git a/src/glstate.cpp b/src/opengl/source/glstate.cpp similarity index 100% rename from src/glstate.cpp rename to src/opengl/source/glstate.cpp diff --git a/src/plane.cpp b/src/opengl/source/plane.cpp similarity index 100% rename from src/plane.cpp rename to src/opengl/source/plane.cpp diff --git a/src/screen.cpp b/src/opengl/source/screen.cpp similarity index 100% rename from src/screen.cpp rename to src/opengl/source/screen.cpp diff --git a/src/shader.cpp b/src/opengl/source/shader.cpp similarity index 100% rename from src/shader.cpp rename to src/opengl/source/shader.cpp diff --git a/src/table.cpp b/src/opengl/source/table.cpp similarity index 100% rename from src/table.cpp rename to src/opengl/source/table.cpp diff --git a/src/texpool.cpp b/src/opengl/source/texpool.cpp similarity index 100% rename from src/texpool.cpp rename to src/opengl/source/texpool.cpp diff --git a/src/tilequad.cpp b/src/opengl/source/tilequad.cpp similarity index 100% rename from src/tilequad.cpp rename to src/opengl/source/tilequad.cpp diff --git a/src/vertex.cpp b/src/opengl/source/vertex.cpp similarity index 100% rename from src/vertex.cpp rename to src/opengl/source/vertex.cpp diff --git a/src/viewport.cpp b/src/opengl/source/viewport.cpp similarity index 100% rename from src/viewport.cpp rename to src/opengl/source/viewport.cpp diff --git a/src/window.cpp b/src/opengl/source/window.cpp similarity index 100% rename from src/window.cpp rename to src/opengl/source/window.cpp diff --git a/src/steam.cpp b/src/steam/steam.cpp similarity index 100% rename from src/steam.cpp rename to src/steam/steam.cpp diff --git a/src/steam.h b/src/steam/steam.h similarity index 100% rename from src/steam.h rename to src/steam/steam.h diff --git a/src/trstr.h b/src/trstr.h deleted file mode 100644 index ad1646fa..00000000 --- a/src/trstr.h +++ /dev/null @@ -1,54 +0,0 @@ -#define TRSTR_EMPTY 0 -#define TRSTR_JOURNAL_TITLE 1 -#define TRSTR_KEYBIND_A 2 -#define TRSTR_KEYBIND_B 3 -#define TRSTR_KEYBIND_X 4 -#define TRSTR_KEYBIND_Y 5 -#define TRSTR_KEYBIND_BACK 6 -#define TRSTR_KEYBIND_GUIDE 7 -#define TRSTR_KEYBIND_START 8 -#define TRSTR_KEYBIND_LSTICK 9 -#define TRSTR_KEYBIND_RSTICK 10 -#define TRSTR_KEYBIND_LSHOULDER 11 -#define TRSTR_KEYBIND_RSHOULDER 12 -#define TRSTR_KEYBIND_PADU 13 -#define TRSTR_KEYBIND_PADD 14 -#define TRSTR_KEYBIND_PADL 15 -#define TRSTR_KEYBIND_PADR 16 -#define TRSTR_KEYBIND_SHIFT 17 -#define TRSTR_KEYBIND_UNK 18 -#define TRSTR_KEYBIND_KEYFMT 19 -#define TRSTR_KEYBIND_LSTICKL 20 -#define TRSTR_KEYBIND_LSTICKR 21 -#define TRSTR_KEYBIND_LSTICKU 22 -#define TRSTR_KEYBIND_LSTICKD 23 -#define TRSTR_KEYBIND_RSTICKL 24 -#define TRSTR_KEYBIND_RSTICKR 25 -#define TRSTR_KEYBIND_RSTICKU 26 -#define TRSTR_KEYBIND_RSTICKD 27 -#define TRSTR_KEYBIND_LTRIGGER 28 -#define TRSTR_KEYBIND_RTRIGGER 29 -#define TRSTR_KEYBIND_JOYBTTNFMT 30 -#define TRSTR_KEYBIND_JOYHATFMT 31 -#define TRSTR_KEYBIND_JOYAXISFMT 32 -#define TRSTR_KEYBIND_KEYPROMPT 33 -#define TRSTR_KEYBIND_TITLE 34 -#define TRSTR_KEYBIND_RESET 35 -#define TRSTR_CANCEL 36 -#define TRSTR_ACCEPT 37 -#define TRSTR_KEYBIND_INSTRUCT 38 -#define TRSTR_KEYBIND_CONFLICT 39 -#define TRSTR_KEYBIND_UP 40 -#define TRSTR_KEYBIND_LEFT 41 -#define TRSTR_KEYBIND_ACTION 42 -#define TRSTR_KEYBIND_MENU 43 -#define TRSTR_KEYBIND_CANCEL 44 -#define TRSTR_KEYBIND_L 45 -#define TRSTR_KEYBIND_DOWN 46 -#define TRSTR_KEYBIND_RIGHT 47 -#define TRSTR_KEYBIND_RUN 48 -#define TRSTR_KEYBIND_DEACTIVATE 49 -#define TRSTR_KEYBIND_ITEMS 50 -#define TRSTR_KEYBIND_R 51 -#define TRSTR_KEYBIND_SETTINGS 52 -#define TRSTR_KEYBIND_PAUSE 53 \ No newline at end of file