Working procedural asset load flow

Author: AlvaroHG

.gitignore

@@ -128,3 +128,5 @@ unity/Assets/Editor/Instant Screenshot/Documentation - Instant screenshot.pdf.me
 *.log
 tmp/
 
+objaverse/
+unity/Assets/Resources/ai2thor-objaverse

scripts/objaverse_expand.py

@@ -0,0 +1,39 @@
+import os
+import glob
+import argparse
+import compress_pickle
+import json
+
+def normalize_texture_path(obj_dir, texture_path):
+    return os.path.join(obj_dir, os.path.basename(texture_path))
+
+def expand_objaverse(directory, ids):
+    id_set = {}
+    if ids != "":
+        id_set = {id for id in ids.split(",")}
+        print(f"selected ids: {id_set}")
+    for obj_file in glob.glob(os.path.join(directory, "*", "*.pkl.gz")):
+        obj_dir = os.path.dirname(obj_file)
+        obj_id =  os.path.basename(obj_dir)
+        if not id_set or obj_id in id_set: 
+            obj = compress_pickle.load(obj_file)
+            obj["albedoTexturePath"] = normalize_texture_path(obj_dir, obj["albedoTexturePath"])
+            obj["normalTexturePath"] = normalize_texture_path(obj_dir, obj["normalTexturePath"])
+            obj["emissionTexturePath"] = normalize_texture_path(obj_dir, obj["emissionTexturePath"])
+            out_obj = os.path.join(obj_dir, f"{obj_id}.json")
+            print(out_obj)
+            with open(out_obj, "w") as f:
+                json.dump(obj, f)
+
+if __name__ == "__main__":
+    # 0a0a8274693445a6b533dce7f97f747c
+    parser = argparse.ArgumentParser()
+    parser.add_argument('directory')  
+    parser.add_argument(   
+        "--ids",
+        help="Comma separated list of ids to convert",
+        type=str,
+        default="",
+    )
+    args = parser.parse_args()
+    expand_objaverse(args.directory, args.ids)

unity/Assets/Scripts/BaseFPSAgentController.cs

@@ -2053,7 +2053,7 @@ public virtual ObjectMetadata[] generateObjectMetadata(SimObjPhysics[] simObject
 
             for (int k = 0; k < numObj; k++) {
                 SimObjPhysics simObj = simObjects[k];
-                ObjectMetadata meta = ObjectMetadataFromSimObjPhysics(
+                ObjectMetadata meta = SimObjPhysics.ObjectMetadataFromSimObjPhysics(
                     simObj,
                     visibleSimObjsHash.Contains(simObj),
                     interactableSimObjsHash.Contains(simObj)
@@ -6677,215 +6677,28 @@ public void CreateObjectPrefab(
             Vector3[]? visibilityPoints = null,
             ObjectAnnotations annotations = null,
             bool receptacleCandidate = false,
-            float yRotOffset = 0f
+            float yRotOffset = 0f,
+            bool serializable = false
         ) {
-            // create a new game object
-            GameObject go = new GameObject();
-
-            // create a new mesh
-            GameObject meshObj = new GameObject("mesh");
-            meshObj.transform.parent = go.transform;
-            Mesh mesh = new Mesh();
-            if (vertices.Length >= 65535) {
-                mesh.indexFormat = UnityEngine.Rendering.IndexFormat.UInt32;
-            }
-            mesh.vertices = vertices;
-            mesh.triangles = triangles;
-            mesh.normals = normals;
-            if (uvs != null) {
-                mesh.uv = uvs;
-            }
-
-            // add the mesh to the object
-            meshObj.AddComponent<MeshRenderer>();
-            MeshFilter meshFilter = meshObj.AddComponent<MeshFilter>();
-            meshFilter.mesh = mesh;
-
-            // add the mesh colliders
-            GameObject triggerCollidersObj = new GameObject("TriggerColliders");
-            triggerCollidersObj.layer = LayerMask.NameToLayer("SimObjVisible");
-            triggerCollidersObj.transform.parent = go.transform;
-
-            GameObject meshCollidersObj = new GameObject("Colliders");
-            meshCollidersObj.layer = LayerMask.NameToLayer("SimObjVisible");
-            meshCollidersObj.transform.parent = go.transform;
-            List<Collider> meshColliders = new List<Collider>();
-            if (colliders != null && colliders.Length > 0) {
-                int i = 0;
-                foreach (var collider in colliders) {
-                    // create a mesh of the collider
-                    Mesh colliderMesh = new Mesh();
-                    colliderMesh.vertices = collider.vertices;
-                    colliderMesh.triangles = collider.triangles;
-
-                    // add the mesh collider
-                    GameObject meshColliderObj = new GameObject($"collider_{i}");
-                    meshColliderObj.layer = LayerMask.NameToLayer("SimObjVisible");
-                    meshColliderObj.transform.parent = meshCollidersObj.transform;
-                    MeshCollider meshCollider = meshColliderObj.AddComponent<MeshCollider>();
-                    meshCollider.sharedMesh = colliderMesh;
-                    meshCollider.convex = true;
-                    meshColliders.Add(meshCollider);
-
-                    // add the trigger collider
-                    GameObject triggerColliderObj = new GameObject($"trigger_{i}");
-                    triggerColliderObj.layer = LayerMask.NameToLayer("SimObjVisible");
-                    triggerColliderObj.transform.parent = triggerCollidersObj.transform;
-                    MeshCollider triggerCollider = triggerColliderObj.AddComponent<MeshCollider>();
-                    triggerCollider.sharedMesh = colliderMesh;
-                    triggerCollider.convex = true;
-                    triggerCollider.isTrigger = true;
-
-                    i++;
-                }
-            }
-
-            // add the visibility points
-            GameObject visPoints = new GameObject("VisibilityPoints");
-            visPoints.transform.parent = go.transform;
-            Transform[] visPointTransforms = new Transform[visibilityPoints.Length];
-            for (int i = 0; i < visibilityPoints.Length; i++) {
-                GameObject visPoint = new GameObject($"visPoint_{i}");
-                visPoint.transform.parent = visPoints.transform;
-                visPoint.transform.localPosition = visibilityPoints[i];
-                visPointTransforms[i] = visPoint.transform;
-                visPoint.layer = LayerMask.NameToLayer("SimObjVisible");
-            }
-
-            // Rotate the object, this requires reassigning things to a new game object
-            go.transform.Rotate(Vector3.up, yRotOffset);
-            GameObject newGo = new GameObject();
-
-            foreach (Transform t in go.GetComponentsInChildren<Transform>()) {
-                if (t.parent == go.transform) {
-                    Debug.Log($"Moving transform of {t.gameObject.name}");
-                    t.parent = newGo.transform;
-                }
-            }
-            go.SetActive(false);
-            go = newGo;
-
-            go.name = name;
-            go.layer = LayerMask.NameToLayer("SimObjVisible");
-            go.tag = "SimObjPhysics";
-
-            Material mat = null;
-            // load image from disk
-            if (albedoTexturePath != null) {
-                // textures aren't saved as part of the prefab, so we load them from disk
-                RuntimePrefab runtimePrefab = go.AddComponent<RuntimePrefab>();
-                runtimePrefab.localTexturePath = albedoTexturePath;
-
-                byte[] imageBytes = File.ReadAllBytes(albedoTexturePath);
-                // Is this size right?
-                Texture2D tex = new Texture2D(2, 2);
-                tex.LoadImage(imageBytes);
-
-                // create a new material
-                mat = new Material(Shader.Find("Standard"));
-                mat.mainTexture = tex;
-
-                // assign the material to the game object
-                meshObj.GetComponent<Renderer>().material = mat;
-                runtimePrefab.sharedMaterial = mat;
-            } else {
-                // create a new material
-                mat = new Material(Shader.Find("Standard"));
-                meshObj.GetComponent<Renderer>().material = mat;
-            }
-
-            mat.SetFloat("_Glossiness", 0f);
-
-            if (normalTexturePath != null) {
-                mat.EnableKeyword("_NORMALMAP");
-                byte[] imageBytes = File.ReadAllBytes(normalTexturePath);
-                Texture2D tex = new Texture2D(2, 2);
-                tex.LoadImage(imageBytes);
-                mat.SetTexture("_BumpMap", tex);
-            }
-
-            if (emissionTexturePath != null) {
-                mat.globalIlluminationFlags = MaterialGlobalIlluminationFlags.RealtimeEmissive;
-                mat.EnableKeyword("_EMISSION");
-                byte[] imageBytes = File.ReadAllBytes(emissionTexturePath);
-                Texture2D tex = new Texture2D(2, 2);
-                tex.LoadImage(imageBytes);
-                mat.SetTexture("_EmissionMap", tex);
-                mat.SetColor("_EmissionColor", Color.white);
-            }
-
-            // have the mesh refer to the mesh at meshPath
-            meshObj.GetComponent<MeshFilter>().sharedMesh = mesh;
-
-            // add the rigidbody
-            Rigidbody rb = go.AddComponent<Rigidbody>();
-            if (physicalProperties != null) {
-                rb.mass = physicalProperties.mass;
-                rb.drag = physicalProperties.drag;
-                rb.angularDrag = physicalProperties.angularDrag;
-                rb.useGravity = physicalProperties.useGravity;
-                rb.isKinematic = physicalProperties.isKinematic;
-            }
-
-            // add the SimObjPhysics component
-            SimObjPhysics sop = go.AddComponent<SimObjPhysics>();
-            sop.VisibilityPoints = visPointTransforms;
-            sop.MyColliders = meshColliders.ToArray();
-            sop.assetID = name;
-            sop.objectID = name;
-
-            // add the annotations of the object
-            if (annotations == null) {
-                annotations = new ObjectAnnotations();
-            }
-            sop.PrimaryProperty = (SimObjPrimaryProperty)Enum.Parse(
-                typeof(SimObjPrimaryProperty), annotations.primaryProperty
+            var assetData = ProceduralTools.CreateAsset(
+                vertices,
+                normals,
+                name,
+                triangles,
+                uvs,
+                albedoTexturePath ,
+                normalTexturePath ,
+                emissionTexturePath,
+                colliders ,
+                physicalProperties,
+                visibilityPoints ,
+                annotations ,
+                receptacleCandidate ,
+                yRotOffset ,
+                serializable 
             );
-            sop.Type = (SimObjType)Enum.Parse(typeof(SimObjType), annotations.objectType);
-            if (annotations.secondaryProperties == null) {
-                annotations.secondaryProperties = new string[0];
-            }
-            sop.SecondaryProperties = annotations.secondaryProperties.Select(
-                p => (SimObjSecondaryProperty)Enum.Parse(typeof(SimObjSecondaryProperty), p)
-            ).ToArray();
-            sop.syncBoundingBoxes(forceCacheReset: true, forceCreateObjectOrientedBoundingBox: true);
 
-            if (receptacleCandidate) {
-                BaseFPSAgentController.TryToAddReceptacleTriggerBox(sop: sop);
-                GameObject receptacleTriggerBoxes = go.transform.Find("ReceptacleTriggerBoxes").gameObject;
-                if (receptacleTriggerBoxes.transform.childCount > 0) {
-                    sop.SecondaryProperties = new SimObjSecondaryProperty[] { SimObjSecondaryProperty.Receptacle };
-                }
-            }
-
-            // Add the asset to the procedural asset database
-            var assetDb = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
-            if (assetDb != null) {
-                assetDb.addAsset(go, procedural: true);
-            }
-
-            // Compute the object metadata
-            // IMPORTANT: this must happen before the object is added to the prefabParent object below,
-            //            otherwise the object's bounding box will be incorrect! This has something to do with how
-            //            our bounding box computation code works where it ignores some unactive components of an object
-            var assetMeta = getAssetMetadata(sop.gameObject);
-            var objectMeta = ObjectMetadataFromSimObjPhysics(sop, true, true);
-
-            // get child object on assetDb's game object that's called "Prefabs"
-            // and add the prefab to that
-            var prefabParentTransform = assetDb.transform.Find("Prefabs");
-            if (prefabParentTransform == null) {
-                var prefabParent = new GameObject("Prefabs");
-                prefabParent.transform.parent = assetDb.transform;
-                prefabParent.SetActive(false);
-                prefabParentTransform = prefabParent.transform;
-            }
-            go.transform.parent = prefabParentTransform;
-
-            actionFinished(success: true, actionReturn: new Dictionary<string, object>{
-                {"assetMetadata", assetMeta},
-                {"objectMetadata", objectMeta}
-            });
+            actionFinished(success: true, actionReturn: assetData);
         }
 
         public void CreateHouse(ProceduralHouse house) {

unity/Assets/Scripts/DebugInputField.cs

@@ -4441,6 +4441,7 @@ IEnumerator executeBatch(JArray jActions) {
                         JObject obj = JObject.Parse(jsonStr);
 
                         obj["action"] = "CreateObjectPrefab";
+                        obj["serializable"] = true;
                         CurrentActiveController().ProcessControlCommand(new DynamicServerAction(obj));
 
                         break;

unity/Assets/Scripts/DraggablePoint.cs

@@ -8,7 +8,7 @@ public class DraggablePoint : PropertyAttribute {}
 
 
 #if UNITY_EDITOR
-[CustomEditor(typeof(MonoBehaviour), true)]
+// [CustomEditor(typeof(MonoBehaviour), true)]
 public class DraggablePointDrawer : Editor {
 
   readonly GUIStyle style = new GUIStyle();

unity/Assets/Scripts/ProceduralAssetDatabase.cs

@@ -17,7 +17,7 @@ public class ProceduralAssetDatabase : MonoBehaviour {
 
         public bool dontDestroyOnLoad = true;
 
-        void Awake() {
+        public void Awake() {
             if (Instance != null) {
                 Destroy(gameObject);
                 return;