Deaktivated Multiplayer but did not remove it
This commit is contained in:
@@ -100,9 +100,9 @@ MonoBehaviour:
|
|||||||
m_Keys: []
|
m_Keys: []
|
||||||
m_Values:
|
m_Values:
|
||||||
m_PrefilteringModeMainLightShadows: 3
|
m_PrefilteringModeMainLightShadows: 3
|
||||||
m_PrefilteringModeAdditionalLight: 4
|
m_PrefilteringModeAdditionalLight: 3
|
||||||
m_PrefilteringModeAdditionalLightShadows: 2
|
m_PrefilteringModeAdditionalLightShadows: 2
|
||||||
m_PrefilterXRKeywords: 0
|
m_PrefilterXRKeywords: 1
|
||||||
m_PrefilteringModeForwardPlus: 0
|
m_PrefilteringModeForwardPlus: 0
|
||||||
m_PrefilteringModeDeferredRendering: 0
|
m_PrefilteringModeDeferredRendering: 0
|
||||||
m_PrefilteringModeScreenSpaceOcclusion: 0
|
m_PrefilteringModeScreenSpaceOcclusion: 0
|
||||||
@@ -122,10 +122,10 @@ MonoBehaviour:
|
|||||||
m_PrefilterDBufferMRT1: 1
|
m_PrefilterDBufferMRT1: 1
|
||||||
m_PrefilterDBufferMRT2: 1
|
m_PrefilterDBufferMRT2: 1
|
||||||
m_PrefilterDBufferMRT3: 1
|
m_PrefilterDBufferMRT3: 1
|
||||||
m_PrefilterSoftShadowsQualityLow: 0
|
m_PrefilterSoftShadowsQualityLow: 1
|
||||||
m_PrefilterSoftShadowsQualityMedium: 1
|
m_PrefilterSoftShadowsQualityMedium: 1
|
||||||
m_PrefilterSoftShadowsQualityHigh: 1
|
m_PrefilterSoftShadowsQualityHigh: 1
|
||||||
m_PrefilterSoftShadows: 1
|
m_PrefilterSoftShadows: 0
|
||||||
m_PrefilterScreenCoord: 1
|
m_PrefilterScreenCoord: 1
|
||||||
m_PrefilterNativeRenderPass: 1
|
m_PrefilterNativeRenderPass: 1
|
||||||
m_PrefilterUseLegacyLightmaps: 0
|
m_PrefilterUseLegacyLightmaps: 0
|
||||||
|
|||||||
@@ -79,8 +79,7 @@ MonoBehaviour:
|
|||||||
m_RequiresSettingsUpdate: 0
|
m_RequiresSettingsUpdate: 0
|
||||||
m_AutomaticLoading: 0
|
m_AutomaticLoading: 0
|
||||||
m_AutomaticRunning: 0
|
m_AutomaticRunning: 0
|
||||||
m_Loaders:
|
m_Loaders: []
|
||||||
- {fileID: 11400000, guid: 54863b214ad6f4e4c81f9dc85bd3a2cf, type: 2}
|
|
||||||
--- !u!114 &5269706996647393442
|
--- !u!114 &5269706996647393442
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b98b0de9fe670d2469cfbcd6e1d2d8f5
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+568
-568
File diff suppressed because it is too large
Load Diff
@@ -1605,8 +1605,10 @@ MonoBehaviour:
|
|||||||
UserFilter:
|
UserFilter:
|
||||||
Loop: 1
|
Loop: 1
|
||||||
dateSelector: {fileID: 1258891560}
|
dateSelector: {fileID: 1258891560}
|
||||||
|
LimitTimeRange: 1
|
||||||
|
TimeRangeMinutes: 15
|
||||||
TrackedObjects:
|
TrackedObjects:
|
||||||
- objectId: NetworkedPlayerRig(Clone)
|
- objectId: NetworkedPlayerRig
|
||||||
targetObject: {fileID: 5358844087720009267}
|
targetObject: {fileID: 5358844087720009267}
|
||||||
- objectId: CenterEyeAnchor
|
- objectId: CenterEyeAnchor
|
||||||
targetObject: {fileID: 1163434183}
|
targetObject: {fileID: 1163434183}
|
||||||
@@ -1618,8 +1620,6 @@ MonoBehaviour:
|
|||||||
targetObject: {fileID: 1936952808}
|
targetObject: {fileID: 1936952808}
|
||||||
- objectId: '[BuildingBlock] Eye Gaze Right'
|
- objectId: '[BuildingBlock] Eye Gaze Right'
|
||||||
targetObject: {fileID: 5382534}
|
targetObject: {fileID: 5382534}
|
||||||
- objectId: HitPoint(Clone)
|
|
||||||
targetObject: {fileID: 936036517}
|
|
||||||
PlaybackSpeed: 1
|
PlaybackSpeed: 1
|
||||||
AutoStart: 1
|
AutoStart: 1
|
||||||
playbackSlider: {fileID: 1661599825}
|
playbackSlider: {fileID: 1661599825}
|
||||||
@@ -10877,6 +10877,7 @@ GameObject:
|
|||||||
- component: {fileID: 1936952813}
|
- component: {fileID: 1936952813}
|
||||||
- component: {fileID: 1936952812}
|
- component: {fileID: 1936952812}
|
||||||
- component: {fileID: 1936952810}
|
- component: {fileID: 1936952810}
|
||||||
|
- component: {fileID: 1936952814}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: EyeLeft
|
m_Name: EyeLeft
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -11069,6 +11070,24 @@ MeshFilter:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1936952808}
|
m_GameObject: {fileID: 1936952808}
|
||||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!114 &1936952814
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1936952808}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 333c9f69cc49e564ba4816a87e7255bb, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
rayDistance: 10
|
||||||
|
layersToInclude:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 256
|
||||||
|
hitPointPrefab: {fileID: 0}
|
||||||
|
hitPoint: {fileID: 936036517}
|
||||||
--- !u!1 &1953766673
|
--- !u!1 &1953766673
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ public class EyeTrackingCollisionPoints : MonoBehaviour
|
|||||||
|
|
||||||
public GameObject hitPointPrefab;
|
public GameObject hitPointPrefab;
|
||||||
|
|
||||||
private GameObject hitPoint;
|
public GameObject hitPoint;
|
||||||
|
|
||||||
private void FixedUpdate()
|
private void FixedUpdate()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ using System;
|
|||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using Postgrest;
|
using Postgrest;
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
|
using UnityEngine.Rendering.Universal;
|
||||||
|
using System.Globalization;
|
||||||
|
|
||||||
namespace GhostSystem
|
namespace GhostSystem
|
||||||
{
|
{
|
||||||
@@ -18,6 +20,12 @@ namespace GhostSystem
|
|||||||
public DateTime selectedStartTime;
|
public DateTime selectedStartTime;
|
||||||
public DateSelector dateSelector;
|
public DateSelector dateSelector;
|
||||||
|
|
||||||
|
[Tooltip("Optional: Begrenze die Frame-Abfrage auf einen Zeitraum ab Startzeit.")]
|
||||||
|
public bool LimitTimeRange = true;
|
||||||
|
|
||||||
|
[Tooltip("Zeitraum in Minuten, der ab Startzeit ausgewertet wird.")]
|
||||||
|
public int TimeRangeMinutes = 15;
|
||||||
|
|
||||||
[Header("Target Objects")]
|
[Header("Target Objects")]
|
||||||
public List<TrackedObjectBinding> TrackedObjects;
|
public List<TrackedObjectBinding> TrackedObjects;
|
||||||
|
|
||||||
@@ -89,6 +97,9 @@ namespace GhostSystem
|
|||||||
Debug.Log("SceneId used in query: " + SceneId);
|
Debug.Log("SceneId used in query: " + SceneId);
|
||||||
Debug.Log("StartTime filter: " + dateSelector.selectedDateTime().ToString("o"));
|
Debug.Log("StartTime filter: " + dateSelector.selectedDateTime().ToString("o"));
|
||||||
|
|
||||||
|
var startTime = dateSelector.selectedDateTime();
|
||||||
|
var endTime = new DateTime(startTime.Year, startTime.Month, startTime.Day, startTime.Hour, startTime.Minute + 15, 0, DateTimeKind.Utc);
|
||||||
|
|
||||||
objectTracks.Clear();
|
objectTracks.Clear();
|
||||||
int batchSize = 1000;
|
int batchSize = 1000;
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
@@ -100,11 +111,14 @@ namespace GhostSystem
|
|||||||
var query = SupabaseManager.instance.supabase
|
var query = SupabaseManager.instance.supabase
|
||||||
.From<FrameModel>()
|
.From<FrameModel>()
|
||||||
.Filter("scene_id", Postgrest.Constants.Operator.Equals, SceneId)
|
.Filter("scene_id", Postgrest.Constants.Operator.Equals, SceneId)
|
||||||
.Filter("timestamp", Postgrest.Constants.Operator.GreaterThanOrEqual, dateSelector.selectedDateTime().ToString("o"))
|
.Filter("timestamp", Postgrest.Constants.Operator.GreaterThanOrEqual, startTime.ToString("o"))
|
||||||
.Order("timestamp", Postgrest.Constants.Ordering.Ascending)
|
.Order("timestamp", Postgrest.Constants.Ordering.Ascending)
|
||||||
.Limit(batchSize) // Limit, wie viele Frames in einem Batch geladen werden. (Standardmäßig 1000)
|
.Limit(batchSize) // Limit, wie viele Frames in einem Batch geladen werden. (Standardmäßig 1000)
|
||||||
.Offset(offset); // Um zu wissen, wo der nçhste Batch anfängt
|
.Offset(offset); // Um zu wissen, wo der nçhste Batch anfängt
|
||||||
|
|
||||||
|
/*if (LimitTimeRange)
|
||||||
|
query = query.Filter("timestamp", Postgrest.Constants.Operator.LessThanOrEqual, endTime.ToString("o"));*/
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(UserFilter))
|
if (!string.IsNullOrEmpty(UserFilter))
|
||||||
query = query.Filter("user_id", Postgrest.Constants.Operator.Equals, UserFilter);
|
query = query.Filter("user_id", Postgrest.Constants.Operator.Equals, UserFilter);
|
||||||
|
|
||||||
@@ -144,12 +158,18 @@ namespace GhostSystem
|
|||||||
|
|
||||||
private async UniTask LoadNewFramesAfter(DateTime afterTime) // lädt einen neuen Batch nach.
|
private async UniTask LoadNewFramesAfter(DateTime afterTime) // lädt einen neuen Batch nach.
|
||||||
{
|
{
|
||||||
|
var startTime = dateSelector.selectedDateTime();
|
||||||
|
var endTime = new DateTime(startTime.Year, startTime.Month, startTime.Day, startTime.Hour, startTime.Minute + 15, 0, DateTimeKind.Utc);
|
||||||
|
|
||||||
var query = SupabaseManager.instance.supabase
|
var query = SupabaseManager.instance.supabase
|
||||||
.From<FrameModel>()
|
.From<FrameModel>()
|
||||||
.Filter("scene_id", Postgrest.Constants.Operator.Equals, SceneId)
|
.Filter("scene_id", Postgrest.Constants.Operator.Equals, SceneId)
|
||||||
.Filter("timestamp", Postgrest.Constants.Operator.GreaterThan, afterTime.ToString("o"))
|
.Filter("timestamp", Postgrest.Constants.Operator.GreaterThan, afterTime.ToString("o"))
|
||||||
.Order("timestamp", Postgrest.Constants.Ordering.Ascending);
|
.Order("timestamp", Postgrest.Constants.Ordering.Ascending);
|
||||||
|
|
||||||
|
/*if (LimitTimeRange)
|
||||||
|
query = query.Filter("timestamp", Postgrest.Constants.Operator.LessThanOrEqual, endTime.ToString("o"));*/
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(UserFilter))
|
if (!string.IsNullOrEmpty(UserFilter))
|
||||||
query = query.Filter("user_id", Postgrest.Constants.Operator.Equals, UserFilter);
|
query = query.Filter("user_id", Postgrest.Constants.Operator.Equals, UserFilter);
|
||||||
|
|
||||||
|
|||||||
@@ -18,8 +18,7 @@ public class OVRStickAndRoomscaleMovement : NetworkBehaviour
|
|||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
if (!IsOwner)
|
//if (!IsOwner) return;
|
||||||
return;
|
|
||||||
|
|
||||||
characterController = GetComponent<CharacterController>();
|
characterController = GetComponent<CharacterController>();
|
||||||
|
|
||||||
@@ -29,7 +28,7 @@ public class OVRStickAndRoomscaleMovement : NetworkBehaviour
|
|||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
if (!IsOwner) return;
|
//if (!IsOwner) return;
|
||||||
|
|
||||||
// 1. Real-World Position des Headsets bestimmen
|
// 1. Real-World Position des Headsets bestimmen
|
||||||
Vector3 headLocalPos = rigRoot.InverseTransformPoint(cameraTransform.position);
|
Vector3 headLocalPos = rigRoot.InverseTransformPoint(cameraTransform.position);
|
||||||
|
|||||||
@@ -23,6 +23,10 @@ public class VRDebugger : MonoBehaviour
|
|||||||
GhostRecorderBatch.OnRecord -= RecordingStart;
|
GhostRecorderBatch.OnRecord -= RecordingStart;
|
||||||
GhostRecorderBatch.OnStopRecord -= RecordingStop;
|
GhostRecorderBatch.OnStopRecord -= RecordingStop;
|
||||||
}
|
}
|
||||||
|
private void Start() // Nur für Offline Mode
|
||||||
|
{
|
||||||
|
GetTrackedObjects();
|
||||||
|
}
|
||||||
|
|
||||||
private void GetTrackedObjects()
|
private void GetTrackedObjects()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -17,9 +17,15 @@ EditorBuildSettings:
|
|||||||
- enabled: 0
|
- enabled: 0
|
||||||
path: Assets/_Scenes/TestScene.unity
|
path: Assets/_Scenes/TestScene.unity
|
||||||
guid: 95fce99b6a2e1fa448d27ff8d88c7bef
|
guid: 95fce99b6a2e1fa448d27ff8d88c7bef
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/_Scenes/TestSceneMeta.unity
|
path: Assets/_Scenes/TestSceneMeta.unity
|
||||||
guid: 91bfb95032feb044c81a3964f5553fec
|
guid: 91bfb95032feb044c81a3964f5553fec
|
||||||
|
- enabled: 0
|
||||||
|
path: Assets/_Scenes/TestSceneMeta Offline.unity
|
||||||
|
guid: b98b0de9fe670d2469cfbcd6e1d2d8f5
|
||||||
|
- enabled: 1
|
||||||
|
path: Assets/_Scenes/TrainingObserverMeta.unity
|
||||||
|
guid: 0572ea139ec37b84b88a8d21771f7f1a
|
||||||
- enabled: 0
|
- enabled: 0
|
||||||
path: Assets/_Scenes/NetworkTest.unity
|
path: Assets/_Scenes/NetworkTest.unity
|
||||||
guid: b5976c62b73452e43a494b19eee50119
|
guid: b5976c62b73452e43a494b19eee50119
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ PlayerSettings:
|
|||||||
useOnDemandResources: 0
|
useOnDemandResources: 0
|
||||||
accelerometerFrequency: 60
|
accelerometerFrequency: 60
|
||||||
companyName: TH
|
companyName: TH
|
||||||
productName: RoomAwareVR
|
productName: RoomAwareVR (offline)
|
||||||
defaultCursor: {fileID: 0}
|
defaultCursor: {fileID: 0}
|
||||||
cursorHotspot: {x: 0, y: 0}
|
cursorHotspot: {x: 0, y: 0}
|
||||||
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
|
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
|
||||||
@@ -109,7 +109,7 @@ PlayerSettings:
|
|||||||
xboxEnableFitness: 0
|
xboxEnableFitness: 0
|
||||||
visibleInBackground: 1
|
visibleInBackground: 1
|
||||||
allowFullscreenSwitch: 1
|
allowFullscreenSwitch: 1
|
||||||
fullscreenMode: 3
|
fullscreenMode: 2
|
||||||
xboxSpeechDB: 0
|
xboxSpeechDB: 0
|
||||||
xboxEnableHeadOrientation: 0
|
xboxEnableHeadOrientation: 0
|
||||||
xboxEnableGuest: 0
|
xboxEnableGuest: 0
|
||||||
@@ -167,7 +167,7 @@ PlayerSettings:
|
|||||||
androidMaxAspectRatio: 2.4
|
androidMaxAspectRatio: 2.4
|
||||||
androidMinAspectRatio: 1
|
androidMinAspectRatio: 1
|
||||||
applicationIdentifier:
|
applicationIdentifier:
|
||||||
Android: com.TH.RoomAwareVR
|
Android: com.TH.RoomAwareVRwithLiveRaycast
|
||||||
Standalone: com.DefaultCompany.VR-Multiplayer
|
Standalone: com.DefaultCompany.VR-Multiplayer
|
||||||
iPhone: com.Unity-Technologies.com.unity.template.urp-blank
|
iPhone: com.Unity-Technologies.com.unity.template.urp-blank
|
||||||
buildNumber:
|
buildNumber:
|
||||||
|
|||||||
Reference in New Issue
Block a user