Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doolys branch #97

Merged
merged 8 commits into from
Jan 5, 2025
Merged

Doolys branch #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
302d440
made it so players can be spawned straight away
dooly123 Jan 4, 2025
542ceb9
has updated
dooly123 Jan 4, 2025
51bce35
fixed up temp location
dooly123 Jan 4, 2025
2b2b6e9
Merge branch 'main' into doolys-branch
dooly123 Jan 4, 2025
e1b3946
updated world in use
dooly123 Jan 4, 2025
59b4f86
fixed addressables
dooly123 Jan 5, 2025
ca1df63
update package directory
dooly123 Jan 5, 2025
c57ef8e
ready to merge
dooly123 Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 80 additions & 0 deletions Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,21 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 18406c2d98a4b874e9ccd06d2741d401
m_Address: Packages/com.basis.visualtrackers/Prefabs/vr_tracker_vive_3_0.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1c4eb22ae1b895b4999f192628cd9cdb
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_cv1_controller_right.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 213ae8df071a2ec42a9f405d5b3e0b62
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_cv1_controller_left.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 26ade42e4ff7eb64eb194e1a6453ad85
m_Address: NetworkManagement
m_ReadOnly: 0
Expand Down Expand Up @@ -70,6 +85,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 411cf3d73f4e3dc46a7ae9e13da44f03
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_pro_controller_right.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 432cc037784849f449cebf9338d58f11
m_Address: SettingsPanel
m_ReadOnly: 0
Expand All @@ -90,6 +110,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4c139b2f91b0dc9448dca7fcc1b6f1e6
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest2_controller_left.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 561d30f605c713f49992f1f48529936b
m_Address: LocalPlayer
m_ReadOnly: 0
Expand All @@ -105,6 +130,16 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 664b0a1856405914186fc25229d9d893
m_Address: Packages/com.basis.visualtrackers/Prefabs/vr_tracker_vive_1_0.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6cdbeef6535327d40a6f7839159facff
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_controller_left.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 71c6687014327544c95558a736c226c7
m_Address: Locomotion
m_ReadOnly: 0
Expand All @@ -120,11 +155,21 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 86272a90b30fb814ea93537106bd9c2c
m_Address: Packages/com.basis.visualtrackers/Prefabs/valve_controller_knu_right.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 98a748106e6c47748a99038c99c23bb8
m_Address: LoadingAvatar
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 98f7128bebf3e374eb8cab55434e4f7e
m_Address: Packages/com.basis.visualtrackers/Prefabs/FallbackSphere.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9b1578359dddd0245b76d3ccd9dcc2d3
m_Address: Assets/ScriptableObjects/BoneData.asset
m_ReadOnly: 0
Expand All @@ -140,11 +185,31 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c48a4804c2b9e8e4ba8c9ea8aab07a1e
m_Address: Packages/com.basis.visualtrackers/Prefabs/valve_controller_knu_left.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c92fd7b20eb8eaf4eb4a6e236e4ac620
m_Address: Assets/Prefabs/Loadins/Virtual Keyboard.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: cdff6bc74faea65489485131ad236623
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_plus_controller_left.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d736adbd5f9ea3441922acf7da4225c3
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_plus_controller_right.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d7624434af8aa17488fd698eabbf2bb6
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest2_controller_right.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: dd1db054b177db7459cc81633b86e525
m_Address: Assets/Scenes/initialization.unity
m_ReadOnly: 0
Expand All @@ -155,6 +220,21 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f95798865974f0740a6932a53740011f
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_controller_right.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fc769e29146b5b34583aa23bb7d1a2b5
m_Address: Packages/com.basis.visualtrackers/Prefabs/tundra_tracker.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fd12decbd8eb25048853cfde62e68f90
m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_pro_controller_left.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 8959b13be1add604380750c0f2e2f9f5, type: 2}
m_SchemaSet:
Expand Down
2 changes: 2 additions & 0 deletions Basis/Assets/Basis/link.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<type fullname="FeatureNetworking" preserve="all"/>
</namespace>
</assembly>
<!-- Preserve the entire BasisExamples.dll assembly -->
<assembly fullname="BasisExamples.dll" preserve="all" />

<!-- Preserve the entire AudioLink assembly -->
<assembly fullname="AudioLink" preserve="all" />
Expand Down
5 changes: 4 additions & 1 deletion Basis/Packages/com.basis.framework/Editor/BasisNetworkManagementEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ public override void OnInspectorGUI()
EditorGUILayout.LabelField("Receiver Count:", BasisNetworkManagement.ReceiverCount.ToString());



if(BasisNetworkManagement.Instance == null)
{
return;
}
EditorGUILayout.Space();
EditorGUILayout.LabelField("Transmitter Details", EditorStyles.boldLabel);
if (BasisNetworkManagement.Instance.Transmitter != null)
Expand Down
18 changes: 17 additions & 1 deletion Basis/Packages/com.basis.framework/Players/BasisLocalPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Basis.Scripts.BasisSdk.Helpers;
using Basis.Scripts.Device_Management.Devices.Desktop;
using Basis.Scripts.Device_Management;
using Basis.Scripts.TransformBinders.BoneControl;
using Basis.Scripts.Avatar;
using Basis.Scripts.Common;
using System.Collections.Generic;
Expand Down Expand Up @@ -86,6 +85,23 @@ public async Task LocalInitialize()
}
MicrophoneRecorder.TryInitialize();
OnLocalPlayerCreatedAndReady?.Invoke();
BasisSceneFactory BasisSceneFactory = FindFirstObjectByType<BasisSceneFactory>(FindObjectsInactive.Exclude);
if (BasisSceneFactory != null)
{
BasisScene BasisScene = FindFirstObjectByType<BasisScene>(FindObjectsInactive.Exclude);
if (BasisScene != null)
{
BasisSceneFactory.Initalize(BasisScene);
}
else
{
BasisDebug.LogError("Cant Find Basis Scene");
}
}
else
{
BasisDebug.LogError("Cant Find Scene Factory");
}
}
public async Task LoadInitalAvatar(BasisDataStore.BasisSavedAvatar LastUsedAvatar)
{
Expand Down
23 changes: 17 additions & 6 deletions Basis/Packages/com.basis.framework/Scene Management/BasisSceneFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ public class BasisSceneFactory : MonoBehaviour
public BasisScene BasisScene;
public AudioMixerGroup WorldDefaultMixer;
public static BasisSceneFactory Instance;
private float timeSinceLastCheck = 0f;
public float RespawnCheckTimer = 5f;
public float RespawnHeight = -100f;
public BasisLocalPlayer BasisLocalPlayer;
public void Awake()
{
if (BasisHelpers.CheckInstance(Instance))
Expand Down Expand Up @@ -53,9 +57,15 @@ public void Initalize(BasisScene scene)
}
}
}
BasisLocalPlayer = BasisLocalPlayer.Instance;
if (BasisLocalPlayer.Instance != null)
{
BasisLocalPlayer = BasisLocalPlayer.Instance;
}
else
{
BasisLocalPlayer = FindFirstObjectByType<BasisLocalPlayer>(FindObjectsInactive.Exclude);
}
}
public BasisLocalPlayer BasisLocalPlayer;
public void LoadCameraPropertys(Camera Camera)
{
Camera RealCamera = BasisLocalCameraDriver.Instance.Camera;
Expand Down Expand Up @@ -108,10 +118,11 @@ public void SpawnPlayer(BasisLocalPlayer Basis)
{
Basis.Teleport(position, rotation);
}
else
{
BasisDebug.LogError("Missing Local Player!");
}
}
private float timeSinceLastCheck = 0f;
public float RespawnCheckTimer = 5f;
public float RespawnHeight = -100f;
public void FixedUpdate()
{
timeSinceLastCheck += Time.deltaTime;
Expand Down Expand Up @@ -145,4 +156,4 @@ public void RequestSpawnPoint(out Vector3 Position, out Quaternion Rotation)
Rotation = Quaternion.identity;
}
}
}
}
Loading
Loading