@shapediver/viewer.rendering-engine.rendering-engine-threejs 3.0.6 → 3.1.1

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 (8) hide show
  1. package/dist/managers/postprocessing/utils/CopyMaterial.js +1 -1
  2. package/dist/shaders/multi_points.d.ts +1 -1
  3. package/dist/shaders/multi_points.d.ts.map +1 -1
  4. package/dist/shaders/multi_points.js +2 -2
  5. package/package.json +17 -17
  6. package/src/managers/postprocessing/utils/CopyMaterial.ts +1 -1
  7. package/src/shaders/multi_points.ts +2 -2
  8. package/src/shaders/multi_points_frag.glsl +2 -2
package/dist/managers/postprocessing/utils/CopyMaterial.js CHANGED
@@ -35,7 +35,7 @@ void main() {
35
35
  vec4 texel = texture2D(inputBuffer, vUv);
36
36
  gl_FragColor = opacity * texel;
37
37
 
38
- #include <encodings_fragment>
38
+ #include <colorspace_fragment>
39
39
  #include <dithering_fragment>
40
40
 
41
41
  }
package/dist/shaders/multi_points.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export declare const vert = "\nattribute float positionIndex;\nflat varying int vMaterialIndex;\nflat varying int vPositionIndex;\n\nuniform float size_0;\nuniform float size_1;\nuniform float size_2;\nuniform float size_3;\nuniform float size_4;\nuniform float size_5;\nuniform float size_6;\nuniform float size_7;\n\nuniform bool sizeAttenuation_0;\nuniform bool sizeAttenuation_1;\nuniform bool sizeAttenuation_2;\nuniform bool sizeAttenuation_3;\nuniform bool sizeAttenuation_4;\nuniform bool sizeAttenuation_5;\nuniform bool sizeAttenuation_6;\nuniform bool sizeAttenuation_7;\n\nuniform highp usampler2D materialIndexDataTexture;\n\nuniform float scale;\n\nfloat getSize(int materialIndex) {\n if ( materialIndex == 1 ) {\n return size_1;\n } else if ( materialIndex == 2 ) {\n return size_2;\n } else if ( materialIndex == 3 ) {\n return size_3;\n } else if ( materialIndex == 4 ) {\n return size_4;\n } else if ( materialIndex == 5 ) {\n return size_5;\n } else if ( materialIndex == 6 ) {\n return size_6;\n } else if ( materialIndex == 7 ) {\n return size_7;\n } else {\n return size_0;\n }\n}\n\nbool getSizeAttenuation(int materialIndex) {\n if ( materialIndex == 1 ) {\n return sizeAttenuation_1;\n } else if ( materialIndex == 2 ) {\n return sizeAttenuation_2;\n } else if ( materialIndex == 3 ) {\n return sizeAttenuation_3;\n } else if ( materialIndex == 4 ) {\n return sizeAttenuation_4;\n } else if ( materialIndex == 5 ) {\n return sizeAttenuation_5;\n } else if ( materialIndex == 6 ) {\n return sizeAttenuation_6;\n } else if ( materialIndex == 7 ) {\n return sizeAttenuation_7;\n } else {\n return sizeAttenuation_0;\n }\n}\n\n#include <common>\n#include <color_pars_vertex>\n#include <fog_pars_vertex>\n#include <morphtarget_pars_vertex>\n#include <logdepthbuf_pars_vertex>\n#include <clipping_planes_pars_vertex>\n\n#ifdef USE_POINTS_UV\n\n\tvarying vec2 vUv;\n\tuniform mat3 uvTransform;\n\n#endif\n\nint retrieveMaterialIndex() {\n vec2 uv = vec2(positionIndex/1024.0, 0.5);\n\n // get the value of a texture at a specific index\n return int(texture2D(materialIndexDataTexture, uv).r);\n}\n\nvoid main() {\n int materialIndex = retrieveMaterialIndex();\n vMaterialIndex = materialIndex;\n\n float size = getSize(materialIndex);\n bool sizeAttenuation = getSizeAttenuation(materialIndex);\n\n\t#ifdef USE_POINTS_UV\n\n\t\tvUv = ( uvTransform * vec3( uv, 1 ) ).xy;\n\n\t#endif\n\n\t#include <color_vertex>\n\t#include <morphcolor_vertex>\n\t#include <begin_vertex>\n\t#include <morphtarget_vertex>\n\t#include <project_vertex>\n\n gl_PointSize = size;\n\n\tif(sizeAttenuation) {\n\t\tbool isPerspective = isPerspectiveMatrix( projectionMatrix );\n\t\tif ( isPerspective ) gl_PointSize *= ( scale / - mvPosition.z );\n }\n\n\n\t#include <logdepthbuf_vertex>\n\t#include <clipping_planes_vertex>\n\t#include <worldpos_vertex>\n\t#include <fog_vertex>\n\n}\n";
2
- export declare const frag = "\nuniform vec3 diffuse;\nuniform vec3 color_0;\nuniform vec3 color_1;\nuniform vec3 color_2;\nuniform vec3 color_3;\nuniform vec3 color_4;\nuniform vec3 color_5;\nuniform vec3 color_6;\nuniform vec3 color_7;\n\n\nuniform float opacity;\nflat varying int vMaterialIndex;\nflat varying int vPositionIndex;\n\n#include <common>\n#include <color_pars_fragment>\n\n#if defined( USE_POINTS_UV )\n\n\tvarying vec2 vUv;\n\n#else\n\n\t#if defined( USE_MAP ) || defined( USE_ALPHAMAP )\n\n\t\tuniform mat3 uvTransform;\n\n\t#endif\n\n#endif\n\n#ifdef USE_MAP\n\n\tuniform sampler2D map_0;\n\tuniform sampler2D map_1;\n\tuniform sampler2D map_2;\n\tuniform sampler2D map_3;\n uniform sampler2D map_4;\n uniform sampler2D map_5;\n uniform sampler2D map_6;\n uniform sampler2D map_7;\n\n#endif\n\n#ifdef USE_ALPHAMAP\n\n\tuniform sampler2D alphaMap_0;\n uniform sampler2D alphaMap_1;\n uniform sampler2D alphaMap_2;\n uniform sampler2D alphaMap_3;\n uniform sampler2D alphaMap_4;\n uniform sampler2D alphaMap_5;\n uniform sampler2D alphaMap_6;\n uniform sampler2D alphaMap_7;\n\n#endif\n\n\n#include <alphatest_pars_fragment>\n#include <fog_pars_fragment>\n#include <logdepthbuf_pars_fragment>\n#include <clipping_planes_pars_fragment>\n\nvoid main() {\n\n\t#include <clipping_planes_fragment>\n\n\tvec3 outgoingLight = vec3( 0.0 );\n\n vec3 c = vec3(1.0, 0.0, 0.0);\n if ( vMaterialIndex == 1 ) {\n c = color_1;\n } else if ( vMaterialIndex == 2 ) {\n c = color_2;\n } else if ( vMaterialIndex == 3 ) {\n c = color_3;\n } else if ( vMaterialIndex == 4 ) {\n c = color_4;\n } else if ( vMaterialIndex == 5 ) {\n c = color_5;\n } else if ( vMaterialIndex == 6 ) {\n c = color_6;\n } else if ( vMaterialIndex == 7 ) {\n c = color_7;\n } else {\n c = color_0;\n }\n\n\tvec4 diffuseColor = vec4( c, opacity );\n\n \n\n\n\t#include <logdepthbuf_fragment>\n\n #if defined( USE_MAP ) || defined( USE_ALPHAMAP )\n\n #if defined( USE_POINTS_UV )\n\n vec2 uv = vUv;\n\n #else\n\n vec2 uv = ( uvTransform * vec3( gl_PointCoord.x, 1.0 - gl_PointCoord.y, 1 ) ).xy;\n\n #endif\n\n #endif\n\n #ifdef USE_MAP\n\n if ( vMaterialIndex == 1 ) {\n diffuseColor *= texture2D( map_1, uv );\n } else if ( vMaterialIndex == 2 ) {\n diffuseColor *= texture2D( map_2, uv );\n } else if ( vMaterialIndex == 3 ) {\n diffuseColor *= texture2D( map_3, uv );\n } else if ( vMaterialIndex == 4 ) {\n diffuseColor *= texture2D( map_4, uv );\n } else if ( vMaterialIndex == 5 ) {\n diffuseColor *= texture2D( map_5, uv );\n } else if ( vMaterialIndex == 6 ) {\n diffuseColor *= texture2D( map_6, uv );\n } else if ( vMaterialIndex == 7 ) {\n diffuseColor *= texture2D( map_7, uv );\n } else {\n diffuseColor *= texture2D( map_0, uv );\n }\n\n #endif\n\n #ifdef USE_ALPHAMAP\n\n if ( vMaterialIndex == 1 ) {\n diffuseColor *= texture2D( alphaMap_1, uv );\n } else if ( vMaterialIndex == 2 ) {\n diffuseColor *= texture2D( alphaMap_2, uv );\n } else if ( vMaterialIndex == 3 ) {\n diffuseColor *= texture2D( alphaMap_3, uv );\n } else if ( vMaterialIndex == 4 ) {\n diffuseColor *= texture2D( alphaMap_4, uv );\n } else if ( vMaterialIndex == 5 ) {\n diffuseColor *= texture2D( alphaMap_5, uv );\n } else if ( vMaterialIndex == 6 ) {\n diffuseColor *= texture2D( alphaMap_6, uv );\n } else if ( vMaterialIndex == 7 ) {\n diffuseColor *= texture2D( alphaMap_7, uv );\n } else {\n diffuseColor *= texture2D( alphaMap_0, uv );\n }\n\n #endif\n\n\t#include <color_fragment>\n\t#include <alphatest_fragment>\n\n\toutgoingLight = diffuseColor.rgb;\n\n\t#include <output_fragment>\n\t#include <tonemapping_fragment>\n\t#include <encodings_fragment>\n\t#include <fog_fragment>\n\t#include <premultiplied_alpha_fragment>\n\n}\n";
2
+ export declare const frag = "\nuniform vec3 diffuse;\nuniform vec3 color_0;\nuniform vec3 color_1;\nuniform vec3 color_2;\nuniform vec3 color_3;\nuniform vec3 color_4;\nuniform vec3 color_5;\nuniform vec3 color_6;\nuniform vec3 color_7;\n\n\nuniform float opacity;\nflat varying int vMaterialIndex;\nflat varying int vPositionIndex;\n\n#include <common>\n#include <color_pars_fragment>\n\n#if defined( USE_POINTS_UV )\n\n\tvarying vec2 vUv;\n\n#else\n\n\t#if defined( USE_MAP ) || defined( USE_ALPHAMAP )\n\n\t\tuniform mat3 uvTransform;\n\n\t#endif\n\n#endif\n\n#ifdef USE_MAP\n\n\tuniform sampler2D map_0;\n\tuniform sampler2D map_1;\n\tuniform sampler2D map_2;\n\tuniform sampler2D map_3;\n uniform sampler2D map_4;\n uniform sampler2D map_5;\n uniform sampler2D map_6;\n uniform sampler2D map_7;\n\n#endif\n\n#ifdef USE_ALPHAMAP\n\n\tuniform sampler2D alphaMap_0;\n uniform sampler2D alphaMap_1;\n uniform sampler2D alphaMap_2;\n uniform sampler2D alphaMap_3;\n uniform sampler2D alphaMap_4;\n uniform sampler2D alphaMap_5;\n uniform sampler2D alphaMap_6;\n uniform sampler2D alphaMap_7;\n\n#endif\n\n\n#include <alphatest_pars_fragment>\n#include <fog_pars_fragment>\n#include <logdepthbuf_pars_fragment>\n#include <clipping_planes_pars_fragment>\n\nvoid main() {\n\n\t#include <clipping_planes_fragment>\n\n\tvec3 outgoingLight = vec3( 0.0 );\n\n vec3 c = vec3(1.0, 0.0, 0.0);\n if ( vMaterialIndex == 1 ) {\n c = color_1;\n } else if ( vMaterialIndex == 2 ) {\n c = color_2;\n } else if ( vMaterialIndex == 3 ) {\n c = color_3;\n } else if ( vMaterialIndex == 4 ) {\n c = color_4;\n } else if ( vMaterialIndex == 5 ) {\n c = color_5;\n } else if ( vMaterialIndex == 6 ) {\n c = color_6;\n } else if ( vMaterialIndex == 7 ) {\n c = color_7;\n } else {\n c = color_0;\n }\n\n\tvec4 diffuseColor = vec4( c, opacity );\n\n \n\n\n\t#include <logdepthbuf_fragment>\n\n #if defined( USE_MAP ) || defined( USE_ALPHAMAP )\n\n #if defined( USE_POINTS_UV )\n\n vec2 uv = vUv;\n\n #else\n\n vec2 uv = ( uvTransform * vec3( gl_PointCoord.x, 1.0 - gl_PointCoord.y, 1 ) ).xy;\n\n #endif\n\n #endif\n\n #ifdef USE_MAP\n\n if ( vMaterialIndex == 1 ) {\n diffuseColor *= texture2D( map_1, uv );\n } else if ( vMaterialIndex == 2 ) {\n diffuseColor *= texture2D( map_2, uv );\n } else if ( vMaterialIndex == 3 ) {\n diffuseColor *= texture2D( map_3, uv );\n } else if ( vMaterialIndex == 4 ) {\n diffuseColor *= texture2D( map_4, uv );\n } else if ( vMaterialIndex == 5 ) {\n diffuseColor *= texture2D( map_5, uv );\n } else if ( vMaterialIndex == 6 ) {\n diffuseColor *= texture2D( map_6, uv );\n } else if ( vMaterialIndex == 7 ) {\n diffuseColor *= texture2D( map_7, uv );\n } else {\n diffuseColor *= texture2D( map_0, uv );\n }\n\n #endif\n\n #ifdef USE_ALPHAMAP\n\n if ( vMaterialIndex == 1 ) {\n diffuseColor *= texture2D( alphaMap_1, uv );\n } else if ( vMaterialIndex == 2 ) {\n diffuseColor *= texture2D( alphaMap_2, uv );\n } else if ( vMaterialIndex == 3 ) {\n diffuseColor *= texture2D( alphaMap_3, uv );\n } else if ( vMaterialIndex == 4 ) {\n diffuseColor *= texture2D( alphaMap_4, uv );\n } else if ( vMaterialIndex == 5 ) {\n diffuseColor *= texture2D( alphaMap_5, uv );\n } else if ( vMaterialIndex == 6 ) {\n diffuseColor *= texture2D( alphaMap_6, uv );\n } else if ( vMaterialIndex == 7 ) {\n diffuseColor *= texture2D( alphaMap_7, uv );\n } else {\n diffuseColor *= texture2D( alphaMap_0, uv );\n }\n\n #endif\n\n\t#include <color_fragment>\n\t#include <alphatest_fragment>\n\n\toutgoingLight = diffuseColor.rgb;\n\n\t#include <opaque_fragment>\n\t#include <tonemapping_fragment>\n\t#include <colorspace_fragment>\n\t#include <fog_fragment>\n\t#include <premultiplied_alpha_fragment>\n\n}\n";
3
3
  //# sourceMappingURL=multi_points.d.ts.map
package/dist/shaders/multi_points.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"multi_points.d.ts","sourceRoot":"","sources":["../../src/shaders/multi_points.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI,w+FAyHhB,CAAC;AAEF,eAAO,MAAM,IAAI,+jIAuKhB,CAAC"}
1
+ {"version":3,"file":"multi_points.d.ts","sourceRoot":"","sources":["../../src/shaders/multi_points.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI,w+FAyHhB,CAAC;AAEF,eAAO,MAAM,IAAI,gkIAuKhB,CAAC"}
package/dist/shaders/multi_points.js CHANGED
@@ -283,9 +283,9 @@ void main() {
283
283
 
284
284
  outgoingLight = diffuseColor.rgb;
285
285
 
286
- #include <output_fragment>
286
+ #include <opaque_fragment>
287
287
  #include <tonemapping_fragment>
288
- #include <encodings_fragment>
288
+ #include <colorspace_fragment>
289
289
  #include <fog_fragment>
290
290
  #include <premultiplied_alpha_fragment>
291
291
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shapediver/viewer.rendering-engine.rendering-engine-threejs",
3
- "version": "3.0.6",
3
+ "version": "3.1.1",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "author": "Michael Oppitz <michael@shapediver.com>",
@@ -39,21 +39,21 @@
39
39
  "testEnvironment": "node"
40
40
  },
41
41
  "dependencies": {
42
- "@shapediver/viewer.data-engine.gltf-converter": "3.0.6",
43
- "@shapediver/viewer.data-engine.shared-types": "3.0.6",
44
- "@shapediver/viewer.data-engine.tag3d-engine": "3.0.6",
45
- "@shapediver/viewer.rendering-engine.animation-engine": "3.0.6",
46
- "@shapediver/viewer.rendering-engine.animation-frame-engine": "3.0.6",
47
- "@shapediver/viewer.rendering-engine.camera-engine": "3.0.6",
48
- "@shapediver/viewer.rendering-engine.canvas-engine": "3.0.6",
49
- "@shapediver/viewer.rendering-engine.intersection-engine": "3.0.6",
50
- "@shapediver/viewer.rendering-engine.light-engine": "3.0.6",
51
- "@shapediver/viewer.rendering-engine.rendering-engine": "3.0.6",
52
- "@shapediver/viewer.shared.global-access-objects": "3.0.6",
53
- "@shapediver/viewer.shared.math": "3.0.6",
54
- "@shapediver/viewer.shared.node-tree": "3.0.6",
55
- "@shapediver/viewer.shared.services": "3.0.6",
56
- "@shapediver/viewer.shared.types": "3.0.6",
42
+ "@shapediver/viewer.data-engine.gltf-converter": "3.1.1",
43
+ "@shapediver/viewer.data-engine.shared-types": "3.1.1",
44
+ "@shapediver/viewer.data-engine.tag3d-engine": "3.1.1",
45
+ "@shapediver/viewer.rendering-engine.animation-engine": "3.1.1",
46
+ "@shapediver/viewer.rendering-engine.animation-frame-engine": "3.1.1",
47
+ "@shapediver/viewer.rendering-engine.camera-engine": "3.1.1",
48
+ "@shapediver/viewer.rendering-engine.canvas-engine": "3.1.1",
49
+ "@shapediver/viewer.rendering-engine.intersection-engine": "3.1.1",
50
+ "@shapediver/viewer.rendering-engine.light-engine": "3.1.1",
51
+ "@shapediver/viewer.rendering-engine.rendering-engine": "3.1.1",
52
+ "@shapediver/viewer.shared.global-access-objects": "3.1.1",
53
+ "@shapediver/viewer.shared.math": "3.1.1",
54
+ "@shapediver/viewer.shared.node-tree": "3.1.1",
55
+ "@shapediver/viewer.shared.services": "3.1.1",
56
+ "@shapediver/viewer.shared.types": "3.1.1",
57
57
  "@tweenjs/tween.js": "^18.6.4",
58
58
  "@types/stats.js": "^0.17.0",
59
59
  "@types/three": "0.162.0",
@@ -62,5 +62,5 @@
62
62
  "stats.js": "^0.17.0",
63
63
  "three": "0.162.0"
64
64
  },
65
- "gitHead": "c9a43ef749feeeb9b4825b6a25b37a06a62e78e9"
65
+ "gitHead": "907a4374f92599a4ffb37eedd2f5cc388b9c4aab"
66
66
  }
package/src/managers/postprocessing/utils/CopyMaterial.ts CHANGED
@@ -38,7 +38,7 @@ void main() {
38
38
  vec4 texel = texture2D(inputBuffer, vUv);
39
39
  gl_FragColor = opacity * texel;
40
40
 
41
- #include <encodings_fragment>
41
+ #include <colorspace_fragment>
42
42
  #include <dithering_fragment>
43
43
 
44
44
  }
package/src/shaders/multi_points.ts CHANGED
@@ -281,9 +281,9 @@ void main() {
281
281
 
282
282
  outgoingLight = diffuseColor.rgb;
283
283
 
284
- #include <output_fragment>
284
+ #include <opaque_fragment>
285
285
  #include <tonemapping_fragment>
286
- #include <encodings_fragment>
286
+ #include <colorspace_fragment>
287
287
  #include <fog_fragment>
288
288
  #include <premultiplied_alpha_fragment>
289
289
 
package/src/shaders/multi_points_frag.glsl CHANGED
@@ -157,9 +157,9 @@ void main() {
157
157
 
158
158
  outgoingLight = diffuseColor.rgb;
159
159
 
160
- #include <output_fragment>
160
+ #include <opaque_fragment>
161
161
  #include <tonemapping_fragment>
162
- #include <encodings_fragment>
162
+ #include <colorspace_fragment>
163
163
  #include <fog_fragment>
164
164
  #include <premultiplied_alpha_fragment>
165
165