diff --git a/Assets/HHI.meta b/Assets/HHI.meta new file mode 100644 index 0000000000000000000000000000000000000000..5ab1506810514a62aa34ad4b2b832dba0dc74249 --- /dev/null +++ b/Assets/HHI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31baf714eb2add046993d3682b6cd8f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HHI/HHI_ARFWorldAnalysisUser.asset b/Assets/HHI/HHI_ARFWorldAnalysisUser.asset new file mode 100644 index 0000000000000000000000000000000000000000..aed56912bfd3fd518c6c1f046ca7d3e78fa6e6bb --- /dev/null +++ b/Assets/HHI/HHI_ARFWorldAnalysisUser.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01f9889f0a04026429aa8459e181e973, type: 3} + m_Name: HHI_ARFWorldAnalysisUser + m_EditorClassIdentifier: + userName: HHI + company: Fraunhofer HHI + UUID: 75189aef-0fa8-4a37-b1cb-ff246bf99828 diff --git a/Assets/HHI/HHI_ARFWorldAnalysisUser.asset.meta b/Assets/HHI/HHI_ARFWorldAnalysisUser.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..3b693128512422eb786b0cb1c710a8581da45ae6 --- /dev/null +++ b/Assets/HHI/HHI_ARFWorldAnalysisUser.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 568321977f2db614d9bdb32281524601 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HHI/HHI_Analysis Local.asset b/Assets/HHI/HHI_Analysis Local.asset new file mode 100644 index 0000000000000000000000000000000000000000..8f2fccd784f28b54c055b70b8edca1404252a252 --- /dev/null +++ b/Assets/HHI/HHI_Analysis Local.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4571d019d0609224aa4a14ed18de30cd, type: 3} + m_Name: HHI_Analysis Local + m_EditorClassIdentifier: + serverName: HHI Local (DEV) + company: Fraunhofer HHI + basePath: http://localhost + port: 61788 + currentUser: {fileID: 11400000, guid: 568321977f2db614d9bdb32281524601, type: 2} diff --git a/Assets/HHI/HHI_Analysis Local.asset.meta b/Assets/HHI/HHI_Analysis Local.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..8e9f2ac55bf4e7204182266fe90c81527a6c91d0 --- /dev/null +++ b/Assets/HHI/HHI_Analysis Local.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5edacbb89cfeb54da3475ea5561a4ac +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HHI/HHI_Analysis.asset b/Assets/HHI/HHI_Analysis.asset new file mode 100644 index 0000000000000000000000000000000000000000..6ffa8ea090c4839d4105941b949624b1101811f5 --- /dev/null +++ b/Assets/HHI/HHI_Analysis.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4571d019d0609224aa4a14ed18de30cd, type: 3} + m_Name: HHI_Analysis + m_EditorClassIdentifier: + serverName: HHI + company: Fraunhofer HHI + basePath: https:// + port: 8080 + currentUser: {fileID: 11400000, guid: 568321977f2db614d9bdb32281524601, type: 2} diff --git a/Assets/HHI/HHI_Analysis.asset.meta b/Assets/HHI/HHI_Analysis.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..d344d51b241ca4a0eebbef9c9656edb464890088 --- /dev/null +++ b/Assets/HHI/HHI_Analysis.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1cf0a2f6e95ec449bc971f00bffe9df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HHI/Scripts.meta b/Assets/HHI/Scripts.meta new file mode 100644 index 0000000000000000000000000000000000000000..5cf908bb6114e9e03c385eab7b6803a1969e9797 --- /dev/null +++ b/Assets/HHI/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 099fe9f81070c9345820718eb8b98412 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HHI/Scripts/TestAPIWebSocketsClient.cs b/Assets/HHI/Scripts/TestAPIWebSocketsClient.cs new file mode 100644 index 0000000000000000000000000000000000000000..0396f02d8bf5fdf3b0d2cbf22a0cb7e80d797e8a --- /dev/null +++ b/Assets/HHI/Scripts/TestAPIWebSocketsClient.cs @@ -0,0 +1,132 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +using WebSocketSharp; + +using ETSI.ARF.WorldAnalysis; +using ETSI.ARF.WorldAnalysis.REST; +using ETSI.ARF.OpenAPI.WorldAnalysis; +using Pose = ETSI.ARF.OpenAPI.WorldAnalysis.Pose; +using UnityEngine.InputSystem; + +public class TestWebSocketsClient : MonoBehaviour +{ + public WorldAnalysisREST rest; + public GameObject asset1; + + private WebSocketSharp.WebSocket webSocket; + string websocketServer; + bool websocketConnected = false; + + // Start is called before the first frame update + void Start() + { + if (asset1 != null) asset1.GetComponent<Renderer>().material.color = Color.red; + + rest.CheckServer(); + rest.PrintCapabilities(); + + //websocketServer = rest.GetWebSocketEndpoint(); + websocketServer = "ws://localhost:61788/ws"; + + WebSocketConnect(); + } + + // Update is called once per frame + bool updateAsset1 = false; + Color asset1Color = Color.grey; + void Update() + { + if (Keyboard.current.spaceKey.wasPressedThisFrame) + { + webSocket.Send("StartSendingPose:10"); + } + + if (updateAsset1) + { + updateAsset1 = false; + asset1.GetComponent<Renderer>().material.color = asset1Color; + } + } + + void SetColor(Color c) + { + updateAsset1 = true; + asset1Color = c; + } + + private void OnDestroy() + { + if (websocketConnected) WebSocketClose(); + } + + // + // WebSocket methods + // + public void WebSocketClose() + { + webSocket.Send("unregister"); + webSocket.Close(); + } + + public void WebSocketConnect() + { + webSocket = new WebSocketSharp.WebSocket(websocketServer.ToString()); + + webSocket.OnOpen += (sender, e) => + { + websocketConnected = true; + Debug.Log("[WS] Connected"); + webSocket.Send("client:UnitySceneManagement"); + }; + webSocket.OnClose += (sender, e) => + { + websocketConnected = false; + SetColor(Color.red); + Debug.Log("[WS] Disconnected"); + }; + webSocket.OnError += (sender, e) => Debug.Log("[WS] Error!"); + webSocket.OnMessage += (sender, e) => WebSocketHandleMessage(e.Data); + webSocket.Connect(); + } + + bool ok = false; + public void WebSocketHandleMessage(string data) + { + Debug.Log("[WS] Receiving: " + data); + + if (data.Contains("You are now registered")) + { + ok = true; + SetColor(Color.yellow); + webSocket.Send("StartSendingPose:10"); + } + else if (data == "Stop") + { + SetColor(Color.yellow); + //ok = false; + } + else if (ok) + { + if (data.Contains("estimationState")) + { + // Handle pose + Pose p = JsonUtility.FromJson<Pose>(data); + Debug.Log("[WS][Pose] State: " + p.EstimationState.ToString()); + if (p.EstimationState == PoseEstimationState.OK) + { + if (asset1 != null) + { + SetColor(Color.green); + //asset1.transform.rotation = WorldAnalysisUnityHelper.ConvertETSIARFQuaternionToUnity(p.Value.ro) + } + } + else + { + SetColor(Color.yellow); + } + } + } + } +} diff --git a/Assets/HHI/Scripts/TestAPIWebSocketsClient.cs.meta b/Assets/HHI/Scripts/TestAPIWebSocketsClient.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..6ff2c8c45e1136ebd1f477ad71c229c553057901 --- /dev/null +++ b/Assets/HHI/Scripts/TestAPIWebSocketsClient.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 88970364eded81345a2d1f1fce3fe155 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HHI/Scripts/WAClientTest.unity b/Assets/HHI/Scripts/WAClientTest.unity new file mode 100644 index 0000000000000000000000000000000000000000..f1aac87218709978521bec645ac15855d41d05af --- /dev/null +++ b/Assets/HHI/Scripts/WAClientTest.unity @@ -0,0 +1,484 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &347171821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 347171823} + - component: {fileID: 347171822} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &347171822 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 347171821} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &347171823 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 347171821} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &481779981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 481779985} + - component: {fileID: 481779984} + - component: {fileID: 481779983} + - component: {fileID: 481779982} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &481779982 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481779981} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &481779983 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481779981} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &481779984 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481779981} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &481779985 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481779981} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.80859965, y: 0.07700671, z: -4.212555} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &960712811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 960712813} + - component: {fileID: 960712812} + - component: {fileID: 960712814} + m_Layer: 0 + m_Name: WAClient + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &960712812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960712811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88970364eded81345a2d1f1fce3fe155, type: 3} + m_Name: + m_EditorClassIdentifier: + rest: {fileID: 960712814} + asset1: {fileID: 481779981} +--- !u!4 &960712813 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960712811} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.80859965, y: 0.07700671, z: -4.212555} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &960712814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960712811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0885b8471e62a34599778bb8e199c52, type: 3} + m_Name: + m_EditorClassIdentifier: + waServer: {fileID: 11400000, guid: c5edacbb89cfeb54da3475ea5561a4ac, type: 2} +--- !u!1 &1526929762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1526929765} + - component: {fileID: 1526929764} + - component: {fileID: 1526929763} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1526929763 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526929762} + m_Enabled: 1 +--- !u!20 &1526929764 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526929762} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1526929765 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526929762} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1526929765} + - {fileID: 347171823} + - {fileID: 960712813} + - {fileID: 481779985} diff --git a/Assets/HHI/Scripts/WAClientTest.unity.meta b/Assets/HHI/Scripts/WAClientTest.unity.meta new file mode 100644 index 0000000000000000000000000000000000000000..bfdb1c4089a1ea76d98568127a46fa043d65f6df --- /dev/null +++ b/Assets/HHI/Scripts/WAClientTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6c3dda3aaa09dbf46af61577b63883c1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NuGet.config b/Assets/NuGet.config new file mode 100644 index 0000000000000000000000000000000000000000..0c083882bf36e80cf9fe975d30835d547a15d05d --- /dev/null +++ b/Assets/NuGet.config @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <packageSources> + <clear /> + <add key="nuget.org" value="https://api.nuget.org/v3/index.json" /> + </packageSources> + <disabledPackageSources /> + <activePackageSource> + <add key="All" value="(Aggregate source)" /> + </activePackageSource> + <config> + <add key="packageInstallLocation" value="CustomWithinAssets" /> + <add key="repositoryPath" value="./Packages" /> + <add key="PackagesConfigDirectoryPath" value="." /> + <add key="slimRestore" value="true" /> + <add key="PreferNetStandardOverNetFramework" value="true" /> + </config> +</configuration> \ No newline at end of file diff --git a/Assets/NuGet.config.meta b/Assets/NuGet.config.meta new file mode 100644 index 0000000000000000000000000000000000000000..adc693cfb6c0d97108eb2b5e77b4377c0bbce7c7 --- /dev/null +++ b/Assets/NuGet.config.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e9446455be0109d44b5857ce18f10ec5 +labels: +- NuGetForUnity +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages.meta b/Assets/Packages.meta new file mode 100644 index 0000000000000000000000000000000000000000..b6c7aeca1ec8da4b41c26c6fae77efb8761f346e --- /dev/null +++ b/Assets/Packages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 953b8657509a139449794a24f2147730 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/websocket-sharp-latest.1.0.2.meta b/Assets/Packages/websocket-sharp-latest.1.0.2.meta new file mode 100644 index 0000000000000000000000000000000000000000..15642e0d3a8f9637a42e7f53f507c648e2c076de --- /dev/null +++ b/Assets/Packages/websocket-sharp-latest.1.0.2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4af05175caa96bb43844e080f1d8701b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/websocket-sharp-latest.1.0.2/.signature.p7s b/Assets/Packages/websocket-sharp-latest.1.0.2/.signature.p7s new file mode 100644 index 0000000000000000000000000000000000000000..29b82e384cd4bfbf60c118bfe30e6e30bd1d7699 Binary files /dev/null and b/Assets/Packages/websocket-sharp-latest.1.0.2/.signature.p7s differ diff --git a/Assets/Packages/websocket-sharp-latest.1.0.2/lib.meta b/Assets/Packages/websocket-sharp-latest.1.0.2/lib.meta new file mode 100644 index 0000000000000000000000000000000000000000..b83a27ae6b2adea4b3933cad26125ed564976044 --- /dev/null +++ b/Assets/Packages/websocket-sharp-latest.1.0.2/lib.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1494d109bc218c346ab7622ed734ea86 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/websocket-sharp-latest.1.0.2/lib/netstandard2.0.meta b/Assets/Packages/websocket-sharp-latest.1.0.2/lib/netstandard2.0.meta new file mode 100644 index 0000000000000000000000000000000000000000..7d2e7f155cabf023f95db07c08c3503c753acea9 --- /dev/null +++ b/Assets/Packages/websocket-sharp-latest.1.0.2/lib/netstandard2.0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d5dbed810c34cc4db0fe224cda88d0b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/websocket-sharp-latest.1.0.2/lib/netstandard2.0/websocket-sharp-latest.dll.meta b/Assets/Packages/websocket-sharp-latest.1.0.2/lib/netstandard2.0/websocket-sharp-latest.dll.meta new file mode 100644 index 0000000000000000000000000000000000000000..9be2412de27263ba5dd369214fc161c466858683 --- /dev/null +++ b/Assets/Packages/websocket-sharp-latest.1.0.2/lib/netstandard2.0/websocket-sharp-latest.dll.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bddbf4bf9ff11da4885638979b82efb2 +labels: +- NuGetForUnity +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp-latest.nuspec b/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp-latest.nuspec new file mode 100644 index 0000000000000000000000000000000000000000..18e382ad69a2b8278b2aab3d31e54b9ac5380f6c --- /dev/null +++ b/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp-latest.nuspec @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> + <metadata> + <id>websocket-sharp-latest</id> + <version>1.0.2</version> + <authors>websocket-sharp-latest</authors> + <license type="expression">MIT</license> + <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl> + <icon>websocket-sharp_icon.png</icon> + <description>Package Description</description> + <releaseNotes>https://github.com/garbles-labs/websocket-sharp/releases</releaseNotes> + <repository type="git" /> + <dependencies> + <group targetFramework=".NETStandard2.0" /> + </dependencies> + </metadata> +</package> \ No newline at end of file diff --git a/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp-latest.nuspec.meta b/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp-latest.nuspec.meta new file mode 100644 index 0000000000000000000000000000000000000000..667b2c7eb8fbb988a74c062695fe599842cacbf5 --- /dev/null +++ b/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp-latest.nuspec.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a9d61c123a66f5b4a8d236c2972a3609 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp_icon.png b/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a07c30eb38d729691b987ff3ae8597fe3256b999 Binary files /dev/null and b/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp_icon.png differ diff --git a/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp_icon.png.meta b/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp_icon.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..76b216b774fff699b984249323daaaf4c052bf04 --- /dev/null +++ b/Assets/Packages/websocket-sharp-latest.1.0.2/websocket-sharp_icon.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: b3235afb951bf0a4f9e21db48a0937f6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/HHI.asset b/Assets/Resources/HHI.asset index f3495a88bb2ba7366bafa861a1af633d51dc42eb..a7211eb372083f46ac22f8ea1a14d7618b82e15c 100644 --- a/Assets/Resources/HHI.asset +++ b/Assets/Resources/HHI.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: HHI m_EditorClassIdentifier: serverName: HHI - company: HHI + company: Fraunhofer HHI basePath: https://etsi.hhi.fraunhofer.de/ port: 443 currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2} diff --git a/Assets/Resources/HHIServer.asset b/Assets/Resources/HHIServer.asset index d96fee2dc1019726eecc3b3931e084251459bf8e..68d185d560ef1399903583cc3d4615d325716f1a 100644 --- a/Assets/Resources/HHIServer.asset +++ b/Assets/Resources/HHIServer.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: HHIServer m_EditorClassIdentifier: serverName: HHI - company: HHI + company: Fraunhofer HHI basePath: https://etsi.hhi.fraunhofer.de port: 0 currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2} diff --git a/Assets/packages.config b/Assets/packages.config new file mode 100644 index 0000000000000000000000000000000000000000..bbe11dae28bcdc11ea6a6685b6eb8ba1cce54d55 --- /dev/null +++ b/Assets/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="websocket-sharp-latest" version="1.0.2" manuallyInstalled="true" /> +</packages> \ No newline at end of file diff --git a/Assets/packages.config.meta b/Assets/packages.config.meta new file mode 100644 index 0000000000000000000000000000000000000000..0b3e2b44c095d70681598607e99b5867a5e71b4c --- /dev/null +++ b/Assets/packages.config.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 36f09c56c89e0a34f9ac77ac391dcd59 +labels: +- NuGetForUnity +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index ae8e3632e3604e5f95e3850a6b1ae92d4085fb4f..c8d77ea99a3151397f1435970e3a63adfecbd673 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { - "com.google.ar.core.arfoundation.extensions": "https://github.com/google-ar/arcore-unity-extensions.git", + "com.github-glitchenzo.nugetforunity": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity", + "com.google.ar.core.arfoundation.extensions": "https://github.com/google-ar/arcore-unity-extensions.git", "com.unity.ai.navigation": "1.1.5", "com.unity.cloud.gltfast": "6.4.0", "com.unity.collab-proxy": "2.3.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index eb67a365bc42c1f69d75f42e8344a697880b2bd7..10317c2565dc34c3baabc988d1b091af9690f1bf 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,12 @@ { "dependencies": { + "com.github-glitchenzo.nugetforunity": { + "version": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "90fa6db024148d466fe738f58fd4263c7267346b" + }, "com.google.ar.core.arfoundation.extensions": { "version": "https://github.com/google-ar/arcore-unity-extensions.git", "depth": 0, diff --git a/Packages/unity-world-analysis-package b/Packages/unity-world-analysis-package index 7e30b8448e183bbd8d0f3b38f7276fff6e788c20..cafd4e6c5d163bd637415b09531f072fb38f1644 160000 --- a/Packages/unity-world-analysis-package +++ b/Packages/unity-world-analysis-package @@ -1 +1 @@ -Subproject commit 7e30b8448e183bbd8d0f3b38f7276fff6e788c20 +Subproject commit cafd4e6c5d163bd637415b09531f072fb38f1644 diff --git a/Packages/unity-world-storage-package b/Packages/unity-world-storage-package index 63adf7f5487d843f031a15c4db1d493fefe95a31..3eb6aa6a08d1e96e15e32cfb69c64fc5bc2afc6e 160000 --- a/Packages/unity-world-storage-package +++ b/Packages/unity-world-storage-package @@ -1 +1 @@ -Subproject commit 63adf7f5487d843f031a15c4db1d493fefe95a31 +Subproject commit 3eb6aa6a08d1e96e15e32cfb69c64fc5bc2afc6e