mirror of
https://github.com/misternebula/quantum-space-buddies.git
synced 2025-03-11 19:13:32 +00:00
we dont really need to transform sync meteors
This commit is contained in:
parent
17811547fa
commit
161209535b
Binary file not shown.
@ -1,9 +1,9 @@
|
||||
ManifestFileVersion: 0
|
||||
CRC: 1413327377
|
||||
CRC: 460430998
|
||||
Hashes:
|
||||
AssetFileHash:
|
||||
serializedVersion: 2
|
||||
Hash: f90094727e1ce28574220075b5b78331
|
||||
Hash: b493638b4693b8de8ad9467521d5a138
|
||||
TypeTreeHash:
|
||||
serializedVersion: 2
|
||||
Hash: 6968c5d2bbef57a79632abd61ea01bb3
|
||||
@ -26,7 +26,6 @@ Assets:
|
||||
- Assets/NetworkProbe.prefab
|
||||
- Assets/NETWORK_Player_Body.prefab
|
||||
- Assets/NetworkOrb.prefab
|
||||
- Assets/NetworkMeteor.prefab
|
||||
- Assets/NetworkAngler.prefab
|
||||
- Assets/NetworkShip.prefab
|
||||
Dependencies: []
|
||||
|
@ -1,84 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using QSB.MeteorSync.WorldObjects;
|
||||
using QSB.Syncs.Unsectored.Rigidbodies;
|
||||
using QSB.WorldSync;
|
||||
using QuantumUNET.Transport;
|
||||
|
||||
namespace QSB.MeteorSync.TransformSync
|
||||
{
|
||||
public class MeteorTransformSync : UnsectoredRigidbodySync
|
||||
{
|
||||
public override bool IsReady => MeteorManager.Ready;
|
||||
public override bool UseInterpolation => false;
|
||||
|
||||
private QSBMeteor _qsbMeteor;
|
||||
private static readonly List<MeteorTransformSync> _instances = new List<MeteorTransformSync>();
|
||||
|
||||
protected override OWRigidbody GetRigidbody()
|
||||
=> _qsbMeteor.AttachedObject.owRigidbody;
|
||||
|
||||
public override void Start()
|
||||
{
|
||||
_instances.Add(this);
|
||||
base.Start();
|
||||
}
|
||||
|
||||
protected override void OnDestroy()
|
||||
{
|
||||
_instances.Remove(this);
|
||||
base.OnDestroy();
|
||||
}
|
||||
|
||||
public override float GetNetworkSendInterval() => 5;
|
||||
|
||||
protected override void Init()
|
||||
{
|
||||
_qsbMeteor = QSBWorldSync.GetWorldFromId<QSBMeteor>(_instances.IndexOf(this));
|
||||
_qsbMeteor.TransformSync = this;
|
||||
|
||||
base.Init();
|
||||
SetReferenceTransform(Locator._brittleHollow.transform);
|
||||
}
|
||||
|
||||
|
||||
private bool _shouldUpdate;
|
||||
|
||||
public override void DeserializeTransform(QNetworkReader reader, bool initialState)
|
||||
{
|
||||
base.DeserializeTransform(reader, initialState);
|
||||
_shouldUpdate = true;
|
||||
}
|
||||
|
||||
protected override bool UpdateTransform()
|
||||
{
|
||||
if (HasAuthority)
|
||||
{
|
||||
return base.UpdateTransform();
|
||||
}
|
||||
|
||||
if (!_shouldUpdate)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
_shouldUpdate = false;
|
||||
return base.UpdateTransform();
|
||||
}
|
||||
|
||||
|
||||
protected override void OnRenderObject()
|
||||
{
|
||||
if (!MeteorManager.Ready
|
||||
|| !QSBCore.DebugMode
|
||||
|| !QSBCore.ShowLinesInDebug
|
||||
|| !IsReady
|
||||
|| ReferenceTransform == null
|
||||
|| _intermediaryTransform.GetReferenceTransform() == null
|
||||
|| _qsbMeteor.AttachedObject.isSuspended)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
base.OnRenderObject();
|
||||
}
|
||||
}
|
||||
}
|
@ -1,32 +1,14 @@
|
||||
using QSB.MeteorSync.TransformSync;
|
||||
using QSB.Utility;
|
||||
using QSB.WorldSync;
|
||||
using QuantumUNET;
|
||||
using QSB.WorldSync;
|
||||
using UnityEngine;
|
||||
|
||||
namespace QSB.MeteorSync.WorldObjects
|
||||
{
|
||||
public class QSBMeteor : WorldObject<MeteorController>
|
||||
{
|
||||
public MeteorTransformSync TransformSync;
|
||||
|
||||
public override void Init(MeteorController attachedObject, int id)
|
||||
{
|
||||
ObjectId = id;
|
||||
AttachedObject = attachedObject;
|
||||
|
||||
if (QSBCore.IsHost)
|
||||
{
|
||||
Object.Instantiate(QSBNetworkManager.Instance.MeteorPrefab).SpawnWithServerAuthority();
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnRemoval()
|
||||
{
|
||||
if (QSBCore.IsHost)
|
||||
{
|
||||
QNetworkServer.Destroy(TransformSync.gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -137,7 +137,6 @@
|
||||
<Compile Include="MeteorSync\MeteorManager.cs" />
|
||||
<Compile Include="MeteorSync\Patches\MeteorClientPatches.cs" />
|
||||
<Compile Include="MeteorSync\Patches\MeteorServerPatches.cs" />
|
||||
<Compile Include="MeteorSync\TransformSync\MeteorTransformSync.cs" />
|
||||
<Compile Include="MeteorSync\WorldObjects\QSBFragment.cs" />
|
||||
<Compile Include="MeteorSync\WorldObjects\QSBMeteor.cs" />
|
||||
<Compile Include="MeteorSync\WorldObjects\QSBMeteorLauncher.cs" />
|
||||
|
@ -13,7 +13,6 @@ using QSB.Player.TransformSync;
|
||||
using QSB.PoolSync;
|
||||
using QSB.ShipSync.TransformSync;
|
||||
using QSB.Anglerfish.TransformSync;
|
||||
using QSB.MeteorSync.TransformSync;
|
||||
using QSB.TimeSync;
|
||||
using QSB.Tools.ProbeTool.TransformSync;
|
||||
using QSB.Utility;
|
||||
@ -40,7 +39,6 @@ namespace QSB
|
||||
public GameObject OrbPrefab { get; private set; }
|
||||
public GameObject ShipPrefab { get; private set; }
|
||||
public GameObject AnglerPrefab { get; private set; }
|
||||
public GameObject MeteorPrefab { get; private set; }
|
||||
public string PlayerName { get; private set; }
|
||||
|
||||
private const int MaxConnections = 128;
|
||||
@ -92,12 +90,6 @@ namespace QSB
|
||||
AnglerPrefab.AddComponent<AnglerTransformSync>();
|
||||
spawnPrefabs.Add(AnglerPrefab);
|
||||
|
||||
MeteorPrefab = _assetBundle.LoadAsset<GameObject>("assets/networkmeteor.prefab");
|
||||
SetupNetworkId(MeteorPrefab, 6);
|
||||
SetupNetworkTransform(MeteorPrefab);
|
||||
MeteorPrefab.AddComponent<MeteorTransformSync>();
|
||||
spawnPrefabs.Add(MeteorPrefab);
|
||||
|
||||
ConfigureNetworkManager();
|
||||
}
|
||||
|
||||
|
@ -1,89 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &5883252657705884242
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5098047629544573660}
|
||||
- component: {fileID: 776328158895715672}
|
||||
- component: {fileID: 6170136007589091904}
|
||||
m_Layer: 0
|
||||
m_Name: NetworkMeteor
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &5098047629544573660
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5883252657705884242}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &776328158895715672
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5883252657705884242}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 372142912, guid: 93b08009869340045a8e7321508b6355, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_SceneId:
|
||||
m_Value: 0
|
||||
m_AssetId:
|
||||
i0: 0
|
||||
i1: 0
|
||||
i2: 0
|
||||
i3: 0
|
||||
i4: 0
|
||||
i5: 0
|
||||
i6: 0
|
||||
i7: 0
|
||||
i8: 0
|
||||
i9: 0
|
||||
i10: 0
|
||||
i11: 0
|
||||
i12: 0
|
||||
i13: 0
|
||||
i14: 0
|
||||
i15: 0
|
||||
m_ServerOnly: 0
|
||||
m_LocalPlayerAuthority: 0
|
||||
--- !u!114 &6170136007589091904
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5883252657705884242}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -1768714887, guid: 93b08009869340045a8e7321508b6355, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_TransformSyncMode: 0
|
||||
m_SendInterval: 0.1
|
||||
m_SyncRotationAxis: 7
|
||||
m_RotationSyncCompression: 0
|
||||
m_SyncSpin: 0
|
||||
m_MovementTheshold: 0.001
|
||||
m_VelocityThreshold: 0.0001
|
||||
m_SnapThreshold: 5
|
||||
m_InterpolateRotation: 1
|
||||
m_InterpolateMovement: 1
|
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7319496ae35a4124bbe088ca1cb818ac
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: network
|
||||
assetBundleVariant:
|
Loading…
x
Reference in New Issue
Block a user