x_ite 5.0.2 → 6.0.0

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 (340) hide show
  1. package/.vscode/settings.json +12 -5
  2. package/.vscode/tasks.json +21 -0
  3. package/Makefile +10 -15
  4. package/README.md +6 -11
  5. package/build/bin/dist.pl +0 -6
  6. package/build/bin/version.pl +1 -4
  7. package/dist/assets/components/annotation.js +2 -2
  8. package/dist/assets/components/annotation.min.js +1 -1
  9. package/dist/assets/components/cad-geometry.js +2 -2
  10. package/dist/assets/components/cad-geometry.min.js +1 -1
  11. package/dist/assets/components/cube-map-texturing.js +6 -19
  12. package/dist/assets/components/cube-map-texturing.min.js +1 -1
  13. package/dist/assets/components/dis.js +2 -2
  14. package/dist/assets/components/dis.min.js +1 -1
  15. package/dist/assets/components/event-utilities.js +3 -3
  16. package/dist/assets/components/event-utilities.min.js +1 -1
  17. package/dist/assets/components/geometry2d.js +4 -4
  18. package/dist/assets/components/geometry2d.min.js +1 -1
  19. package/dist/assets/components/geospatial.js +32 -1685
  20. package/dist/assets/components/geospatial.min.js +1 -1
  21. package/dist/assets/components/h-anim.js +70 -77
  22. package/dist/assets/components/h-anim.min.js +1 -1
  23. package/dist/assets/components/key-device-sensor.js +3 -3
  24. package/dist/assets/components/key-device-sensor.min.js +1 -1
  25. package/dist/assets/components/layout.js +38 -52
  26. package/dist/assets/components/layout.min.js +1 -1
  27. package/dist/assets/components/nurbs.js +277 -194
  28. package/dist/assets/components/nurbs.min.js +1 -1
  29. package/dist/assets/components/particle-systems.js +1918 -1658
  30. package/dist/assets/components/particle-systems.min.js +1 -1
  31. package/dist/assets/components/picking.js +33 -41
  32. package/dist/assets/components/picking.min.js +1 -1
  33. package/dist/assets/components/projective-texture-mapping.js +72 -86
  34. package/dist/assets/components/projective-texture-mapping.min.js +1 -1
  35. package/dist/assets/components/rigid-body-physics.js +36 -57
  36. package/dist/assets/components/rigid-body-physics.min.js +1 -1
  37. package/dist/assets/components/scripting.js +2 -2
  38. package/dist/assets/components/scripting.min.js +1 -1
  39. package/dist/assets/components/texturing-3d.js +26 -75
  40. package/dist/assets/components/texturing-3d.min.js +3 -3
  41. package/dist/assets/components/volume-rendering.js +10 -10
  42. package/dist/assets/components/volume-rendering.min.js +1 -1
  43. package/dist/assets/components/x_ite.js +2 -2
  44. package/dist/assets/components/x_ite.min.js +1 -1
  45. package/dist/assets/linetype/1.png +0 -0
  46. package/dist/assets/linetype/10.png +0 -0
  47. package/dist/assets/linetype/11.png +0 -0
  48. package/dist/assets/linetype/12.png +0 -0
  49. package/dist/assets/linetype/13.png +0 -0
  50. package/dist/assets/linetype/14.png +0 -0
  51. package/dist/assets/linetype/15.png +0 -0
  52. package/dist/assets/linetype/16.png +0 -0
  53. package/dist/assets/linetype/2.png +0 -0
  54. package/dist/assets/linetype/3.png +0 -0
  55. package/dist/assets/linetype/4.png +0 -0
  56. package/dist/assets/linetype/5.png +0 -0
  57. package/dist/assets/linetype/6.png +0 -0
  58. package/dist/assets/linetype/7.png +0 -0
  59. package/dist/assets/linetype/8.png +0 -0
  60. package/dist/assets/linetype/9.png +0 -0
  61. package/dist/assets/shaders/webgl1/Line.fs +0 -21
  62. package/dist/assets/shaders/webgl1/Line.vs +0 -10
  63. package/dist/assets/shaders/webgl1/PBR.vs +1 -1
  64. package/dist/assets/shaders/webgl2/Depth.vs +29 -1
  65. package/dist/assets/shaders/webgl2/Gouraud.vs +31 -3
  66. package/dist/assets/shaders/webgl2/Line.fs +24 -12
  67. package/dist/assets/shaders/webgl2/Line.vs +36 -11
  68. package/dist/assets/shaders/webgl2/LineTransform.fs +4 -0
  69. package/dist/assets/shaders/webgl2/LineTransform.vs +57 -0
  70. package/dist/assets/shaders/webgl2/PBR.vs +35 -7
  71. package/dist/assets/shaders/webgl2/Phong.vs +31 -3
  72. package/dist/assets/shaders/webgl2/Point.vs +29 -1
  73. package/dist/assets/shaders/webgl2/Unlit.vs +31 -3
  74. package/dist/example.html +6 -6
  75. package/dist/x_ite.css +180 -208
  76. package/dist/x_ite.js +16477 -16629
  77. package/dist/x_ite.min.js +17 -17
  78. package/dist/x_ite.zip +0 -0
  79. package/docs/404.md +6 -0
  80. package/docs/Accessing-the-External-Browser.md +20 -14
  81. package/docs/Browser-Support.md +6 -0
  82. package/docs/Custom-Shaders.md +17 -24
  83. package/docs/Features.md +7 -1
  84. package/docs/Gemfile +44 -0
  85. package/docs/Gemfile.lock +122 -0
  86. package/docs/Glossary.md +6 -0
  87. package/docs/How-To-Configure-Your-Web-Server.md +6 -0
  88. package/docs/Supported-Nodes.md +9 -1
  89. package/docs/What's-New.md +31 -0
  90. package/docs/XHTML-DOM-Integration.md +6 -0
  91. package/docs/_config.yml +1 -1
  92. package/docs/assets/css/main.scss +26 -0
  93. package/docs/index.md +38 -46
  94. package/docs/reference/Browser-Services.md +9 -3
  95. package/docs/reference/Constants-Services.md +6 -0
  96. package/docs/reference/ECMAScript-Object-and-Function-Definitions.md +6 -0
  97. package/docs/reference/Field-Services-and-Objects.md +6 -0
  98. package/docs/reference/Prototype-Services.md +6 -0
  99. package/docs/reference/Route-Services.md +6 -0
  100. package/docs/reference/Scene-Services.md +8 -2
  101. package/docs/reference/Script-Node-Authoring-Interface.md +7 -1
  102. package/docs/tutorials/Adding-backgrounds.md +6 -0
  103. package/docs/tutorials/Adding-fog.md +6 -0
  104. package/docs/tutorials/Adding-sound.md +6 -0
  105. package/docs/tutorials/Animating-transforms.md +6 -0
  106. package/docs/tutorials/Basic-Nodes.md +6 -0
  107. package/docs/tutorials/Building-a-X3D-world.md +6 -0
  108. package/docs/tutorials/Building-elevation-grids.md +6 -0
  109. package/docs/tutorials/Building-extruded-shapes.md +6 -0
  110. package/docs/tutorials/Building-primitive-shapes.md +6 -0
  111. package/docs/tutorials/Building-shapes-out-of-points,-lines,-and-faces.md +6 -0
  112. package/docs/tutorials/Controlling-appearance-with-materials.md +6 -0
  113. package/docs/tutorials/Controlling-color-on-coordinate-based-geometry.md +6 -0
  114. package/docs/tutorials/Controlling-detail.md +6 -0
  115. package/docs/tutorials/Controlling-how-textures-are-mapped.md +6 -0
  116. package/docs/tutorials/Controlling-navigation.md +6 -0
  117. package/docs/tutorials/Controlling-shading-on-coordinate-based-geometry.md +6 -0
  118. package/docs/tutorials/Controlling-the-viewpoint.md +6 -0
  119. package/docs/tutorials/Creating-new-node-types.md +6 -0
  120. package/docs/tutorials/Grouping-nodes.md +6 -0
  121. package/docs/tutorials/Hello,-World!.md +6 -0
  122. package/docs/tutorials/Improving-Performance.md +6 -0
  123. package/docs/tutorials/Increasing-Rendering-Speed.md +6 -0
  124. package/docs/tutorials/Introducing-X3D.md +6 -0
  125. package/docs/tutorials/Introducing-animation.md +6 -0
  126. package/docs/tutorials/Introducing-script-use.md +6 -0
  127. package/docs/tutorials/Lighting-your-world.md +6 -0
  128. package/docs/tutorials/Mapping-textures.md +6 -0
  129. package/docs/tutorials/Naming-nodes.md +6 -0
  130. package/docs/tutorials/Providing-information-about-your-world.md +6 -0
  131. package/docs/tutorials/Sensing-the-viewer.md +6 -0
  132. package/docs/tutorials/Sensing-viewer-actions.md +6 -0
  133. package/docs/tutorials/Transforming-Shapes.md +6 -0
  134. package/docs/tutorials/Writing-program-scripts-with-ECMAScript.md +6 -0
  135. package/docs/tutorials/index.md +6 -0
  136. package/package.json +6 -7
  137. package/src/assets/components/geometry2d.js +1 -1
  138. package/src/assets/components/key-device-sensor.js +1 -1
  139. package/src/assets/components/layout.js +1 -1
  140. package/src/assets/components/particle-systems.js +1 -1
  141. package/src/assets/components/volume-rendering.js +1 -1
  142. package/src/assets/linetype/1.png +0 -0
  143. package/src/assets/linetype/10.png +0 -0
  144. package/src/assets/linetype/11.png +0 -0
  145. package/src/assets/linetype/12.png +0 -0
  146. package/src/assets/linetype/13.png +0 -0
  147. package/src/assets/linetype/14.png +0 -0
  148. package/src/assets/linetype/15.png +0 -0
  149. package/src/assets/linetype/16.png +0 -0
  150. package/src/assets/linetype/2.png +0 -0
  151. package/src/assets/linetype/3.png +0 -0
  152. package/src/assets/linetype/4.png +0 -0
  153. package/src/assets/linetype/5.png +0 -0
  154. package/src/assets/linetype/6.png +0 -0
  155. package/src/assets/linetype/7.png +0 -0
  156. package/src/assets/linetype/8.png +0 -0
  157. package/src/assets/linetype/9.png +0 -0
  158. package/src/assets/shaders/Types.glsl +1 -9
  159. package/src/assets/shaders/webgl1/Line.fs +3 -28
  160. package/src/assets/shaders/webgl1/Line.vs +5 -19
  161. package/src/assets/shaders/webgl1/PBR.vs +1 -1
  162. package/src/assets/shaders/webgl1/Point.vs +2 -3
  163. package/src/assets/shaders/webgl2/Depth.vs +4 -1
  164. package/src/assets/shaders/webgl2/Gouraud.vs +5 -3
  165. package/src/assets/shaders/webgl2/Line.fs +11 -17
  166. package/src/assets/shaders/webgl2/Line.vs +16 -20
  167. package/src/assets/shaders/webgl2/LineTransform.fs +6 -0
  168. package/src/assets/shaders/webgl2/LineTransform.vs +77 -0
  169. package/src/assets/shaders/webgl2/PBR.vs +10 -7
  170. package/src/assets/shaders/webgl2/Phong.vs +6 -3
  171. package/src/assets/shaders/webgl2/Point.vs +6 -6
  172. package/src/assets/shaders/webgl2/Unlit.vs +6 -3
  173. package/src/assets/shaders/webgl2/include/Line2.glsl +20 -0
  174. package/src/assets/shaders/webgl2/include/Particle.glsl +36 -0
  175. package/src/example.html +6 -6
  176. package/src/standard/Math/Algorithm.js +12 -28
  177. package/src/standard/Math/Geometry/Plane3.js +0 -2
  178. package/src/standard/Math/Geometry/ViewVolume.js +88 -83
  179. package/src/standard/Math/Numbers/Color3.js +6 -0
  180. package/src/standard/Math/Numbers/Color4.js +7 -0
  181. package/src/standard/Math/Numbers/Complex.js +5 -0
  182. package/src/standard/Math/Numbers/Matrix2.js +20 -2
  183. package/src/standard/Math/Numbers/Matrix3.js +129 -110
  184. package/src/standard/Math/Numbers/Matrix4.js +138 -119
  185. package/src/standard/Math/Numbers/Quaternion.js +7 -0
  186. package/src/standard/Math/Numbers/Rotation4.js +7 -0
  187. package/src/standard/Math/Numbers/Vector2.js +8 -5
  188. package/src/standard/Math/Numbers/Vector3.js +16 -10
  189. package/src/standard/Math/Numbers/Vector4.js +12 -7
  190. package/src/standard/Math/Utility/BVH.js +45 -17
  191. package/src/tests.js +6 -1
  192. package/src/x_ite/Base/X3DBaseNode.js +22 -11
  193. package/src/x_ite/Base/X3DField.js +1 -1
  194. package/src/x_ite/Browser/Core/BrowserOptions.js +2 -2
  195. package/src/x_ite/Browser/Core/BrowserTimings.js +4 -2
  196. package/src/x_ite/Browser/Core/Context.js +185 -0
  197. package/src/x_ite/Browser/Core/ContextMenu.js +299 -193
  198. package/src/x_ite/Browser/Core/Notification.js +1 -0
  199. package/src/x_ite/Browser/Core/X3DCoreContext.js +35 -146
  200. package/src/x_ite/Browser/Layout/ScreenText.js +11 -4
  201. package/src/x_ite/Browser/Layout/X3DLayoutContext.js +4 -15
  202. package/src/x_ite/Browser/Navigation/ExamineViewer.js +12 -19
  203. package/src/x_ite/Browser/Navigation/LookAtViewer.js +0 -3
  204. package/src/x_ite/Browser/Navigation/PlaneViewer.js +0 -3
  205. package/src/x_ite/Browser/Navigation/X3DFlyViewer.js +14 -7
  206. package/src/x_ite/Browser/Navigation/X3DViewer.js +12 -20
  207. package/src/x_ite/Browser/Networking/X3DNetworkingContext.js +11 -7
  208. package/src/x_ite/Browser/ParticleSystems/BVH.glsl +183 -0
  209. package/src/x_ite/Browser/ParticleSystems/Box3.glsl +47 -0
  210. package/src/x_ite/Browser/ParticleSystems/GeometryTypes.js +66 -0
  211. package/src/x_ite/Browser/ParticleSystems/Line3.glsl +55 -0
  212. package/src/x_ite/Browser/ParticleSystems/Plane3.glsl +160 -0
  213. package/src/x_ite/Browser/PointingDeviceSensor/PointingDevice.js +27 -3
  214. package/src/x_ite/Browser/PointingDeviceSensor/X3DPointingDeviceSensorContext.js +37 -37
  215. package/src/x_ite/Browser/Rendering/X3DRenderingContext.js +19 -13
  216. package/src/x_ite/Browser/Shaders/Shader.js +33 -12
  217. package/src/x_ite/Browser/Shaders/ShaderSource.js +6 -0
  218. package/src/x_ite/Browser/Shaders/ShaderTest.js +16 -10
  219. package/src/x_ite/Browser/Shape/X3DShapeContext.js +50 -9
  220. package/src/x_ite/Browser/Text/X3DTextContext.js +4 -13
  221. package/src/x_ite/Browser/Texturing/X3DTexturingContext.js +23 -33
  222. package/src/x_ite/Browser/Texturing3D/DICOMParser.js +2 -2
  223. package/src/x_ite/Browser/Time/X3DTimeContext.js +3 -1
  224. package/src/x_ite/Browser/VERSION.js +1 -1
  225. package/src/x_ite/Browser/X3DBrowser.js +7 -6
  226. package/src/x_ite/Browser/X3DBrowserContext.js +35 -10
  227. package/src/x_ite/Components/Core/X3DNode.js +4 -0
  228. package/src/x_ite/Components/Core/X3DPrototypeInstance.js +0 -2
  229. package/src/x_ite/Components/CubeMapTexturing/ComposedCubeMapTexture.js +3 -4
  230. package/src/x_ite/Components/CubeMapTexturing/GeneratedCubeMapTexture.js +1 -12
  231. package/src/x_ite/Components/CubeMapTexturing/ImageCubeMapTexture.js +0 -1
  232. package/src/x_ite/Components/EnvironmentalEffects/TextureBackground.js +1 -1
  233. package/src/x_ite/Components/EnvironmentalEffects/X3DBackgroundNode.js +76 -77
  234. package/src/x_ite/Components/EnvironmentalEffects/X3DFogObject.js +2 -9
  235. package/src/x_ite/Components/EnvironmentalSensor/ProximitySensor.js +51 -65
  236. package/src/x_ite/Components/EventUtilities/X3DSequencerNode.js +1 -1
  237. package/src/x_ite/Components/Followers/X3DChaserNode.js +18 -32
  238. package/src/x_ite/Components/Followers/X3DDamperNode.js +1 -6
  239. package/src/x_ite/Components/Geometry2D/TriangleSet2D.js +1 -1
  240. package/src/x_ite/Components/Geometry3D/ElevationGrid.js +12 -4
  241. package/src/x_ite/Components/Geometry3D/IndexedFaceSet.js +4 -4
  242. package/src/x_ite/Components/Geospatial/GeoCoordinate.js +10 -27
  243. package/src/x_ite/Components/Geospatial/GeoPositionInterpolator.js +5 -10
  244. package/src/x_ite/Components/Geospatial/GeoTouchSensor.js +9 -16
  245. package/src/x_ite/Components/Geospatial/GeoTransform.js +6 -18
  246. package/src/x_ite/Components/Geospatial/X3DGeospatialObject.js +20 -27
  247. package/src/x_ite/Components/Grouping/X3DGroupingNode.js +8 -8
  248. package/src/x_ite/Components/Grouping/X3DTransformNode.js +0 -4
  249. package/src/x_ite/Components/HAnim/HAnimHumanoid.js +68 -75
  250. package/src/x_ite/Components/Interpolation/OrientationInterpolator.js +4 -11
  251. package/src/x_ite/Components/Interpolation/X3DInterpolatorNode.js +1 -1
  252. package/src/x_ite/Components/Layout/LayoutGroup.js +4 -9
  253. package/src/x_ite/Components/Layout/ScreenFontStyle.js +1 -1
  254. package/src/x_ite/Components/Layout/ScreenGroup.js +18 -23
  255. package/src/x_ite/Components/Lighting/DirectionalLight.js +28 -36
  256. package/src/x_ite/Components/Lighting/PointLight.js +32 -47
  257. package/src/x_ite/Components/Lighting/SpotLight.js +33 -48
  258. package/src/x_ite/Components/Navigation/Billboard.js +49 -56
  259. package/src/x_ite/Components/Navigation/LOD.js +1 -1
  260. package/src/x_ite/Components/Navigation/X3DViewpointNode.js +82 -111
  261. package/src/x_ite/Components/Networking/Anchor.js +10 -4
  262. package/src/x_ite/Components/ParticleSystems/BoundedPhysicsModel.js +6 -6
  263. package/src/x_ite/Components/ParticleSystems/ConeEmitter.js +44 -36
  264. package/src/x_ite/Components/ParticleSystems/ExplosionEmitter.js +26 -17
  265. package/src/x_ite/Components/ParticleSystems/ForcePhysicsModel.js +20 -7
  266. package/src/x_ite/Components/ParticleSystems/ParticleSystem.js +461 -876
  267. package/src/x_ite/Components/ParticleSystems/PointEmitter.js +39 -35
  268. package/src/x_ite/Components/ParticleSystems/PolylineEmitter.js +112 -128
  269. package/src/x_ite/Components/ParticleSystems/SurfaceEmitter.js +105 -112
  270. package/src/x_ite/Components/ParticleSystems/VolumeEmitter.js +138 -176
  271. package/src/x_ite/Components/ParticleSystems/WindPhysicsModel.js +16 -11
  272. package/src/x_ite/Components/ParticleSystems/X3DParticleEmitterNode.js +807 -217
  273. package/src/x_ite/Components/Picking/LinePickSensor.js +31 -39
  274. package/src/x_ite/Components/PointingDeviceSensor/CylinderSensor.js +90 -107
  275. package/src/x_ite/Components/PointingDeviceSensor/PlaneSensor.js +48 -55
  276. package/src/x_ite/Components/PointingDeviceSensor/SphereSensor.js +53 -70
  277. package/src/x_ite/Components/PointingDeviceSensor/TouchSensor.js +8 -15
  278. package/src/x_ite/Components/ProjectiveTextureMapping/TextureProjectorParallel.js +43 -50
  279. package/src/x_ite/Components/ProjectiveTextureMapping/TextureProjectorPerspective.js +32 -39
  280. package/src/x_ite/Components/Rendering/ClipPlane.js +3 -11
  281. package/src/x_ite/Components/Rendering/Color.js +12 -37
  282. package/src/x_ite/Components/Rendering/ColorRGBA.js +13 -38
  283. package/src/x_ite/Components/Rendering/IndexedLineSet.js +12 -4
  284. package/src/x_ite/Components/Rendering/LineSet.js +21 -13
  285. package/src/x_ite/Components/Rendering/PointSet.js +21 -13
  286. package/src/x_ite/Components/Rendering/X3DColorNode.js +13 -0
  287. package/src/x_ite/Components/Rendering/X3DComposedGeometryNode.js +13 -5
  288. package/src/x_ite/Components/Rendering/X3DGeometryNode.js +248 -325
  289. package/src/x_ite/Components/Rendering/X3DLineGeometryNode.js +305 -134
  290. package/src/x_ite/Components/Rendering/X3DPointGeometryNode.js +99 -122
  291. package/src/x_ite/Components/RigidBodyPhysics/DoubleAxisHingeJoint.js +24 -38
  292. package/src/x_ite/Components/RigidBodyPhysics/SingleAxisHingeJoint.js +10 -17
  293. package/src/x_ite/Components/Shaders/ComposedShader.js +35 -75
  294. package/src/x_ite/Components/Shaders/FloatVertexAttribute.js +5 -15
  295. package/src/x_ite/Components/Shaders/Matrix3VertexAttribute.js +7 -24
  296. package/src/x_ite/Components/Shaders/Matrix4VertexAttribute.js +7 -24
  297. package/src/x_ite/Components/Shaders/ShaderPart.js +1 -10
  298. package/src/x_ite/Components/Shaders/X3DProgrammableShaderObject.js +219 -209
  299. package/src/x_ite/Components/Shaders/X3DShaderNode.js +1 -1
  300. package/src/x_ite/Components/Shaders/X3DVertexAttributeNode.js +23 -1
  301. package/src/x_ite/Components/Shape/Appearance.js +12 -0
  302. package/src/x_ite/Components/Shape/FillProperties.js +12 -1
  303. package/src/x_ite/Components/Shape/LineProperties.js +33 -1
  304. package/src/x_ite/Components/Shape/PointProperties.js +23 -1
  305. package/src/x_ite/Components/Shape/Shape.js +27 -34
  306. package/src/x_ite/Components/Sound/Sound.js +30 -40
  307. package/src/x_ite/Components/Text/Text.js +6 -20
  308. package/src/x_ite/Components/Texturing/TextureCoordinate.js +5 -26
  309. package/src/x_ite/Components/Texturing/TextureProperties.js +4 -4
  310. package/src/x_ite/Components/Texturing/X3DSingleTextureCoordinateNode.js +21 -0
  311. package/src/x_ite/Components/Texturing/X3DSingleTextureNode.js +5 -4
  312. package/src/x_ite/Components/Texturing/X3DTexture2DNode.js +24 -33
  313. package/src/x_ite/Components/Texturing3D/TextureCoordinate3D.js +5 -26
  314. package/src/x_ite/Components/Texturing3D/TextureCoordinate4D.js +5 -26
  315. package/src/x_ite/Components/Texturing3D/X3DTexture3DNode.js +12 -19
  316. package/src/x_ite/Components/VolumeRendering/X3DVolumeDataNode.js +7 -7
  317. package/src/x_ite/Components.js +2 -2
  318. package/src/x_ite/Fallback.js +9 -3
  319. package/src/x_ite/Fields/SFColor.js +4 -0
  320. package/src/x_ite/Fields/SFColorRGBA.js +4 -0
  321. package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js +4 -0
  322. package/src/x_ite/Fields/SFRotation.js +4 -0
  323. package/src/x_ite/Fields/SFString.js +4 -0
  324. package/src/x_ite/Fields/SFVecPrototypeTemplate.js +4 -0
  325. package/src/x_ite/Parser/XMLParser.js +1 -1
  326. package/src/x_ite/Rendering/TextureBuffer.js +43 -36
  327. package/src/x_ite/Rendering/VertexArray.js +101 -0
  328. package/src/x_ite/Rendering/X3DRenderObject.js +123 -144
  329. package/src/x_ite/X3D.js +32 -26
  330. package/src/x_ite.config.js +0 -5
  331. package/src/x_ite.css +200 -162
  332. package/src/x_ite.html +26 -10
  333. package/src/x_ite.js +42 -0
  334. package/x_ite.min.html +26 -10
  335. package/dist/assets/hatching/0.png +0 -0
  336. package/dist/assets/linetype/0.png +0 -0
  337. package/src/assets/hatching/0.png +0 -0
  338. package/src/assets/linetype/0.png +0 -0
  339. package/src/spinner.css +0 -67
  340. package/src/x_ite/Browser/Shape/LineStipples.xcf +0 -0
@@ -49,11 +49,13 @@
49
49
 
50
50
  define ([
51
51
  "x_ite/Components/Rendering/X3DGeometryNode",
52
+ "standard/Math/Geometry/ViewVolume",
52
53
  "standard/Math/Numbers/Vector2",
53
54
  "standard/Math/Numbers/Vector3",
54
55
  "standard/Math/Numbers/Matrix4",
55
56
  ],
56
57
  function (X3DGeometryNode,
58
+ ViewVolume,
57
59
  Vector2,
58
60
  Vector3,
59
61
  Matrix4)
@@ -77,27 +79,49 @@ function (X3DGeometryNode,
77
79
  constructor: X3DLineGeometryNode,
78
80
  intersectsLine: (function ()
79
81
  {
80
- const PICK_DISTANCE_FACTOR = 1 / 300;
81
-
82
82
  const
83
- point = new Vector3 (0, 0, 0),
84
- vector = new Vector3 (0, 0, 0),
85
- clipPoint = new Vector3 (0, 0, 0);
86
-
87
- return function (hitRay, clipPlanes, modelViewMatrix, intersections)
83
+ modelViewProjectionMatrix = new Matrix4 (),
84
+ invModelViewProjectionMatrix = new Matrix4 (),
85
+ point = new Vector3 (0, 0, 0),
86
+ vector = new Vector3 (0, 0, 0),
87
+ win = new Vector3 (0, 0, 0),
88
+ radius = new Vector3 (0, 0, 0),
89
+ clipPoint = new Vector3 (0, 0, 0);
90
+
91
+ return function (hitRay, renderObject, appearanceNode, intersections)
88
92
  {
89
93
  if (this .intersectsBBox (hitRay, 1))
90
94
  {
91
- const vertices = this .getVertices ();
95
+ const
96
+ modelViewMatrix = renderObject .getModelViewMatrix () .get (),
97
+ projectionMatrix = renderObject .getProjectionMatrix () .get (),
98
+ viewport = renderObject .getViewVolume () .getViewport (),
99
+ pointPropertiesNode = appearanceNode .getPointProperties (),
100
+ vertices = this .getVertices (),
101
+ numVertices = vertices .length;
102
+
103
+ modelViewProjectionMatrix .assign (modelViewMatrix) .multRight (projectionMatrix);
104
+ invModelViewProjectionMatrix .assign (modelViewProjectionMatrix) .inverse ();
92
105
 
93
- for (let i = 0, length = vertices .length; i < length; i += 4)
106
+ for (let i = 0; i < numVertices; i += 4)
94
107
  {
95
108
  point .set (vertices [i + 0], vertices [i + 1], vertices [i + 2]);
96
109
 
97
- if (hitRay .getPerpendicularVectorToPoint (point, vector) .abs () < hitRay .point .distance (point) * PICK_DISTANCE_FACTOR)
110
+ const pointSize1_2 = Math .max (1, pointPropertiesNode .getPointSize (point, modelViewMatrix) / (2 * Math .SQRT2));
111
+
112
+ ViewVolume .projectPointMatrix (point, modelViewProjectionMatrix, viewport, win);
113
+
114
+ win .x += pointSize1_2;
115
+ win .y += pointSize1_2;
116
+
117
+ ViewVolume .unProjectPointMatrix (win .x, win .y, win .z, invModelViewProjectionMatrix, viewport, radius);
118
+
119
+ if (hitRay .getPerpendicularVectorToPoint (point, vector) .abs () < point .distance (radius))
98
120
  {
99
- if (this .isClipped (modelViewMatrix .multVecMatrix (clipPoint .assign (point)), clipPlanes))
121
+ if (this .isClipped (modelViewMatrix .multVecMatrix (clipPoint .assign (point)), renderObject .getLocalObjects ()))
122
+ {
100
123
  continue;
124
+ }
101
125
 
102
126
  intersections .push ({ texCoord: new Vector2 (0, 0), normal: new Vector3 (0, 0, 0), point: point .copy () });
103
127
  return true;
@@ -112,153 +136,106 @@ function (X3DGeometryNode,
112
136
  {
113
137
  return false;
114
138
  },
139
+ buildTexCoords: function ()
140
+ { },
115
141
  display: function (gl, context)
116
142
  {
117
- try
143
+ const
144
+ browser = context .browser,
145
+ appearanceNode = context .shapeNode .getAppearance (),
146
+ shaderNode = appearanceNode .shaderNode || browser .getPointShader (),
147
+ blendModeNode = appearanceNode .blendModeNode,
148
+ attribNodes = this .attribNodes,
149
+ attribBuffers = this .attribBuffers;
150
+
151
+ if (shaderNode .isValid ())
118
152
  {
119
- const
120
- browser = context .browser,
121
- appearanceNode = context .shapeNode .getAppearance (),
122
- shaderNode = appearanceNode .shaderNode || browser .getPointShader ();;
153
+ if (blendModeNode)
154
+ blendModeNode .enable (gl);
123
155
 
124
- if (shaderNode .getValid ())
125
- {
126
- const
127
- blendModeNode = appearanceNode .blendModeNode,
128
- attribNodes = this .attribNodes,
129
- attribBuffers = this .attribBuffers;
156
+ // Setup shader.
130
157
 
131
- if (blendModeNode)
132
- blendModeNode .enable (gl);
158
+ shaderNode .enable (gl);
159
+ shaderNode .setLocalUniforms (gl, context);
133
160
 
134
- // Setup shader.
135
-
136
- shaderNode .enable (gl);
137
- shaderNode .setLocalUniforms (gl, context);
138
-
139
- // Setup vertex attributes.
161
+ // Setup vertex attributes.
140
162
 
163
+ if (this .vertexArrayObject .enable (gl, shaderNode))
164
+ {
141
165
  for (let i = 0, length = attribNodes .length; i < length; ++ i)
142
166
  attribNodes [i] .enable (gl, shaderNode, attribBuffers [i]);
143
167
 
144
168
  if (this .fogCoords)
145
- shaderNode .enableFogDepthAttribute (gl, this .fogDepthBuffer);
169
+ shaderNode .enableFogDepthAttribute (gl, this .fogDepthBuffer, 0, 0);
146
170
 
147
171
  if (this .colorMaterial)
148
- shaderNode .enableColorAttribute (gl, this .colorBuffer);
172
+ shaderNode .enableColorAttribute (gl, this .colorBuffer, 0, 0);
149
173
 
150
- if (this .getMultiTexCoords () .length)
151
- shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers, true);
152
-
153
- shaderNode .enableVertexAttribute (gl, this .vertexBuffer);
154
-
155
- gl .drawArrays (this .primitiveMode, 0, this .vertexCount);
156
-
157
- for (const attribNode of attribNodes)
158
- attribNode .disable (gl, shaderNode);
159
-
160
- if (this .fogCoords)
161
- shaderNode .disableFogDepthAttribute (gl);
162
-
163
- if (this .colorMaterial)
164
- shaderNode .disableColorAttribute (gl);
174
+ shaderNode .enableVertexAttribute (gl, this .vertexBuffer, 0, 0);
175
+ }
165
176
 
166
- if (this .getMultiTexCoords () .length)
167
- shaderNode .disableTexCoordAttribute (gl);
177
+ gl .drawArrays (this .primitiveMode, 0, this .vertexCount);
168
178
 
169
- if (blendModeNode)
170
- blendModeNode .disable (gl);
171
- }
172
- }
173
- catch (error)
174
- {
175
- // Catch error from setLocalUniforms.
176
- console .error (error);
179
+ if (blendModeNode)
180
+ blendModeNode .disable (gl);
177
181
  }
178
182
  },
179
- displayParticles: function (gl, context, particles, numParticles)
183
+ displayParticles: function (gl, context, particleSystem)
180
184
  {
181
- try
185
+ const
186
+ browser = context .browser,
187
+ appearanceNode = context .shapeNode .getAppearance (),
188
+ shaderNode = appearanceNode .shaderNode || browser .getPointShader (),
189
+ blendModeNode = appearanceNode .blendModeNode,
190
+ attribNodes = this .attribNodes,
191
+ attribBuffers = this .attribBuffers;
192
+
193
+ if (shaderNode .isValid ())
182
194
  {
183
- const
184
- browser = context .browser,
185
- appearanceNode = context .shapeNode .getAppearance (),
186
- shaderNode = appearanceNode .shaderNode || this .getShader (browser);
195
+ if (blendModeNode)
196
+ blendModeNode .enable (gl);
187
197
 
188
- if (shaderNode .getValid ())
189
- {
190
- const
191
- blendModeNode = appearanceNode .blendModeNode,
192
- attribNodes = this .attribNodes,
193
- attribBuffers = this .attribBuffers;
198
+ // Setup shader.
199
+
200
+ shaderNode .enable (gl);
201
+ shaderNode .setLocalUniforms (gl, context);
194
202
 
195
- if (blendModeNode)
196
- blendModeNode .enable (gl);
203
+ // Setup vertex attributes.
197
204
 
198
- // Setup shader.
205
+ const outputParticles = particleSystem .outputParticles;
206
+
207
+ if (this .updateParticles)
208
+ {
209
+ this .updateParticles = false;
199
210
 
200
- shaderNode .enable (gl);
201
- shaderNode .setLocalUniforms (gl, context);
211
+ outputParticles .vertexArrayObject .update ();
212
+ }
213
+
214
+ if (outputParticles .vertexArrayObject .enable (gl, shaderNode))
215
+ {
216
+ const particleStride = particleSystem .particleStride;
202
217
 
203
- // Setup vertex attributes.
218
+ shaderNode .enableParticleAttribute (gl, outputParticles, particleStride, particleSystem .particleOffset, 1);
219
+ shaderNode .enableParticleMatrixAttribute (gl, outputParticles, particleStride, particleSystem .matrixOffset, 1);
204
220
 
205
221
  for (let i = 0, length = attribNodes .length; i < length; ++ i)
206
222
  attribNodes [i] .enable (gl, shaderNode, attribBuffers [i]);
207
223
 
208
224
  if (this .fogCoords)
209
- shaderNode .enableFogDepthAttribute (gl, this .fogDepthBuffer);
225
+ shaderNode .enableFogDepthAttribute (gl, this .fogDepthBuffer, 0, 0);
210
226
 
211
227
  if (this .colorMaterial)
212
- shaderNode .enableColorAttribute (gl, this .colorBuffer);
213
-
214
- if (this .getMultiTexCoords () .length)
215
- shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers);
216
-
217
- shaderNode .enableVertexAttribute (gl, this .vertexBuffer);
218
-
219
- // Wireframes are always solid so only one drawing call is needed.
220
-
221
- const
222
- modelViewMatrix = context .modelViewMatrix,
223
- x = modelViewMatrix [12],
224
- y = modelViewMatrix [13],
225
- z = modelViewMatrix [14],
226
- primitiveMode = this .primitiveMode;
227
-
228
- for (let p = 0; p < numParticles; ++ p)
229
- {
230
- const particle = particles [p];
231
-
232
- modelViewMatrix [12] = x;
233
- modelViewMatrix [13] = y;
234
- modelViewMatrix [14] = z;
235
-
236
- Matrix4 .prototype .translate .call (modelViewMatrix, particle .position);
237
-
238
- shaderNode .setParticle (gl, particle, modelViewMatrix);
239
-
240
- gl .drawArrays (primitiveMode, 0, this .vertexCount);
241
- }
242
-
243
- for (const attribNode of attribNodes)
244
- attribNode .disable (gl, shaderNode);
228
+ shaderNode .enableColorAttribute (gl, this .colorBuffer, 0, 0);
245
229
 
246
- if (this .fogCoords)
247
- shaderNode .disableFogDepthAttribute (gl);
230
+ shaderNode .enableVertexAttribute (gl, this .vertexBuffer, 0, 0);
231
+ }
248
232
 
249
- if (this .colorMaterial)
250
- shaderNode .disableColorAttribute (gl);
233
+ // Wireframes are always solid so only one drawing call is needed.
251
234
 
252
- shaderNode .disableTexCoordAttribute (gl);
235
+ gl .drawArraysInstanced (this .primitiveMode, 0, this .vertexCount, particleSystem .numParticles);
253
236
 
254
- if (blendModeNode)
255
- blendModeNode .disable (gl);
256
- }
257
- }
258
- catch (error)
259
- {
260
- // Catch error from setLocalUniforms.
261
- console .error (error);
237
+ if (blendModeNode)
238
+ blendModeNode .disable (gl);
262
239
  }
263
240
  },
264
241
  });
@@ -240,30 +240,23 @@ function ($,
240
240
 
241
241
  return function ()
242
242
  {
243
- try
244
- {
245
- if (this .outputs .body1AnchorPoint)
246
- this ._body1AnchorPoint = this .getBody1 () .getMatrix () .multVecMatrix (this .getInitialInverseMatrix1 () .multVecMatrix (localAnchorPoint1 .assign (this .localAnchorPoint1)));
243
+ if (this .outputs .body1AnchorPoint)
244
+ this ._body1AnchorPoint = this .getBody1 () .getMatrix () .multVecMatrix (this .getInitialInverseMatrix1 () .multVecMatrix (localAnchorPoint1 .assign (this .localAnchorPoint1)));
247
245
 
248
- if (this .outputs .body1Axis)
249
- this ._body1Axis = this .getInitialInverseMatrix1 () .multDirMatrix (this .getBody1 () .getMatrix () .multDirMatrix (localAxis1 .assign (this .localAxis1))) .normalize ();
246
+ if (this .outputs .body1Axis)
247
+ this ._body1Axis = this .getInitialInverseMatrix1 () .multDirMatrix (this .getBody1 () .getMatrix () .multDirMatrix (localAxis1 .assign (this .localAxis1))) .normalize ();
250
248
 
251
- if (this .outputs .hinge1Angle)
252
- {
253
- var lastAngle = this ._hinge1Angle .getValue ();
249
+ if (this .outputs .hinge1Angle)
250
+ {
251
+ var lastAngle = this ._hinge1Angle .getValue ();
254
252
 
255
- difference .assign (this .getInitialInverseMatrix1 ()) .multRight (this .getBody1 () .getMatrix ());
256
- difference .get (null, rotation);
253
+ difference .assign (this .getInitialInverseMatrix1 ()) .multRight (this .getBody1 () .getMatrix ());
254
+ difference .get (null, rotation);
257
255
 
258
- this ._hinge1Angle = rotation .angle;
256
+ this ._hinge1Angle = rotation .angle;
259
257
 
260
- if (this .outputs .angleRate)
261
- this ._hinge1AngleRate = (this ._hinge1Angle .getValue () - lastAngle) * this .getBrowser () .getCurrentFrameRate ();
262
- }
263
- }
264
- catch (error)
265
- {
266
- // matrix .get
258
+ if (this .outputs .angleRate)
259
+ this ._hinge1AngleRate = (this ._hinge1Angle .getValue () - lastAngle) * this .getBrowser () .getCurrentFrameRate ();
267
260
  }
268
261
  };
269
262
  })(),
@@ -277,30 +270,23 @@ function ($,
277
270
 
278
271
  return function ()
279
272
  {
280
- try
281
- {
282
- if (this .outputs .body2AnchorPoint)
283
- this ._body2AnchorPoint = this .getBody2 () .getMatrix () .multVecMatrix (this .getInitialInverseMatrix2 () .multVecMatrix (localAnchorPoint2 .assign (this .localAnchorPoint2)));
273
+ if (this .outputs .body2AnchorPoint)
274
+ this ._body2AnchorPoint = this .getBody2 () .getMatrix () .multVecMatrix (this .getInitialInverseMatrix2 () .multVecMatrix (localAnchorPoint2 .assign (this .localAnchorPoint2)));
284
275
 
285
- if (this .outputs .body2Axis)
286
- this ._body2Axis = this .getInitialInverseMatrix2 () .multDirMatrix (this .getBody2 () .getMatrix () .multDirMatrix (localAxis2 .assign (this .localAxis2))) .normalize ();
276
+ if (this .outputs .body2Axis)
277
+ this ._body2Axis = this .getInitialInverseMatrix2 () .multDirMatrix (this .getBody2 () .getMatrix () .multDirMatrix (localAxis2 .assign (this .localAxis2))) .normalize ();
287
278
 
288
- if (this .outputs .hinge2Angle)
289
- {
290
- var lastAngle = this ._hinge2Angle .getValue ();
279
+ if (this .outputs .hinge2Angle)
280
+ {
281
+ var lastAngle = this ._hinge2Angle .getValue ();
291
282
 
292
- difference .assign (this .getInitialInverseMatrix2 ()) .multRight (this .getBody2 () .getMatrix ());
293
- difference .get (null, rotation);
283
+ difference .assign (this .getInitialInverseMatrix2 ()) .multRight (this .getBody2 () .getMatrix ());
284
+ difference .get (null, rotation);
294
285
 
295
- this ._hinge2Angle = rotation .angle;
286
+ this ._hinge2Angle = rotation .angle;
296
287
 
297
- if (this .outputs .angleRate)
298
- this ._hinge2AngleRate = (this ._hinge2Angle .getValue () - lastAngle) * this .getBrowser () .getCurrentFrameRate ();
299
- }
300
- }
301
- catch (error)
302
- {
303
- // matrix .get
288
+ if (this .outputs .angleRate)
289
+ this ._hinge2AngleRate = (this ._hinge2Angle .getValue () - lastAngle) * this .getBrowser () .getCurrentFrameRate ();
304
290
  }
305
291
  };
306
292
  })(),
@@ -232,27 +232,20 @@ function ($,
232
232
 
233
233
  return function ()
234
234
  {
235
- try
236
- {
237
- if (this .outputs .body2AnchorPoint)
238
- this ._body2AnchorPoint = this .getBody2 () .getMatrix () .multVecMatrix (this .getInitialInverseMatrix2 () .multVecMatrix (localAnchorPoint2 .assign (this .localAnchorPoint2)));
235
+ if (this .outputs .body2AnchorPoint)
236
+ this ._body2AnchorPoint = this .getBody2 () .getMatrix () .multVecMatrix (this .getInitialInverseMatrix2 () .multVecMatrix (localAnchorPoint2 .assign (this .localAnchorPoint2)));
239
237
 
240
- if (this .outputs .angle)
241
- {
242
- var lastAngle = this ._angle .getValue ();
238
+ if (this .outputs .angle)
239
+ {
240
+ var lastAngle = this ._angle .getValue ();
243
241
 
244
- difference .assign (this .getInitialInverseMatrix2 ()) .multRight (this .getBody2 () .getMatrix ());
245
- difference .get (null, rotation);
242
+ difference .assign (this .getInitialInverseMatrix2 ()) .multRight (this .getBody2 () .getMatrix ());
243
+ difference .get (null, rotation);
246
244
 
247
- this ._angle = rotation .angle;
245
+ this ._angle = rotation .angle;
248
246
 
249
- if (this .outputs .angleRate)
250
- this ._angleRate = (this ._angle .getValue () - lastAngle) * this .getBrowser () .getCurrentFrameRate ();
251
- }
252
- }
253
- catch (error)
254
- {
255
- // matrix .get
247
+ if (this .outputs .angleRate)
248
+ this ._angleRate = (this ._angle .getValue () - lastAngle) * this .getBrowser () .getCurrentFrameRate ();
256
249
  }
257
250
  };
258
251
  })(),
@@ -75,7 +75,8 @@ function (Fields,
75
75
 
76
76
  this .addType (X3DConstants .ComposedShader);
77
77
 
78
- this .loadSensor = new LoadSensor (executionContext);
78
+ this .loadSensor = new LoadSensor (executionContext);
79
+ this .transformFeedbackVaryings = [ ];
79
80
  }
80
81
 
81
82
  ComposedShader .prototype = Object .assign (Object .create (X3DShaderNode .prototype),
@@ -125,39 +126,27 @@ function (Fields,
125
126
  },
126
127
  addUserDefinedField: function (accessType, name, field)
127
128
  {
128
- const gl = this .getBrowser () .getContext ();
129
-
130
- if (this .isInitialized () && this .isLive () .getValue () && this .getValid ())
131
- {
132
- this .enable (gl);
129
+ if (this .isInitialized () && this .isLive () .getValue () && this .isValid ())
133
130
  this .removeShaderFields ();
134
- }
135
131
 
136
132
  X3DShaderNode .prototype .addUserDefinedField .call (this, accessType, name, field);
137
133
 
138
- if (this .isInitialized () && this .isLive () .getValue () && this .getValid ())
139
- {
140
- this .enable (gl);
141
- this .addShaderFields ();
142
- }
134
+ if (this .isInitialized () && this .isLive () .getValue () && this .isValid ())
135
+ this .addShaderFields (this .program);
143
136
  },
144
137
  removeUserDefinedField: function (name)
145
138
  {
146
- const gl = this .getBrowser () .getContext ();
147
-
148
- if (this .isInitialized () && this .isLive () .getValue () && this .getValid ())
149
- {
150
- this .enable (gl);
139
+ if (this .isInitialized () && this .isLive () .getValue () && this .isValid ())
151
140
  this .removeShaderFields ();
152
- }
153
141
 
154
142
  X3DShaderNode .prototype .removeUserDefinedField .call (this, name);
155
143
 
156
- if (this .isInitialized () && this .isLive () .getValue () && this .getValid ())
157
- {
158
- this .enable (gl);
159
- this .addShaderFields ();
160
- }
144
+ if (this .isInitialized () && this .isLive () .getValue () && this .isValid ())
145
+ this .addShaderFields (this .program);
146
+ },
147
+ setTransformFeedbackVaryings: function (value)
148
+ {
149
+ this .transformFeedbackVaryings = value;
161
150
  },
162
151
  getProgram: function ()
163
152
  {
@@ -165,23 +154,15 @@ function (Fields,
165
154
  },
166
155
  set_live__: function ()
167
156
  {
168
- const gl = this .getBrowser () .getContext ();
169
-
170
157
  if (this .isLive () .getValue ())
171
158
  {
172
- if (this .getValid ())
173
- {
174
- this .enable (gl);
175
- this .addShaderFields ();
176
- }
159
+ if (this .isValid ())
160
+ this .addShaderFields (this .program);
177
161
  }
178
162
  else
179
163
  {
180
- if (this .getValid ())
181
- {
182
- this .enable (gl);
164
+ if (this .isValid ())
183
165
  this .removeShaderFields ();
184
- }
185
166
  }
186
167
  },
187
168
  set_loaded__: function ()
@@ -192,11 +173,11 @@ function (Fields,
192
173
  gl = this .getBrowser () .getContext (),
193
174
  program = gl .createProgram ();
194
175
 
195
- let valid = 0;
196
-
197
- if (this .getValid ())
176
+ if (this .isValid ())
198
177
  this .removeShaderFields ();
199
178
 
179
+ gl .deleteProgram (this .program);
180
+
200
181
  this .program = program;
201
182
 
202
183
  for (const node of this ._parts)
@@ -204,38 +185,18 @@ function (Fields,
204
185
  const partNode = X3DCast (X3DConstants .ShaderPart, node);
205
186
 
206
187
  if (partNode)
207
- {
208
- valid += partNode .isValid ();
209
188
  gl .attachShader (program, partNode .getShader ());
210
- }
211
189
  }
212
190
 
213
- if (valid)
214
- {
215
- this .bindAttributeLocations (gl, program);
216
-
217
- gl .linkProgram (program);
191
+ if (this .transformFeedbackVaryings .length)
192
+ gl .transformFeedbackVaryings (program, this .transformFeedbackVaryings, gl .INTERLEAVED_ATTRIBS);
218
193
 
219
- valid = gl .getProgramParameter (program, gl .LINK_STATUS);
220
- }
194
+ gl .linkProgram (program);
221
195
 
222
- if (valid)
196
+ if (gl .getProgramParameter (program, gl .LINK_STATUS))
223
197
  {
224
- gl .useProgram (this .program);
225
-
226
- // Initialize uniform variables and attributes
227
- if (this .getDefaultUniforms ())
228
- {
229
- // Setup user-defined fields.
230
- this .addShaderFields ();
231
- }
232
- else
233
- {
234
- valid = false;
235
- }
236
-
237
- // Debug, print complete shader info and statistics.
238
- // this .printProgramInfo ();
198
+ this .getDefaultUniformsAndAttributes (program);
199
+ this .setValid (true);
239
200
  }
240
201
  else
241
202
  {
@@ -243,9 +204,12 @@ function (Fields,
243
204
  {
244
205
  console .warn ("Couldn't initialize " + this .getTypeName () + " '" + this .getName () + "': " + gl .getProgramInfoLog (program));
245
206
  }
207
+
208
+ this .setValid (false);
246
209
  }
247
210
 
248
- this .setValid (!! valid);
211
+ if (this .isValid ())
212
+ this .addShaderFields (this .program);
249
213
  }
250
214
  else
251
215
  {
@@ -254,23 +218,19 @@ function (Fields,
254
218
  },
255
219
  set_field__: function (field)
256
220
  {
257
- const gl = this .getBrowser () .getContext ();
258
-
259
- gl .useProgram (this .program);
260
-
261
- X3DProgrammableShaderObject .prototype .set_field__ .call (this, field);
221
+ if (this .isValid ())
222
+ X3DProgrammableShaderObject .prototype .set_field__ .call (this, field, this .program);
262
223
  },
263
224
  setGlobalUniforms: function (gl, renderObject, cameraSpaceMatrixArray, projectionMatrixArray, viewportArray)
264
225
  {
265
- gl .useProgram (this .program);
266
-
267
- X3DProgrammableShaderObject .prototype .setGlobalUniforms .call (this, gl, renderObject, cameraSpaceMatrixArray, projectionMatrixArray, viewportArray);
226
+ if (this .isValid ())
227
+ {
228
+ X3DProgrammableShaderObject .prototype .setGlobalUniforms .call (this, gl, this .program, renderObject, cameraSpaceMatrixArray, projectionMatrixArray, viewportArray);
229
+ }
268
230
  },
269
231
  enable: function (gl)
270
232
  {
271
- gl .useProgram (this .program);
272
-
273
- X3DProgrammableShaderObject .prototype .enable .call (this, gl);
233
+ X3DProgrammableShaderObject .prototype .enable .call (this, gl, this .program);
274
234
  },
275
235
  });
276
236
 
@@ -96,21 +96,15 @@ function (Fields,
96
96
  {
97
97
  X3DVertexAttributeNode .prototype .initialize .call (this);
98
98
 
99
- this ._numComponents .addInterest ("set_numComponents", this);
100
- this ._value .addInterest ("set_value", this);
99
+ this ._numComponents .addInterest ("set_numComponents__", this);
100
+ this ._numComponents .addInterest ("set_attribute__", this);
101
101
 
102
- this .set_numComponents ();
103
- this .set_value ();
102
+ this .set_numComponents__ ();
104
103
  },
105
- set_numComponents: function ()
104
+ set_numComponents__: function ()
106
105
  {
107
106
  this .numComponents = Algorithm .clamp (this ._numComponents .getValue (), 1, 4);
108
107
  },
109
- set_value: function ()
110
- {
111
- this .value = this ._value .getValue ();
112
- this .length = this ._value .length;
113
- },
114
108
  addValue: function (index, array)
115
109
  {
116
110
  const value = this .value;
@@ -140,11 +134,7 @@ function (Fields,
140
134
  },
141
135
  enable: function (gl, shaderNode, buffer)
142
136
  {
143
- shaderNode .enableFloatAttrib (gl, this ._name .getValue (), buffer, this .numComponents);
144
- },
145
- disable: function (gl, shaderNode)
146
- {
147
- shaderNode .disableFloatAttrib (gl, this ._name .getValue ());
137
+ shaderNode .enableFloatAttrib (gl, this ._name .getValue (), buffer, this .numComponents, 0, 0);
148
138
  },
149
139
  });
150
140