AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-08 14:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move MSDOS and webclient backend files out

Browse Source
This commit is contained in:
UnknownShadow200 2025-07-09 18:56:08 +10:00
parent 01c2e1c3fd
commit 85f1b4c5c5
10 changed files with 85 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build_webclient.yml vendored
View File

@ -21,9 +21,10 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Compiles webclient - name: Compiles webclient
id: compile id: compile
env:
SRCS: "src/*.c src/webclient/*.c"
run: | run: |
cd src emcc ${{ env.SRCS }} -o ClassiCube.js -s WASM=0 -s NO_EXIT_RUNTIME=1 -s LEGACY_VM_SUPPORT=1 -s ALLOW_MEMORY_GROWTH=1 -s ABORTING_MALLOC=0 -s ENVIRONMENT=web -s TOTAL_STACK=256Kb --js-library src/webclient/interop_web.js -Os -g2 -s SINGLE_FILE
emcc *.c -o ClassiCube.js -s WASM=0 -s NO_EXIT_RUNTIME=1 -s LEGACY_VM_SUPPORT=1 -s ALLOW_MEMORY_GROWTH=1 -s ABORTING_MALLOC=0 -s ENVIRONMENT=web -s TOTAL_STACK=256Kb --js-library interop_web.js -Os -g2 -s SINGLE_FILE
sed -i 's#eventHandler.useCapture);#{ useCapture: eventHandler.useCapture, passive: false });#g' ClassiCube.js sed -i 's#eventHandler.useCapture);#{ useCapture: eventHandler.useCapture, passive: false });#g' ClassiCube.js
- uses: ./.github/actions/notify_failure - uses: ./.github/actions/notify_failure
@ -35,7 +36,7 @@ jobs:
- uses: ./.github/actions/upload_build - uses: ./.github/actions/upload_build
if: ${{ always() && steps.compile.outcome == 'success' }} if: ${{ always() && steps.compile.outcome == 'success' }}
with: with:
SOURCE_FILE: 'src/ClassiCube.js' SOURCE_FILE: 'ClassiCube.js'
DEST_NAME: 'ClassiCube.js' DEST_NAME: 'ClassiCube.js'

12
Makefile
View File

@ -59,9 +59,12 @@ ifeq ($(PLAT),web)
CC = emcc CC = emcc
OEXT = .html OEXT = .html
CFLAGS = -g CFLAGS = -g
LDFLAGS = -g -s WASM=1 -s NO_EXIT_RUNTIME=1 -s ABORTING_MALLOC=0 -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_STACK=256Kb --js-library $(SOURCE_DIR)/interop_web.js LDFLAGS = -g -s WASM=1 -s NO_EXIT_RUNTIME=1 -s ABORTING_MALLOC=0 -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_STACK=256Kb --js-library $(SOURCE_DIR)/webclient/interop_web.js
BUILD_DIR = build/web BUILD_DIR = build/web
BEARSSL = 0 BEARSSL = 0
BUILD_DIRS += $(BUILD_DIR)/src/webclient
C_SOURCES += $(wildcard src/webclient/*.c)
endif endif
ifeq ($(PLAT),mingw) ifeq ($(PLAT),mingw)
@ -176,6 +179,9 @@ ifeq ($(PLAT),dos)
OEXT = .exe OEXT = .exe
BUILD_DIR = build/dos BUILD_DIR = build/dos
BEARSSL = 0 BEARSSL = 0
BUILD_DIRS += $(BUILD_DIR)/src/msdos
C_SOURCES += $(wildcard src/msdos/*.c)
endif endif
@ -194,9 +200,7 @@ endif
ifeq ($(BEARSSL),1) ifeq ($(BEARSSL),1)
BUILD_DIRS += $(BUILD_DIR)/third_party/bearssl BUILD_DIRS += $(BUILD_DIR)/third_party/bearssl
BEARSSL_SOURCES = $(wildcard third_party/bearssl/*.c) C_SOURCES += $(wildcard third_party/bearssl/*.c)
BEARSSL_OBJECTS = $(patsubst %.c, $(BUILD_DIR)/%.o, $(BEARSSL_SOURCES))
OBJECTS += $(BEARSSL_OBJECTS)
endif endif
ifdef RELEASE ifdef RELEASE

4
readme.md
View File

@ -206,8 +206,8 @@ NOTE: If you are distributing a modified version, **please change the bundle ID
1. Install emscripten if necessary. 1. Install emscripten if necessary.
2. Run either: 2. Run either:
* `make web` or * `make web` - produces simple non-optimised output, easier to debug
* `emcc src/*.c -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_STACK=1Mb --js-library interop_web.js` * `make web RELEASE=1` - produces optimised output, harder to debug
The generated javascript file has some issues. [See here for how to fix](doc/compile-fixes.md#webclient-patches) The generated javascript file has some issues. [See here for how to fix](doc/compile-fixes.md#webclient-patches)

24
src/Platform_MSDOS.c → src/msdos/Platform_MSDOS.c
View File

@ -1,15 +1,13 @@
#include "Core.h" #include "../_PlatformBase.h"
#if defined CC_BUILD_MSDOS #include "../Stream.h"
#include "../ExtMath.h"
#include "../SystemFonts.h"
#include "../Funcs.h"
#include "../Window.h"
#include "../Utils.h"
#include "../Errors.h"
#include "../PackedCol.h"
#include "_PlatformBase.h"
#include "Stream.h"
#include "ExtMath.h"
#include "SystemFonts.h"
#include "Funcs.h"
#include "Window.h"
#include "Utils.h"
#include "Errors.h"
#include "PackedCol.h"
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#include <stdlib.h> #include <stdlib.h>
@ -39,7 +37,7 @@ cc_bool Platform_ReadonlyFilesystem;
/*########################################################################################################################* /*########################################################################################################################*
*-----------------------------------------------------Main entrypoint-----------------------------------------------------* *-----------------------------------------------------Main entrypoint-----------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
#include "main_impl.h" #include "../main_impl.h"
int main(int argc, char** argv) { int main(int argc, char** argv) {
cc_result res; cc_result res;
@ -450,4 +448,4 @@ int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, cc_string* arg
cc_result Platform_SetDefaultCurrentDirectory(int argc, char **argv) { cc_result Platform_SetDefaultCurrentDirectory(int argc, char **argv) {
return 0; return 0;
} }
#endif

16
src/Window_MSDOS.c → src/msdos/Window_MSDOS.c
View File

@ -1,12 +1,10 @@
#include "Core.h" #include "../_WindowBase.h"
#if defined CC_BUILD_MSDOS #include "../String.h"
#include "../Funcs.h"
#include "../Bitmap.h"
#include "../Options.h"
#include "../Errors.h"
#include "_WindowBase.h"
#include "String.h"
#include "Funcs.h"
#include "Bitmap.h"
#include "Options.h"
#include "Errors.h"
#include <dpmi.h> #include <dpmi.h>
#include <sys/nearptr.h> #include <sys/nearptr.h>
#include <pc.h> #include <pc.h>
@ -347,4 +345,4 @@ void Window_UpdateRawMouse(void) {
void Window_DisableRawMouse(void) { void Window_DisableRawMouse(void) {
DefaultDisableRawMouse(); DefaultDisableRawMouse();
} }
#endif

8
src/Audio_Web.c → src/webclient/Audio_Web.c
View File

@ -1,12 +1,9 @@
#include "Core.h"
#if defined CC_BUILD_WEBAUDIO
struct AudioContext { int contextID, count; void* data; }; struct AudioContext { int contextID, count; void* data; };
#define AUDIO_OVERRIDE_SOUNDS #define AUDIO_OVERRIDE_SOUNDS
#define AUDIO_OVERRIDE_ALLOC #define AUDIO_OVERRIDE_ALLOC
#include "_AudioBase.h" #include "../_AudioBase.h"
#include "Funcs.h" #include "../Funcs.h"
extern int interop_InitAudio(void); extern int interop_InitAudio(void);
extern int interop_AudioCreate(void); extern int interop_AudioCreate(void);
@ -140,5 +137,4 @@ void AudioBackend_LoadSounds(void) {
} }
} }
} }
#endif

28
src/Http_Web.c → src/webclient/Http_Web.c
View File

@ -1,10 +1,10 @@
#include "Core.h" #include "../_HttpBase.h"
#ifdef CC_BUILD_WEB #include "../Errors.h"
#include "_HttpBase.h"
#include <emscripten/emscripten.h> #include <emscripten/emscripten.h>
#include "Errors.h"
extern int interop_DownloadAsync(const char* url, int method, int reqID); extern int interop_DownloadAsync(const char* url, int method, int reqID);
extern int interop_IsHttpsOnly(void); extern int interop_IsHttpsOnly(void);
static struct RequestList workingReqs, queuedReqs; static struct RequestList workingReqs, queuedReqs;
static cc_uint64 startTime; static cc_uint64 startTime;
@ -21,7 +21,7 @@ cc_bool Http_GetResult(int reqID, struct HttpRequest* item) {
} }
cc_bool Http_GetCurrent(int* reqID, int* progress) { cc_bool Http_GetCurrent(int* reqID, int* progress) {
/* TODO: Stubbed as this isn't required at the moment */ // TODO: Stubbed as this isn't required at the moment
*progress = 0; *progress = 0;
return 0; return 0;
} }
@ -59,7 +59,7 @@ static void Http_StartNextDownload(void) {
struct HttpRequest* req; struct HttpRequest* req;
cc_result res; cc_result res;
/* Avoid making too many requests at once */ // Avoid making too many requests at once
if (workingReqs.count >= HTTP_MAX_CONCURRENCY) return; if (workingReqs.count >= HTTP_MAX_CONCURRENCY) return;
if (!queuedReqs.count) return; if (!queuedReqs.count) return;
String_InitArray(url, urlBuffer); String_InitArray(url, urlBuffer);
@ -72,11 +72,11 @@ static void Http_StartNextDownload(void) {
res = interop_DownloadAsync(urlStr, req->requestType, req->id); res = interop_DownloadAsync(urlStr, req->requestType, req->id);
if (res) { if (res) {
/* interop error code -> ClassiCube error code */ // interop error code -> ClassiCube error code
if (res == 1) res = ERR_INVALID_DATA_URL; if (res == 1) res = ERR_INVALID_DATA_URL;
req->result = res; req->result = res;
/* Invalid URL so move onto next request */ // Invalid URL so move onto next request
Http_FinishRequest(req); Http_FinishRequest(req);
RequestList_RemoveAt(&queuedReqs, 0); RequestList_RemoveAt(&queuedReqs, 0);
Http_StartNextDownload(); Http_StartNextDownload();
@ -98,7 +98,7 @@ EMSCRIPTEN_KEEPALIVE void Http_OnFinishedAsync(int reqID, void* data, int len, i
int idx = RequestList_Find(&workingReqs, reqID); int idx = RequestList_Find(&workingReqs, reqID);
if (idx == -1) { if (idx == -1) {
/* Shouldn't ever happen, but log a warning anyways */ // Shouldn't ever happen, but log a warning anyways
Mem_Free(data); Mem_Free(data);
Platform_Log1("Ignoring invalid request (%i)", &reqID); Platform_Log1("Ignoring invalid request (%i)", &reqID);
} else { } else {
@ -108,7 +108,7 @@ EMSCRIPTEN_KEEPALIVE void Http_OnFinishedAsync(int reqID, void* data, int len, i
req->statusCode = status; req->statusCode = status;
req->contentLength = len; req->contentLength = len;
/* Usually this happens when denied by CORS */ // Usually this happens when denied by CORS
if (!status && !data) req->result = ERR_DOWNLOAD_INVALID; if (!status && !data) req->result = ERR_DOWNLOAD_INVALID;
if (req->data) Platform_Log1("HTTP returned data: %i bytes", &req->size); if (req->data) Platform_Log1("HTTP returned data: %i bytes", &req->size);
@ -118,9 +118,9 @@ EMSCRIPTEN_KEEPALIVE void Http_OnFinishedAsync(int reqID, void* data, int len, i
Http_StartNextDownload(); Http_StartNextDownload();
} }
/* Adds a req to the list of pending requests, waking up worker thread if needed */ // Adds a req to the list of pending requests, waking up worker thread if needed
static void HttpBackend_Add(struct HttpRequest* req, cc_uint8 flags) { static void HttpBackend_Add(struct HttpRequest* req, cc_uint8 flags) {
/* Add time based query string parameter to bypass browser cache */ // Add time based query string parameter to bypass browser cache
if (flags & HTTP_FLAG_NOCACHE) { if (flags & HTTP_FLAG_NOCACHE) {
cc_string url = String_FromRawArray(req->url); cc_string url = String_FromRawArray(req->url);
int lo = (int)(startTime), hi = (int)(startTime >> 32); int lo = (int)(startTime), hi = (int)(startTime >> 32);
@ -137,7 +137,7 @@ static void HttpBackend_Add(struct HttpRequest* req, cc_uint8 flags) {
*#########################################################################################################################*/ *#########################################################################################################################*/
static void Http_Init(void) { static void Http_Init(void) {
Http_InitCommon(); Http_InitCommon();
/* If this webpage is https://, browsers deny any http:// downloading */ // If this webpage is https://, browsers deny any http:// downloading
httpsOnly = interop_IsHttpsOnly(); httpsOnly = interop_IsHttpsOnly();
startTime = DateTime_CurrentUTC(); startTime = DateTime_CurrentUTC();
@ -145,4 +145,4 @@ static void Http_Init(void) {
RequestList_Init(&workingReqs); RequestList_Init(&workingReqs);
RequestList_Init(&processedReqs); RequestList_Init(&processedReqs);
} }
#endif

53
src/Platform_Web.c → src/webclient/Platform_Web.c
View File

@ -1,14 +1,11 @@
#include "Core.h" #include "../_PlatformBase.h"
#if defined CC_BUILD_WEB #include "../Stream.h"
#include "../ExtMath.h"
#include "_PlatformBase.h" #include "../SystemFonts.h"
#include "Stream.h" #include "../Funcs.h"
#include "ExtMath.h" #include "../Window.h"
#include "SystemFonts.h" #include "../Utils.h"
#include "Funcs.h" #include "../Errors.h"
#include "Window.h"
#include "Utils.h"
#include "Errors.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -22,16 +19,16 @@
#define O_EXCL 0x080 #define O_EXCL 0x080
#define O_TRUNC 0x200 #define O_TRUNC 0x200
/* Unfortunately, errno constants are different in some older emscripten versions */ // Unfortunately, errno constants are different in some older emscripten versions
/* (linux errno numbers compared to WASI errno numbers) */ // (linux errno numbers compared to WASI errno numbers)
/* So just use the same errono numbers as interop_web.js */ // So just use the same errono numbers as interop_web.js
#define _ENOENT 2 #define _ENOENT 2
#define _EAGAIN 6 /* same as EWOULDBLOCK */ #define _EAGAIN 6 // same as EWOULDBLOCK
#define _EEXIST 17 #define _EEXIST 17
#define _EHOSTUNREACH 23 #define _EHOSTUNREACH 23
#define _EINPROGRESS 26 #define _EINPROGRESS 26
const cc_result ReturnCode_FileShareViolation = 1000000000; /* Not used in web filesystem backend */ const cc_result ReturnCode_FileShareViolation = 1000000000; // Not used in web filesystem backend
const cc_result ReturnCode_FileNotFound = _ENOENT; const cc_result ReturnCode_FileNotFound = _ENOENT;
const cc_result ReturnCode_SocketInProgess = _EINPROGRESS; const cc_result ReturnCode_SocketInProgess = _EINPROGRESS;
const cc_result ReturnCode_SocketWouldBlock = _EAGAIN; const cc_result ReturnCode_SocketWouldBlock = _EAGAIN;
@ -424,18 +421,18 @@ cc_result Platform_GetEntropy(void* data, int len) {
*#########################################################################################################################*/ *#########################################################################################################################*/
int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, cc_string* args) { int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, cc_string* args) {
int i, count; int i, count;
argc--; argv++; /* skip executable path argument */ argc--; argv++; // skip executable path argument //
count = min(argc, GAME_MAX_CMDARGS); count = min(argc, GAME_MAX_CMDARGS);
for (i = 0; i < count; i++) { args[i] = String_FromReadonly(argv[i]); } for (i = 0; i < count; i++) { args[i] = String_FromReadonly(argv[i]); }
return count; return count;
} }
#include "main_impl.h" #include "../main_impl.h"
static int _argc; static int _argc;
static char** _argv; static char** _argv;
/* webclient does some asynchronous initialisation first, then kickstarts the game after that */ // webclient does some asynchronous initialisation first, then kickstarts the game after that
static void web_main(void) { static void web_main(void) {
SetupProgram(_argc, _argv); SetupProgram(_argc, _argv);
@ -462,11 +459,11 @@ extern void interop_AsyncDownloadTexturePack(const char* path);
EMSCRIPTEN_KEEPALIVE int main(int argc, char** argv) { EMSCRIPTEN_KEEPALIVE int main(int argc, char** argv) {
_argc = argc; _argv = argv; _argc = argc; _argv = argv;
/* Game loads resources asynchronously, then actually starts itself */ // Game loads resources asynchronously, then actually starts itself:
/* main */ // main
/* > texture pack download (async) */ // > texture pack download (async)
/* > load indexedDB (async) */ // > load indexedDB (async)
/* > web_main (game actually starts) */ // > web_main (game actually starts)
interop_FS_Init(); interop_FS_Init();
interop_DirectorySetWorking("/classicube"); interop_DirectorySetWorking("/classicube");
interop_AsyncDownloadTexturePack("texpacks/default.zip"); interop_AsyncDownloadTexturePack("texpacks/default.zip");
@ -475,12 +472,12 @@ EMSCRIPTEN_KEEPALIVE int main(int argc, char** argv) {
extern void interop_LoadIndexedDB(void); extern void interop_LoadIndexedDB(void);
extern void interop_AsyncLoadIndexedDB(void); extern void interop_AsyncLoadIndexedDB(void);
/* Asynchronous callback after texture pack is downloaded */ // Asynchronous callback after texture pack is downloaded
EMSCRIPTEN_KEEPALIVE void main_phase1(void) { EMSCRIPTEN_KEEPALIVE void main_phase1(void) {
interop_LoadIndexedDB(); /* legacy compatibility */ interop_LoadIndexedDB(); // legacy compatibility
interop_AsyncLoadIndexedDB(); interop_AsyncLoadIndexedDB();
} }
/* Asynchronous callback after IndexedDB is loaded */ // Asynchronous callback after IndexedDB is loaded
EMSCRIPTEN_KEEPALIVE void main_phase2(void) { web_main(); } EMSCRIPTEN_KEEPALIVE void main_phase2(void) { web_main(); }
#endif

24
src/Window_Web.c → src/webclient/Window_Web.c
View File

@ -1,13 +1,13 @@
#include "Core.h" #include "../Core.h"
#if defined CC_BUILD_WEB && !defined CC_BUILD_SDL #include "../_WindowBase.h"
#include "_WindowBase.h" #include "../Game.h"
#include "Game.h" #include "../String.h"
#include "String.h" #include "../Funcs.h"
#include "Funcs.h" #include "../ExtMath.h"
#include "ExtMath.h" #include "../Bitmap.h"
#include "Bitmap.h" #include "../Errors.h"
#include "Errors.h" #include "../Gui.h"
#include "Gui.h"
#include <emscripten/emscripten.h> #include <emscripten/emscripten.h>
#include <emscripten/html5.h> #include <emscripten/html5.h>
#include <emscripten/key_codes.h> #include <emscripten/key_codes.h>
@ -754,7 +754,7 @@ void Window_DisableRawMouse(void) {
*------------------------------------------------Emscripten WebGL context-------------------------------------------------* *------------------------------------------------Emscripten WebGL context-------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
#if CC_GFX_BACKEND_IS_GL() #if CC_GFX_BACKEND_IS_GL()
#include "Graphics.h" #include "../Graphics.h"
static EMSCRIPTEN_WEBGL_CONTEXT_HANDLE ctx_handle; static EMSCRIPTEN_WEBGL_CONTEXT_HANDLE ctx_handle;
static EM_BOOL GLContext_OnLost(int eventType, const void *reserved, void *userData) { static EM_BOOL GLContext_OnLost(int eventType, const void *reserved, void *userData) {
@ -819,4 +819,4 @@ void GLContext_GetApiInfo(cc_string* info) {
String_AppendUtf8(info, buffer, len); String_AppendUtf8(info, buffer, len);
} }
#endif #endif
#endif

0
src/interop_web.js → src/webclient/interop_web.js
View File