Merge pull request #632 from misternebula/dev

0.28.3
This commit is contained in:
_nebula 2023-06-25 15:10:00 +01:00 committed by GitHub
commit a1fcbd3d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions

View File

@ -4,7 +4,7 @@ namespace QSB.PoolSync;
internal class CustomNomaiRemoteCamera : MonoBehaviour internal class CustomNomaiRemoteCamera : MonoBehaviour
{ {
private OWCamera _camera; public OWCamera _camera;
private AudioListener _audioListener; private AudioListener _audioListener;
private NomaiViewerImageEffect _viewerImageEffect; private NomaiViewerImageEffect _viewerImageEffect;
private CustomNomaiRemoteCameraPlatform _owningPlatform; private CustomNomaiRemoteCameraPlatform _owningPlatform;

View File

@ -6,6 +6,7 @@ using QSB.Player.Messages;
using QSB.Utility; using QSB.Utility;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using UnityEngine; using UnityEngine;
namespace QSB.PoolSync; namespace QSB.PoolSync;
@ -516,8 +517,16 @@ internal class CustomNomaiRemoteCameraPlatform : NomaiShared
private void SwitchToPlayerCamera() private void SwitchToPlayerCamera()
{ {
// does nothing except run CCU's prefix if (QSBCore.Helper.Interaction.ModExists("xen.CommonCameraUtility"))
_oldPlatform.SwitchToPlayerCamera(); {
// this is a really fucking dumb fix, but i cannot be
// bothered to rewrite this class to make this work better
var ccuAssembly = QSBCore.Helper.Interaction.TryGetMod("xen.CommonCameraUtility").GetType().Assembly;
var utilClass = ccuAssembly.GetType("CommonCameraUtil.CommonCameraUtil");
var instance = utilClass.GetField("Instance", BindingFlags.Public | BindingFlags.Static).GetValue(null);
var removeCameraMethod = utilClass.GetMethod("RemoveCamera", BindingFlags.Public | BindingFlags.Instance);
removeCameraMethod.Invoke(instance, new object[] { _slavePlatform._ownedCamera._camera });
}
if (_slavePlatform._visualSector != null) if (_slavePlatform._visualSector != null)
{ {

View File

@ -7,7 +7,7 @@
"body": "- Disable *all* other mods. (Can heavily affect performance)\n- Make sure you are not running any other network-intensive applications." "body": "- Disable *all* other mods. (Can heavily affect performance)\n- Make sure you are not running any other network-intensive applications."
}, },
"uniqueName": "Raicuparta.QuantumSpaceBuddies", "uniqueName": "Raicuparta.QuantumSpaceBuddies",
"version": "0.28.2", "version": "0.28.3",
"owmlVersion": "2.9.0", "owmlVersion": "2.9.0",
"dependencies": [ "_nebula.MenuFramework", "JohnCorby.VanillaFix" ], "dependencies": [ "_nebula.MenuFramework", "JohnCorby.VanillaFix" ],
"pathsToPreserve": [ "debugsettings.json" ], "pathsToPreserve": [ "debugsettings.json" ],