diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index 80dba9e..57d17f3 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -118,6 +118,7 @@ GameObject: - component: {fileID: 401532114} - component: {fileID: 401532113} - component: {fileID: 401532115} + - component: {fileID: 401532116} m_Layer: 0 m_Name: PointCloudGenerator m_TagString: Untagged @@ -168,6 +169,17 @@ MonoBehaviour: scaleAdjustSensitivity: 0.005 userCanAdjustYaw: 0 yawAdjustSensitivity: 0.15 +--- !u!114 &401532116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 401532112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 869509cfaaf611f4bb3e4289fcdfee6a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &433422985 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/miniature.unity b/Assets/Scenes/miniature.unity index 721ad89..f18d43e 100644 --- a/Assets/Scenes/miniature.unity +++ b/Assets/Scenes/miniature.unity @@ -118,6 +118,7 @@ GameObject: - component: {fileID: 401532114} - component: {fileID: 401532113} - component: {fileID: 401532115} + - component: {fileID: 401532116} m_Layer: 0 m_Name: PointCloudGenerator m_TagString: Untagged @@ -168,6 +169,17 @@ MonoBehaviour: scaleAdjustSensitivity: 0.005 userCanAdjustYaw: 1 yawAdjustSensitivity: 0.15 +--- !u!114 &401532116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 401532112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 869509cfaaf611f4bb3e4289fcdfee6a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &433422985 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CloseApplication.cs b/Assets/Scripts/CloseApplication.cs new file mode 100644 index 0000000..160b9c5 --- /dev/null +++ b/Assets/Scripts/CloseApplication.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CloseApplication : MonoBehaviour +{ + + // Update is called once per frame + void Update() + { + if (Input.GetKey(KeyCode.Escape)) + Application.Quit(); + } +} diff --git a/Assets/Scripts/CloseApplication.cs.meta b/Assets/Scripts/CloseApplication.cs.meta new file mode 100644 index 0000000..74c7f9b --- /dev/null +++ b/Assets/Scripts/CloseApplication.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 869509cfaaf611f4bb3e4289fcdfee6a +timeCreated: 1502731311 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 6acd06d..30928f9 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,9 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/main.unity guid: 719ad96afbf06dc4da7a44ed053e3eb3 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/miniature.unity guid: 8ee21dd8d29fd6c4fb18fedd2c7eb1d6 diff --git a/README.md b/README.md index 295d178..b87b704 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Main Viewer | Miniature Viewer - Wait for the application to parse the file and render the points. - For the main viewer, use `Q` & `E` to adjust the vertical position of the point cloud so the camera appears to be at head height, and the floor in the scan matches the ground plane. Then walk around inside the scan. - For the miniature viewer, experiment with the transform controls listed below to view the diorama. -- To exit the application, simply `alt-tab` out and close the executable. +- To exit the application and close the executable, press `ESC`. ### Controls - `WASD`: movement @@ -26,6 +26,7 @@ Main Viewer | Miniature Viewer - `Q` & `E`: adjust the vertical position of the point cloud - `Z` & `C`: adjust the scale of the point cloud (only available in miniature scene) - `R` & `T`: adjust the yaw rotation of the point cloud (only available in miniature scene) +- `ESC`: exit application ### Notes on VR - Support for VR is included.