fixes updates and cleaner readme

Sage-of-Mirrors · Aug 11, 2023 · 467cb61 · 467cb61
1 parent c8026b8
commit 467cb61
Show file tree

Hide file tree

Showing 11 changed files with 179 additions and 254 deletions.
diff --git a/.gitignore b/.gitignore
@@ -371,4 +371,6 @@ lib/*
 .vscode
 
 src/DiscordIntegration.cpp
-include/DiscordIntegration.hpp
+include/DiscordIntegration.hpp
+
+*.ini
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,11 +35,5 @@ add_executable(booldozer ${BOOLDOZER_SRC})
 target_include_directories(booldozer PUBLIC include lib/libflipper/include lib/libflipper/include/geometry lib/imgui lib/imgui/backends lib/fmt/include lib/glfw/include lib/glad/include lib/glm lib/J3DUltra/include)
 add_definitions(-DIMGUI_DEFINE_MATH_OPERATORS)
 
-
 find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED)
-target_link_libraries(booldozer PUBLIC imgui glfw gctools ICU::uc ICU::i18n fmt j3dultra discord-rpc)
-
-
-#if(WIN32)
-#target_link_libraries(booldozer PUBLIC imgui glfw gctools fmt j3dultra /usr/x86_64-w64-mingw32/lib/libicuin.dll.a /usr/x86_64-w64-mingw32/lib/libicuuc.dll.a /usr/x86_64-w64-mingw32/lib/libicudt.dll.a /usr/x86_64-w64-mingw32/lib/libicuio.dll.a /usr/x86_64-w64-mingw32/lib/libicutu.dll.a /usr/x86_64-w64-mingw32/lib/libicutu.dll.a ssp)
-#endif(WIN32)
+target_link_libraries(booldozer PUBLIC imgui glfw gctools ICU::uc ICU::i18n fmt j3dultra)
diff --git a/README.md b/README.md
@@ -5,27 +5,35 @@
 
 Booldozer is a work-in-progress editor for the original [Luigi's Mansion on GameCube](https://en.wikipedia.org/wiki/Luigi%27s_Mansion), written by SpaceCats ([@kittensandals](https://twitter.com/kittensandals)) and Gamma ([@SageOfMirrors](https://twitter.com/SageOfMirrors)). It aims to cover as many aspects of modding the game as possible.
 
-### Features
-#### Map Editing
-![E-k8w2SWUAgQz2b](https://user-images.githubusercontent.com/10427486/133895701-32d46944-6717-4805-9828-ab7f1a69fd14.jpeg)
+![screenshot](preview.png)
 
-Create custom maps with Booldozer's various editing modes! Set the scene with Actor Mode, configure loot drops with Item Mode, and customize collision with Collision Mode.
+## Build Instructions
 
-#### Spawn Groups
-![Peek 2021-09-01 15-54](https://user-images.githubusercontent.com/10427486/131735867-3b93c4eb-bb5e-4ff5-94c3-5ec35e564255.gif)
+### Cloning the Repository
 
-Keeping track of create names manually is a thing of the past! Use Booldozer's Spawn Group Editor to make managing waves of enemies as easy as clicking and dragging.
+```
+git clone https://github.com/Sage-of-Mirrors/Booldozer.git
 
-#### Ghost Configs (PRM)
-![Screenshot_2021-09-01_15-52-16](https://user-images.githubusercontent.com/10427486/131735977-82385508-40a6-408b-8a82-74c3b2d059ac.png)
+cd Booldozer
 
-Make objects act the way you want with Booldozer's Ghost Config Editor! Change their attacks, their HP, and even what color they glow.
+git submodule update --init --recursive
+```
 
-### Roadmap/TODOs
-  - Modes
-    - Collision
-    - Event
-  - Complete this list
+### Linux
+
+Ensure all required packages are installed (Iconv, libpng, zlib)
+
+```
+cmake -S . -B build
+cd build
+make
+```
+
+### Windows
+
+Open the repository in Visual Studio as a CMake Project and compile like any other VS Project.
+
+**Must** be a version of VS that includes vcpkg.
 
 <p align="center">
 <img src=https://raw.githubusercontent.com/Sage-of-Mirrors/Booldozer/main/res/img/about.png width="60%" height="60%"></img>

diff --git a/imgui.ini b/imgui.ini
diff --git a/include/DiscordIntegration.hpp b/include/DiscordIntegration.hpp
@@ -1,4 +1,5 @@
 #pragma once
+/*
 #include <discord_rpc.h>
 
 // Invalidated Old ID
@@ -14,4 +15,5 @@ namespace Discord {
     void HandleJoinRequest(const DiscordUser* request);
     
     extern DiscordRichPresence RichPresence;
-};
+};
+*/
diff --git a/preview.png b/preview.png
diff --git a/src/DiscordIntegration.cpp b/src/DiscordIntegration.cpp
@@ -1,5 +1,6 @@
-#include <DiscordIntegration.hpp>
 #include <cstdio>
+/*
+#include <DiscordIntegration.hpp>
 
 namespace Discord {
     DiscordRichPresence RichPresence;
@@ -21,4 +22,5 @@ namespace Discord {
     void HandleSpectate(const char* secret){}
 
     void HandleJoinRequest(const DiscordUser* request){}
-}
+}
+*/
diff --git a/src/modes/ActorMode.cpp b/src/modes/ActorMode.cpp
@@ -4,7 +4,7 @@
 #include "ImGuizmo.h"
 #include "UIUtil.hpp"
 
-#include <DiscordIntegration.hpp>
+//#include <DiscordIntegration.hpp>
 
 LActorMode::LActorMode()
 {
@@ -216,10 +216,12 @@ void LActorMode::Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene*
 	if(mRoomChanged){
 
 		if(std::shared_ptr<LRoomDOMNode> room = mManualRoomSelect.lock()){
+			/*
 			std::string room_name = fmt::format("Editing {}", room->GetName());
 
 			Discord::RichPresence.details = room_name.c_str();
 			Discord_UpdatePresence(&Discord::RichPresence);
+			*/
 			renderer_scene->SetRoom(room);
 		}
 	}