add simple material option to models. Trigger volumes can now be scaled

packages/client-core/i18n/en/editor.json

@@ -236,6 +236,7 @@
       "error-url": "Error Loading From URL",
       "lbl-loopAnimation": "Loop Animation",
       "lbl-isAvatar": "Is Avatar",
+      "lbl-useBasicMaterials": "Use Basic Materials",
       "lbl-isGPUInstancing": "Is Using GPU Instancing",
       "lbl-isDynamic": "Is Dynamic",
       "lbl-castShadow": "Cast Shadow",

packages/editor/src/components/properties/ModelNodeEditor.tsx

@@ -129,6 +129,12 @@ export const ModelNodeEditor: EditorComponentType = (props) => {
           onChange={updateProperty(ModelComponent, 'matrixAutoUpdate')}
         />
       </InputGroup>
+      <InputGroup name="Use Basic Materials" label={t('editor:properties.model.lbl-useBasicMaterials')}>
+        <BooleanInput
+          value={modelComponent.useBasicMaterial}
+          onChange={updateProperty(ModelComponent, 'useBasicMaterial')}
+        />
+      </InputGroup>
       <InputGroup name="Is Using GPU Instancing" label={t('editor:properties.model.lbl-isGPUInstancing')}>
         <BooleanInput
           value={modelComponent.isUsingGPUInstancing}

packages/engine/src/scene/components/ModelComponent.ts

@@ -6,6 +6,7 @@ export type ModelComponentType = {
   textureOverride: string
   materialOverrides: MaterialOverrideComponentType[]
   matrixAutoUpdate: boolean
+  useBasicMaterial: boolean
   isUsingGPUInstancing: boolean
   isDynamicObject: boolean
   curScr?: string

packages/engine/src/scene/functions/loaders/ModelFunctions.ts

@@ -1,4 +1,4 @@
-import { Texture } from 'three'
+import { Mesh, Texture } from 'three'
 
 import { ComponentJson } from '@xrengine/common/src/interfaces/SceneInterface'
 
@@ -20,13 +20,15 @@ import cloneObject3D from '../cloneObject3D'
 import { addError, removeError } from '../ErrorFunctions'
 import { overrideTexture, parseGLTFModel } from '../loadGLTFModel'
 import { initializeOverride } from './MaterialOverrideFunctions'
+import { useSimpleMaterial, useStandardMaterial } from './SimpleMaterialFunctions'
 
 export const SCENE_COMPONENT_MODEL = 'gltf-model'
 export const SCENE_COMPONENT_MODEL_DEFAULT_VALUE = {
   src: '',
   textureOverride: '',
   materialOverrides: [] as MaterialOverrideComponentType[],
   matrixAutoUpdate: true,
+  useBasicMaterial: false,
   isUsingGPUInstancing: false,
   isDynamicObject: false
 }
@@ -66,6 +68,15 @@ export const updateModel: ComponentUpdateFunction = (entity: Entity, properties:
   if (typeof properties.textureOverride !== 'undefined') {
     overrideTexture(entity)
   }
+
+  if (properties.useBasicMaterial !== undefined) {
+    const obj3d = getComponent(entity, Object3DComponent).value
+    obj3d.traverseVisible((child: Mesh) => {
+      if (child.isMesh) {
+        properties.useBasicMaterial ? useSimpleMaterial(child as any) : useStandardMaterial(child as any)
+      }
+    })
+  }
 }
 
 export const serializeModel: ComponentSerializeFunction = (entity) => {
@@ -104,6 +115,7 @@ const parseModelProperties = (props): ModelComponentType => {
     textureOverride: props.textureOverride ?? SCENE_COMPONENT_MODEL_DEFAULT_VALUE.textureOverride,
     materialOverrides: props.materialOverrides ?? SCENE_COMPONENT_MODEL_DEFAULT_VALUE.materialOverrides,
     matrixAutoUpdate: props.matrixAutoUpdate ?? SCENE_COMPONENT_MODEL_DEFAULT_VALUE.matrixAutoUpdate,
+    useBasicMaterial: props.useBasicMaterial ?? SCENE_COMPONENT_MODEL_DEFAULT_VALUE.useBasicMaterial,
     isUsingGPUInstancing: props.isUsingGPUInstancing ?? SCENE_COMPONENT_MODEL_DEFAULT_VALUE.isUsingGPUInstancing,
     isDynamicObject: props.isDynamicObject ?? SCENE_COMPONENT_MODEL_DEFAULT_VALUE.isDynamicObject
   }

packages/engine/src/scene/functions/loaders/TriggerVolumeFunctions.ts

@@ -24,6 +24,8 @@ export const deserializeTriggerVolume: ComponentDeserializeFunction = (
   entity: Entity,
   json: ComponentJson<TriggerVolumeComponentType>
 ): void => {
+  const transform = getComponent(entity, TransformComponent)
+
   const boxMesh = new Mesh(new BoxBufferGeometry(), new MeshBasicMaterial())
   boxMesh.material.visible = false
   boxMesh.userData = {
@@ -33,7 +35,7 @@ export const deserializeTriggerVolume: ComponentDeserializeFunction = (
     collisionLayer: CollisionGroups.Trigger,
     collisionMask: CollisionGroups.Default
   }
-
+  boxMesh.scale.set(transform.scale.x, transform.scale.y, transform.scale.z)
   createCollider(entity, boxMesh)
 
   addComponent(entity, TriggerVolumeComponent, {