Add level downloading through ID

TheGreatRambler · Dec 23, 2021 · a169580 · a169580
1 parent 441bba2
commit a169580
Show file tree

Hide file tree

Showing 70 changed files with 2,038 additions and 2,473 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,7 @@ temp.bcd
 test*
 *.png
 tilesheetFiles.txt
-third_party
+third_party
+*.txt
+*.bcd
+*.zip
diff --git a/Makefile b/Makefile
@@ -19,13 +19,13 @@ CPPFLAGS := -Wall -Wextra -Wno-missing-field-initializers -Wno-deprecated-enum-e
 
 ifeq ($(BUILD),release)
 	# "Release" build - optimization, and no debug symbols
-	CPPFLAGS += -O3 -s -DNDEBUG
+	CPPFLAGS += -O3 -s
 else
 	# "Debug" build - no optimization, and debugging symbols
 	ifeq ($(PLATFORM),web)
-	CPPFLAGS += -O0 -g -DDEBUG
+	CPPFLAGS += -O0 -g
 	else
-	CPPFLAGS += -Og -g -ggdb -DDEBUG
+	CPPFLAGS += -Og -g -ggdb
 	endif
 endif
 
@@ -34,13 +34,12 @@ ifeq ($(PLATFORM),web)
 
 	EMS += -s USE_SDL=2 -s USE_ZLIB=1 -s USE_FREETYPE=1 -s USE_LIBPNG=1 -s DISABLE_EXCEPTION_CATCHING=1
 	CPPFLAGS += -I./third_party/cairo-1.16.0/src -O2 $(EMS)
-	LDFLAGS += -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_STACK=10000000 -s ASYNCIFY -s FORCE_FILESYSTEM=1 -o bin/index.html --shell-file shell_minimal.html $(PRELOADED_FILES) $(EMS) -L./third_party/cairo-1.16.0/src/.libs -lcairo -L./third_party/pixman-0.40.0/pixman/.libs -lpixman-1
+	LDFLAGS += -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_STACK=10000000 -s ASYNCIFY -s FETCH=1 -s FORCE_FILESYSTEM=1 -o bin/index.html --shell-file shell_minimal.html $(PRELOADED_FILES) $(EMS) -L./third_party/cairo-1.16.0/src/.libs -lcairo -L./third_party/pixman-0.40.0/pixman/.libs -lpixman-1
 else
-	CPPFLAGS += $(shell pkg-config --cflags sdl2 glew glfw3 zlib cairo freetype2) -Wno-cast-function-type
-	LDFLAGS := -lpthread -lopengl32 $(shell pkg-config --libs --static sdl2 glew glfw3 zlib cairo freetype2) -liconv -mconsole -fPIC -static -static-libgcc -static-libstdc++
+	CPPFLAGS += $(shell pkg-config --cflags sdl2 glew glfw3 zlib cairo freetype2 libcurl) -Wno-cast-function-type
+	LDFLAGS := -lpthread -lopengl32 $(shell pkg-config --libs --static sdl2 glew glfw3 zlib cairo freetype2 libcurl) -lunistring -liconv -lbrotlicommon -mconsole -fPIC -static -static-libgcc -static-libstdc++
 
 	ifeq ($(UNAME),Msys)
-		# Needed for sockets on windows
 		LDFLAGS += -lmingw32 -lws2_32 -lwsock32
 	else
 		LDFLAGS += -ldl

diff --git a/README.md b/README.md
@@ -1,3 +1,14 @@
-# toost
+# Toost
 
 Level viewer for Super Mario Maker 2, based on  JiXiaomai's work
+
+# How to build
+If building for desktop, obtain development files for `sdl2`, `glew`, `glfw3`, `zlib`, `cairo`, `freetype2`, and `libcurl`, as well as having an up to date GCC and pkg-config. Compilation on Windows should use MSYS2, on Mac should use homebrew and on linux should use standard GCC. Type `make` for a debug build and `make BUILD=release` for a release build.
+If building for web, first obtain a working Emscripten build environment and put its binaries on the path, such as `emmake`, `emcc` and `em++`. Next, run `./prepare_web_deps.sh`. This only needs to be done once, as it downloads and compiles Cairo to prepare it for the web environment. Once that is done, you can run `make PLATFORM=web` for a debug build and `make PLATFORM=web BUILD=release` for a release build. To prepare a zip to distribute, run `./build_release.sh` for desktop and `./build_release.sh web` for web.
+
+# Hosting the web build
+As long as all files in `bin` are in the same directory on your webserver and you are hosting them over https, you can access index.html to see the viewer.
+
+# Credits
+* Ji Xiaomai, as the core level renderer is based on his work
+* The Spriters Resource for the sprites
diff --git a/build_release.sh b/build_release.sh
@@ -0,0 +1,11 @@
+make clean
+if [[ "$1" == "web" ]];
+then
+	make PLATFORM=web BUILD=release
+	rm -rf bin/src
+	zip -9r build_web.zip bin
+else
+	make BUILD=release
+	rm -rf bin/src
+	zip -9r build.zip bin fonts img
+fi
diff --git a/fonts/NotoSansJP-Bold.otf b/fonts/NotoSansJP-Bold.otf
diff --git a/fonts/unifont-14.0.01.ttf b/fonts/unifont-14.0.01.ttf
diff --git a/img/CMN/A0.png b/img/CMN/A0.png
diff --git a/img/CMN/A1.png b/img/CMN/A1.png
diff --git a/img/CMN/A2.png b/img/CMN/A2.png
diff --git a/img/CMN/A3.png b/img/CMN/A3.png
diff --git a/img/CMN/B.png b/img/CMN/B.png
diff --git a/img/CMN/B0.png b/img/CMN/B0.png
diff --git a/img/CMN/B1.png b/img/CMN/B1.png
diff --git a/img/CMN/C0.png b/img/CMN/C0.png
diff --git a/img/CMN/C1.png b/img/CMN/C1.png
diff --git a/img/CMN/C2.png b/img/CMN/C2.png
diff --git a/img/CMN/C3.png b/img/CMN/C3.png
diff --git a/img/CMN/C4.png b/img/CMN/C4.png
diff --git a/img/CMN/C5.png b/img/CMN/C5.png
diff --git a/img/CMN/C6.png b/img/CMN/C6.png
diff --git a/img/CMN/C7.png b/img/CMN/C7.png
diff --git a/img/CMN/C8.png b/img/CMN/C8.png
diff --git a/img/CMN/C9.png b/img/CMN/C9.png
diff --git a/img/CMN/D0.png b/img/CMN/D0.png
diff --git a/img/CMN/D1.png b/img/CMN/D1.png
diff --git a/img/CMN/D2.png b/img/CMN/D2.png
diff --git a/img/CMN/D3.png b/img/CMN/D3.png
diff --git a/img/CMN/E0.png b/img/CMN/E0.png
diff --git a/img/CMN/E1.png b/img/CMN/E1.png
diff --git a/img/CMN/E2.png b/img/CMN/E2.png
diff --git a/img/CMN/E3.png b/img/CMN/E3.png
diff --git a/img/CMN/F0.png b/img/CMN/F0.png
diff --git a/img/CMN/F1.png b/img/CMN/F1.png
diff --git a/img/CMN/G0.png b/img/CMN/G0.png
diff --git a/img/CMN/JA.png b/img/CMN/JA.png
diff --git a/img/CMN/JB.png b/img/CMN/JB.png
diff --git a/img/CMN/JC.png b/img/CMN/JC.png
diff --git a/img/CMN/JD.png b/img/CMN/JD.png
diff --git a/img/CMN/JE.png b/img/CMN/JE.png
diff --git a/img/CMN/JF.png b/img/CMN/JF.png
diff --git a/img/CMN/JG.png b/img/CMN/JG.png
diff --git a/img/CMN/JH.png b/img/CMN/JH.png
diff --git a/img/CMN/JJ.png b/img/CMN/JJ.png
diff --git a/img/CMN/JK.png b/img/CMN/JK.png
diff --git a/img/CMN/JM.png b/img/CMN/JM.png
diff --git a/img/CMN/JP.png b/img/CMN/JP.png
diff --git a/img/CMN/JW.png b/img/CMN/JW.png
diff --git a/img/CMN/M.png b/img/CMN/M.png
diff --git a/img/CMN/P.png b/img/CMN/P.png
diff --git a/img/CMN/SD.png b/img/CMN/SD.png
diff --git a/img/CMN/SDL.png b/img/CMN/SDL.png
diff --git a/img/CMN/SDR.png b/img/CMN/SDR.png
diff --git a/img/CMN/SE.png b/img/CMN/SE.png
diff --git a/img/CMN/SL.png b/img/CMN/SL.png
diff --git a/img/CMN/SLD.png b/img/CMN/SLD.png
diff --git a/img/CMN/SLU.png b/img/CMN/SLU.png
diff --git a/img/CMN/SR.png b/img/CMN/SR.png
diff --git a/img/CMN/SRD.png b/img/CMN/SRD.png
diff --git a/img/CMN/SRU.png b/img/CMN/SRU.png
diff --git a/img/CMN/SS.png b/img/CMN/SS.png
diff --git a/img/CMN/SU.png b/img/CMN/SU.png
diff --git a/img/CMN/SUL.png b/img/CMN/SUL.png
diff --git a/img/CMN/SUR.png b/img/CMN/SUR.png
diff --git a/img/CMN/W.png b/img/CMN/W.png
diff --git a/build_web.sh → prepare_web_deps.sh b/build_web.sh → prepare_web_deps.sh
@@ -1,3 +1,11 @@
+mkdir third_party
+wget -c https://www.cairographics.org/releases/cairo-1.16.0.tar.xz
+C:/msys64/usr/bin/tar.exe -xvf cairo-1.16.0.tar.xz -C third_party
+rm cairo-1.16.0.tar.xz
+wget -c https://www.cairographics.org/releases/pixman-0.40.0.tar.gz
+C:/msys64/usr/bin/tar.exe -xvf pixman-0.40.0.tar.gz -C third_party
+rm pixman-0.40.0.tar.gz
+
 cd third_party/pixman-0.40.0
 CC=emcc AR=emar LD=emcc RANLIB=emranlib PNG_LIBS="-L." ./configure --host=wasm32-unknown-emscripten --disable-gtk --enable-libpng --disable-shared --disable-openmp
 export EMCC_CFLAGS="-s USE_PTHREADS=1 -s USE_LIBPNG=1 -s USE_ZLIB=1"

diff --git a/src/Drawers.cpp b/src/Drawers.cpp
@@ -4032,7 +4032,7 @@ void Drawers::DrawCID() {
 				}
 			} else {
 				if((level.MapObj[i].CFlag / 0x40000) % 2 == 1) {
-					DrawImage(fmt::format("{}/img/{}/cid/{]B.png", P, level.LH.GameStyle, level.MapObj[i].CID), LX, LY,
+					DrawImage(fmt::format("{}/img/{}/cid/{}B.png", P, level.LH.GameStyle, level.MapObj[i].CID), LX, LY,
 						Zm, Zm);
 				} else {
 					DrawImage(fmt::format("{}/img/{}/cid/{}.png", P, level.LH.GameStyle, level.MapObj[i].CID), LX, LY,
@@ -4083,7 +4083,7 @@ void Drawers::DrawCID() {
 		default:
 			if((level.MapObj[i].CFlag / 0x4) % 2 == 1) {
 				DrawImage(
-					fmt::format("{}/img/{}/cid/{]A.png", P, level.LH.GameStyle, level.MapObj[i].CID), LX, LY, Zm, Zm);
+					fmt::format("{}/img/{}/cid/{}A.png", P, level.LH.GameStyle, level.MapObj[i].CID), LX, LY, Zm, Zm);
 			} else {
 				DrawImage(
 					fmt::format("{}/img/{}/cid/{}.png", P, level.LH.GameStyle, level.MapObj[i].CID), LX, LY, Zm, Zm);

diff --git a/src/Helpers.cpp b/src/Helpers.cpp
@@ -21,6 +21,19 @@ bool Helpers::LoadTextureFromSurface(cairo_surface_t* surface, GLuint* out_textu
 	if(image_data == NULL)
 		return false;
 
+	/*
+	cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
+	cairo_pattern_set_filter(pattern, CAIRO_FILTER_NEAREST);
+	int new_width                = image_width * scale;
+	int new_height               = image_width * scale;
+	cairo_surface_t* new_surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, new_width, new_height);
+	cairo_t* cr                  = cairo_create(new_surface);
+	cairo_scale(cr, scale, scale);
+	cairo_set_source(cr, pattern);
+	cairo_paint(cr);
+	cairo_pattern_destroy(pattern);
+	*/
+
 	int image_data_pixels = image_width * image_height;
 	// Need to convert from cairo ARGB to OpenGL RGBA
 	uint32_t* fixed_image_data = (uint32_t*)malloc(image_data_pixels * 4);

diff --git a/src/LevelParser.hpp b/src/LevelParser.hpp
@@ -550,11 +550,13 @@ class LevelParserMappings {
 		{ 3, "x3" },
 	};
 
-	const std::string FormatMillisecondTime(int milliseconds) {
-		int seconds      = (milliseconds / 1000) % 60;
-		int minutes      = (milliseconds / 1000) / 60;
-		milliseconds     = milliseconds % 1000;
-		std::string time = fmt::format("{:02}:{:02}.{:03}", minutes, seconds, milliseconds);
+	const std::string FormatMillisecondTime(int32_t milliseconds) {
+		int32_t seconds = (milliseconds / 1000) % 60;
+		int32_t minutes = (milliseconds / 1000) / 60;
+		milliseconds    = milliseconds % 1000;
+		// Corrupts the string on emscripten
+		// std::string time = fmt::format("{:02}:{:02}.{:03}", minutes, seconds, milliseconds);
+		std::string time = fmt::format("{}:{:02}.{}", minutes, seconds, milliseconds);
 		return time;
 	}
 };