@needle-tools/engine 3.5.9-alpha.1 → 3.5.9-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/needle-engine.js +1734 -1722
  3. package/dist/needle-engine.light.js +1680 -1668
  4. package/dist/needle-engine.light.min.js +74 -74
  5. package/dist/needle-engine.light.umd.cjs +72 -72
  6. package/dist/needle-engine.min.js +79 -79
  7. package/dist/needle-engine.umd.cjs +73 -73
  8. package/lib/engine/api.d.ts +1 -0
  9. package/lib/engine/api.js +1 -0
  10. package/lib/engine/api.js.map +1 -1
  11. package/lib/engine/engine_element.d.ts +4 -1
  12. package/lib/engine/engine_element.js +17 -13
  13. package/lib/engine/engine_element.js.map +1 -1
  14. package/lib/engine/engine_element_attributes.d.ts +37 -0
  15. package/lib/engine/engine_element_attributes.js +2 -0
  16. package/lib/engine/engine_element_attributes.js.map +1 -0
  17. package/lib/engine/engine_gltf_builtin_components.js +7 -0
  18. package/lib/engine/engine_gltf_builtin_components.js.map +1 -1
  19. package/lib/engine/extensions/NEEDLE_progressive.d.ts +1 -0
  20. package/lib/engine/extensions/NEEDLE_progressive.js +41 -24
  21. package/lib/engine/extensions/NEEDLE_progressive.js.map +1 -1
  22. package/package.json +1 -1
  23. package/plugins/next/next.js +1 -1
  24. package/src/engine/api.ts +1 -0
  25. package/src/engine/engine_element.ts +22 -14
  26. package/src/engine/engine_element_attributes.ts +42 -0
  27. package/src/engine/engine_gltf_builtin_components.ts +9 -1
  28. package/src/engine/extensions/NEEDLE_progressive.ts +43 -24
package/src/engine/extensions/NEEDLE_progressive.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Material, Texture, TextureLoader } from "three";
1
+ import { Material, RawShaderMaterial, Texture, TextureLoader } from "three";
2
2
  import { GLTF, GLTFLoader, GLTFLoaderPlugin, GLTFParser } from "three/examples/jsm/loaders/GLTFLoader";
3
3
  import { SourceIdentifier } from "../engine_types";
4
4
  import { Context } from "../engine_setup";
@@ -36,42 +36,55 @@ if (debug) {
36
36
  });
37
37
  }
38
38
 
39
-
40
39
  export class NEEDLE_progressive implements GLTFLoaderPlugin {
41
40
 
42
41
  static assignTextureLOD(context: Context, source: SourceIdentifier | undefined, material: Material, level: number = 0) {
43
42
  if (!material) return;
43
+
44
44
  for (let slot of Object.keys(material)) {
45
45
  const val = material[slot];
46
- if (val?.isTexture === true) {
46
+ if (val?.isTexture)
47
+ this.assignTextureLODForSlot(context, source, material, level, slot, val);
48
+ }
47
49
 
48
- if (debug) console.log("-----------\n", "FIND", material.name, slot, val?.name, val?.userData, val, material);
50
+ if (material instanceof RawShaderMaterial) {
51
+ // iterate uniforms
52
+ for (let slot of Object.keys(material.uniforms)) {
53
+ const val = material.uniforms[slot].value;
54
+ if (val?.isTexture)
55
+ this.assignTextureLODForSlot(context, source, material, level, slot, val);
56
+ }
57
+ }
58
+ }
49
59
 
50
- NEEDLE_progressive.getOrLoadTexture(context, source, material, slot, val, level).then(t => {
51
- if (t?.isTexture === true) {
60
+ private static assignTextureLODForSlot(context: Context, source: SourceIdentifier | undefined, material: Material, level: number, slot: string, val: any) {
61
+ if (val?.isTexture !== true) return;
52
62
 
53
- if (debug) console.log("Assign LOD", material.name, slot, t.name, t["guid"], material, "Prev:", val, "Now:", t, "\n--------------");
63
+ if (debug) console.log("-----------\n", "FIND", material.name, slot, val?.name, val?.userData, val, material);
54
64
 
55
- material[slot] = t;
56
- t.needsUpdate = true;
57
- material.needsUpdate = true;
65
+ NEEDLE_progressive.getOrLoadTexture(context, source, material, slot, val, level).then(t => {
66
+ if (t?.isTexture === true) {
58
67
 
59
- if (debug) {
60
- let debug_map = debug_toggle_maps.get(material);
61
- if (!debug_map) {
62
- debug_map = {};
63
- debug_toggle_maps.set(material, debug_map);
64
- }
65
- let entry = debug_map[slot];
66
- if (!entry) {
67
- entry = debug_map[slot] = { original: val, lod0: t };
68
- }
69
- entry.lod0 = t;
70
- }
68
+ if (debug) console.log("Assign LOD", material.name, slot, t.name, t["guid"], material, "Prev:", val, "Now:", t, "\n--------------");
69
+
70
+ material[slot] = t;
71
+ t.needsUpdate = true;
72
+ material.needsUpdate = true;
73
+
74
+ if (debug) {
75
+ let debug_map = debug_toggle_maps.get(material);
76
+ if (!debug_map) {
77
+ debug_map = {};
78
+ debug_toggle_maps.set(material, debug_map);
71
79
  }
72
- });
80
+ let entry = debug_map[slot];
81
+ if (!entry) {
82
+ entry = debug_map[slot] = { original: val, lod0: t };
83
+ }
84
+ entry.lod0 = t;
85
+ }
73
86
  }
74
- }
87
+ });
75
88
  }
76
89
 
77
90
  get name(): string {
@@ -176,6 +189,12 @@ export class NEEDLE_progressive implements GLTFLoaderPlugin {
176
189
  if (debug) console.log("Loading finished " + uri, material.name, slot, ext.guid);
177
190
  let index = -1;
178
191
  let found = false;
192
+
193
+ if (!gltf.parser.json?.textures) {
194
+ if (debug) console.warn("No textures in glTF " + uri + " - may be a bug", material.name, slot, ext.guid);
195
+ return resolve(null);
196
+ }
197
+
179
198
  for (const tex of gltf.parser.json.textures) {
180
199
  index++;
181
200
  if (tex?.extensions) {