x_ite 5.0.0 → 5.0.2

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 (69) hide show
  1. package/dist/assets/components/annotation.js +2 -2
  2. package/dist/assets/components/annotation.min.js +1 -1
  3. package/dist/assets/components/cad-geometry.js +2 -2
  4. package/dist/assets/components/cad-geometry.min.js +1 -1
  5. package/dist/assets/components/cube-map-texturing.js +2 -2
  6. package/dist/assets/components/cube-map-texturing.min.js +1 -1
  7. package/dist/assets/components/dis.js +2 -2
  8. package/dist/assets/components/dis.min.js +1 -1
  9. package/dist/assets/components/event-utilities.js +2 -2
  10. package/dist/assets/components/event-utilities.min.js +1 -1
  11. package/dist/assets/components/geometry2d.js +2 -2
  12. package/dist/assets/components/geometry2d.min.js +1 -1
  13. package/dist/assets/components/geospatial.js +2 -2
  14. package/dist/assets/components/geospatial.min.js +1 -1
  15. package/dist/assets/components/h-anim.js +2 -2
  16. package/dist/assets/components/h-anim.min.js +1 -1
  17. package/dist/assets/components/key-device-sensor.js +2 -2
  18. package/dist/assets/components/key-device-sensor.min.js +1 -1
  19. package/dist/assets/components/layout.js +2 -2
  20. package/dist/assets/components/layout.min.js +1 -1
  21. package/dist/assets/components/nurbs.js +2 -2
  22. package/dist/assets/components/nurbs.min.js +1 -1
  23. package/dist/assets/components/particle-systems.js +2 -2
  24. package/dist/assets/components/particle-systems.min.js +1 -1
  25. package/dist/assets/components/picking.js +2 -2
  26. package/dist/assets/components/picking.min.js +1 -1
  27. package/dist/assets/components/projective-texture-mapping.js +2 -2
  28. package/dist/assets/components/projective-texture-mapping.min.js +1 -1
  29. package/dist/assets/components/rigid-body-physics.js +2 -2
  30. package/dist/assets/components/rigid-body-physics.min.js +1 -1
  31. package/dist/assets/components/scripting.js +2 -2
  32. package/dist/assets/components/scripting.min.js +1 -1
  33. package/dist/assets/components/texturing-3d.js +2 -2
  34. package/dist/assets/components/texturing-3d.min.js +1 -1
  35. package/dist/assets/components/volume-rendering.js +2 -2
  36. package/dist/assets/components/volume-rendering.min.js +1 -1
  37. package/dist/assets/components/x_ite.js +2 -2
  38. package/dist/assets/components/x_ite.min.js +1 -1
  39. package/dist/assets/shaders/webgl1/Phong.fs +3 -3
  40. package/dist/assets/shaders/webgl2/Phong.fs +3 -3
  41. package/dist/example.html +2 -2
  42. package/dist/x_ite.css +2 -2
  43. package/dist/x_ite.js +14 -45
  44. package/dist/x_ite.min.js +4 -4
  45. package/dist/x_ite.zip +0 -0
  46. package/docs/_config.yml +1 -1
  47. package/docs/index.md +2 -2
  48. package/package.json +3 -3
  49. package/src/assets/shaders/webgl1/Phong.fs +3 -3
  50. package/src/assets/shaders/webgl2/Phong.fs +3 -3
  51. package/src/x_ite/Base/X3DBaseNode.js +8 -2
  52. package/src/x_ite/Browser/NURBS/NURBS.js +51 -51
  53. package/src/x_ite/Browser/VERSION.js +1 -1
  54. package/src/x_ite/Components/Grouping/X3DGroupingNode.js +17 -16
  55. package/src/x_ite/Components/NURBS/Contour2D.js +53 -14
  56. package/src/x_ite/Components/NURBS/ContourPolyline2D.js +15 -12
  57. package/src/x_ite/Components/NURBS/NurbsCurve2D.js +9 -9
  58. package/src/x_ite/Components/NURBS/NurbsOrientationInterpolator.js +9 -9
  59. package/src/x_ite/Components/NURBS/NurbsPositionInterpolator.js +6 -6
  60. package/src/x_ite/Components/NURBS/NurbsSet.js +31 -27
  61. package/src/x_ite/Components/NURBS/NurbsSurfaceInterpolator.js +10 -10
  62. package/src/x_ite/Components/NURBS/NurbsSweptSurface.js +5 -5
  63. package/src/x_ite/Components/NURBS/NurbsSwungSurface.js +4 -4
  64. package/src/x_ite/Components/NURBS/NurbsTextureCoordinate.js +6 -6
  65. package/src/x_ite/Components/NURBS/NurbsTrimmedSurface.js +46 -7
  66. package/src/x_ite/Components/NURBS/X3DNurbsSurfaceGeometryNode.js +30 -32
  67. package/src/x_ite/Components/Shape/Material.js +0 -20
  68. package/src/x_ite/Components/Shape/PhysicalMaterial.js +0 -12
  69. package/src/x_ite/Components/Shape/X3DOneSidedMaterialNode.js +0 -8
@@ -843,9 +843,9 @@ uniform x3d_ShininessTextureParameters x3d_ShininessTexture;
843
843
  uniform x3d_OcclusionTextureParameters x3d_OcclusionTexture;
844
844
  #endif
845
845
  vec3
846
- getAmbientColor ()
846
+ getAmbientColor (in vec3 diffuseColor)
847
847
  {
848
- vec3 ambientParameter = x3d_Material .ambientIntensity * x3d_Material .diffuseColor;
848
+ vec3 ambientParameter = x3d_Material .ambientIntensity * diffuseColor;
849
849
  #if defined(X3D_AMBIENT_TEXTURE) && !defined(X3D_AMBIENT_TEXTURE_3D)
850
850
  vec4 texCoord = getTexCoord (x3d_AmbientTexture .textureTransformMapping, x3d_AmbientTexture .textureCoordinateMapping);
851
851
  #if defined(X3D_AMBIENT_TEXTURE_2D)
@@ -940,7 +940,7 @@ vec3 V = normalize (-vertex);
940
940
  vec4 diffuseColorAlpha = getDiffuseColor ();
941
941
  float alpha = diffuseColorAlpha .a;
942
942
  vec3 diffuseColor = diffuseColorAlpha .rgb;
943
- vec3 ambientColor = getAmbientColor ();
943
+ vec3 ambientColor = getAmbientColor (diffuseColor);
944
944
  vec3 specularColor = getSpecularColor ();
945
945
  float shininessFactor = getShininessFactor ();
946
946
  vec4 P = getProjectiveTextureColor (vec4 (1.0));
@@ -996,9 +996,9 @@ uniform x3d_ShininessTextureParameters x3d_ShininessTexture;
996
996
  uniform x3d_OcclusionTextureParameters x3d_OcclusionTexture;
997
997
  #endif
998
998
  vec3
999
- getAmbientColor ()
999
+ getAmbientColor (in vec3 diffuseColor)
1000
1000
  {
1001
- vec3 ambientParameter = x3d_Material .ambientIntensity * x3d_Material .diffuseColor;
1001
+ vec3 ambientParameter = x3d_Material .ambientIntensity * diffuseColor;
1002
1002
  #if defined(X3D_AMBIENT_TEXTURE)
1003
1003
  vec4 texCoord = getTexCoord (x3d_AmbientTexture .textureTransformMapping, x3d_AmbientTexture .textureCoordinateMapping);
1004
1004
  #if defined(X3D_AMBIENT_TEXTURE_2D)
@@ -1105,7 +1105,7 @@ vec3 V = normalize (-vertex);
1105
1105
  vec4 diffuseColorAlpha = getDiffuseColor ();
1106
1106
  float alpha = diffuseColorAlpha .a;
1107
1107
  vec3 diffuseColor = diffuseColorAlpha .rgb;
1108
- vec3 ambientColor = getAmbientColor ();
1108
+ vec3 ambientColor = getAmbientColor (diffuseColor);
1109
1109
  vec3 specularColor = getSpecularColor ();
1110
1110
  float shininessFactor = getShininessFactor ();
1111
1111
  vec4 P = getProjectiveTextureColor (vec4 (1.0));
package/dist/example.html CHANGED
@@ -2,8 +2,8 @@
2
2
  <html>
3
3
  <head>
4
4
  <meta charset="utf-8"/>
5
- <link rel="stylesheet" type="text/css" href="https://create3000.github.io/code/x_ite/5.0.0/dist/x_ite.css"/>
6
- <script type="text/javascript" src="https://create3000.github.io/code/x_ite/5.0.0/dist/x_ite.min.js"></script>
5
+ <link rel="stylesheet" type="text/css" href="https://create3000.github.io/code/x_ite/5.0.2/dist/x_ite.css"/>
6
+ <script type="text/javascript" src="https://create3000.github.io/code/x_ite/5.0.2/dist/x_ite.min.js"></script>
7
7
  <style>
8
8
  X3DCanvas {
9
9
  width: 1000px;
package/dist/x_ite.css CHANGED
@@ -1,4 +1,4 @@
1
- /* X_ITE v5.0.0-1145 */
1
+ /* X_ITE v5.0.2-1147 */
2
2
  @charset "utf-8";
3
3
  @import url(https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700,700italic);
4
4
  X3DCanvas .x_ite-private-splash-screen {
@@ -303,7 +303,7 @@ X3DCanvas #context-menu-layer {
303
303
  z-index: 0 !important;
304
304
  }
305
305
  .x_ite-private-menu.x_ite-private-menu-title:before {
306
- content: "X_ITE Browser v5.0.0";
306
+ content: "X_ITE Browser v5.0.2";
307
307
  display: block;
308
308
  padding: 4px 32px 4px 8px;
309
309
  font-weight: bold;
package/dist/x_ite.js CHANGED
@@ -1,4 +1,4 @@
1
- /* X_ITE v5.0.0-1145 */
1
+ /* X_ITE v5.0.2-1147 */
2
2
 
3
3
  (function (global, factory)
4
4
  {
@@ -25842,6 +25842,9 @@ function (X3DEventObject,
25842
25842
  if (this [_executionContext] !== this)
25843
25843
  this [_executionContext] .isLive () .addInterest (_set_live__, this);
25844
25844
 
25845
+ if (this .getOuterNode && this .getOuterNode ())
25846
+ this .getOuterNode () .isLive () .addInterest (_set_live__, this);
25847
+
25845
25848
  // Return field
25846
25849
 
25847
25850
  return this .isLive ();
@@ -25866,10 +25869,16 @@ function (X3DEventObject,
25866
25869
  {
25867
25870
  /// Determines the live state of this node.
25868
25871
 
25872
+ let live = this .getLive ();
25873
+ let elive = true;
25874
+
25869
25875
  if (this !== this [_executionContext])
25870
- return this .getLive () && this [_executionContext] .isLive () .getValue ();
25876
+ elive = this [_executionContext] .isLive () .getValue ();
25877
+
25878
+ if (this .getOuterNode && this .getOuterNode ())
25879
+ elive = elive || this .getOuterNode () .isLive () .getValue ();
25871
25880
 
25872
- return this .getLive ();
25881
+ return live && elive;
25873
25882
  },
25874
25883
  [_set_live__]: function ()
25875
25884
  {
@@ -26289,7 +26298,7 @@ function (X3DEventObject,
26289
26298
 
26290
26299
  define ('x_ite/Browser/VERSION',[],function ()
26291
26300
  {
26292
- return "5.0.0";
26301
+ return "5.0.2";
26293
26302
  });
26294
26303
 
26295
26304
  /* -*- Mode: JavaScript; coding: utf-8; tab-width: 3; indent-tabs-mode: tab; c-basic-offset: 3 -*-
@@ -69035,10 +69044,6 @@ function (Fields,
69035
69044
  gl .uniform1i (emissiveTexture .textureTransformMapping, textureTransformMapping .get (this ._emissiveTextureMapping .getValue ()) || 0);
69036
69045
  gl .uniform1i (emissiveTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._emissiveTextureMapping .getValue ()) || 0);
69037
69046
  }
69038
- else
69039
- {
69040
- gl .uniform1i (emissiveTexture .textureType, 0);
69041
- }
69042
69047
 
69043
69048
  // Normal parameters
69044
69049
 
@@ -69051,10 +69056,6 @@ function (Fields,
69051
69056
  gl .uniform1i (normalTexture .textureTransformMapping, textureTransformMapping .get (this ._normalTextureMapping .getValue ()) || 0);
69052
69057
  gl .uniform1i (normalTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._normalTextureMapping .getValue ()) || 0);
69053
69058
  }
69054
- else
69055
- {
69056
- gl .uniform1i (normalTexture .textureType, 0);
69057
- }
69058
69059
  }
69059
69060
  },
69060
69061
  });
@@ -116320,10 +116321,6 @@ function (Fields,
116320
116321
  gl .uniform1i (ambientTexture .textureTransformMapping, textureTransformMapping .get (this ._ambientTextureMapping .getValue ()) || 0);
116321
116322
  gl .uniform1i (ambientTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._ambientTextureMapping .getValue ()) || 0);
116322
116323
  }
116323
- else
116324
- {
116325
- gl .uniform1i (ambientTexture .textureType, 0);
116326
- }
116327
116324
 
116328
116325
  // Diffuse parameters
116329
116326
 
@@ -116334,10 +116331,6 @@ function (Fields,
116334
116331
  gl .uniform1i (diffuseTexture .textureTransformMapping, textureTransformMapping .get (this ._diffuseTextureMapping .getValue ()) || 0);
116335
116332
  gl .uniform1i (diffuseTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._diffuseTextureMapping .getValue ()) || 0);
116336
116333
  }
116337
- else
116338
- {
116339
- gl .uniform1i (diffuseTexture .textureType, 0);
116340
- }
116341
116334
 
116342
116335
  // Specular parameters
116343
116336
 
@@ -116348,10 +116341,6 @@ function (Fields,
116348
116341
  gl .uniform1i (specularTexture .textureTransformMapping, textureTransformMapping .get (this ._specularTextureMapping .getValue ()) || 0);
116349
116342
  gl .uniform1i (specularTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._specularTextureMapping .getValue ()) || 0);
116350
116343
  }
116351
- else
116352
- {
116353
- gl .uniform1i (specularTexture .textureType, 0);
116354
- }
116355
116344
 
116356
116345
  // Shininess parameters
116357
116346
 
@@ -116362,10 +116351,6 @@ function (Fields,
116362
116351
  gl .uniform1i (shininessTexture .textureTransformMapping, textureTransformMapping .get (this ._shininessTextureMapping .getValue ()) || 0);
116363
116352
  gl .uniform1i (shininessTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._shininessTextureMapping .getValue ()) || 0);
116364
116353
  }
116365
- else
116366
- {
116367
- gl .uniform1i (shininessTexture .textureType, 0);
116368
- }
116369
116354
 
116370
116355
  // Occlusion parameters
116371
116356
 
@@ -116378,10 +116363,6 @@ function (Fields,
116378
116363
  gl .uniform1i (occlusionTexture .textureTransformMapping, textureTransformMapping .get (this ._occlusionTextureMapping .getValue ()) || 0);
116379
116364
  gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._occlusionTextureMapping .getValue ()) || 0);
116380
116365
  }
116381
- else
116382
- {
116383
- gl .uniform1i (occlusionTexture .textureType, 0);
116384
- }
116385
116366
  }
116386
116367
  },
116387
116368
  });
@@ -116659,10 +116640,6 @@ function (Fields,
116659
116640
  gl .uniform1i (baseTexture .textureTransformMapping, textureTransformMapping .get (this ._baseTextureMapping .getValue ()) || 0);
116660
116641
  gl .uniform1i (baseTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._baseTextureMapping .getValue ()) || 0);
116661
116642
  }
116662
- else
116663
- {
116664
- gl .uniform1i (baseTexture .textureType, 0);
116665
- }
116666
116643
 
116667
116644
  // Metallic roughness parameters
116668
116645
 
@@ -116673,10 +116650,6 @@ function (Fields,
116673
116650
  gl .uniform1i (metallicRoughnessTexture .textureTransformMapping, textureTransformMapping .get (this ._metallicRoughnessTextureMapping .getValue ()) || 0);
116674
116651
  gl .uniform1i (metallicRoughnessTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._metallicRoughnessTextureMapping .getValue ()) || 0);
116675
116652
  }
116676
- else
116677
- {
116678
- gl .uniform1i (metallicRoughnessTexture .textureType, 0);
116679
- }
116680
116653
 
116681
116654
  // Occlusion parameters
116682
116655
 
@@ -116689,10 +116662,6 @@ function (Fields,
116689
116662
  gl .uniform1i (occlusionTexture .textureTransformMapping, textureTransformMapping .get (this ._occlusionTextureMapping .getValue ()) || 0);
116690
116663
  gl .uniform1i (occlusionTexture .textureCoordinateMapping, textureCoordinateMapping .get (this ._occlusionTextureMapping .getValue ()) || 0);
116691
116664
  }
116692
- else
116693
- {
116694
- gl .uniform1i (occlusionTexture .textureType, 0);
116695
- }
116696
116665
  }
116697
116666
  },
116698
116667
  });
@@ -122206,7 +122175,7 @@ const getScriptURL = (function ()
122206
122175
 
122207
122176
  // Now assign our X3D.
122208
122177
  window .X3D = X_ITE;
122209
- window [Symbol .for ("X_ITE.X3D-5.0.0")] = X_ITE;
122178
+ window [Symbol .for ("X_ITE.X3D-5.0.2")] = X_ITE;
122210
122179
 
122211
122180
  if (typeof __global_module__ === "object" && typeof __global_module__ .exports === "object")
122212
122181
  __global_module__ .exports = X_ITE;