Add error model

vanjac · Jun 17, 2024 · e8fd14d · e8fd14d
1 parent 2be1326
commit e8fd14d
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -85,6 +85,7 @@ ios-build/
 /Assets/GameAssets/3dtextures/*/*.png
 /Assets/GameAssets/NASA/*.tif
 /Assets/GameAssets/Footsteps/*.wav
+/Assets/Resources/GameAssets/*.obj
 /Assets/Resources/GameAssets/Models/*.obj
 /Assets/Resources/Thumbnails/*.png
 

diff --git a/Assets/Objects/Prop.cs b/Assets/Objects/Prop.cs
@@ -39,7 +39,8 @@ public PropObject()
                 PropertyGUIs.Model),
         });
 
-    private Mesh GetMesh() => Resources.Load<Mesh>("GameAssets/Models/" + modelName);
+    private Mesh GetMesh() => Resources.Load<Mesh>("GameAssets/Models/" + modelName)
+        ?? Resources.Load<Mesh>("GameAssets/error_model");
 
     private GameObject CreatePropObject()
     {

diff --git a/Assets/Resources/GameAssets/Models/SM_Primitive_Cone_03.obj.meta b/Assets/Resources/GameAssets/Models/SM_Primitive_Cone_03.obj.meta
diff --git a/Assets/Resources/GameAssets/error_model.obj.meta b/Assets/Resources/GameAssets/error_model.obj.meta