mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-30 03:32:47 +00:00
Code Issues Projects Releases Wiki Activity

update more stuff

Browse Source
This commit is contained in:
Mister_Nebula 2022-02-03 09:20:14 +00:00
parent dd83b4b9e8
commit f3220ae02f
7 changed files with 49 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
QSB/AssetBundles/network
View File

Binary file not shown.

4
QSB/AssetBundles/network.manifest
View File

@ -1,9 +1,9 @@
ManifestFileVersion: 0 ManifestFileVersion: 0
CRC: 1236337440 CRC: 2877256378
Hashes: Hashes:
AssetFileHash: AssetFileHash:
serializedVersion: 2 serializedVersion: 2
Hash: 91db39439a02545ccbd81737830d763f Hash: 8d7ea522fab30919b9da9d6fcc291d2b
TypeTreeHash: TypeTreeHash:
serializedVersion: 2 serializedVersion: 2
Hash: 7c361b9660415c98c90cf08b6645985a Hash: 7c361b9660415c98c90cf08b6645985a

3
QSB/PlayerBodySetup/Local/LocalPlayerCreation.cs
View File

@ -3,6 +3,7 @@ using QSB.Player;
using QSB.Player.Messages; using QSB.Player.Messages;
using QSB.SectorSync; using QSB.SectorSync;
using QSB.Tools; using QSB.Tools;
using QSB.Utility;
using QSB.WorldSync; using QSB.WorldSync;
using System.Linq; using System.Linq;
using UnityEngine; using UnityEngine;
@ -19,6 +20,8 @@ namespace QSB.PlayerBodySetup.Local
out Transform visibleStickPivot, out Transform visibleStickPivot,
out Transform visibleStickTip) out Transform visibleStickTip)
{ {
DebugLog.DebugWrite($"CREATE PLAYER");
sectorDetector.Init(Locator.GetPlayerSectorDetector(), TargetType.Player); sectorDetector.Init(Locator.GetPlayerSectorDetector(), TargetType.Player);
// player body // player body

55
QSB/PlayerBodySetup/Remote/FixMaterialsInAllChildren.cs
View File

@ -1,4 +1,8 @@
using System.Collections.Generic; using QSB.Utility;
using QSB.WorldSync;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine; using UnityEngine;
namespace QSB.PlayerBodySetup.Remote namespace QSB.PlayerBodySetup.Remote
@ -28,10 +32,20 @@ namespace QSB.PlayerBodySetup.Remote
public static void ReplaceMaterials(Transform rootObject) public static void ReplaceMaterials(Transform rootObject)
{ {
DebugLog.DebugWrite($"Replace materials on children of {rootObject.name}");
if (_materialDefinitions.Count == 0) if (_materialDefinitions.Count == 0)
{
try
{ {
GenerateMaterialDefinitions(); GenerateMaterialDefinitions();
} }
catch (Exception ex)
{
DebugLog.ToConsole($"Exception when generating material definitions. {ex}", OWML.Common.MessageType.Error);
return;
}
}
foreach (var renderer in rootObject.GetComponentsInChildren<Renderer>(true)) foreach (var renderer in rootObject.GetComponentsInChildren<Renderer>(true))
{ {
@ -44,31 +58,28 @@ namespace QSB.PlayerBodySetup.Remote
private static void GenerateMaterialDefinitions() private static void GenerateMaterialDefinitions()
{ {
var localPlayerAnimController = Locator.GetPlayerBody().GetComponentInChildren<PlayerAnimController>(true); var matNameList = new List<string>()
{
"Traveller_HEA_Player_Skin_mat",
"Traveller_HEA_Player_Clothes_mat",
"Traveller_HEA_PlayerSuit_mat",
"Props_HEA_Jetpack_mat"
};
var playerClothesMat = localPlayerAnimController._unsuitedGroup.transform.GetChild(0).GetComponent<SkinnedMeshRenderer>().material; var allMaterials = (Material[])Resources.FindObjectsOfTypeAll(typeof(Material));
var playerSkinMat = localPlayerAnimController._unsuitedGroup.transform.GetChild(1).GetComponent<SkinnedMeshRenderer>().material;
var playerSuitMat = localPlayerAnimController._suitedGroup.transform.GetChild(0).GetComponent<SkinnedMeshRenderer>().material;
var playerJetpackMat = localPlayerAnimController._suitedGroup.transform.GetChild(4).GetComponent<SkinnedMeshRenderer>().material;
var roastingSystem = Locator.GetPlayerCamera().transform.Find("RoastingSystem"); foreach (var name in matNameList)
var stickRoot = roastingSystem.GetChild(0); {
var stickPivot = stickRoot.GetChild(0); var matchingMaterial = allMaterials.FirstOrDefault(x => x.name == name);
var stickTip = stickPivot.GetChild(0);
var localMallowRoot = stickTip.Find("Mallow_Root"); if (matchingMaterial == default)
var localMallowFlames = localMallowRoot.Find("Effects_HEA_MarshmallowFlames"); {
var mallowFlamesMat = localMallowFlames.GetComponent<MeshRenderer>().material; DebugLog.ToConsole($"Error - could not find material with the name {name}!", OWML.Common.MessageType.Error);
return;
}
var localStick = stickTip.Find("Props_HEA_RoastingSick").GetChild(0); _materialDefinitions.Add(new(name, matchingMaterial));
var roastingStickMat = localStick.GetComponent<MeshRenderer>().material; }
_materialDefinitions.Add(new(playerSkinMat.name, playerSkinMat));
_materialDefinitions.Add(new(playerClothesMat.name, playerClothesMat));
_materialDefinitions.Add(new(playerSuitMat.name, playerSuitMat));
_materialDefinitions.Add(new(playerJetpackMat.name, playerJetpackMat));
_materialDefinitions.Add(new(mallowFlamesMat.name, mallowFlamesMat));
_materialDefinitions.Add(new(roastingStickMat.name, roastingStickMat));
} }
} }
} }

11
QSB/PlayerBodySetup/Remote/RemotePlayerCreation.cs
View File

@ -17,10 +17,14 @@ namespace QSB.PlayerBodySetup.Remote
out Transform visibleStickPivot, out Transform visibleStickPivot,
out Transform visibleStickTip) out Transform visibleStickTip)
{ {
DebugLog.DebugWrite($"CREATE PLAYER");
/* /*
* CREATE PLAYER STRUCTURE * CREATE PLAYER STRUCTURE
*/ */
DebugLog.DebugWrite($"CREATE PLAYER STRUCTURE");
// Variable naming convention is broken here to reflect OW unity project (with REMOTE_ prefixed) for readability // Variable naming convention is broken here to reflect OW unity project (with REMOTE_ prefixed) for readability
var REMOTE_Player_Body = UnityEngine.Object.Instantiate(QSBCore.NetworkAssetBundle.LoadAsset<GameObject>("Assets/Prefabs/REMOTE_Player_Body.prefab")); var REMOTE_Player_Body = UnityEngine.Object.Instantiate(QSBCore.NetworkAssetBundle.LoadAsset<GameObject>("Assets/Prefabs/REMOTE_Player_Body.prefab"));
@ -36,6 +40,8 @@ namespace QSB.PlayerBodySetup.Remote
* SET UP PLAYER BODY * SET UP PLAYER BODY
*/ */
DebugLog.DebugWrite($"SET UP PLAYER BODY");
player.Body = REMOTE_Player_Body; player.Body = REMOTE_Player_Body;
FixMaterialsInAllChildren.ReplaceMaterials(REMOTE_Player_Body.transform); FixMaterialsInAllChildren.ReplaceMaterials(REMOTE_Player_Body.transform);
@ -58,6 +64,8 @@ namespace QSB.PlayerBodySetup.Remote
* SET UP PLAYER CAMERA * SET UP PLAYER CAMERA
*/ */
DebugLog.DebugWrite($"SET UP PLAYER CAMERA");
REMOTE_PlayerCamera.GetComponent<Camera>().enabled = false; REMOTE_PlayerCamera.GetComponent<Camera>().enabled = false;
var owcamera = REMOTE_PlayerCamera.GetComponent<OWCamera>(); var owcamera = REMOTE_PlayerCamera.GetComponent<OWCamera>();
player.Camera = owcamera; player.Camera = owcamera;
@ -70,6 +78,8 @@ namespace QSB.PlayerBodySetup.Remote
* SET UP ROASTING STICK * SET UP ROASTING STICK
*/ */
DebugLog.DebugWrite($"SET UP ROASTING STICK");
var REMOTE_Stick_Pivot = REMOTE_Stick_Root.transform.GetChild(0); var REMOTE_Stick_Pivot = REMOTE_Stick_Root.transform.GetChild(0);
REMOTE_Stick_Pivot.gameObject.SetActive(false); REMOTE_Stick_Pivot.gameObject.SetActive(false);
var mallowRoot = REMOTE_Stick_Pivot.Find("REMOTE_Stick_Tip/Mallow_Root"); var mallowRoot = REMOTE_Stick_Pivot.Find("REMOTE_Stick_Tip/Mallow_Root");
@ -78,7 +88,6 @@ namespace QSB.PlayerBodySetup.Remote
player.RoastingStick = REMOTE_Stick_Pivot.gameObject; player.RoastingStick = REMOTE_Stick_Pivot.gameObject;
var marshmallow = mallowRoot.GetComponent<QSBMarshmallow>(); var marshmallow = mallowRoot.GetComponent<QSBMarshmallow>();
player.Marshmallow = marshmallow; player.Marshmallow = marshmallow;
marshmallow.enabled = true;
visibleRoastingSystem = REMOTE_RoastingSystem.transform; visibleRoastingSystem = REMOTE_RoastingSystem.transform;
visibleStickPivot = REMOTE_Stick_Pivot; visibleStickPivot = REMOTE_Stick_Pivot;

52
QSB/Tools/PlayerToolsManager.cs
View File

@ -68,60 +68,8 @@ namespace QSB.Tools
private static void CreateStowTransforms(Transform cameraBody) private static void CreateStowTransforms(Transform cameraBody)
{ {
var playerBody = cameraBody.parent;
StowTransform = cameraBody.Find("REMOTE_ToolStowTransform"); StowTransform = cameraBody.Find("REMOTE_ToolStowTransform");
HoldTransform = cameraBody.Find("REMOTE_ToolHoldTransform"); HoldTransform = cameraBody.Find("REMOTE_ToolHoldTransform");
/*
var item = new GameObject("REMOTE_ItemSocket");
item.transform.parent = cameraBody;
item.transform.localPosition = new Vector3(0.125f, -0.12f, 0.2f);
item.transform.localRotation = Quaternion.Euler(0, 0, 15);
item.transform.localScale = new Vector3(0.33f, 0.33f, 0.33f);
var scroll = new GameObject("REMOTE_ScrollSocket");
scroll.transform.parent = cameraBody;
scroll.transform.localPosition = new Vector3(0.148f, -0.0522f, 0.2465f);
scroll.transform.localRotation = Quaternion.Euler(236.054f, 56.46799f, -152.472f);
scroll.transform.localScale = new Vector3(0.33f, 0.33f, 0.33f);
var sharedStone = new GameObject("REMOTE_SharedStoneSocket");
sharedStone.transform.parent = cameraBody;
sharedStone.transform.localPosition = new Vector3(0.1375f, -0.119f, 0.2236f);
sharedStone.transform.localRotation = Quaternion.Euler(-23.053f, -0.263f, 6.704f);
sharedStone.transform.localScale = new Vector3(0.33f, 0.33f, 0.33f);
var warpCore = new GameObject("REMOTE_WarpCoreSocket");
warpCore.transform.parent = cameraBody;
warpCore.transform.localPosition = new Vector3(0.161f, -0.107f, 0.223f);
warpCore.transform.localRotation = Quaternion.Euler(179.949f, 82.59f, 163.697f);
warpCore.transform.localScale = new Vector3(0.33f, 0.33f, 0.33f);
var vesselCore = new GameObject("REMOTE_VesselCoreSocket");
vesselCore.transform.parent = cameraBody;
vesselCore.transform.localPosition = new Vector3(0.177f, -0.106f, 0.2f);
vesselCore.transform.localRotation = Quaternion.Euler(3.142f, 14.827f, 12.094f);
vesselCore.transform.localScale = new Vector3(0.27f, 0.27f, 0.27f);
var dreamLantern = new GameObject("REMOTE_DreamLanternSocket");
dreamLantern.transform.parent = cameraBody;
dreamLantern.transform.localPosition = new Vector3(0.243f, -0.207f, 0.262f);
dreamLantern.transform.localRotation = Quaternion.Euler(0f, 0f, 0f);
dreamLantern.transform.localScale = new Vector3(0.33f, 0.33f, 0.33f);
var slideReel = new GameObject("REMOTE_SlideReelSocket");
slideReel.transform.parent = cameraBody;
slideReel.transform.localPosition = new Vector3(0.1353f, -0.0878f, 0.2878f);
slideReel.transform.localRotation = Quaternion.Euler(-145.532f, 6.589996f, -94.54901f);
slideReel.transform.localScale = new Vector3(0.3300001f, 0.33f, 0.3299999f);
var visionTorch = new GameObject("REMOTE_VisionTorchSocket");
visionTorch.transform.parent = cameraBody;
visionTorch.transform.localPosition = new Vector3(0.21f, -0.32f, 0.33f);
visionTorch.transform.localRotation = Quaternion.Euler(-4.5f, 0.03f, 9f);
visionTorch.transform.localScale = new Vector3(0.33f, 0.33f, 0.33f);
*/
} }
internal static MeshRenderer GetRenderer(GameObject root, string gameObjectName) => internal static MeshRenderer GetRenderer(GameObject root, string gameObjectName) =>

2
QSB/Tools/SignalscopeTool/SignalscopeCreator.cs
View File

@ -6,8 +6,6 @@ namespace QSB.Tools.SignalscopeTool
{ {
internal static class SignalscopeCreator internal static class SignalscopeCreator
{ {
private static readonly Vector3 SignalscopeScale = new(1.5f, 1.5f, 1.5f);
internal static void CreateSignalscope(PlayerInfo player) internal static void CreateSignalscope(PlayerInfo player)
{ {
var signalscopeRoot = player.CameraBody.transform.Find("REMOTE_Signalscope").gameObject; var signalscopeRoot = player.CameraBody.transform.Find("REMOTE_Signalscope").gameObject;