diff --git a/package-lock.json b/package-lock.json index f8d63bdd..cd5dd938 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2678,9 +2678,9 @@ } }, "node_modules/@webwindowed/vite-plugin-cpp-header": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@webwindowed/vite-plugin-cpp-header/-/vite-plugin-cpp-header-1.0.0.tgz", - "integrity": "sha512-0eALUR+M6rkq45FXslE36/UJWZ2Xy9Gt+JH1GNINnlp9QH+JP7wBqp228+bUHuSxgGIiSXsSQi3C0CA+AbmxRg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@webwindowed/vite-plugin-cpp-header/-/vite-plugin-cpp-header-1.1.0.tgz", + "integrity": "sha512-3vfsU4uAKZXkzoXKUUokXByygF25Vt9lsv6BmSDWwH6iYMbVZqJ9nX/7MIobGJw0YirH7FoOCjeDtSGQTE9y4Q==", "dev": true, "license": "MIT", "peerDependencies": { @@ -6899,7 +6899,7 @@ "@vue/eslint-config-typescript": "14.8.0", "@vue/test-utils": "2.4.11", "@vue/tsconfig": "0.9.1", - "@webwindowed/vite-plugin-cpp-header": "1.0.0", + "@webwindowed/vite-plugin-cpp-header": "1.1.0", "@webwindowed/web-api": "1.0.0", "eslint": "10.4.1", "eslint-plugin-vue": "10.9.2", diff --git a/src/ModMan/main.cpp b/src/ModMan/main.cpp index a43ff958..a6739bb7 100644 --- a/src/ModMan/main.cpp +++ b/src/ModMan/main.cpp @@ -48,11 +48,15 @@ namespace #endif newWindow.set_title("OpenAssetTools ModMan"); - // newWindow.set_window_min(640, 480); + newWindow.set_window_min(640, 480); newWindow.set_window_size(1280, 640); - const auto assetHandlerPlugin = std::make_shared(VITE_ASSETS, std::extent_v); + const auto assetHandlerPlugin = std::make_shared(); assetHandlerPlugin->set_protocol_name("modman"); + + for (const auto& asset : VITE_ASSETS) + assetHandlerPlugin->add_static_asset(webwindowed::static_asset(asset.filename, asset.data, asset.dataSize)); + newWindow.register_plugin(assetHandlerPlugin); webwindowed::commands_builder commands; diff --git a/src/ModManUi/package.json b/src/ModManUi/package.json index 17bed55c..620661f1 100644 --- a/src/ModManUi/package.json +++ b/src/ModManUi/package.json @@ -31,7 +31,7 @@ "@vue/eslint-config-typescript": "14.8.0", "@vue/test-utils": "2.4.11", "@vue/tsconfig": "0.9.1", - "@webwindowed/vite-plugin-cpp-header": "1.0.0", + "@webwindowed/vite-plugin-cpp-header": "1.1.0", "@webwindowed/web-api": "1.0.0", "eslint": "10.4.1", "eslint-plugin-vue": "10.9.2", diff --git a/thirdparty/webwindowed b/thirdparty/webwindowed index 1e5e89d0..61bd002a 160000 --- a/thirdparty/webwindowed +++ b/thirdparty/webwindowed @@ -1 +1 @@ -Subproject commit 1e5e89d054386d821e82b8ace4fa38e52f1b5bef +Subproject commit 61bd002a6b881003ecd198306fd3886a3ce2b78e