Merge pull request #18 from muskit/main

Control panel things + "performant" render pipline

Assets/Material/White Ring.png.meta

@@ -0,0 +1,122 @@
+fileFormatVersion: 2
+guid: 300aef8eab6ac1b4c98b87c5d928ddf2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 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: 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: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 55c71b90f58b501409674fd6129f38ac
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Audio.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 54072e2503037954c8b27f2a3c7424d9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Audio/button press.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d111fd0185fe2fc45b460568521cfa52
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Audio/lock.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 97d033599d2196d40a3f6d50bf26eeec
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Audio/unlock.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b210a512db9639e42b2299d31090e315
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/ControlLocker.cs

@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class ControlLocker : MonoBehaviour
-{
-    private int colliderCount = 0;
-    private bool isLocked = false;
-
-    [SerializeField]
-    private RawImage statusImg;
-    [SerializeField]
-    private Texture lockImg;
-    [SerializeField]
-    private Texture unlockImg;
-    [SerializeField]
-    private List<ControlPanel> cpanButtons;
-
-    private void Start()
-    {
-        statusImg.texture = unlockImg;
-    }
-
-    private void OnTriggerEnter(Collider _)
-    {
-        Debug.Log("Lock btn pressed.");
-        colliderCount++;
-        if (colliderCount == 1)
-        {
-            // set state var
-            isLocked = !isLocked;
-
-            // set img
-            statusImg.texture = isLocked ? lockImg : unlockImg;
-
-            // set buttons' state
-            foreach (var btn in cpanButtons)
-            {
-                btn.GetComponent<Collider>().enabled = !isLocked;
-            }
-        }
-    }
-
-    private void OnTriggerExit(Collider _)
-    {
-        Debug.Log("Lock btn unpressed.");
-        colliderCount--;
-    }
-}

Assets/Script/ControlPanel.cs

@@ -1,78 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using UnityEngine;
-using WindowsInput.Native;
-
-public class ControlPanel : MonoBehaviour
-{
-    public Transform Button;
-    [DllImport("user32.dll")]
-    public static extern uint MapVirtualKey(uint uCode, uint uMapType);
-    [DllImport("user32.dll")]
-    static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo);
-    public VirtualKeyCode key;
-    public VirtualKeyCode key2;
-    private int _insideColliderCount = 0;
-    public bool isToggle;
-    public bool isOn;
-    private Renderer cr;
-    public GameObject camera;
-    // Start is called before the first frame update
-
-
-    void Start()
-        {
-            cr = GetComponent<Renderer>();
-        }
-
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (isToggle == true)
-        {
-            if(isOn == false)
-            {
-                isOn = true;
-                cr.material.color = new Color(0f, 1f, 0f, 1f);
-                _insideColliderCount += 1;
-                keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 0, UIntPtr.Zero);
-            } else if (isOn == true)
-            {
-                isOn = false;
-                cr.material.color = new Color(1f, 0f, 0f, 1f);
-                _insideColliderCount += 1;
-                keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 0, UIntPtr.Zero);
-            }
-
-        } else if (isToggle == false)
-        {
-            _insideColliderCount += 1;
-            keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 0, UIntPtr.Zero);
-        }
-    }
-
-    private void OnTriggerExit(Collider other)
-    {
-        _insideColliderCount -= 1;
-        _insideColliderCount = Mathf.Max(0, _insideColliderCount);
-        if (_insideColliderCount == 0)
-            keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 2, UIntPtr.Zero);
-    }
-
-    
-
-    // Update is called once per frame
-    void Update()
-    {
-        if (Input.GetKeyDown(KeyCode.Home))
-        {
-            camera.SetActive(true);
-        }
-        
-        if (Input.GetKeyDown(KeyCode.End))
-        {
-            camera.SetActive(false);
-        }
-
-    }
-}

Assets/Script/PanelButton.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Runtime.InteropServices;
+using UnityEngine;
+using WindowsInput.Native;
+
+[RequireComponent(typeof(AudioSource))]
+public class PanelButton : MonoBehaviour
+{
+    [DllImport("user32.dll")]
+    public static extern uint MapVirtualKey(uint uCode, uint uMapType);
+    [DllImport("user32.dll")]
+    static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo);
+
+    public VirtualKeyCode key;
+    public VirtualKeyCode key2;
+
+    public bool isToggle;
+    public bool doesBeep;
+
+    public bool isOn;
+    private int _insideColliderCount = 0;
+
+    private Renderer cr;
+    public GameObject camera;
+    private AudioSource audioSrc;
+    private static AudioClip btnSound;
+
+    void Start()
+    {
+        btnSound = Resources.Load<AudioClip>("Audio/button press");
+        cr = GetComponent<Renderer>();
+
+        audioSrc = GetComponent<AudioSource>();
+        audioSrc.playOnAwake = false;
+        audioSrc.clip = btnSound;
+
+        if (isToggle)
+        {
+            // initialize toggle state
+            ButtonPress();
+            ButtonRelease();
+        }
+    }
+    
+    private void OnTriggerEnter(Collider other)
+    {
+        _insideColliderCount += 1;
+        if (doesBeep)
+            audioSrc.Play();
+        ButtonPress();
+    }
+
+    private void OnTriggerExit(Collider other)
+    {
+        _insideColliderCount = Mathf.Clamp(_insideColliderCount - 1, 0, _insideColliderCount);
+
+        if (_insideColliderCount == 0)
+        {
+            ButtonRelease();
+        }
+    }
+
+    private void ButtonPress()
+    {
+        if (isToggle)
+        {
+            if (!isOn)
+            {
+                cr.material.color = Color.green;
+                keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 2, UIntPtr.Zero);
+                keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 0, UIntPtr.Zero);
+                isOn = true;
+            }
+            else
+            {
+                cr.material.color = Color.red;
+                keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 2, UIntPtr.Zero);
+                keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 0, UIntPtr.Zero);
+                isOn = false;
+            }
+
+        }
+        else
+        {
+            cr.material.color = Color.white;
+            keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 0, UIntPtr.Zero);
+        }
+    }
+
+    private void ButtonRelease()
+    {
+        keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 2, UIntPtr.Zero);
+        keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 2, UIntPtr.Zero);
+        if (!isToggle)
+            cr.material.color = Color.gray;
+    }
+}

Assets/Script/PanelLocker.cs

@@ -0,0 +1,87 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class PanelLocker : MonoBehaviour
+{
+    private int colliderCount = 0;
+    private bool isLocked = false;
+    private float timer = 0f;
+    private bool actionTaken = false;
+
+    [Header("Settings")]
+    [SerializeField]
+    private float holdTime = 1f;
+
+    [Header("Components")]
+    [SerializeField]
+    private RawImage statusImg;
+    [SerializeField]
+    private Image timerRing;
+    [SerializeField]
+    private AudioSource audioSrc;
+    [SerializeField]
+    private List<GameObject> panelButtons;
+
+    [Header("Assets")]
+    [SerializeField]
+    private Texture lockImg;
+    [SerializeField]
+    private Texture unlockImg;
+    [SerializeField]
+    private AudioClip lockSound;
+    [SerializeField]
+    private AudioClip unlockSound;
+
+    private void Start()
+    {
+        statusImg.texture = unlockImg;
+        audioSrc.clip = lockSound;
+    }
+
+    private void OnTriggerEnter(Collider _)
+    {
+        ++colliderCount;
+    }
+
+    private void OnTriggerExit(Collider _)
+    {
+        colliderCount = Mathf.Clamp(colliderCount - 1, 0, colliderCount);
+    }
+
+    private void Update()
+    {
+        if (colliderCount >= 1)
+        {
+            timer += Time.unscaledDeltaTime;
+            float ratio = Mathf.Clamp(timer, 0, holdTime) / holdTime;
+
+            timerRing.fillAmount = Mathf.Pow(ratio, 3f);
+
+            if (ratio >= 1 && !actionTaken)
+            {
+                isLocked = !isLocked;
+            
+                audioSrc.clip = isLocked ? lockSound : unlockSound;
+                audioSrc.Play();
+
+                timerRing.color = Color.cyan;
+                statusImg.texture = isLocked ? lockImg : unlockImg;
+                
+                foreach (var btn in panelButtons)
+                {
+                    btn.SetActive(!isLocked);
+                }
+
+                actionTaken = true;
+            }
+        }
+        else
+        {
+            timer = 0;
+            timerRing.fillAmount = 0;
+            timerRing.color = Color.white;
+            actionTaken = false;
+        }
+    }
+}

Assets/Script/PanelThirdPersonButton.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Runtime.InteropServices;
+using UnityEngine;
+using WindowsInput.Native;
+
+[RequireComponent(typeof(AudioSource))]
+public class PanelThirdPersonButton : MonoBehaviour
+{
+    public bool isTP;
+
+    private Renderer cr;
+    public GameObject tpCamera;
+    private AudioSource audioSrc;
+    private static AudioClip btnSound;
+
+    void Start()
+    {
+        btnSound = Resources.Load<AudioClip>("Audio/button press");
+        audioSrc = GetComponent<AudioSource>();
+        audioSrc.playOnAwake = false;
+        audioSrc.clip = btnSound;
+
+        cr = GetComponent<Renderer>();
+
+        SetTP(isTP);
+    }
+    
+    private void OnTriggerEnter(Collider other)
+    {
+        audioSrc.Play();
+        isTP = !isTP;
+        SetTP(isTP);
+    }
+
+    private void SetTP(bool state)
+    {
+        isTP = state;
+        cr.material.color = state ? Color.green : Color.red;
+        tpCamera?.SetActive(state);
+    }
+}

Assets/Script/PanelThirdPersonButton.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 447b0e47a465da145b212861d2c70c27
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/GraphicsSettings.asset

@@ -41,7 +41,7 @@ GraphicsSettings:
   m_PreloadShadersBatchTimeLimit: -1
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
-  m_CustomRenderPipeline: {fileID: 11400000, guid: 7b7fd9122c28c4d15b667c7040e3b3fd,
+  m_CustomRenderPipeline: {fileID: 11400000, guid: d0e2fc18fe036412f8223b3b3d9ad574,
     type: 2}
   m_TransparencySortMode: 0
   m_TransparencySortAxis: {x: 0, y: 0, z: 1}

ProjectSettings/ProjectSettings.asset

@@ -137,8 +137,6 @@ PlayerSettings:
   bundleVersion: 0.1.0
   preloadedAssets:
   - {fileID: 11400000, guid: 74eeb7429f216ca45a7093c586513e98, type: 2}
-  - {fileID: -6265376527240436808, guid: 5e2dc0db42cc5b3459a781fecb0b76f9, type: 2}
-  - {fileID: -6348321304186183749, guid: 6460523340b221f4ea5611d2c011a26c, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

README.md

@@ -1,18 +1,17 @@
 # WACVR
 A VR arcade emulator
 
-## Current stage:
+## Current stage
 - Successfully started the game itself
-- Semi-successfully initialized touch
+- Successfully initialized touch
 - Successfully send touch signal
 - Successfully enabled Freeplay and tested the touch signal in game
 
 ## Current issue
-- touch startup will fail. need to enter test mode to reconnect the touch panel
+- None!
 
 ## Quick guide
 - Port binding is same as my other repo MaiDXR
-- need to enter test mode to reconnect the touch panel
 - add "[touch] enable=0" to ini file
 
 ## Why this repo now?

UserSettings/Layouts/default-2021.dwlt

@@ -14,14 +14,23 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
+<<<<<<< Updated upstream
     x: 0
     y: 43.2
     width: 1536
     height: 820.8
   m_ShowMode: 4
   m_Title: Project
+=======
+    x: 1080
+    y: 181
+    width: 1920
+    height: 1007
+  m_ShowMode: 4
+  m_Title: Console
+>>>>>>> Stashed changes
   m_RootView: {fileID: 5}
-  m_MinSize: {x: 875, y: 300}
+  m_MinSize: {x: 875, y: 350}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
@@ -34,23 +43,32 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
+<<<<<<< Updated upstream
     y: 461.6
     width: 1536
     height: 309.19998
   m_MinSize: {x: 230, y: 271}
   m_MaxSize: {x: 10000, y: 10021}
   m_ActualView: {fileID: 13}
+=======
+    y: 685
+    width: 1920
+    height: 272
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 11}
+>>>>>>> Stashed changes
   m_Panes:
   - {fileID: 13}
   - {fileID: 11}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -70,12 +88,21 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
+<<<<<<< Updated upstream
     width: 1536
     height: 770.8
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 1
   controlID: 341
+=======
+    width: 1920
+    height: 957
+  m_MinSize: {x: 300, y: 200}
+  m_MaxSize: {x: 24288, y: 16192}
+  vertical: 1
+  controlID: 92
+>>>>>>> Stashed changes
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -93,10 +120,17 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
+<<<<<<< Updated upstream
     width: 247.2
     height: 461.6
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
+=======
+    width: 302
+    height: 685
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+>>>>>>> Stashed changes
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -122,8 +156,13 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
+<<<<<<< Updated upstream
     width: 1536
     height: 820.8
+=======
+    width: 1920
+    height: 1007
+>>>>>>> Stashed changes
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -172,12 +211,21 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
+<<<<<<< Updated upstream
     width: 1536
     height: 461.6
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 8096}
   vertical: 0
   controlID: 342
+=======
+    width: 1920
+    height: 685
+  m_MinSize: {x: 300, y: 100}
+  m_MaxSize: {x: 24288, y: 8096}
+  vertical: 0
+  controlID: 93
+>>>>>>> Stashed changes
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -194,8 +242,13 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
+<<<<<<< Updated upstream
     y: 800.8
     width: 1536
+=======
+    y: 987
+    width: 1920
+>>>>>>> Stashed changes
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -209,23 +262,29 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 247.2
     y: 0
+<<<<<<< Updated upstream
     width: 813.60004
     height: 461.6
   m_MinSize: {x: 202, y: 221}
+=======
+    width: 978
+    height: 685
+  m_MinSize: {x: 102, y: 121}
+>>>>>>> Stashed changes
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 14}
   - {fileID: 16}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -241,12 +300,21 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
+<<<<<<< Updated upstream
     x: 1060.8
     y: 0
     width: 475.19995
     height: 461.6
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
+=======
+    x: 1280
+    y: 0
+    width: 640
+    height: 685
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+>>>>>>> Stashed changes
   m_ActualView: {fileID: 12}
   m_Panes:
   - {fileID: 12}
@@ -273,10 +341,17 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
+<<<<<<< Updated upstream
     x: 0
     y: 535.2
     width: 1536
     height: 288.19998
+=======
+    x: 1080
+    y: 896
+    width: 1920
+    height: 251
+>>>>>>> Stashed changes
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -302,10 +377,17 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
+<<<<<<< Updated upstream
     x: 1060.8
     y: 73.6
     width: 474.19995
     height: 440.6
+=======
+    x: 2360
+    y: 211
+    width: 639
+    height: 664
+>>>>>>> Stashed changes
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -344,10 +426,17 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
+<<<<<<< Updated upstream
     x: 0
     y: 535.2
     width: 1536
     height: 288.19998
+=======
+    x: 1080
+    y: 896
+    width: 1920
+    height: 251
+>>>>>>> Stashed changes
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -373,6 +462,7 @@ MonoBehaviour:
   m_LastFolders:
   - Assets
   m_LastFoldersGridSize: -1
+<<<<<<< Updated upstream
   m_LastProjectPath: D:\WACCA\WACVR
   m_LockTracker:
     m_IsLocked: 0
@@ -381,6 +471,16 @@ MonoBehaviour:
     m_SelectedIDs: 046f0000
     m_LastClickedID: 28420
     m_ExpandedIDs: 00000000046f00000a6f00005a6f000000ca9a3bffffff7f
+=======
+  m_LastProjectPath: C:\Users\Alex\Documents\GitHub\WACVR
+  m_LockTracker:
+    m_IsLocked: 0
+  m_FolderTreeState:
+    scrollPos: {x: 0, y: 9}
+    m_SelectedIDs: c4810000
+    m_LastClickedID: 33220
+    m_ExpandedIDs: 00000000c481000000ca9a3bffffff7f
+>>>>>>> Stashed changes
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -408,7 +508,11 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
+<<<<<<< Updated upstream
     m_ExpandedIDs: 00000000046f000000ca9a3bffffff7f
+=======
+    m_ExpandedIDs: 00000000c4810000
+>>>>>>> Stashed changes
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -433,10 +537,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: 2ede0000
+    m_LastClickedInstanceID: 56878
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000f4790000ce810000e081000044800000
+    m_ExpandedInstanceIDs: c6230000f4790000ce810000e08100004480000000000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -485,10 +589,17 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
+<<<<<<< Updated upstream
     x: 247.2
     y: 73.6
     width: 811.60004
     height: 440.6
+=======
+    x: 1382
+    y: 211
+    width: 976
+    height: 664
+>>>>>>> Stashed changes
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -690,9 +801,15 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
+<<<<<<< Updated upstream
     m_Target: {x: -0.23342612, y: 1.154188, z: -0.029027253}
     speed: 2
     m_Value: {x: -0.23342612, y: 1.154188, z: -0.029027253}
+=======
+    m_Target: {x: 4.5800953, y: 0.37747407, z: -0.7965523}
+    speed: 2
+    m_Value: {x: 4.5800953, y: 0.37747407, z: -0.7965523}
+>>>>>>> Stashed changes
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -739,6 +856,7 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
+<<<<<<< Updated upstream
     m_Target: {x: 0.14618626, y: 0.061685134, z: -0.009133707, w: 0.98729026}
     speed: 2
     m_Value: {x: 0.14618619, y: 0.061685104, z: -0.009133702, w: 0.9872898}
@@ -746,13 +864,22 @@ MonoBehaviour:
     m_Target: 0.19183554
     speed: 2
     m_Value: 0.19183554
+=======
+    m_Target: {x: -0.068585575, y: -0.72520596, z: 0.07401841, w: -0.68067557}
+    speed: 2
+    m_Value: {x: -0.06860528, y: -0.72541434, z: 0.074039675, w: -0.6808711}
+  m_Size:
+    m_Target: 2.349763
+    speed: 2
+    m_Value: 2.349763
+>>>>>>> Stashed changes
   m_Ortho:
     m_Target: 0
     speed: 2
     m_Value: 0
   m_CameraSettings:
-    m_Speed: 1.0646999
-    m_SpeedNormalized: 0.53
+    m_Speed: 0.069699995
+    m_SpeedNormalized: 0.03
     m_SpeedMin: 0.01
     m_SpeedMax: 2
     m_EasingEnabled: 1
@@ -791,20 +918,34 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
+<<<<<<< Updated upstream
     x: 0
     y: 73.6
     width: 246.2
     height: 440.6
+=======
+    x: 1080
+    y: 211
+    width: 301
+    height: 664
+>>>>>>> Stashed changes
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
   m_SceneHierarchy:
     m_TreeViewState:
+<<<<<<< Updated upstream
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 046f0000
       m_LastClickedID: 0
       m_ExpandedIDs: 76f8ffff2c730000607300002a740000ca760000c2780000
+=======
+      scrollPos: {x: 0, y: 749}
+      m_SelectedIDs: f47b0000
+      m_LastClickedID: 31732
+      m_ExpandedIDs: 30fbffff7c6f00007a7000001a7100009e710000d07200001a73000012750000
+>>>>>>> Stashed changes
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -849,10 +990,17 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
+<<<<<<< Updated upstream
     x: 241.6
     y: 73.6
     width: 817.2001
     height: 440.6
+=======
+    x: 1382
+    y: 211
+    width: 976
+    height: 664
+>>>>>>> Stashed changes
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -865,7 +1013,11 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+<<<<<<< Updated upstream
   m_TargetSize: {x: 817.2001, y: 419.6}
+=======
+  m_TargetSize: {x: 976, y: 643}
+>>>>>>> Stashed changes
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -880,10 +1032,17 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
+<<<<<<< Updated upstream
     m_HBaseRangeMin: -326.88004
     m_HBaseRangeMax: 326.88004
     m_VBaseRangeMin: -167.84001
     m_VBaseRangeMax: 167.84001
+=======
+    m_HBaseRangeMin: -488
+    m_HBaseRangeMax: 488
+    m_VBaseRangeMin: -321.5
+    m_VBaseRangeMax: 321.5
+>>>>>>> Stashed changes
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -901,16 +1060,24 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
+<<<<<<< Updated upstream
       width: 817.2001
       height: 419.6
     m_Scale: {x: 1, y: 1}
     m_Translation: {x: 408.60004, y: 209.8}
+=======
+      width: 976
+      height: 643
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 488, y: 321.5}
+>>>>>>> Stashed changes
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
+<<<<<<< Updated upstream
       x: -408.60004
       y: -209.8
       width: 817.2001
@@ -918,6 +1085,15 @@ MonoBehaviour:
     m_MinimalGUI: 1
   m_defaultScale: 1
   m_LastWindowPixelSize: {x: 1021.5001, y: 550.75}
+=======
+      x: -488
+      y: -321.5
+      width: 976
+      height: 643
+    m_MinimalGUI: 1
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 976, y: 664}
+>>>>>>> Stashed changes
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000