@luma.gl/engine 8.6.0-alpha.5 → 9.0.0-alpha.3

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 (129) hide show
  1. package/dist/animation/key-frames.d.ts +1 -0
  2. package/dist/animation/key-frames.d.ts.map +1 -1
  3. package/dist/animation/key-frames.js.map +1 -1
  4. package/dist/animation/timeline.d.ts +1 -1
  5. package/dist/animation/timeline.d.ts.map +1 -1
  6. package/dist/animation/timeline.js.map +1 -1
  7. package/dist/geometries/cone-geometry.d.ts.map +1 -1
  8. package/dist/geometries/cone-geometry.js +1 -1
  9. package/dist/geometries/cone-geometry.js.map +1 -1
  10. package/dist/geometries/cube-geometry.d.ts +4 -0
  11. package/dist/geometries/cube-geometry.d.ts.map +1 -1
  12. package/dist/geometries/cube-geometry.js +30 -7
  13. package/dist/geometries/cube-geometry.js.map +1 -1
  14. package/dist/geometries/cylinder-geometry.d.ts.map +1 -1
  15. package/dist/geometries/cylinder-geometry.js +1 -1
  16. package/dist/geometries/cylinder-geometry.js.map +1 -1
  17. package/dist/geometries/ico-sphere-geometry.d.ts.map +1 -1
  18. package/dist/geometries/ico-sphere-geometry.js +1 -1
  19. package/dist/geometries/ico-sphere-geometry.js.map +1 -1
  20. package/dist/geometries/plane-geometry.d.ts.map +1 -1
  21. package/dist/geometries/plane-geometry.js +1 -1
  22. package/dist/geometries/plane-geometry.js.map +1 -1
  23. package/dist/geometries/sphere-geometry.d.ts.map +1 -1
  24. package/dist/geometries/sphere-geometry.js +1 -1
  25. package/dist/geometries/sphere-geometry.js.map +1 -1
  26. package/dist/geometries/truncated-cone-geometry.d.ts +15 -3
  27. package/dist/geometries/truncated-cone-geometry.d.ts.map +1 -1
  28. package/dist/geometries/truncated-cone-geometry.js +29 -15
  29. package/dist/geometries/truncated-cone-geometry.js.map +1 -1
  30. package/dist/geometry/geometry-table.d.ts +15 -0
  31. package/dist/geometry/geometry-table.d.ts.map +1 -0
  32. package/dist/geometry/geometry-table.js +2 -0
  33. package/dist/{transform/transform-types.js.map → geometry/geometry-table.js.map} +1 -1
  34. package/dist/geometry/geometry-utils.js.map +1 -1
  35. package/dist/geometry/geometry.d.ts +34 -7
  36. package/dist/geometry/geometry.d.ts.map +1 -1
  37. package/dist/geometry/geometry.js +33 -11
  38. package/dist/geometry/geometry.js.map +1 -1
  39. package/dist/geometry/primitive-utils.d.ts +1 -0
  40. package/dist/geometry/primitive-utils.d.ts.map +1 -0
  41. package/dist/geometry/primitive-utils.js +2 -0
  42. package/dist/geometry/primitive-utils.js.map +1 -0
  43. package/dist/index.d.ts +3 -5
  44. package/dist/index.d.ts.map +1 -1
  45. package/dist/index.js +1 -4
  46. package/dist/index.js.map +1 -1
  47. package/dist/lib/animation-loop.d.ts +14 -73
  48. package/dist/lib/animation-loop.d.ts.map +1 -1
  49. package/dist/lib/animation-loop.js +39 -160
  50. package/dist/lib/animation-loop.js.map +1 -1
  51. package/dist/lib/animation-props.d.ts +24 -0
  52. package/dist/lib/animation-props.d.ts.map +1 -0
  53. package/dist/lib/animation-props.js +2 -0
  54. package/dist/lib/animation-props.js.map +1 -0
  55. package/dist/lib/clip-space.d.ts +1 -0
  56. package/dist/lib/clip-space.d.ts.map +1 -0
  57. package/dist/lib/clip-space.js +2 -0
  58. package/dist/lib/clip-space.js.map +1 -0
  59. package/dist/lib/model-utils.d.ts +4 -3
  60. package/dist/lib/model-utils.d.ts.map +1 -1
  61. package/dist/lib/model-utils.js +24 -70
  62. package/dist/lib/model-utils.js.map +1 -1
  63. package/dist/lib/model.d.ts +34 -104
  64. package/dist/lib/model.d.ts.map +1 -1
  65. package/dist/lib/model.js +108 -505
  66. package/dist/lib/model.js.map +1 -1
  67. package/dist/lib/pipeline-factory.d.ts +55 -0
  68. package/dist/lib/pipeline-factory.d.ts.map +1 -0
  69. package/dist/lib/pipeline-factory.js +191 -0
  70. package/dist/lib/pipeline-factory.js.map +1 -0
  71. package/dist/lib/render-loop.d.ts +4 -17
  72. package/dist/lib/render-loop.d.ts.map +1 -1
  73. package/dist/lib/render-loop.js +14 -21
  74. package/dist/lib/render-loop.js.map +1 -1
  75. package/package.json +5 -5
  76. package/src/animation/key-frames.ts +1 -0
  77. package/src/animation/timeline.ts +1 -1
  78. package/src/geometries/cone-geometry.ts +1 -1
  79. package/src/geometries/cube-geometry.ts +159 -8
  80. package/src/geometries/cylinder-geometry.ts +1 -1
  81. package/src/geometries/ico-sphere-geometry.ts +1 -1
  82. package/src/geometries/plane-geometry.ts +1 -1
  83. package/src/geometries/sphere-geometry.ts +2 -2
  84. package/src/geometries/truncated-cone-geometry.ts +30 -12
  85. package/src/geometry/geometry-table.ts +16 -0
  86. package/src/geometry/geometry-utils.ts +1 -1
  87. package/src/geometry/geometry.ts +58 -13
  88. package/src/geometry/primitive-utils.ts +30 -0
  89. package/src/index.ts +7 -8
  90. package/src/lib/animation-loop.ts +85 -274
  91. package/src/lib/animation-props.ts +31 -0
  92. package/src/{utils → lib}/clip-space.ts +5 -2
  93. package/src/lib/model-utils.ts +60 -32
  94. package/src/lib/model.ts +126 -642
  95. package/src/lib/pipeline-factory.ts +225 -0
  96. package/src/lib/render-loop.ts +21 -19
  97. package/dist/lib/program-manager.d.ts +0 -39
  98. package/dist/lib/program-manager.d.ts.map +0 -1
  99. package/dist/lib/program-manager.js +0 -175
  100. package/dist/lib/program-manager.js.map +0 -1
  101. package/dist/transform/buffer-transform.d.ts +0 -36
  102. package/dist/transform/buffer-transform.d.ts.map +0 -1
  103. package/dist/transform/buffer-transform.js +0 -255
  104. package/dist/transform/buffer-transform.js.map +0 -1
  105. package/dist/transform/texture-transform.d.ts +0 -57
  106. package/dist/transform/texture-transform.d.ts.map +0 -1
  107. package/dist/transform/texture-transform.js +0 -412
  108. package/dist/transform/texture-transform.js.map +0 -1
  109. package/dist/transform/transform-shader-utils.d.ts +0 -26
  110. package/dist/transform/transform-shader-utils.d.ts.map +0 -1
  111. package/dist/transform/transform-shader-utils.js +0 -149
  112. package/dist/transform/transform-shader-utils.js.map +0 -1
  113. package/dist/transform/transform-types.d.ts +0 -44
  114. package/dist/transform/transform-types.d.ts.map +0 -1
  115. package/dist/transform/transform-types.js +0 -2
  116. package/dist/transform/transform.d.ts +0 -47
  117. package/dist/transform/transform.d.ts.map +0 -1
  118. package/dist/transform/transform.js +0 -198
  119. package/dist/transform/transform.js.map +0 -1
  120. package/dist/utils/clip-space.d.ts +0 -5
  121. package/dist/utils/clip-space.d.ts.map +0 -1
  122. package/dist/utils/clip-space.js +0 -34
  123. package/dist/utils/clip-space.js.map +0 -1
  124. package/src/lib/program-manager.ts +0 -187
  125. package/src/transform/buffer-transform.ts +0 -214
  126. package/src/transform/texture-transform.ts +0 -344
  127. package/src/transform/transform-shader-utils.ts +0 -169
  128. package/src/transform/transform-types.ts +0 -42
  129. package/src/transform/transform.ts +0 -189
@@ -1,5 +1,4 @@
1
- import GL from '@luma.gl/constants';
2
- import { Buffer, assert } from '@luma.gl/webgl';
1
+ import { Buffer, assert } from '@luma.gl/api';
3
2
  const GLTF_TO_LUMA_ATTRIBUTE_MAP = {
4
3
  POSITION: 'positions',
5
4
  NORMAL: 'normals',
@@ -8,84 +7,39 @@ const GLTF_TO_LUMA_ATTRIBUTE_MAP = {
8
7
  TEXCOORD_1: 'texCoords1',
9
8
  TEXCOORD_2: 'texCoords2'
10
9
  };
11
- export function getBuffersFromGeometry(gl, geometry, options) {
10
+ export function getIndexBufferFromGeometry(device, geometry) {
11
+ if (!geometry.indices) {
12
+ return undefined;
13
+ }
14
+
15
+ const data = geometry.indices.value || geometry.indices;
16
+ assert(data instanceof Uint16Array || data instanceof Uint32Array, 'attribute array for "indices" must be of integer type');
17
+ return device.createBuffer({
18
+ usage: Buffer.INDEX,
19
+ data
20
+ });
21
+ }
22
+ export function getAttributeBuffersFromGeometry(device, geometry) {
12
23
  const buffers = {};
13
- let indices = geometry.indices;
14
24
 
15
- for (const name in geometry.attributes) {
16
- const attribute = geometry.attributes[name];
17
- const remappedName = mapAttributeName(name, options);
25
+ for (const [name, attribute] of Object.entries(geometry.attributes)) {
26
+ const remappedName = mapAttributeName(name);
18
27
 
19
- if (name === 'indices') {
20
- indices = attribute;
21
- } else if (attribute.constant) {
22
- buffers[remappedName] = attribute.value;
28
+ if (attribute.constant) {
29
+ throw new Error('constant attributes not supported');
23
30
  } else {
24
31
  const typedArray = attribute.value;
25
- const accessor = { ...attribute
26
- };
27
- delete accessor.value;
28
- buffers[remappedName] = [new Buffer(gl, typedArray), accessor];
29
- inferAttributeAccessor(name, accessor);
32
+ buffers[remappedName] = device.createBuffer({
33
+ data: typedArray,
34
+ id: "".concat(remappedName, "-buffer")
35
+ });
30
36
  }
31
37
  }
32
38
 
33
- if (indices) {
34
- const data = indices.value || indices;
35
- assert(data instanceof Uint16Array || data instanceof Uint32Array, 'attribute array for "indices" must be of integer type');
36
- const accessor = {
37
- size: 1,
38
- isIndexed: indices.isIndexed === undefined ? true : indices.isIndexed
39
- };
40
- buffers.indices = [new Buffer(gl, {
41
- data,
42
- target: GL.ELEMENT_ARRAY_BUFFER
43
- }), accessor];
44
- }
45
-
46
39
  return buffers;
47
40
  }
48
41
 
49
- function mapAttributeName(name, options) {
50
- const {
51
- attributeMap = GLTF_TO_LUMA_ATTRIBUTE_MAP
52
- } = options || {};
53
- return attributeMap && attributeMap[name] || name;
54
- }
55
-
56
- export function inferAttributeAccessor(attributeName, attribute) {
57
- let category;
58
-
59
- switch (attributeName) {
60
- case 'texCoords':
61
- case 'texCoord1':
62
- case 'texCoord2':
63
- case 'texCoord3':
64
- category = 'uvs';
65
- break;
66
-
67
- case 'vertices':
68
- case 'positions':
69
- case 'normals':
70
- case 'pickingColors':
71
- category = 'vectors';
72
- break;
73
-
74
- default:
75
- }
76
-
77
- switch (category) {
78
- case 'vectors':
79
- attribute.size = attribute.size || 3;
80
- break;
81
-
82
- case 'uvs':
83
- attribute.size = attribute.size || 2;
84
- break;
85
-
86
- default:
87
- }
88
-
89
- assert(Number.isFinite(attribute.size), "attribute ".concat(attributeName, " needs size"));
42
+ function mapAttributeName(name) {
43
+ return GLTF_TO_LUMA_ATTRIBUTE_MAP[name] || name;
90
44
  }
91
45
  //# sourceMappingURL=model-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/lib/model-utils.ts"],"names":["GL","Buffer","assert","GLTF_TO_LUMA_ATTRIBUTE_MAP","POSITION","NORMAL","COLOR_0","TEXCOORD_0","TEXCOORD_1","TEXCOORD_2","getBuffersFromGeometry","gl","geometry","options","buffers","indices","name","attributes","attribute","remappedName","mapAttributeName","constant","value","typedArray","accessor","inferAttributeAccessor","data","Uint16Array","Uint32Array","size","isIndexed","undefined","target","ELEMENT_ARRAY_BUFFER","attributeMap","attributeName","category","Number","isFinite"],"mappings":"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","sourcesContent":["import GL from '@luma.gl/constants';\nimport {Buffer, assert} from '@luma.gl/webgl';\n\n// Support for mapping new geometries with glTF attribute names to \"classic\" luma.gl shader names\nconst GLTF_TO_LUMA_ATTRIBUTE_MAP = {\n POSITION: 'positions',\n NORMAL: 'normals',\n COLOR_0: 'colors',\n TEXCOORD_0: 'texCoords',\n TEXCOORD_1: 'texCoords1',\n TEXCOORD_2: 'texCoords2'\n};\n\nexport function getBuffersFromGeometry(gl: WebGLRenderingContext, geometry, options?) {\n const buffers: Record<string, Buffer | [Buffer, {}]> = {};\n let indices = geometry.indices;\n\n for (const name in geometry.attributes) {\n const attribute = geometry.attributes[name];\n const remappedName = mapAttributeName(name, options);\n\n if (name === 'indices') {\n indices = attribute;\n } else if (attribute.constant) {\n buffers[remappedName] = attribute.value;\n } else {\n const typedArray = attribute.value;\n // Create accessor by copying the attribute and removing `value``\n const accessor = {...attribute};\n delete accessor.value;\n buffers[remappedName] = [new Buffer(gl, typedArray), accessor];\n\n inferAttributeAccessor(name, accessor);\n }\n }\n\n if (indices) {\n const data = indices.value || indices;\n assert(\n data instanceof Uint16Array || data instanceof Uint32Array,\n 'attribute array for \"indices\" must be of integer type'\n );\n const accessor = {\n size: 1,\n isIndexed: indices.isIndexed === undefined ? true : indices.isIndexed\n };\n buffers.indices = [\n new Buffer(gl, {\n data,\n target: GL.ELEMENT_ARRAY_BUFFER\n }),\n accessor\n ];\n }\n\n return buffers;\n}\n\nfunction mapAttributeName(name, options) {\n const {attributeMap = GLTF_TO_LUMA_ATTRIBUTE_MAP} = options || {};\n return (attributeMap && attributeMap[name]) || name;\n}\n\n// Check for well known attribute names\n// eslint-disable-next-line complexity\nexport function inferAttributeAccessor(attributeName, attribute) {\n let category;\n switch (attributeName) {\n case 'texCoords':\n case 'texCoord1':\n case 'texCoord2':\n case 'texCoord3':\n category = 'uvs';\n break;\n case 'vertices':\n case 'positions':\n case 'normals':\n case 'pickingColors':\n category = 'vectors';\n break;\n default:\n }\n\n // Check for categorys\n switch (category) {\n case 'vectors':\n attribute.size = attribute.size || 3;\n break;\n case 'uvs':\n attribute.size = attribute.size || 2;\n break;\n default:\n }\n\n assert(Number.isFinite(attribute.size), `attribute ${attributeName} needs size`);\n}\n"],"file":"model-utils.js"}
1
+ {"version":3,"sources":["../../src/lib/model-utils.ts"],"names":["Buffer","assert","GLTF_TO_LUMA_ATTRIBUTE_MAP","POSITION","NORMAL","COLOR_0","TEXCOORD_0","TEXCOORD_1","TEXCOORD_2","getIndexBufferFromGeometry","device","geometry","indices","undefined","data","value","Uint16Array","Uint32Array","createBuffer","usage","INDEX","getAttributeBuffersFromGeometry","buffers","name","attribute","Object","entries","attributes","remappedName","mapAttributeName","constant","Error","typedArray","id"],"mappings":"AAAA,SAAgBA,MAAhB,EAAwBC,MAAxB,QAAqC,cAArC;AAIA,MAAMC,0BAA0B,GAAG;AACjCC,EAAAA,QAAQ,EAAE,WADuB;AAEjCC,EAAAA,MAAM,EAAE,SAFyB;AAGjCC,EAAAA,OAAO,EAAE,QAHwB;AAIjCC,EAAAA,UAAU,EAAE,WAJqB;AAKjCC,EAAAA,UAAU,EAAE,YALqB;AAMjCC,EAAAA,UAAU,EAAE;AANqB,CAAnC;AAmDA,OAAO,SAASC,0BAAT,CAAoCC,MAApC,EAAoDC,QAApD,EAA4F;AACjG,MAAI,CAACA,QAAQ,CAACC,OAAd,EAAuB;AACrB,WAAOC,SAAP;AACD;;AAGD,QAAMC,IAAI,GAAGH,QAAQ,CAACC,OAAT,CAAiBG,KAAjB,IAA0BJ,QAAQ,CAACC,OAAhD;AACAX,EAAAA,MAAM,CACJa,IAAI,YAAYE,WAAhB,IAA+BF,IAAI,YAAYG,WAD3C,EAEJ,uDAFI,CAAN;AAIA,SAAOP,MAAM,CAACQ,YAAP,CAAoB;AAACC,IAAAA,KAAK,EAAEnB,MAAM,CAACoB,KAAf;AAAsBN,IAAAA;AAAtB,GAApB,CAAP;AACD;AAED,OAAO,SAASO,+BAAT,CAAyCX,MAAzC,EAAyDC,QAAzD,EAAqG;AAC1G,QAAMW,OAA+B,GAAG,EAAxC;;AAEA,OAAK,MAAM,CAACC,IAAD,EAAOC,SAAP,CAAX,IAAgCC,MAAM,CAACC,OAAP,CAAef,QAAQ,CAACgB,UAAxB,CAAhC,EAAqE;AACnE,UAAMC,YAAY,GAAGC,gBAAgB,CAACN,IAAD,CAArC;;AACA,QAAIC,SAAS,CAACM,QAAd,EAAwB;AACtB,YAAM,IAAIC,KAAJ,CAAU,mCAAV,CAAN;AACD,KAFD,MAEO;AACL,YAAMC,UAAU,GAAGR,SAAS,CAACT,KAA7B;AACAO,MAAAA,OAAO,CAACM,YAAD,CAAP,GAAwBlB,MAAM,CAACQ,YAAP,CAAoB;AAACJ,QAAAA,IAAI,EAAEkB,UAAP;AAAmBC,QAAAA,EAAE,YAAKL,YAAL;AAArB,OAApB,CAAxB;AACD;AACF;;AAED,SAAON,OAAP;AACD;;AAED,SAASO,gBAAT,CAA0BN,IAA1B,EAAgD;AAC9C,SAAOrB,0BAA0B,CAACqB,IAAD,CAA1B,IAAoCA,IAA3C;AACD","sourcesContent":["import {Device, Buffer, assert} from '@luma.gl/api';\nimport type Geometry from '../geometry/geometry';\n\n// Support for mapping new geometries with glTF attribute names to \"classic\" luma.gl shader names\nconst GLTF_TO_LUMA_ATTRIBUTE_MAP = {\n POSITION: 'positions',\n NORMAL: 'normals',\n COLOR_0: 'colors',\n TEXCOORD_0: 'texCoords',\n TEXCOORD_1: 'texCoords1',\n TEXCOORD_2: 'texCoords2'\n};\n\n/*\nexport function getAttributeLayoutsFromGeometry(geometry: Geometry) {\n const layouts: Record<string, {}> = {};\n let indices = geometry.indices;\n\n for (const [name, attribute] of Object.entries(geometry.attributes)) {\n const remappedName = mapAttributeName(name);\n\n if (attribute.constant) {\n throw new Error('constant attributes not supported');\n } else {\n const typedArray = attribute.value;\n // Create accessor by copying the attribute and removing `value``\n const accessor = {...attribute};\n delete accessor.value;\n buffers[remappedName] = [device.createBuffer(typedArray), accessor];\n\n inferAttributeAccessor(name, accessor);\n }\n }\n}\n\nexport class Table {\n length: number;\n // columns: Record<string, TypedArray> = {};\n}\n\nexport class GPUTable {\n length: number;\n columns: Record<string, Buffer> = {};\n}\n\nexport function convertTableToGPUTable(table: Table) {\n // for (const ) {}\n}\n\nexport function renameTableColumns(table: Table, map: (name: string) => string) {\n const newColumns = table.columns.reduce()\n table.clone();\n}\n*/\n\nexport function getIndexBufferFromGeometry(device: Device, geometry: Geometry): Buffer | undefined {\n if (!geometry.indices) {\n return undefined;\n }\n\n // @ts-expect-error\n const data = geometry.indices.value || geometry.indices;\n assert(\n data instanceof Uint16Array || data instanceof Uint32Array,\n 'attribute array for \"indices\" must be of integer type'\n );\n return device.createBuffer({usage: Buffer.INDEX, data});\n}\n\nexport function getAttributeBuffersFromGeometry(device: Device, geometry: Geometry): Record<string, Buffer> {\n const buffers: Record<string, Buffer> = {};\n\n for (const [name, attribute] of Object.entries(geometry.attributes)) {\n const remappedName = mapAttributeName(name);\n if (attribute.constant) {\n throw new Error('constant attributes not supported');\n } else {\n const typedArray = attribute.value;\n buffers[remappedName] = device.createBuffer({data: typedArray, id: `${remappedName}-buffer`});\n }\n }\n\n return buffers;\n}\n\nfunction mapAttributeName(name: string): string {\n return GLTF_TO_LUMA_ATTRIBUTE_MAP[name] || name;\n}\n\n/*\n// Check for well known attribute names\n// eslint-disable-next-line complexity\nexport function inferAttributeAccessor(attributeName, attribute) {\n let category;\n switch (attributeName) {\n case 'texCoords':\n case 'texCoord1':\n case 'texCoord2':\n case 'texCoord3':\n category = 'uvs';\n break;\n case 'vertices':\n case 'positions':\n case 'normals':\n case 'pickingColors':\n category = 'vectors';\n break;\n default:\n }\n\n // Check for categorys\n switch (category) {\n case 'vectors':\n attribute.size = attribute.size || 3;\n break;\n case 'uvs':\n attribute.size = attribute.size || 2;\n break;\n default:\n }\n\n assert(Number.isFinite(attribute.size), `attribute ${attributeName} needs size`);\n}\n*/\n"],"file":"model-utils.js"}
@@ -1,111 +1,41 @@
1
- import { Device } from '@luma.gl/api';
2
- import type { ProgramProps } from '@luma.gl/webgl';
3
- import { Program, VertexArray, TransformFeedback } from '@luma.gl/webgl';
4
- import ProgramManager from './program-manager';
5
- export declare type ModelProps = ProgramProps & {
6
- id?: string;
7
- varyings?: string[];
8
- bufferMode?: any;
9
- program?: Program;
10
- modules?: any[];
11
- defines?: Record<string, number | boolean>;
12
- inject?: Record<string, any>;
13
- transpileToGLSL100?: boolean;
14
- moduleSettings?: object;
15
- attributes?: object;
16
- uniforms?: object;
17
- geometry?: object;
18
- vertexCount?: number;
19
- drawMode?: number;
20
- isInstanced?: boolean;
21
- instanceCount?: number;
22
- programManager?: ProgramManager;
23
- onBeforeRender?: () => void;
24
- onAfterRender?: () => void;
25
- _feedbackBuffers?: object;
26
- isIndexed?: boolean;
27
- indexType?: any;
28
- indexOffset?: number;
29
- vertexArrayInstanced?: boolean;
30
- /** @deprecated Use isInstanced */
31
- instanced?: boolean;
32
- };
33
- export declare type ModelDrawOptions = {
34
- moduleSettings?: any;
35
- framebuffer?: any;
36
- uniforms?: any;
37
- attributes?: any;
38
- transformFeedback?: any;
39
- parameters?: any;
40
- vertexArray?: any;
1
+ import type { Device, Buffer, RenderPipelineProps, RenderPass, Binding } from '@luma.gl/api';
2
+ import { RenderPipeline } from '@luma.gl/api';
3
+ import type { ShaderModule } from '@luma.gl/shadertools';
4
+ import type Geometry from '../geometry/geometry';
5
+ export declare type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
6
+ vs?: {
7
+ glsl?: string;
8
+ wgsl?: string;
9
+ } | string;
10
+ fs?: {
11
+ glsl?: string;
12
+ wgsl?: string;
13
+ } | string;
14
+ modules?: ShaderModule[];
15
+ moduleSettings?: Record<string, Record<string, any>>;
16
+ geometry?: Geometry;
41
17
  };
18
+ /** v9 API */
42
19
  export default class Model {
43
20
  readonly device: Device;
44
- readonly gl: WebGLRenderingContext;
21
+ readonly pipeline: RenderPipeline;
45
22
  readonly id: string;
46
- readonly animated: boolean;
47
- programManager: ProgramManager;
48
- vertexCount: number;
49
- lastLogTime: number;
50
- props: ModelProps;
51
- userData: Record<string, any>;
52
- needsRedraw: boolean;
53
- attributes: Record<string, any>;
54
- _attributes: Record<string, any>;
55
- uniforms: Record<string, any>;
56
- drawMode: any;
57
- instanceCount: number;
58
- pickable: boolean;
59
- programProps: ProgramProps & {
60
- program?: Program;
61
- modules: any;
62
- inject: any;
63
- defines: any;
64
- varyings: any;
65
- bufferMode: any;
66
- transpileToGLSL100: any;
67
- };
68
- vertexArray: VertexArray;
69
- program: Program;
70
- transformFeedback: TransformFeedback | undefined;
71
- _programDirty: boolean;
72
- _programManagerState: any;
73
- _managedProgram: any;
74
- geometryBuffers: {};
75
- isInstanced: boolean;
76
- geometry: {};
77
- constructor(device: Device, props?: ModelProps);
78
- constructor(gl: WebGLRenderingContext, props?: ModelProps);
79
- initialize(props: ModelProps): void;
80
- setProps(props: any): void;
23
+ readonly vs: string;
24
+ readonly fs: string | undefined;
25
+ readonly topology: string;
26
+ readonly vertexCount: any;
27
+ props: Required<ModelProps>;
28
+ private _getModuleUniforms;
29
+ constructor(device: Device, props: ModelProps);
81
30
  destroy(): void;
82
- /** @deprecated Use .destroy() */
83
- delete(): void;
84
- getDrawMode(): any;
85
- getVertexCount(): number;
86
- getInstanceCount(): number;
87
- getAttributes(): Record<string, any>;
88
- getProgram(): Program;
89
- setProgram(props: any): void;
90
- getUniforms(): Record<string, any>;
91
- setDrawMode(drawMode: any): this;
92
- setVertexCount(vertexCount: any): this;
93
- setInstanceCount(instanceCount: any): this;
94
- setGeometry(geometry: any): this;
95
- setAttributes(attributes?: {}): this;
96
- setUniforms(uniforms?: {}): this;
97
- getModuleUniforms(opts?: any): any;
98
- updateModuleSettings(opts?: any): this;
99
- clear(opts: any): this;
100
- draw(opts?: ModelDrawOptions): boolean;
101
- transform(opts?: ModelDrawOptions): this;
102
- render(uniforms?: {}): boolean;
103
- _setModelProps(props: any): void;
104
- _checkProgram(): void;
105
- _deleteGeometryBuffers(): void;
106
- _setAnimationProps(animationProps: any): void;
107
- _setFeedbackBuffers(feedbackBuffers?: {}): this;
108
- _logDrawCallStart(logLevel: number): number;
109
- _logDrawCallEnd(logLevel: any, vertexArray: any, uniforms: any, framebuffer?: any): void;
31
+ draw(renderPass?: RenderPass): this;
32
+ setProps(props: ModelProps): this;
33
+ updateModuleSettings(props: Record<string, any>): this;
34
+ setIndexBuffer(indices: Buffer): this;
35
+ setAttributes(attributes: Record<string, Buffer>): this;
36
+ /** Set the bindings */
37
+ setBindings(bindings: Record<string, Binding>): this;
38
+ setUniforms(uniforms: Record<string, any>): this;
39
+ _setGeometry(geometry: Geometry): void;
110
40
  }
111
41
  //# sourceMappingURL=model.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AAEpC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,iBAAiB,EAMlB,MAAM,gBAAgB,CAAC;AAMxB,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAW/C,oBAAY,UAAU,GAAG,YAAY,GAAG;IACtC,EAAE,CAAC,EAAE,MAAM,CAAC;IAKZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,MAAC;IAEZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,MAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,kCAAkC;IAClC,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAC;AAGF,oBAAY,gBAAgB,GAAG;IAC7B,cAAc,CAAC,MAAC;IAChB,WAAW,CAAC,MAAC;IACb,QAAQ,CAAC,MAAC;IACV,UAAU,CAAC,MAAC;IACZ,iBAAiB,CAAC,MAAC;IACnB,UAAU,CAAC,MAAC;IACZ,WAAW,CAAC,MAAC;CACd,CAAC;AAyCF,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,EAAE,qBAAqB,CAAC;IAEnC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAS;IACnC,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IAEpB,WAAW,EAAE,MAAM,CAAK;IAExB,KAAK,EAAE,UAAU,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IACnC,WAAW,EAAE,OAAO,CAAQ;IAC5B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IACtC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEnC,QAAQ,MAAC;IACT,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAQ;IAEzB,YAAY,EAAE,YAAY,GAAG;QAAC,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,MAAC;QAAC,MAAM,MAAC;QAAC,OAAO,MAAC;QAAC,QAAQ,MAAC;QAAC,UAAU,MAAC;QAAC,kBAAkB,MAAC;KAAC,CAAC;IACtH,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACjD,aAAa,UAAQ;IACrB,oBAAoB,MAAC;IACrB,eAAe,MAAC;IAGhB,eAAe,KAAM;IAErB,WAAW,EAAE,OAAO,CAAC;IAErB,QAAQ,KAAM;gBAEF,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,UAAU;gBAElC,EAAE,EAAE,qBAAqB,EAAE,KAAK,CAAC,EAAE,UAAU;IAYzD,UAAU,CAAC,KAAK,EAAE,UAAU;IA4E5B,QAAQ,CAAC,KAAK,KAAA;IAId,OAAO,IAAI,IAAI;IAmBf,iCAAiC;IACjC,MAAM,IAAI,IAAI;IAMd,WAAW;IAIX,cAAc,IAAI,MAAM;IAIxB,gBAAgB,IAAI,MAAM;IAI1B,aAAa;IAIb,UAAU,IAAI,OAAO;IAIrB,UAAU,CAAC,KAAK,KAAA,GAAG,IAAI;IAiBvB,WAAW;IAMX,WAAW,CAAC,QAAQ,KAAA,GAAG,IAAI;IAK3B,cAAc,CAAC,WAAW,KAAA,GAAG,IAAI;IAMjC,gBAAgB,CAAC,aAAa,KAAA,GAAG,IAAI;IAMrC,WAAW,CAAC,QAAQ,KAAA,GAAG,IAAI;IAW3B,aAAa,CAAC,UAAU,KAAK,GAAG,IAAI;IAmBpC,WAAW,CAAC,QAAQ,KAAK,GAAG,IAAI;IAKhC,iBAAiB,CAAC,IAAI,CAAC,KAAA;IAYvB,oBAAoB,CAAC,IAAI,CAAC,KAAA,GAAG,IAAI;IAOjC,KAAK,CAAC,IAAI,KAAA,GAAG,IAAI;IAKjB,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO;IAyE1C,SAAS,CAAC,IAAI,GAAE,gBAAqB,GAAG,IAAI;IA0B5C,MAAM,CAAC,QAAQ,KAAK,GAAG,OAAO;IAO9B,cAAc,CAAC,KAAK,KAAA,GAAG,IAAI;IA2B3B,aAAa,IAAI,IAAI;IA2DrB,sBAAsB,IAAI,IAAI;IAY9B,kBAAkB,CAAC,cAAc,KAAA,GAAG,IAAI;IAUxC,mBAAmB,CAAC,eAAe,KAAK,GAAG,IAAI;IAiB/C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAa3C,eAAe,CAAC,QAAQ,KAAA,EAAE,WAAW,KAAA,EAAE,QAAQ,KAAA,EAAE,WAAW,CAAC,KAAA,GAAG,IAAI;CAsDrE"}
1
+ {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,EAAC,MAAM,cAAc,CAAC;AAC3F,OAAO,EAAC,cAAc,EAAe,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAC;AAIjD,oBAAY,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG;IAEhE,EAAE,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,CAAC;IAC7C,EAAE,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,CAAC;IAC7C,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACrD,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAcF,aAAa;AACb,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,MAAC;IACrB,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE5B,OAAO,CAAC,kBAAkB,CAAuE;gBAErF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAyC7C,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IASnC,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAmBjC,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMtD,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAMrC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAMvD,uBAAuB;IACvB,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAMpD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMhD,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAWvC"}