Merge main into sweep/use-aframe-anisotropy

3DStreet · Sep 19, 2023 · 0a41a43 · 0a41a43
2 parents eddf613 + c2705b5
commit 0a41a43
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/json-utils.js b/src/json-utils.js
@@ -360,6 +360,14 @@ function createEntityFromObj(entityData, parentEl) {
     entity.setAttribute('geometry', 'primitive', entityData['primitive']);
   }
 
+  // load this attributes in advance in right order to correctly apply other specific components
+  for (const attr of ['geometry', 'material']) {
+    if (entityData.components[attr]) {
+      entity.setAttribute(attr, entityData.components[attr]);
+      delete entityData.components[attr];
+    }
+  }
+
   if (entityData.id) {
     entity.setAttribute('id', entityData.id);
   }