This commit is contained in:
Mister_Nebula 2021-03-05 15:23:51 +00:00
parent 01dfcd6d5e
commit 3d1c6e02cf
5 changed files with 500 additions and 1 deletions

View File

@ -0,0 +1,460 @@
using OWML.Utils;
using QSB.Player;
using QSB.Utility;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEngine;
namespace QSB.ItemSync
{
class CustomNomaiRemoteCameraPlatform : NomaiShared
{
private static List<CustomNomaiRemoteCameraPlatform> s_platforms;
private static MaterialPropertyBlock s_matPropBlock;
private static int s_propID_Fade;
private static int s_propID_HeightMaskScale;
private static int s_propID_WaveScale;
private static int s_propID_Ripple2Position;
private static int s_propID_Ripple2Params;
public string _dataPointID
{
get => _oldPlatform.GetValue<string>("_dataPointID");
set => _oldPlatform.SetValue("_dataPointID", value);
}
public Sector _visualSector
{
get => _oldPlatform.GetValue<Sector>("_visualSector");
set => _oldPlatform.SetValue("_visualSector", value);
}
public Sector _visualSector2
{
get => _oldPlatform.GetValue<Sector>("_visualSector2");
set => _oldPlatform.SetValue("_visualSector2", value);
}
public Shape _connectionBounds
{
get => _oldPlatform.GetValue<Shape>("_connectionBounds");
set => _oldPlatform.SetValue("_connectionBounds", value);
}
public MeshRenderer _poolRenderer
{
get => _oldPlatform.GetValue<MeshRenderer>("_poolRenderer");
set => _oldPlatform.SetValue("_poolRenderer", value);
}
public float _poolFillLength
{
get => _oldPlatform.GetValue<float>("_poolFillLength");
set => _oldPlatform.SetValue("_poolFillLength", value);
}
public float _poolEmptyLength
{
get => _oldPlatform.GetValue<float>("_poolEmptyLength");
set => _oldPlatform.SetValue("_poolEmptyLength", value);
}
public AnimationCurve _poolHeightCurve
{
get => _oldPlatform.GetValue<AnimationCurve>("_poolHeightCurve");
set => _oldPlatform.SetValue("_poolHeightCurve", value);
}
public AnimationCurve _poolMaskCurve
{
get => _oldPlatform.GetValue<AnimationCurve>("_poolMaskCurve");
set => _oldPlatform.SetValue("_poolMaskCurve", value);
}
public AnimationCurve _poolWaveHeightCurve
{
get => _oldPlatform.GetValue<AnimationCurve>("_poolWaveHeightCurve");
set => _oldPlatform.SetValue("_poolWaveHeightCurve", value);
}
public Renderer[] _transitionRenderers
{
get => _oldPlatform.GetValue<Renderer[]>("_transitionRenderers");
set => _oldPlatform.SetValue("_transitionRenderers", value);
}
public PedestalAnimator _transitionPedestalAnimator
{
get => _oldPlatform.GetValue<PedestalAnimator>("_transitionPedestalAnimator");
set => _oldPlatform.SetValue("_transitionPedestalAnimator", value);
}
public GameObject _transitionStone
{
get => _oldPlatform.GetValue<GameObject>("_transitionStone");
set => _oldPlatform.SetValue("_transitionStone", value);
}
public GameObject _hologramGroup
{
get => _oldPlatform.GetValue<GameObject>("_hologramGroup");
set => _oldPlatform.SetValue("_hologramGroup", value);
}
public Transform _playerHologram
{
get => _oldPlatform.GetValue<Transform>("_playerHologram");
set => _oldPlatform.SetValue("_playerHologram", value);
}
public Transform _stoneHologram
{
get => _oldPlatform.GetValue<Transform>("_stoneHologram");
set => _oldPlatform.SetValue("_stoneHologram", value);
}
public float _fadeInLength = 1.5f;
public float _fadeOutLength = 0.25f;
public OWAudioSource _ambientAudioSource
{
get => _oldPlatform.GetValue<OWAudioSource>("_ambientAudioSource");
set => _oldPlatform.SetValue("_ambientAudioSource", value);
}
public OWAudioSource _oneShotAudioSource
{
get => _oldPlatform.GetValue<OWAudioSource>("_oneShotAudioSource");
set => _oldPlatform.SetValue("_oneShotAudioSource", value);
}
public DarkZone _darkZone
{
get => _oldPlatform.GetValue<DarkZone>("_darkZone");
set => _oldPlatform.SetValue("_darkZone", value);
}
private OWCamera _playerCamera;
private NomaiRemoteCamera _ownedCamera;
private SharedStoneSocket _socket;
private PedestalAnimator _pedestalAnimator;
private bool _platformActive;
private float _poolT;
private bool _showPlayerRipples;
private Transform _activePlayerHolo;
private float _transitionFade;
private CustomNomaiRemoteCameraPlatform _slavePlatform;
private List<Sector> _alreadyOccupiedSectors;
private NomaiRemoteCameraPlatform _oldPlatform;
private bool _peopleStillOnPlatform;
private bool _wasInBounds;
private void Awake()
{
_oldPlatform = GetComponent<NomaiRemoteCameraPlatform>();
_id = _oldPlatform.GetValue<NomaiRemoteCameraPlatform.ID>("_id");
_sharedStone = _oldPlatform.GetValue<SharedStone>("_sharedStone");
_ownedCamera = GetComponentInChildren<NomaiRemoteCamera>();
_alreadyOccupiedSectors = new List<Sector>(16);
DebugLog.DebugWrite($"{_oldPlatform.name} - active = false");
_platformActive = false;
_poolT = 0f;
_showPlayerRipples = false;
_activePlayerHolo = null;
_transitionFade = 0f;
if (s_matPropBlock == null)
{
s_matPropBlock = new MaterialPropertyBlock();
s_propID_Fade = Shader.PropertyToID("_Fade");
s_propID_HeightMaskScale = Shader.PropertyToID("_HeightMaskScale");
s_propID_WaveScale = Shader.PropertyToID("_WaveScale");
s_propID_Ripple2Position = Shader.PropertyToID("_Ripple2Position");
s_propID_Ripple2Params = Shader.PropertyToID("_Ripple2Params");
}
_socket = GetComponentInChildren<SharedStoneSocket>();
if (_socket != null)
{
_pedestalAnimator = _socket.GetPedestalAnimator();
}
else
{
Debug.LogWarning("SharedStoneSocket not found!", this);
}
UpdatePoolRenderer();
_hologramGroup.SetActive(false);
UpdateRendererFade();
_transitionStone.SetActive(false);
}
private void Start()
{
if (s_platforms == null)
{
s_platforms = new List<CustomNomaiRemoteCameraPlatform>(32);
}
s_platforms.Add(this);
_playerCamera = Locator.GetPlayerCamera();
if (_socket != null)
{
var socket = _socket;
socket.OnSocketableRemoved += OnSocketableRemoved;
var socket2 = _socket;
socket2.OnSocketableDonePlacing += OnSocketableDonePlacing;
}
enabled = false;
}
private void OnDestroy()
{
if (_socket != null)
{
var socket = _socket;
socket.OnSocketableRemoved -= OnSocketableRemoved;
var socket2 = _socket;
socket2.OnSocketableDonePlacing -= OnSocketableDonePlacing;
}
if (s_platforms != null)
{
s_platforms.Remove(this);
}
}
private void Update()
{
if (_platformActive && _pedestalAnimator.HasMadeContact())
{
var inBounds = _connectionBounds.PointInside(_playerCamera.transform.position);
_peopleStillOnPlatform = QSBPlayerManager.PlayerList.Any(x => _connectionBounds.PointInside(x.Camera.transform.position));
if (!inBounds && _wasInBounds)
{
OnLeaveBounds();
_wasInBounds = false;
}
else if (inBounds && !_wasInBounds)
{
//OnEnterBounds();
_wasInBounds = true;
}
}
if (_platformActive)
{
UpdatePools(1f, _poolFillLength);
}
else
{
UpdatePools(0f, _poolEmptyLength);
}
}
private void UpdatePools(float target, float length)
{
_poolT = Mathf.MoveTowards(_poolT, target, Time.deltaTime / length);
if (OWMath.ApproxEquals(_poolT, target))
{
if (_slavePlatform != null && target == 0f)
{
DebugLog.DebugWrite($"_poolT reached target 0, setting slave platform to null.");
_slavePlatform = null;
}
return;
}
UpdatePoolRenderer();
_slavePlatform._poolT = target;
_slavePlatform.UpdatePoolRenderer();
}
private void UpdatePoolRenderer()
{
_poolRenderer.transform.localPosition = new Vector3(0f, _poolHeightCurve.Evaluate(_poolT), 0f);
_poolRenderer.material.SetFloat(s_propID_HeightMaskScale, _poolMaskCurve.Evaluate(_poolT));
var waveScale = _poolRenderer.sharedMaterial.GetVector(s_propID_WaveScale);
waveScale.y = _poolWaveHeightCurve.Evaluate(_poolT);
_poolRenderer.material.SetVector(s_propID_WaveScale, waveScale);
var ripplePosition = _poolRenderer.sharedMaterial.GetVector(s_propID_Ripple2Position);
var rippleParams = _poolRenderer.sharedMaterial.GetVector(s_propID_Ripple2Params);
if (_showPlayerRipples)
{
var playerPosition = _poolRenderer.transform.InverseTransformPoint(_activePlayerHolo.position);
ripplePosition.x = playerPosition.x;
ripplePosition.y = playerPosition.z;
rippleParams.x = 0.5f;
}
_poolRenderer.material.SetVector(s_propID_Ripple2Position, ripplePosition);
_poolRenderer.material.SetVector(s_propID_Ripple2Params, rippleParams);
}
private void UpdateRendererFade()
{
s_matPropBlock.SetFloat(s_propID_Fade, 1f - _transitionFade);
for (var i = 0; i < _transitionRenderers.Length; i++)
{
_transitionRenderers[i].SetPropertyBlock(s_matPropBlock);
if (_transitionRenderers[i].enabled && _transitionFade == 0f)
{
_transitionRenderers[i].enabled = false;
}
else if (!_transitionRenderers[i].enabled && _transitionFade > 0f)
{
_transitionRenderers[i].enabled = true;
}
}
_ownedCamera.SetImageEffectFade(1f - _transitionFade);
}
private void UpdateHologramTransforms()
{
_hologramGroup.transform.position = _slavePlatform.transform.position;
_hologramGroup.transform.rotation = _slavePlatform.transform.rotation;
var playerTransform = Locator.GetPlayerTransform();
_playerHologram.position = TransformPoint(playerTransform.position, this, _slavePlatform);
_playerHologram.rotation = TransformRotation(playerTransform.rotation, this, _slavePlatform);
if (_sharedStone != null)
{
var transform = _sharedStone.transform;
_stoneHologram.position = TransformPoint(transform.position, this, _slavePlatform);
_stoneHologram.rotation = TransformRotation(transform.rotation, this, _slavePlatform);
}
else
{
_stoneHologram.SetPositionAndRotation(new Vector3(0f, -2f, 0f), Quaternion.identity);
}
}
private void OnSocketableRemoved(OWItem socketable)
{
DebugLog.DebugWrite($"{_oldPlatform.name} socketable removed");
if (_slavePlatform == null)
{
return;
}
DisconnectPlatform();
//DisconnectCamera();
_transitionStone.SetActive(false);
_slavePlatform._transitionStone.SetActive(false);
_socket.GetPedestalAnimator().PlayOpen();
if (_transitionPedestalAnimator != null)
{
_transitionPedestalAnimator.PlayOpen();
}
if (_slavePlatform._pedestalAnimator != null)
{
_slavePlatform._pedestalAnimator.PlayOpen();
}
if (_slavePlatform._transitionPedestalAnimator != null)
{
_slavePlatform._transitionPedestalAnimator.PlayOpen();
}
_sharedStone = null;
DebugLog.DebugWrite($"{_oldPlatform.name} - active = false");
_platformActive = false;
}
private void OnSocketableDonePlacing(OWItem socketable)
{
DebugLog.DebugWrite($"{_oldPlatform.name} socketable done placing");
DebugLog.DebugWrite($"{_oldPlatform.name} - active = true");
_platformActive = true;
_sharedStone = socketable as SharedStone;
if (_sharedStone == null)
{
Debug.LogError("Placed an empty item or a non SharedStone in a NomaiRemoteCameraPlatform");
}
_slavePlatform = GetPlatform(_sharedStone.GetRemoteCameraID());
if (_slavePlatform == null)
{
Debug.LogError("Shared stone with Remote Camera ID: " + _sharedStone.GetRemoteCameraID() + " has no registered camera platform!");
}
if (_slavePlatform == this || !_slavePlatform.gameObject.activeInHierarchy)
{
_sharedStone = null;
_slavePlatform = null;
return;
}
_transitionStone.SetActive(true);
_slavePlatform._transitionStone.SetActive(true);
_socket.GetPedestalAnimator().PlayClose();
if (_transitionPedestalAnimator != null)
{
_transitionPedestalAnimator.PlayClose();
}
if (_slavePlatform._pedestalAnimator != null)
{
_slavePlatform._pedestalAnimator.PlayClose();
}
if (_slavePlatform._transitionPedestalAnimator != null)
{
_slavePlatform._transitionPedestalAnimator.PlayClose();
}
enabled = true;
}
private void ConnectCamera()
{
}
private void OnEnterBounds()
{
}
private void OnLeaveBounds()
{
DebugLog.DebugWrite($"{_oldPlatform.name} OnLeaveBounds");
DebugLog.DebugWrite($"{_oldPlatform.name} - active = false");
_platformActive = false;
//DisconnectCamera();
if (_peopleStillOnPlatform)
{
DebugLog.DebugWrite($"{_oldPlatform.name} - people still on platform!");
return;
}
DebugLog.DebugWrite($"{_oldPlatform.name} - no one left on platform");
DisconnectPlatform();
if (_pedestalAnimator != null)
{
_pedestalAnimator.PlayOpen();
}
if (_transitionPedestalAnimator != null)
{
_transitionPedestalAnimator.PlayOpen();
}
if (_slavePlatform != null)
{
if (_slavePlatform._pedestalAnimator != null)
{
_slavePlatform._pedestalAnimator.PlayOpen();
}
if (_slavePlatform._transitionPedestalAnimator != null)
{
_slavePlatform._transitionPedestalAnimator.PlayOpen();
}
}
}
private void DisconnectPlatform()
{
DebugLog.DebugWrite($"{_oldPlatform.name} disconnect platform");
_ambientAudioSource.FadeOut(0.5f, OWAudioSource.FadeOutCompleteAction.STOP, 0f);
_oneShotAudioSource.PlayOneShot(AudioType.NomaiRemoteCameraExit, 1f);
Locator.GetAudioMixer().UnmixRemoteCameraPlatform(_fadeOutLength);
}
public static Vector3 TransformPoint(Vector3 worldPos, CustomNomaiRemoteCameraPlatform from, CustomNomaiRemoteCameraPlatform to)
{
var position = from.transform.InverseTransformPoint(worldPos);
return to.transform.TransformPoint(position);
}
public static Quaternion TransformRotation(Quaternion worldRot, CustomNomaiRemoteCameraPlatform from, CustomNomaiRemoteCameraPlatform to)
{
var rhs = from.transform.InverseTransformRotation(worldRot);
return to.transform.rotation * rhs;
}
public static CustomNomaiRemoteCameraPlatform GetPlatform(NomaiRemoteCameraPlatform.ID platformID)
{
if (s_platforms != null)
{
for (var i = 0; i < s_platforms.Count; i++)
{
if (s_platforms[i]._id == platformID)
{
return s_platforms[i];
}
}
}
return null;
}
public enum CameraState
{
Connected,
Connecting_FadeIn,
Connecting_FadeOut,
Disconnected,
Disconnecting_FadeIn,
Disconnecting_FadeOut
}
}
}

View File

@ -29,7 +29,11 @@ namespace QSB.ItemSync
QSBWorldSync.Init<QSBWarpCoreSocket, WarpCoreSocket>();
QSBWorldSync.Init<QSBNomaiConversationStone, NomaiConversationStone>();
QSBWorldSync.Init<QSBNomaiConversationStoneSocket, NomaiConversationStoneSocket>();
QSBWorldSync.Init<QSBNomaiRemoteCameraPlatform, NomaiRemoteCameraPlatform>();
foreach (var platform in Resources.FindObjectsOfTypeAll<NomaiRemoteCameraPlatform>())
{
platform.gameObject.AddComponent<CustomNomaiRemoteCameraPlatform>();
platform.enabled = false;
}
}
public static IQSBOWItem GetObject(OWItem unityObject)

View File

@ -180,9 +180,11 @@ namespace QSB.ItemSync.WorldObjects
.GetMethod("SwitchToPlayerCamera", BindingFlags.NonPublic | BindingFlags.Instance)
.Invoke(AttachedObject, null);
private bool wasInLocally;
public void CustomUpdate()
{
bool dontDisable = false;
if (_active)
{
if (_slavePlatform != null && !_slavePlatform.AttachedObject.gameObject.activeInHierarchy)
@ -204,6 +206,27 @@ namespace QSB.ItemSync.WorldObjects
DebugLog.DebugWrite($"{AttachedObject.name} OnLeaveBounds");
OnLeaveBounds();
}
else if (!_connectionBounds.PointInside(_playerCamera.transform.position) && wasInLocally)
{
// we have left the platform, but other people are still on it - just exit without disconnecting the two platforms!
DebugLog.DebugWrite($"{AttachedObject.name} Local leave");
SwitchToPlayerCamera();
_hologramGroup.SetActive(false);
wasInLocally = false;
}
else if (_connectionBounds.PointInside(_playerCamera.transform.position)
&& (_platformState == NomaiRemoteCameraPlatform.State.Connected
|| _platformState == NomaiRemoteCameraPlatform.State.Connecting_FadeIn
|| _platformState == NomaiRemoteCameraPlatform.State.Connecting_FadeOut)
&& !wasInLocally)
{
// local player entered platform while someone else was still on it - just enter!
DebugLog.DebugWrite($"{AttachedObject.name} Local enter");
SwitchToRemoteCamera();
_hologramGroup.SetActive(true);
wasInLocally = true;
}
dontDisable = QSBPlayerManager.PlayerList.Any(x => _connectionBounds.PointInside(x.Camera.transform.position));
}
_poolT = _active
? Mathf.MoveTowards(_poolT, 1f, Time.deltaTime / _poolFillLength)
@ -212,6 +235,7 @@ namespace QSB.ItemSync.WorldObjects
switch (_platformState)
{
case NomaiRemoteCameraPlatform.State.Connecting_FadeIn:
// Fade out props on the current platform?
_transitionFade = Mathf.MoveTowards(_transitionFade, 1f, Time.deltaTime / _fadeInLength);
UpdateRendererFade();
if (_transitionFade == 1f)
@ -234,6 +258,7 @@ namespace QSB.ItemSync.WorldObjects
}
break;
case NomaiRemoteCameraPlatform.State.Connecting_FadeOut:
// Fade in props on the target platform?
_slavePlatform._transitionFade = Mathf.MoveTowards(_slavePlatform._transitionFade, 0f, Time.deltaTime / _fadeInLength);
_slavePlatform.UpdateRendererFade();
UpdateHologramTransforms();
@ -246,12 +271,14 @@ namespace QSB.ItemSync.WorldObjects
}
break;
case NomaiRemoteCameraPlatform.State.Connected:
// When connection is established
VerifySectorOccupancy();
UpdateHologramTransforms();
_slavePlatform._poolT = _poolT;
_slavePlatform.UpdatePoolRenderer();
break;
case NomaiRemoteCameraPlatform.State.Disconnecting_FadeIn:
// Fade out props on the target platform?
_slavePlatform._transitionFade = Mathf.MoveTowards(_slavePlatform._transitionFade, 1f, Time.deltaTime / _fadeOutLength);
_slavePlatform.UpdateRendererFade();
UpdateHologramTransforms();
@ -274,8 +301,14 @@ namespace QSB.ItemSync.WorldObjects
}
break;
case NomaiRemoteCameraPlatform.State.Disconnecting_FadeOut:
// Fade in props on the current platform?
_transitionFade = Mathf.MoveTowards(_transitionFade, 0f, Time.deltaTime / _fadeOutLength);
UpdateRendererFade();
if (dontDisable)
{
DebugLog.DebugWrite($"{AttachedObject.name} DONT DISABLE!");
break;
}
if (_transitionFade == 0f)
{
if (_sharedStone == null)

View File

@ -132,6 +132,7 @@
<Compile Include="Instruments\QSBCamera\CameraManager.cs" />
<Compile Include="Instruments\QSBCamera\CameraMode.cs" />
<Compile Include="Instruments\InstrumentsManager.cs" />
<Compile Include="ItemSync\CustomNomaiRemoteCameraPlatform.cs" />
<Compile Include="ItemSync\Events\DropItemEvent.cs" />
<Compile Include="ItemSync\Events\DropItemMessage.cs" />
<Compile Include="ItemSync\Events\MoveToCarryEvent.cs" />

View File

@ -64,6 +64,7 @@ namespace QSB.WorldSync
var itemsToRemove = WorldObjects.Where(x => x is TWorldObject);
foreach (var item in itemsToRemove)
{
WorldObjectsToUnityObjects.Remove(item.ReturnObject() as MonoBehaviour);
try
{
item.OnRemoval();