From fb3a700af33dd72bbad7e46045140f79833b57a8 Mon Sep 17 00:00:00 2001
From: RERASER <2641320887@qq.com>
Date: Sat, 9 Nov 2024 07:09:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0D3D9On12=E5=92=8CDXVK?=
=?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
需要把dxvk的d3d9.dll改名为dxvk.dll放在启动器exe旁边
---
assets/launcher-ui/src/modules/iidx.ts | 14 +-
.../launcher-ui/src/views/IIDXSettingView.vue | 21 ++-
.../component/iidx/custom_resolution.cpp | 48 ++++++-
src/client/resource.g.rc | 6 +-
src/client/resources/all.hpp | 6 +-
...{howler-BNH429fS.js => howler-CTWA-ZGT.js} | 2 +-
...{index-i3wpVxTJ.css => index-BGCGHj6k.css} | 2 +-
.../{index-xFWPT9M3.js => index-D1NvJlV7.js} | 136 +++++++++---------
src/client/resources/ui-dist/index.html | 4 +-
src/client/std_include.hpp | 3 +
10 files changed, 158 insertions(+), 84 deletions(-)
rename src/client/resources/ui-dist/assets/{howler-BNH429fS.js => howler-CTWA-ZGT.js} (99%)
rename src/client/resources/ui-dist/assets/{index-i3wpVxTJ.css => index-BGCGHj6k.css} (96%)
rename src/client/resources/ui-dist/assets/{index-xFWPT9M3.js => index-D1NvJlV7.js} (77%)
diff --git a/assets/launcher-ui/src/modules/iidx.ts b/assets/launcher-ui/src/modules/iidx.ts
index 61ac555..e30bbff 100644
--- a/assets/launcher-ui/src/modules/iidx.ts
+++ b/assets/launcher-ui/src/modules/iidx.ts
@@ -3,6 +3,12 @@ import { launcher, VersionState } from "./launcher";
import dedent from "dedent";
import type { TupleType } from "typescript";
+export enum GraphicsAPI {
+ Native = 0,
+ D3D9On12 = 1,
+ DXVK = 1,
+}
+
export enum IIDXDisplayMode {
Fullscreen = 0,
BorderlessWindowed = 1,
@@ -30,6 +36,7 @@ export interface IIDXConfig {
asioDevice: string;
useGsm: boolean;
language: IIDXLanguage;
+ graphicsAPI: GraphicsAPI;
}
export class IIDX {
@@ -43,7 +50,7 @@ export class IIDX {
}
installed() {
- return this.GameMeta.value?.installed??false;
+ return this.GameMeta.value?.installed ?? false;
}
async UpdateMeta() {
@@ -96,6 +103,7 @@ export class IIDX {
asioDevice: devices[0],
useGsm: true,
language: IIDXLanguage.English,
+ graphicsAPI: GraphicsAPI.Native,
}
this._dirty = true;
@@ -130,7 +138,8 @@ export class IIDX {
this._config.value.resolution === undefined ||
this._config.value.soundMode === undefined ||
this._config.value.useGsm === undefined ||
- this._config.value.language === undefined
+ this._config.value.language === undefined ||
+ this._config.value.graphicsAPI === undefined
) {
window.laochan.alert.show('IIDX 设置已被重置, 请前往额外设置重新设置', '#B64040', 2000);
await this.resetConfig();
@@ -156,6 +165,7 @@ export class IIDX {
window.laochan.setParam('IIDX_RESOLTION_W', JSON.stringify(config.resolution.w)),
window.laochan.setParam('IIDX_RESOLTION_H', JSON.stringify(config.resolution.h)),
+ window.laochan.setParam('IIDX_GRAPHICS_API',JSON.stringify(config.graphicsAPI)),
]);
}
diff --git a/assets/launcher-ui/src/views/IIDXSettingView.vue b/assets/launcher-ui/src/views/IIDXSettingView.vue
index 4389537..d1e3da7 100644
--- a/assets/launcher-ui/src/views/IIDXSettingView.vue
+++ b/assets/launcher-ui/src/views/IIDXSettingView.vue
@@ -1,5 +1,5 @@
-
+
+
diff --git a/src/client/std_include.hpp b/src/client/std_include.hpp
index 7531b86..a9930f7 100644
--- a/src/client/std_include.hpp
+++ b/src/client/std_include.hpp
@@ -48,6 +48,8 @@
#include
#include
#include
+#include
+#include
// min and max is required by gdi, therefore NOMINMAX won't work
#ifdef max
@@ -109,6 +111,7 @@
#pragma comment(lib, "dwmapi.lib")
#pragma comment(lib, "dxgi.lib")
#pragma comment(lib, "d3d9.lib")
+#pragma comment(lib, "d3d12.lib")
#include "resource.hpp"