diff --git a/AVVR/Assets/_Scripts/Import Scenery.cs b/AVVR/Assets/_Scripts/Import Scenery.cs index 3ea2c20460fd321351ea0eda257846671273fd7a..265b85231c7ff3c5a590bfe4f21cee7a513430c6 100644 --- a/AVVR/Assets/_Scripts/Import Scenery.cs +++ b/AVVR/Assets/_Scripts/Import Scenery.cs @@ -1,22 +1,22 @@ -#if UNITY_EDITOR - using System.Collections; using System.Collections.Generic; using System.IO; using UnityEngine; using Dummiesman; -using UnityEditor.SceneManagement; [ExecuteInEditMode] public class ImportScenery : MonoBehaviour { + #if UNITY_EDITOR [UnityEditor.MenuItem("AVVR/Import Scene")] public static void PerformImport() { try { // hide demo lidar overlay + #if UNITY_EDITOR LoadDemo.ShowLIDAR(false); + #endif } catch (System.Exception e) { @@ -25,13 +25,17 @@ public class ImportScenery : MonoBehaviour // call get new mesh to obtain obj file, then perform import automation ImportScene(GetNewMesh()); + } + #endif public static void ImportScene(GameObject AVVRScene) { if (AVVRScene == null) { + #if UNITY_EDITOR UnityEditor.EditorUtility.DisplayDialog("Import cancelled!", "Invalid file (.obj file required).", "OK"); + #endif } else { @@ -134,6 +138,7 @@ public class ImportScenery : MonoBehaviour } } + #if UNITY_EDITOR static GameObject GetNewMesh() { // starts in default folder for pipeline output @@ -156,6 +161,7 @@ public class ImportScenery : MonoBehaviour return null; } } + #endif public static GameObject GetNewMesh(string objPath, string mtlPath) { @@ -182,5 +188,4 @@ public class ImportScenery : MonoBehaviour // initialise assignmaterial script in new gameobject materialAssigner.Initialise(); } -} -#endif \ No newline at end of file +} \ No newline at end of file