Loaders 0.0.11

epreston · Aug 21, 2023 · 42ee140 · 42ee140
1 parent ecdf1f5
commit 42ee140
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/loaders/dist/loaders.esm-bundler.js b/packages/loaders/dist/loaders.esm-bundler.js
@@ -1,15 +1,15 @@
 import { InstancedBufferGeometry, BufferGeometry, BufferAttribute, InterleavedBufferAttribute, InstancedBufferAttribute, InterleavedBuffer } from '@renderlayer/buffers';
 import { Vector3, Sphere, Color, Matrix4, Matrix3, Vector4, Vector2 } from '@renderlayer/math';
 import { getTypedArray, createElementNS, UVMapping, CubeReflectionMapping, CubeRefractionMapping, EquirectangularReflectionMapping, EquirectangularRefractionMapping, CubeUVReflectionMapping, RepeatWrapping, ClampToEdgeWrapping, MirroredRepeatWrapping, NearestFilter, NearestMipmapNearestFilter, NearestMipmapLinearFilter, LinearFilter, LinearMipmapNearestFilter, LinearMipmapLinearFilter } from '@renderlayer/shared';
-import { ShadowMaterial, RawShaderMaterial, ShaderMaterial, PointsMaterial, MeshPhysicalMaterial, MeshStandardMaterial, MeshDepthMaterial, MeshDistanceMaterial, MeshBasicMaterial, LineBasicMaterial, Material } from '@renderlayer/materials';
+import { ShadowMaterial, SpriteMaterial, RawShaderMaterial, ShaderMaterial, PointsMaterial, MeshPhysicalMaterial, MeshStandardMaterial, MeshNormalMaterial, MeshDepthMaterial, MeshDistanceMaterial, MeshBasicMaterial, LineBasicMaterial, Material } from '@renderlayer/materials';
 import { AnimationClip } from '@renderlayer/animation';
 import { OrthographicCamera, PerspectiveCamera } from '@renderlayer/cameras';
 import { Object3D } from '@renderlayer/core';
 import { Scene, Fog, FogExp2 } from '@renderlayer/scenes';
 import { DataTexture, Source, CubeTexture, Texture } from '@renderlayer/textures';
 import * as Geometries from '@renderlayer/geometries';
 import { SpotLight, PointLight, DirectionalLight, AmbientLight } from '@renderlayer/lights';
-import { Skeleton, Bone, Group, Points, LineSegments, LineLoop, Line, InstancedMesh, Mesh, SkinnedMesh } from '@renderlayer/objects';
+import { Skeleton, Bone, Group, Sprite, Points, LineSegments, LineLoop, Line, LOD, InstancedMesh, Mesh, SkinnedMesh } from '@renderlayer/objects';
 
 const Cache = {
   enabled: false,
@@ -900,15 +900,15 @@ class MaterialLoader extends Loader {
   static createMaterialFromType(type) {
     const materialLib = {
       ShadowMaterial,
-      // SpriteMaterial,
+      SpriteMaterial,
       RawShaderMaterial,
       ShaderMaterial,
       PointsMaterial,
       MeshPhysicalMaterial,
       MeshStandardMaterial,
       // MeshPhongMaterial,
       // MeshToonMaterial,
-      // MeshNormalMaterial,
+      MeshNormalMaterial,
       // MeshLambertMaterial,
       MeshDepthMaterial,
       MeshDistanceMaterial,
@@ -1442,6 +1442,9 @@ class ObjectLoader extends Loader {
           );
         break;
       }
+      case "LOD":
+        object = new LOD();
+        break;
       case "Line":
         object = new Line(getGeometry(data.geometry), getMaterial(data.material));
         break;
@@ -1455,6 +1458,9 @@ class ObjectLoader extends Loader {
       case "Points":
         object = new Points(getGeometry(data.geometry), getMaterial(data.material));
         break;
+      case "Sprite":
+        object = new Sprite(getMaterial(data.material));
+        break;
       case "Group":
         object = new Group();
         break;
@@ -1524,6 +1530,18 @@ class ObjectLoader extends Loader {
         object.animations.push(animations[uuid]);
       }
     }
+    if (data.type === "LOD") {
+      if (data.autoUpdate !== void 0)
+        object.autoUpdate = data.autoUpdate;
+      const levels = data.levels;
+      for (let l = 0; l < levels.length; l++) {
+        const level = levels[l];
+        const child = object.getObjectByProperty("uuid", level.object);
+        if (child !== void 0) {
+          object.addLevel(child, level.distance, level.hysteresis);
+        }
+      }
+    }
     return object;
   }
   bindSkeletons(object, skeletons) {

diff --git a/packages/loaders/package.json b/packages/loaders/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@renderlayer/loaders",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "@renderlayer/loaders",
   "type": "module",
   "module": "./dist/loaders.esm-bundler.js",

diff --git a/packages/renderlayer/package.json b/packages/renderlayer/package.json
@@ -42,7 +42,7 @@
     "@renderlayer/interpolants": "~0.0.2",
     "@renderlayer/keyframes": "~0.0.2",
     "@renderlayer/lights": "~0.0.3",
-    "@renderlayer/loaders": "~0.0.10",
+    "@renderlayer/loaders": "~0.0.11",
     "@renderlayer/materials": "~0.0.9",
     "@renderlayer/math": "~0.0.7",
     "@renderlayer/objects": "~0.0.4",