@tomorrowevening/hermes 0.0.6 → 0.0.8

package/src/editor/sceneHierarchy/inspector/utils/InspectMaterial.tsx

@@ -38,17 +38,21 @@ export function acceptedMaterialNames(name: string): boolean {
   );
 }
 
-export function niceMaterialNames(name: string): string {
+export function prettyName(name: string): string {
   switch (name) {
     case 'alphaMap': return 'Alpha Map';
+    case 'anisotropyMap': return 'Anisotropy Map';
     case 'anisotropyRotation': return 'Anisotropy Rotation';
     case 'aoMap': return 'AO Map';
     case 'aoMapIntensity': return 'AO Map Intensity';
     case 'attenuationColor': return 'Attenuation Color';
     case 'bumpMap': return 'Bump Map';
     case 'bumpScale': return 'Bump Scale';
+    case 'clearcoatMap': return 'Clearcoat Map';
+    case 'clearcoatNormalMap': return 'Clearcoat Normal Map';
     case 'clearcoatNormalScale': return 'Clearcoat Normal Scale';
     case 'clearcoatRoughness': return 'Clearcoat Roughness';
+    case 'clearcoatRoughnessMap': return 'Clearcoat Roughness Map';
     case 'color': return 'Color';
     case 'defines': return 'Defines';
     case 'depthTest': return 'Depth Test';
@@ -58,6 +62,7 @@ export function niceMaterialNames(name: string): string {
     case 'displacementScale': return 'Displacement Scale';
     case 'dithering': return 'Dithering';
     case 'emissive': return 'Emissive';
+    case 'emissiveMap': return 'Emissive Map';
     case 'emissiveIntensity': return 'Emissive Intensity';
     case 'envMap': return 'Environment Map';
     case 'envMapIntensity': return 'Environment Map Intensity';
@@ -68,6 +73,8 @@ export function niceMaterialNames(name: string): string {
     case 'gradientMap': return 'Gradient Map';
     case 'ior': return 'IOR';
     case 'iridescenceIOR': return 'Iridescence IOR';
+    case 'iridescenceMap': return 'Iridescence Map';
+    case 'iridescenceThicknessMap': return 'Iridescence Thickness Map';
     case 'iridescenceThicknessRange': return 'Iridescence Thickness Range';
     case 'lights': return 'Lights';
     case 'lightMap': return 'Light Map';
@@ -75,6 +82,7 @@ export function niceMaterialNames(name: string): string {
     case 'map': return 'Map';
     case 'matcap': return 'Matcap';
     case 'metalness': return 'Metalness';
+    case 'metalnessMap': return 'Metalness Map';
     case 'name': return 'Name';
     case 'normalMap': return 'Normal Map';
     case 'normalScale': return 'Normal Scale';
@@ -82,13 +90,21 @@ export function niceMaterialNames(name: string): string {
     case 'reflectivity': return 'Reflectivity';
     case 'refractionRatio': return 'Refraction Ratio';
     case 'roughness': return 'Roughness';
+    case 'roughnessMap': return 'Roughness Map';
     case 'sheenColor': return 'Sheen Color';
+    case 'sheenColorMap': return 'Sheen Color Map';
     case 'sheenRoughness': return 'Sheen Roughness';
+    case 'sheenRoughnessMap': return 'Sheen Roughness Map';
     case 'shininess': return 'Shininess';
     case 'specular': return 'Specular';
     case 'specularColor': return 'Specular Color';
+    case 'specularColorMap': return 'Specular Color Map';
     case 'specularIntensity': return 'Specular Intensity';
+    case 'specularIntensityMap': return 'Specular Map Intensity';
     case 'thickness': return 'Thickness';
+    case 'thicknessMap': return 'Thickness Map';
+    case 'transmission': return 'Transmission';
+    case 'transmissionMap': return 'Transmission Map';
     case 'transparent': return 'Transparent';
     case 'type': return 'Type';
     case 'uuid': return 'UUID';
@@ -147,7 +163,7 @@ export function inspectMaterialItems(material: RemoteMaterial, object: RemoteObj
     const value = material[i];
     if (propType === 'boolean' || propType === 'number' || propType === 'string') {
       const newField = {
-        title: niceMaterialNames(i),
+        title: prettyName(i),
         prop: i,
         type: propType,
         value: value,
@@ -176,7 +192,7 @@ export function inspectMaterialItems(material: RemoteMaterial, object: RemoteObj
     } else if (propType === 'object') {
       if (value.isColor) {
         items.push({
-          title: niceMaterialNames(i),
+          title: prettyName(i),
           prop: i,
           type: 'color',
           value: value,
@@ -204,7 +220,7 @@ export function inspectMaterialItems(material: RemoteMaterial, object: RemoteObj
           });
         }
         items.push({
-          title: niceMaterialNames(i),
+          title: prettyName(i),
           items: subChildren,
         });
       } else {
@@ -218,7 +234,7 @@ export function inspectMaterialItems(material: RemoteMaterial, object: RemoteObj
             case 'string':
               if (n === 'src') {
                 items.push({
-                  title: niceMaterialNames(i),
+                  title: prettyName(i),
                   type: 'image',
                   value: propValue,
                   onChange: (prop: string, value: any) => {
@@ -235,7 +251,7 @@ export function inspectMaterialItems(material: RemoteMaterial, object: RemoteObj
                 });
               } else {
                 subChildren.push({
-                  title: `${niceMaterialNames(n)}`,
+                  title: `${prettyName(n)}`,
                   prop: `material.${i}.${n}`,
                   type: `${typeof material[i][n]}`,
                   value: value[n],
@@ -252,7 +268,7 @@ export function inspectMaterialItems(material: RemoteMaterial, object: RemoteObj
               // Uniform textures
               if (propValue.value !== undefined && propValue.value.src !== undefined) {
                 subChildren.push({
-                  title: niceMaterialNames(n),
+                  title: prettyName(n),
                   type: 'image',
                   value: propValue.value.src,
                   onChange: (prop: string, value: any) => {
@@ -285,7 +301,7 @@ export function inspectMaterialItems(material: RemoteMaterial, object: RemoteObj
 
         if (subChildren.length > 0) {
           items.push({
-            title: niceMaterialNames(i),
+            title: prettyName(i),
             items: subChildren,
           });
         }

package/src/editor/sceneHierarchy/utils.ts

@@ -1,4 +1,4 @@
-import { Camera, CubeTexture, Light, Material, Mesh, Object3D, OrthographicCamera, PerspectiveCamera, RepeatWrapping, Texture } from 'three';
+import { CubeTexture, Material, Mesh, Object3D, RepeatWrapping, Texture } from 'three';
 import { MinimumObject, RemoteMaterial, RemoteObject } from './types';
 
 export function determineIcon(obj: Object3D): string {
@@ -132,9 +132,15 @@ export function stripObject(obj: Object3D): RemoteObject {
     uuid: obj.uuid,
     visible: obj.visible,
     matrix: obj.matrix.elements,
+    material: undefined,
+    perspectiveCameraInfo: undefined,
+    orthographicCameraInfo: undefined,
+    lightInfo: undefined,
   };
 
-  if (obj instanceof Mesh) {
+  const type = obj.type.toLowerCase();
+
+  if (type.search('mesh') > -1) {
     const mesh = obj as Mesh;
     if (Array.isArray(mesh.material)) {
       const data: RemoteMaterial[] = [];
@@ -145,33 +151,33 @@ export function stripObject(obj: Object3D): RemoteObject {
     } else {
       stripped.material = stripMaterialData(mesh.material);
     }
-  } else if (obj instanceof Camera) {
-    if (obj instanceof PerspectiveCamera) {
+  } else if (type.search('camera') > -1) {
+    if (obj.type === 'PerspectiveCamera') {
       stripped.perspectiveCameraInfo = {
-        fov: obj.fov,
-        zoom: obj.zoom,
-        near: obj.near,
-        far: obj.far,
-        focus: obj.focus,
-        aspect: obj.aspect,
-        filmGauge: obj.filmGauge,
-        filmOffset: obj.filmOffset,
+        fov: obj['fov'],
+        zoom: obj['zoom'],
+        near: obj['near'],
+        far: obj['far'],
+        focus: obj['focus'],
+        aspect: obj['aspect'],
+        filmGauge: obj['filmGauge'],
+        filmOffset: obj['filmOffset'],
       };
-    } else if (obj instanceof OrthographicCamera) {
+    } else if (obj.type === 'OrthographicCamera') {
       stripped.orthographicCameraInfo = {
-        zoom: obj.zoom,
-        near: obj.near,
-        far: obj.far,
-        left: obj.left,
-        right: obj.right,
-        top: obj.top,
-        bottom: obj.bottom,
+        zoom: obj['zoom'],
+        near: obj['near'],
+        far: obj['far'],
+        left: obj['left'],
+        right: obj['right'],
+        top: obj['top'],
+        bottom: obj['bottom'],
       };
     }
-  } else if (obj instanceof Light) {
+  } else if (type.search('light') > -1) {
     stripped.lightInfo = {
-      color: obj.color,
-      intensity: obj.intensity,
+      color: obj['color'],
+      intensity: obj['intensity'],
       decay: obj['decay'],
       distance: obj['distance'],
       angle: obj['angle'],

package/types/editor/sceneHierarchy/inspector/utils/InspectCamera.d.ts

@@ -1,3 +1,3 @@
 import RemoteThree from '@/core/remote/RemoteThree';
-import { RemoteObject } from "../../types";
+import { RemoteObject } from '../../types';
 export declare function InspectCamera(object: RemoteObject, three: RemoteThree): any;

package/types/editor/sceneHierarchy/inspector/utils/InspectLight.d.ts

@@ -1,3 +1,3 @@
-import { RemoteObject } from "../../types";
 import RemoteThree from '@/core/remote/RemoteThree';
+import { RemoteObject } from '../../types';
 export declare function InspectLight(obj: RemoteObject, three: RemoteThree): import("react/jsx-runtime").JSX.Element;

package/types/editor/sceneHierarchy/inspector/utils/InspectMaterial.d.ts

@@ -1,7 +1,7 @@
 import { RemoteMaterial, RemoteObject } from "../../types";
 import RemoteThree from '@/core/remote/RemoteThree';
 export declare function acceptedMaterialNames(name: string): boolean;
-export declare function niceMaterialNames(name: string): string;
+export declare function prettyName(name: string): string;
 export declare function clampedNames(name: string): boolean;
 export declare function uploadLocalImage(): Promise<string>;
 export declare function inspectMaterialItems(material: RemoteMaterial, object: RemoteObject, three: RemoteThree): any[];