From bce28e1235d10c0ecf95c533fcca9ffeb7a4ce38 Mon Sep 17 00:00:00 2001
From: Abdul Mukheem Shaik <mukheemuddin@gmail.com>
Date: Mon, 27 May 2024 19:30:50 +0200
Subject: [PATCH] Websocket connections updated
User testing done with both Headsets and collaboration
Co-Authored-By: ZeinabBF <145973209+ZeinabBF@users.noreply.github.com>
Co-Authored-By: MinaMaddahi <145911367+MinaMaddahi@users.noreply.github.com>
Co-Authored-By: Masoomeh <145902196+dalarna2022@users.noreply.github.com>
---
Assets/SceneSharing/Materials/GreenButton.mat | 82 ++++++++++
.../Materials/GreenButton.mat.meta | 8 +
.../Podium_AlbedoTransparency-Green.png | Bin 0 -> 10790 bytes
.../Podium_AlbedoTransparency-Green.png.meta | 147 ++++++++++++++++++
.../Prefabs/Resources/GUI.prefab | 6 +-
.../Prefabs/Resources/TalkingAvatar.prefab | 4 +-
Assets/SharedSpatialAnchors/Scripts/API.cs | 10 ++
.../Scripts/WebSocketController.cs | 3 +-
ProjectSettings/ProjectSettings.asset | 2 +-
9 files changed, 257 insertions(+), 5 deletions(-)
create mode 100644 Assets/SceneSharing/Materials/GreenButton.mat
create mode 100644 Assets/SceneSharing/Materials/GreenButton.mat.meta
create mode 100644 Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png
create mode 100644 Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png.meta
diff --git a/Assets/SceneSharing/Materials/GreenButton.mat b/Assets/SceneSharing/Materials/GreenButton.mat
new file mode 100644
index 0000000..8c9e835
--- /dev/null
+++ b/Assets/SceneSharing/Materials/GreenButton.mat
@@ -0,0 +1,82 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: GreenButton
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_ValidKeywords:
+ - _METALLICGLOSSMAP
+ - _NORMALMAP
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 2800000, guid: 93cef7b123baace49a4508c4b6f2cec3, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 9f393d521eced1743813048ee4c113a7, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 2800000, guid: d067328b96a9e22468bb2cbd30c51050, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 2800000, guid: 48b5754585338eb40872d655be3f9d31, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/SceneSharing/Materials/GreenButton.mat.meta b/Assets/SceneSharing/Materials/GreenButton.mat.meta
new file mode 100644
index 0000000..59ce119
--- /dev/null
+++ b/Assets/SceneSharing/Materials/GreenButton.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 496d80de84119434795ada5b79b544f3
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png b/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b697ea352a9915a1fe9e68577de4acf96c13276
GIT binary patch
literal 10790
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
E0&5vnF#rGn
literal 0
HcmV?d00001
diff --git a/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png.meta b/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png.meta
new file mode 100644
index 0000000..35bb7f4
--- /dev/null
+++ b/Assets/SceneSharing/Materials/Podium_AlbedoTransparency-Green.png.meta
@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 9f393d521eced1743813048ee4c113a7
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ 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
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMasterTextureLimit: 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
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 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
+ 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
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Windows Store Apps
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab
index 5528d01..08ac981 100644
--- a/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab
@@ -912,7 +912,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4890728644967733176}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.12994087, y: 0.080064446, z: 1.5369034}
+ m_LocalPosition: {x: -0.014, y: 0.080064446, z: 1.5369034}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -1139,6 +1139,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 7516989854951799700, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 496d80de84119434795ada5b79b544f3, type: 2}
- target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3}
propertyPath: _hoverColor.b
value: 0.003921569
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/TalkingAvatar.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/TalkingAvatar.prefab
index 16b247f..204fad0 100644
--- a/Assets/SharedSpatialAnchors/Prefabs/Resources/TalkingAvatar.prefab
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/TalkingAvatar.prefab
@@ -964,8 +964,8 @@ Transform:
m_GameObject: {fileID: 3128949758138181256}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 1.42, y: 0, z: 0}
- m_LocalScale: {x: 1.25, y: 1.3, z: 1.3}
- m_ConstrainProportionsScale: 0
+ m_LocalScale: {x: 0.83, y: 0.86319995, z: 0.86319995}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 5280034911807405635}
- {fileID: 7815928270693653670}
diff --git a/Assets/SharedSpatialAnchors/Scripts/API.cs b/Assets/SharedSpatialAnchors/Scripts/API.cs
index 0c4c350..7715f1f 100644
--- a/Assets/SharedSpatialAnchors/Scripts/API.cs
+++ b/Assets/SharedSpatialAnchors/Scripts/API.cs
@@ -7,6 +7,7 @@ using System.Security.Cryptography;
using TMPro;
using UnityEngine;
using UnityEngine.Networking;
+using WebSocketSharp;
//https://github.com/GlitchEnzo/NuGetForUnity
// Creating the data structure according to the expected Json
[Serializable]
@@ -70,6 +71,10 @@ public class API : MonoBehaviour
{
if (isButtonPressed)
{
+ if (webSocketControllerScript.ws.ReadyState != WebSocketState.Open)
+ {
+ webSocketControllerScript.ws.Connect();
+ }
photonView = PhotonView.Get(this);
photonView.RPC("RPC_VoltageUpdate", RpcTarget.All, webSocketControllerScript.voltageValue.ToString());
@@ -80,6 +85,7 @@ public class API : MonoBehaviour
{
webSocketController = GameObject.FindGameObjectWithTag("WebController");
webSocketControllerScript = webSocketController.GetComponent<WebSocketController>();
+ webSocketControllerScript.ConnectWithESP32();
StartCoroutine(GetText());
avatar = GameObject.FindGameObjectWithTag("Avatar");
@@ -150,6 +156,10 @@ public void ExtractDataFromJson(string json)
latestWD = point.values[0];
windDirectionInDirectionTerms = GetWindDirection(latestWD);
//windDirValue.SetText(latestWD.ToString());
+ if (webSocketControllerScript.ws.ReadyState != WebSocketState.Open)
+ {
+ webSocketControllerScript.ws.Connect();
+ }
webSocketControllerScript.ws.Send(latestWD.ToString()+":take input");
Debug.Log(latestWD.ToString()+" - Degrees sent to ESP");
}
diff --git a/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs b/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs
index 69a6700..4501bd5 100644
--- a/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs
+++ b/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs
@@ -19,7 +19,7 @@ public class WebSocketController : MonoBehaviour
public String voltageValue = "0.0f";
public void Start(){
- ConnectWithESP32();
+ //ConnectWithESP32();
//narrationController.GetComponent<NarrationController>();
}
@@ -54,6 +54,7 @@ public class WebSocketController : MonoBehaviour
};
ws.Connect();
Debug.Log("Websocket state - " + ws.ReadyState);
+
}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 6eb6409..4c12deb 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -138,7 +138,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
- bundleVersion: 53
+ bundleVersion: 75
preloadedAssets:
- {fileID: 0}
- {fileID: 0}