v0.5.0: Mandatory Height Calibration Prompt, Compatibility with Relay Server v1.1.0, Enhanced People Panel, Various Refactors

Komodo/Assets/DarkBackdrop.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: DarkBackdrop
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        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: 4a3cc84026d549e498181a582921de26, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        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_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _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: []

Komodo/Assets/DarkStage.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: DarkStage
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        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: 4a3cc84026d549e498181a582921de26, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        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_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _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: []

Komodo/Assets/GrabManager.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GrabManager : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+
+    }
+}

Komodo/Assets/Packages/KomodoCore/Hidden~/WebGLTemplates/KomodoWebXRFullView2020/relay.js

@@ -1,13 +1,15 @@
+// 'esversion: 6'
+
 // Replace these with your own server's URLs.
 
 // Tip: if you need to change this on-the-fly, you can edit this file without rebuilding. It's also possible to use the inspector to inspect the VR frame and call `window.RELAY_API_BASE_URL="<your-server-url>"`, if for some reason you need to do that in real time.
 
 var RELAY_BASE_URL = "http://localhost:3000";
 var API_BASE_URL = "http://localhost:4040";
-
+var VR_BASE_URL = "https://localhost:8123"; //TODO -- change this to a better default
 
 // init globals which Unity will assign when setup is done.
-var socket = null;
+var sync = null;
 var chat = null;
 
 /**
@@ -26,12 +28,66 @@ var getParams = function (url) {
         var pair = vars[i].split('=');
         params[pair[0]] = decodeURIComponent(pair[1]);
     }
+
     return params;
 };
 
-let params = getParams(window.location.href);
+var params = getParams(window.location.href);
+
 console.log(params);
 
+// Removes everything after the "?" in the input string.
+var removeQuery = function (url) {
+    var splitUrl = url.split("?");
+
+    if (splitUrl.length != 2) {
+        console.warn("Query was not removed.");
+
+        return url;
+    }
+
+    return splitUrl[0];
+};
+
+// Replaces the hard-coded base URL
+var removeVRBaseUrl = function (url) {
+    var baselessURL = url.replace(VR_BASE_URL, "");
+
+    if (baselessURL == url) {
+        console.warn("Base URL was not removed.");
+
+        return url;
+    }
+
+    return baselessURL;
+};
+
+var splitAppAndBuild = function (appAndBuild) {
+    var splitString = appAndBuild.split("/");
+
+    if(splitString.length != 4) {
+        console.error("could not split app and build");
+
+        return {app: appAndBuild, build: ""};
+    }
+
+    var app = splitString[1];
+
+    var build = splitString[2];
+
+    return {app: app, build: build};
+};
+
+var runtimeAppAndBuild = removeVRBaseUrl(removeQuery(window.location.href));
+
+//console.log(runtimeAppAndBuild);
+
+// TODO(Brandon): in the future, pass app and build as separate details like this:
+// var result = splitAppAndBuild(runtimeAppAndBuild); 
+// var runtimeApp = result.app;
+// var runtimeBuild = result.build;
+// ...then pass it in in request.onload below.
+
 // Client and session params supplied by portal iframe src
 var session_id = Number(params.session);
 var client_id = Number(params.client);
@@ -40,6 +96,8 @@ var playback_id = Number(params.playback);
 
 // wrapper `details` object to be populated by api call and passed to Unity
 // NOTE(rob): Unity cannot deserialize raw arrays
+// NOTE(Brandon): "build" here refers to the lab configuration set by the instructor
+// ... build may differ at runtime for admin and instructor users
 var details = {
     assets: [],
     build: "",
@@ -51,7 +109,7 @@ var details = {
     session_name: "",
     start_time: "",
     users: []
-}
+};
 
 // fetch lab details from portal api
 var url = API_BASE_URL + "/labs/" + session_id.toString();
@@ -63,16 +121,16 @@ request.send();
 request.onload = function(){
     let res = request.response;
     console.log(res);
+
     // session details
-    details.build = res.build;
+    details.build = runtimeAppAndBuild;
     details.course_id = res.course_id;
     details.create_at = res.create_at;
     details.description = res.description;
     details.end_time = res.end_time;
     details.session_id = res.session_id;
     details.session_name = res.session_name;
     details.start_time = res.start_time;
-
     details.users = res.users;
 
     let assets_response = res.assetList;