x_ite 5.0.3 → 6.1.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 (385) hide show
  1. package/.vscode/settings.json +12 -5
  2. package/.vscode/tasks.json +25 -1
  3. package/Makefile +36 -28
  4. package/README.md +6 -11
  5. package/build/bin/dist.pl +0 -6
  6. package/build/bin/examples-and-tests.pl +75 -0
  7. package/build/bin/tests-menu.pl +57 -0
  8. package/build/bin/version.pl +7 -4
  9. package/build/parts/default.start.frag.js +3 -2
  10. package/dist/assets/components/annotation.js +3 -2
  11. package/dist/assets/components/annotation.min.js +1 -1
  12. package/dist/assets/components/cad-geometry.js +3 -2
  13. package/dist/assets/components/cad-geometry.min.js +1 -1
  14. package/dist/assets/components/cube-map-texturing.js +8 -20
  15. package/dist/assets/components/cube-map-texturing.min.js +1 -1
  16. package/dist/assets/components/dis.js +3 -2
  17. package/dist/assets/components/dis.min.js +1 -1
  18. package/dist/assets/components/event-utilities.js +4 -3
  19. package/dist/assets/components/event-utilities.min.js +1 -1
  20. package/dist/assets/components/geometry2d.js +38 -52
  21. package/dist/assets/components/geometry2d.min.js +1 -1
  22. package/dist/assets/components/geospatial.js +34 -1686
  23. package/dist/assets/components/geospatial.min.js +1 -1
  24. package/dist/assets/components/h-anim.js +71 -77
  25. package/dist/assets/components/h-anim.min.js +1 -1
  26. package/dist/assets/components/key-device-sensor.js +4 -3
  27. package/dist/assets/components/key-device-sensor.min.js +1 -1
  28. package/dist/assets/components/layout.js +101 -173
  29. package/dist/assets/components/layout.min.js +1 -1
  30. package/dist/assets/components/nurbs.js +3 -2
  31. package/dist/assets/components/nurbs.min.js +1 -1
  32. package/dist/assets/components/particle-systems.js +1926 -1669
  33. package/dist/assets/components/particle-systems.min.js +1 -1
  34. package/dist/assets/components/picking.js +34 -41
  35. package/dist/assets/components/picking.min.js +1 -1
  36. package/dist/assets/components/projective-texture-mapping.js +73 -86
  37. package/dist/assets/components/projective-texture-mapping.min.js +1 -1
  38. package/dist/assets/components/rigid-body-physics.js +37 -57
  39. package/dist/assets/components/rigid-body-physics.min.js +1 -1
  40. package/dist/assets/components/scripting.js +3 -2
  41. package/dist/assets/components/scripting.min.js +1 -1
  42. package/dist/assets/components/texturing-3d.js +27 -33
  43. package/dist/assets/components/texturing-3d.min.js +3 -3
  44. package/dist/assets/components/volume-rendering.js +12 -11
  45. package/dist/assets/components/volume-rendering.min.js +1 -1
  46. package/dist/assets/components/x_ite.js +3 -2
  47. package/dist/assets/components/x_ite.min.js +1 -1
  48. package/dist/assets/images/Shading.png +0 -0
  49. package/dist/assets/linetype/1.png +0 -0
  50. package/dist/assets/linetype/10.png +0 -0
  51. package/dist/assets/linetype/11.png +0 -0
  52. package/dist/assets/linetype/12.png +0 -0
  53. package/dist/assets/linetype/13.png +0 -0
  54. package/dist/assets/linetype/14.png +0 -0
  55. package/dist/assets/linetype/15.png +0 -0
  56. package/dist/assets/linetype/16.png +0 -0
  57. package/dist/assets/linetype/2.png +0 -0
  58. package/dist/assets/linetype/3.png +0 -0
  59. package/dist/assets/linetype/4.png +0 -0
  60. package/dist/assets/linetype/5.png +0 -0
  61. package/dist/assets/linetype/6.png +0 -0
  62. package/dist/assets/linetype/7.png +0 -0
  63. package/dist/assets/linetype/8.png +0 -0
  64. package/dist/assets/linetype/9.png +0 -0
  65. package/dist/assets/shaders/webgl1/Gouraud.vs +1 -1
  66. package/dist/assets/shaders/webgl1/Line.fs +0 -21
  67. package/dist/assets/shaders/webgl1/Line.vs +0 -10
  68. package/dist/assets/shaders/webgl1/PBR.fs +1 -1
  69. package/dist/assets/shaders/webgl1/PBR.vs +1 -1
  70. package/dist/assets/shaders/webgl1/Phong.fs +1 -1
  71. package/dist/assets/shaders/webgl1/Point.vs +1 -1
  72. package/dist/assets/shaders/webgl2/Depth.vs +29 -1
  73. package/dist/assets/shaders/webgl2/Gouraud.vs +32 -4
  74. package/dist/assets/shaders/webgl2/Line.fs +24 -12
  75. package/dist/assets/shaders/webgl2/Line.vs +36 -11
  76. package/dist/assets/shaders/webgl2/LineTransform.fs +4 -0
  77. package/dist/assets/shaders/webgl2/LineTransform.vs +57 -0
  78. package/dist/assets/shaders/webgl2/PBR.fs +1 -1
  79. package/dist/assets/shaders/webgl2/PBR.vs +35 -7
  80. package/dist/assets/shaders/webgl2/Phong.fs +1 -1
  81. package/dist/assets/shaders/webgl2/Phong.vs +31 -3
  82. package/dist/assets/shaders/webgl2/Point.vs +30 -2
  83. package/dist/assets/shaders/webgl2/Unlit.vs +31 -3
  84. package/dist/example.html +6 -6
  85. package/dist/x_ite.css +199 -224
  86. package/dist/x_ite.js +16335 -15917
  87. package/dist/x_ite.min.js +17 -17
  88. package/dist/x_ite.zip +0 -0
  89. package/docs/404.md +6 -0
  90. package/docs/Accessing-the-External-Browser.md +21 -15
  91. package/docs/Browser-Support.md +6 -0
  92. package/docs/Custom-Shaders.md +18 -25
  93. package/docs/Features.md +11 -5
  94. package/docs/Gemfile +44 -0
  95. package/docs/Gemfile.lock +122 -0
  96. package/docs/Glossary.md +6 -0
  97. package/docs/How-To-Configure-Your-Web-Server.md +6 -0
  98. package/docs/Supported-Nodes.md +9 -1
  99. package/docs/What's-New.md +93 -39
  100. package/docs/XHTML-DOM-Integration.md +6 -0
  101. package/docs/_config.yml +2 -2
  102. package/docs/assets/css/main.scss +26 -0
  103. package/docs/index.md +42 -50
  104. package/docs/reference/Browser-Services.md +9 -3
  105. package/docs/reference/Constants-Services.md +6 -0
  106. package/docs/reference/ECMAScript-Object-and-Function-Definitions.md +12 -6
  107. package/docs/reference/Field-Services-and-Objects.md +105 -1
  108. package/docs/reference/Prototype-Services.md +11 -0
  109. package/docs/reference/Route-Services.md +9 -0
  110. package/docs/reference/Scene-Services.md +17 -2
  111. package/docs/reference/Script-Node-Authoring-Interface.md +7 -1
  112. package/docs/tutorials/Adding-backgrounds.md +6 -0
  113. package/docs/tutorials/Adding-fog.md +6 -0
  114. package/docs/tutorials/Adding-sound.md +6 -0
  115. package/docs/tutorials/Animating-transforms.md +6 -0
  116. package/docs/tutorials/Basic-Nodes.md +6 -0
  117. package/docs/tutorials/Building-a-X3D-world.md +6 -0
  118. package/docs/tutorials/Building-elevation-grids.md +6 -0
  119. package/docs/tutorials/Building-extruded-shapes.md +6 -0
  120. package/docs/tutorials/Building-primitive-shapes.md +6 -0
  121. package/docs/tutorials/Building-shapes-out-of-points,-lines,-and-faces.md +6 -0
  122. package/docs/tutorials/Controlling-appearance-with-materials.md +6 -0
  123. package/docs/tutorials/Controlling-color-on-coordinate-based-geometry.md +6 -0
  124. package/docs/tutorials/Controlling-detail.md +6 -0
  125. package/docs/tutorials/Controlling-how-textures-are-mapped.md +6 -0
  126. package/docs/tutorials/Controlling-navigation.md +6 -0
  127. package/docs/tutorials/Controlling-shading-on-coordinate-based-geometry.md +6 -0
  128. package/docs/tutorials/Controlling-the-viewpoint.md +6 -0
  129. package/docs/tutorials/Creating-new-node-types.md +6 -0
  130. package/docs/tutorials/Grouping-nodes.md +6 -0
  131. package/docs/tutorials/Hello,-World!.md +6 -0
  132. package/docs/tutorials/Improving-Performance.md +6 -0
  133. package/docs/tutorials/Increasing-Rendering-Speed.md +6 -0
  134. package/docs/tutorials/Introducing-X3D.md +6 -0
  135. package/docs/tutorials/Introducing-animation.md +6 -0
  136. package/docs/tutorials/Introducing-script-use.md +6 -0
  137. package/docs/tutorials/Lighting-your-world.md +6 -0
  138. package/docs/tutorials/Mapping-textures.md +6 -0
  139. package/docs/tutorials/Naming-nodes.md +6 -0
  140. package/docs/tutorials/Providing-information-about-your-world.md +6 -0
  141. package/docs/tutorials/Sensing-the-viewer.md +6 -0
  142. package/docs/tutorials/Sensing-viewer-actions.md +6 -0
  143. package/docs/tutorials/Transforming-Shapes.md +6 -0
  144. package/docs/tutorials/Writing-program-scripts-with-ECMAScript.md +6 -0
  145. package/docs/tutorials/index.md +42 -36
  146. package/package.json +6 -7
  147. package/src/assets/components/geometry2d.js +1 -1
  148. package/src/assets/components/key-device-sensor.js +1 -1
  149. package/src/assets/components/layout.js +1 -1
  150. package/src/assets/components/particle-systems.js +1 -1
  151. package/src/assets/components/volume-rendering.js +1 -1
  152. package/src/assets/images/Shading.png +0 -0
  153. package/src/assets/linetype/1.png +0 -0
  154. package/src/assets/linetype/10.png +0 -0
  155. package/src/assets/linetype/11.png +0 -0
  156. package/src/assets/linetype/12.png +0 -0
  157. package/src/assets/linetype/13.png +0 -0
  158. package/src/assets/linetype/14.png +0 -0
  159. package/src/assets/linetype/15.png +0 -0
  160. package/src/assets/linetype/16.png +0 -0
  161. package/src/assets/linetype/2.png +0 -0
  162. package/src/assets/linetype/3.png +0 -0
  163. package/src/assets/linetype/4.png +0 -0
  164. package/src/assets/linetype/5.png +0 -0
  165. package/src/assets/linetype/6.png +0 -0
  166. package/src/assets/linetype/7.png +0 -0
  167. package/src/assets/linetype/8.png +0 -0
  168. package/src/assets/linetype/9.png +0 -0
  169. package/src/assets/shaders/Types.glsl +1 -9
  170. package/src/assets/shaders/webgl1/Gouraud.fs +1 -1
  171. package/src/assets/shaders/webgl1/Gouraud.vs +2 -3
  172. package/src/assets/shaders/webgl1/Line.fs +3 -28
  173. package/src/assets/shaders/webgl1/Line.vs +6 -20
  174. package/src/assets/shaders/webgl1/PBR.fs +6 -6
  175. package/src/assets/shaders/webgl1/PBR.vs +1 -1
  176. package/src/assets/shaders/webgl1/Phong.fs +10 -10
  177. package/src/assets/shaders/webgl1/Point.vs +2 -2
  178. package/src/assets/shaders/webgl1/Unlit.fs +4 -4
  179. package/src/assets/shaders/webgl1/include/Normal.glsl +1 -1
  180. package/src/assets/shaders/webgl1/include/Texture.glsl +3 -8
  181. package/src/assets/shaders/webgl2/Depth.vs +4 -1
  182. package/src/assets/shaders/webgl2/Gouraud.fs +1 -1
  183. package/src/assets/shaders/webgl2/Gouraud.vs +8 -6
  184. package/src/assets/shaders/webgl2/Line.fs +11 -17
  185. package/src/assets/shaders/webgl2/Line.vs +17 -21
  186. package/src/assets/shaders/webgl2/LineTransform.fs +6 -0
  187. package/src/assets/shaders/webgl2/LineTransform.vs +77 -0
  188. package/src/assets/shaders/webgl2/PBR.fs +6 -6
  189. package/src/assets/shaders/webgl2/PBR.vs +10 -7
  190. package/src/assets/shaders/webgl2/Phong.fs +11 -11
  191. package/src/assets/shaders/webgl2/Phong.vs +6 -3
  192. package/src/assets/shaders/webgl2/Point.vs +5 -4
  193. package/src/assets/shaders/webgl2/Unlit.fs +5 -5
  194. package/src/assets/shaders/webgl2/Unlit.vs +6 -3
  195. package/src/assets/shaders/webgl2/include/Line2.glsl +20 -0
  196. package/src/assets/shaders/webgl2/include/Normal.glsl +1 -1
  197. package/src/assets/shaders/webgl2/include/Particle.glsl +36 -0
  198. package/src/assets/shaders/webgl2/include/Texture.glsl +3 -3
  199. package/src/example.html +6 -6
  200. package/src/examples.js +5 -4
  201. package/src/standard/Math/Algorithm.js +12 -28
  202. package/src/standard/Math/Geometry/Line2.js +163 -0
  203. package/src/standard/Math/Geometry/Line3.js +3 -5
  204. package/src/standard/Math/Geometry/Plane3.js +0 -2
  205. package/src/standard/Math/Geometry/Triangle3.js +1 -1
  206. package/src/standard/Math/Geometry/ViewVolume.js +121 -103
  207. package/src/standard/Math/Numbers/Color3.js +6 -0
  208. package/src/standard/Math/Numbers/Color4.js +7 -0
  209. package/src/standard/Math/Numbers/Complex.js +48 -34
  210. package/src/standard/Math/Numbers/Matrix2.js +62 -2
  211. package/src/standard/Math/Numbers/Matrix3.js +129 -110
  212. package/src/standard/Math/Numbers/Matrix4.js +138 -119
  213. package/src/standard/Math/Numbers/Quaternion.js +12 -5
  214. package/src/standard/Math/Numbers/Rotation4.js +8 -1
  215. package/src/standard/Math/Numbers/Vector2.js +42 -9
  216. package/src/standard/Math/Numbers/Vector3.js +50 -14
  217. package/src/standard/Math/Numbers/Vector4.js +48 -11
  218. package/src/standard/Math/Utility/BVH.js +45 -17
  219. package/src/tests.js +68 -66
  220. package/src/x_ite/Base/X3DBaseNode.js +22 -11
  221. package/src/x_ite/Base/X3DField.js +1 -1
  222. package/src/x_ite/Browser/Core/BrowserOptions.js +24 -143
  223. package/src/x_ite/Browser/Core/BrowserTimings.js +6 -4
  224. package/src/x_ite/Browser/Core/Context.js +185 -0
  225. package/src/x_ite/Browser/Core/ContextMenu.js +398 -211
  226. package/src/x_ite/Browser/Core/Notification.js +1 -0
  227. package/src/x_ite/Browser/Core/X3DCoreContext.js +35 -146
  228. package/src/x_ite/Browser/Followers/X3DArrayFollowerTemplate.js +1 -1
  229. package/src/x_ite/Browser/Geometry2D/Disk2DOptions.js +1 -0
  230. package/src/x_ite/Browser/Geometry2D/X3DGeometry2DContext.js +2 -2
  231. package/src/x_ite/Browser/Geometry3D/X3DGeometry3DContext.js +41 -2
  232. package/src/x_ite/Browser/Geospatial/Geocentric.js +2 -2
  233. package/src/x_ite/Browser/Interpolation/CatmullRomSplineInterpolatorTemplate.js +1 -1
  234. package/src/x_ite/Browser/Layout/ScreenText.js +18 -65
  235. package/src/x_ite/Browser/Layout/X3DLayoutContext.js +59 -16
  236. package/src/x_ite/Browser/Navigation/ExamineViewer.js +13 -20
  237. package/src/x_ite/Browser/Navigation/LookAtViewer.js +1 -4
  238. package/src/x_ite/Browser/Navigation/PlaneViewer.js +0 -3
  239. package/src/x_ite/Browser/Navigation/X3DFlyViewer.js +15 -8
  240. package/src/x_ite/Browser/Navigation/X3DViewer.js +12 -20
  241. package/src/x_ite/Browser/Networking/X3DNetworkingContext.js +11 -7
  242. package/src/x_ite/Browser/ParticleSystems/BVH.glsl +183 -0
  243. package/src/x_ite/Browser/ParticleSystems/Box3.glsl +47 -0
  244. package/src/x_ite/Browser/ParticleSystems/GeometryTypes.js +66 -0
  245. package/src/x_ite/Browser/ParticleSystems/Line3.glsl +55 -0
  246. package/src/x_ite/Browser/ParticleSystems/Plane3.glsl +160 -0
  247. package/src/x_ite/Browser/PointingDeviceSensor/PointingDevice.js +27 -3
  248. package/src/x_ite/Browser/PointingDeviceSensor/X3DPointingDeviceSensorContext.js +41 -37
  249. package/src/x_ite/Browser/Rendering/X3DRenderingContext.js +21 -13
  250. package/src/x_ite/Browser/Shaders/Shader.js +33 -12
  251. package/src/x_ite/Browser/Shaders/ShaderSource.js +6 -0
  252. package/src/x_ite/Browser/Shaders/ShaderTest.js +16 -10
  253. package/src/x_ite/Browser/Shape/X3DShapeContext.js +50 -9
  254. package/src/x_ite/Browser/Text/X3DTextContext.js +4 -13
  255. package/src/x_ite/Browser/Text/X3DTextGeometry.js +2 -1
  256. package/src/x_ite/Browser/Texturing/X3DTexturingContext.js +71 -34
  257. package/src/x_ite/Browser/Texturing3D/DICOMParser.js +2 -2
  258. package/src/x_ite/Browser/Time/X3DTimeContext.js +4 -2
  259. package/src/x_ite/Browser/VERSION.js +1 -1
  260. package/src/x_ite/Browser/X3DBrowser.js +7 -6
  261. package/src/x_ite/Browser/X3DBrowserContext.js +43 -10
  262. package/src/x_ite/Components/Core/X3DNode.js +4 -0
  263. package/src/x_ite/Components/Core/X3DPrototypeInstance.js +0 -2
  264. package/src/x_ite/Components/CubeMapTexturing/ComposedCubeMapTexture.js +3 -4
  265. package/src/x_ite/Components/CubeMapTexturing/GeneratedCubeMapTexture.js +1 -12
  266. package/src/x_ite/Components/CubeMapTexturing/ImageCubeMapTexture.js +1 -2
  267. package/src/x_ite/Components/EnvironmentalEffects/TextureBackground.js +1 -1
  268. package/src/x_ite/Components/EnvironmentalEffects/X3DBackgroundNode.js +76 -77
  269. package/src/x_ite/Components/EnvironmentalEffects/X3DFogObject.js +2 -9
  270. package/src/x_ite/Components/EnvironmentalSensor/ProximitySensor.js +51 -65
  271. package/src/x_ite/Components/EventUtilities/X3DSequencerNode.js +1 -1
  272. package/src/x_ite/Components/Followers/ColorDamper.js +1 -1
  273. package/src/x_ite/Components/Followers/X3DChaserNode.js +18 -32
  274. package/src/x_ite/Components/Followers/X3DDamperNode.js +1 -6
  275. package/src/x_ite/Components/Followers/X3DFollowerNode.js +1 -1
  276. package/src/x_ite/Components/Geometry2D/Disk2D.js +30 -46
  277. package/src/x_ite/Components/Geometry2D/TriangleSet2D.js +1 -1
  278. package/src/x_ite/Components/Geometry3D/ElevationGrid.js +12 -4
  279. package/src/x_ite/Components/Geometry3D/IndexedFaceSet.js +4 -4
  280. package/src/x_ite/Components/Geospatial/GeoCoordinate.js +10 -27
  281. package/src/x_ite/Components/Geospatial/GeoLOD.js +1 -1
  282. package/src/x_ite/Components/Geospatial/GeoPositionInterpolator.js +5 -10
  283. package/src/x_ite/Components/Geospatial/GeoTouchSensor.js +9 -16
  284. package/src/x_ite/Components/Geospatial/GeoTransform.js +6 -18
  285. package/src/x_ite/Components/Geospatial/GeoViewpoint.js +26 -30
  286. package/src/x_ite/Components/Geospatial/X3DGeospatialObject.js +20 -27
  287. package/src/x_ite/Components/Grouping/X3DGroupingNode.js +8 -8
  288. package/src/x_ite/Components/Grouping/X3DTransformNode.js +0 -4
  289. package/src/x_ite/Components/HAnim/HAnimHumanoid.js +68 -75
  290. package/src/x_ite/Components/Interpolation/OrientationInterpolator.js +4 -11
  291. package/src/x_ite/Components/Interpolation/X3DInterpolatorNode.js +1 -1
  292. package/src/x_ite/Components/Layout/LayoutGroup.js +4 -9
  293. package/src/x_ite/Components/Layout/ScreenFontStyle.js +1 -1
  294. package/src/x_ite/Components/Layout/ScreenGroup.js +16 -80
  295. package/src/x_ite/Components/Lighting/DirectionalLight.js +28 -36
  296. package/src/x_ite/Components/Lighting/PointLight.js +32 -47
  297. package/src/x_ite/Components/Lighting/SpotLight.js +33 -48
  298. package/src/x_ite/Components/Navigation/Billboard.js +49 -56
  299. package/src/x_ite/Components/Navigation/LOD.js +2 -2
  300. package/src/x_ite/Components/Navigation/OrthoViewpoint.js +29 -30
  301. package/src/x_ite/Components/Navigation/Viewpoint.js +16 -20
  302. package/src/x_ite/Components/Navigation/X3DViewpointNode.js +82 -111
  303. package/src/x_ite/Components/Networking/Anchor.js +18 -7
  304. package/src/x_ite/Components/ParticleSystems/BoundedPhysicsModel.js +6 -6
  305. package/src/x_ite/Components/ParticleSystems/ConeEmitter.js +44 -36
  306. package/src/x_ite/Components/ParticleSystems/ExplosionEmitter.js +26 -17
  307. package/src/x_ite/Components/ParticleSystems/ForcePhysicsModel.js +20 -7
  308. package/src/x_ite/Components/ParticleSystems/ParticleSystem.js +463 -882
  309. package/src/x_ite/Components/ParticleSystems/PointEmitter.js +39 -35
  310. package/src/x_ite/Components/ParticleSystems/PolylineEmitter.js +112 -128
  311. package/src/x_ite/Components/ParticleSystems/SurfaceEmitter.js +105 -112
  312. package/src/x_ite/Components/ParticleSystems/VolumeEmitter.js +138 -176
  313. package/src/x_ite/Components/ParticleSystems/WindPhysicsModel.js +16 -11
  314. package/src/x_ite/Components/ParticleSystems/X3DParticleEmitterNode.js +807 -217
  315. package/src/x_ite/Components/Picking/LinePickSensor.js +31 -39
  316. package/src/x_ite/Components/PointingDeviceSensor/CylinderSensor.js +91 -108
  317. package/src/x_ite/Components/PointingDeviceSensor/PlaneSensor.js +56 -59
  318. package/src/x_ite/Components/PointingDeviceSensor/SphereSensor.js +54 -71
  319. package/src/x_ite/Components/PointingDeviceSensor/TouchSensor.js +8 -15
  320. package/src/x_ite/Components/ProjectiveTextureMapping/TextureProjectorParallel.js +43 -50
  321. package/src/x_ite/Components/ProjectiveTextureMapping/TextureProjectorPerspective.js +32 -39
  322. package/src/x_ite/Components/Rendering/ClipPlane.js +3 -11
  323. package/src/x_ite/Components/Rendering/Color.js +12 -24
  324. package/src/x_ite/Components/Rendering/ColorRGBA.js +13 -25
  325. package/src/x_ite/Components/Rendering/IndexedLineSet.js +26 -4
  326. package/src/x_ite/Components/Rendering/LineSet.js +35 -13
  327. package/src/x_ite/Components/Rendering/PointSet.js +35 -13
  328. package/src/x_ite/Components/Rendering/X3DComposedGeometryNode.js +13 -5
  329. package/src/x_ite/Components/Rendering/X3DGeometryNode.js +331 -387
  330. package/src/x_ite/Components/Rendering/X3DLineGeometryNode.js +350 -140
  331. package/src/x_ite/Components/Rendering/X3DPointGeometryNode.js +116 -126
  332. package/src/x_ite/Components/RigidBodyPhysics/DoubleAxisHingeJoint.js +24 -38
  333. package/src/x_ite/Components/RigidBodyPhysics/SingleAxisHingeJoint.js +10 -17
  334. package/src/x_ite/Components/Shaders/ComposedShader.js +35 -75
  335. package/src/x_ite/Components/Shaders/FloatVertexAttribute.js +8 -11
  336. package/src/x_ite/Components/Shaders/Matrix3VertexAttribute.js +10 -14
  337. package/src/x_ite/Components/Shaders/Matrix4VertexAttribute.js +10 -14
  338. package/src/x_ite/Components/Shaders/ShaderPart.js +1 -10
  339. package/src/x_ite/Components/Shaders/X3DProgrammableShaderObject.js +220 -210
  340. package/src/x_ite/Components/Shaders/X3DShaderNode.js +28 -10
  341. package/src/x_ite/Components/Shaders/X3DVertexAttributeNode.js +15 -1
  342. package/src/x_ite/Components/Shape/Appearance.js +37 -4
  343. package/src/x_ite/Components/Shape/FillProperties.js +12 -1
  344. package/src/x_ite/Components/Shape/LineProperties.js +33 -1
  345. package/src/x_ite/Components/Shape/PointProperties.js +24 -3
  346. package/src/x_ite/Components/Shape/Shape.js +30 -39
  347. package/src/x_ite/Components/Shape/TwoSidedMaterial.js +3 -1
  348. package/src/x_ite/Components/Sound/Sound.js +31 -41
  349. package/src/x_ite/Components/Text/Text.js +6 -20
  350. package/src/x_ite/Components/Texturing/ImageTexture.js +1 -1
  351. package/src/x_ite/Components/Texturing/MovieTexture.js +1 -1
  352. package/src/x_ite/Components/Texturing/PixelTexture.js +2 -2
  353. package/src/x_ite/Components/Texturing/TextureCoordinate.js +5 -5
  354. package/src/x_ite/Components/Texturing/TextureProperties.js +4 -4
  355. package/src/x_ite/Components/Texturing/X3DSingleTextureNode.js +5 -4
  356. package/src/x_ite/Components/Texturing/X3DTexture2DNode.js +24 -33
  357. package/src/x_ite/Components/Texturing3D/TextureCoordinate3D.js +5 -5
  358. package/src/x_ite/Components/Texturing3D/TextureCoordinate4D.js +5 -5
  359. package/src/x_ite/Components/Texturing3D/X3DTexture3DNode.js +12 -19
  360. package/src/x_ite/Components/VolumeRendering/X3DVolumeDataNode.js +8 -8
  361. package/src/x_ite/Components.js +2 -2
  362. package/src/x_ite/Fallback.js +9 -3
  363. package/src/x_ite/Fields/SFColor.js +4 -0
  364. package/src/x_ite/Fields/SFColorRGBA.js +4 -0
  365. package/src/x_ite/Fields/SFImage.js +2 -11
  366. package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js +4 -0
  367. package/src/x_ite/Fields/SFRotation.js +4 -0
  368. package/src/x_ite/Fields/SFString.js +4 -0
  369. package/src/x_ite/Fields/SFVecPrototypeTemplate.js +22 -2
  370. package/src/x_ite/Parser/XMLParser.js +1 -1
  371. package/src/x_ite/Rendering/TextureBuffer.js +43 -36
  372. package/src/x_ite/Rendering/VertexArray.js +103 -0
  373. package/src/x_ite/Rendering/X3DRenderObject.js +127 -148
  374. package/src/x_ite/X3D.js +32 -26
  375. package/src/x_ite.config.js +0 -5
  376. package/src/x_ite.css +216 -175
  377. package/src/x_ite.html +15 -10
  378. package/src/x_ite.js +49 -1
  379. package/x_ite.min.html +15 -10
  380. package/dist/assets/hatching/0.png +0 -0
  381. package/dist/assets/linetype/0.png +0 -0
  382. package/src/assets/hatching/0.png +0 -0
  383. package/src/assets/linetype/0.png +0 -0
  384. package/src/spinner.css +0 -67
  385. package/src/x_ite/Browser/Shape/LineStipples.xcf +0 -0
@@ -49,15 +49,27 @@
49
49
 
50
50
  define ([
51
51
  "x_ite/Components/Rendering/X3DGeometryNode",
52
+ "x_ite/Rendering/VertexArray",
53
+ "standard/Math/Geometry/ViewVolume",
54
+ "standard/Math/Geometry/Box3",
55
+ "standard/Math/Geometry/Line2",
52
56
  "standard/Math/Geometry/Line3",
53
57
  "standard/Math/Numbers/Vector2",
54
58
  "standard/Math/Numbers/Vector3",
59
+ "standard/Math/Numbers/Vector4",
60
+ "standard/Math/Numbers/Matrix2",
55
61
  "standard/Math/Numbers/Matrix4",
56
62
  ],
57
63
  function (X3DGeometryNode,
64
+ VertexArray,
65
+ ViewVolume,
66
+ Box3,
67
+ Line2,
58
68
  Line3,
59
69
  Vector2,
60
70
  Vector3,
71
+ Vector4,
72
+ Matrix2,
61
73
  Matrix4)
62
74
  {
63
75
  "use strict";
@@ -67,174 +79,354 @@ function (X3DGeometryNode,
67
79
  if (!this .getExecutionContext ())
68
80
  X3DGeometryNode .call (this, executionContext);
69
81
 
70
- const browser = this .getBrowser ();
82
+ const
83
+ browser = this .getBrowser (),
84
+ gl = browser .getContext ();
85
+
86
+ this .transformVertexArrayObject = new VertexArray ();
87
+ this .thickVertexArrayObject = new VertexArray ();
88
+ this .trianglesBuffer = gl .createBuffer ();
89
+ this .trianglesTexCoordBuffers = new Array (browser .getMaxTextures ()) .fill (this .trianglesBuffer);
71
90
 
72
91
  this .setGeometryType (1);
73
- this .setPrimitiveMode (browser .getContext () .LINES);
92
+ this .setPrimitiveMode (gl .LINES);
74
93
  this .setSolid (false);
75
94
  }
76
95
 
77
96
  X3DLineGeometryNode .prototype = Object .assign (Object .create (X3DGeometryNode .prototype),
78
97
  {
79
98
  constructor: X3DLineGeometryNode,
80
- intersectsLine: (function ()
99
+ updateVertexArrays: function ()
81
100
  {
82
- const PICK_DISTANCE_FACTOR = 1 / 300;
101
+ X3DGeometryNode .prototype .updateVertexArrays .call (this);
83
102
 
103
+ this .transformVertexArrayObject .update ();
104
+ this .thickVertexArrayObject .update ();
105
+ },
106
+ intersectsLine: (function ()
107
+ {
84
108
  const
85
- point1 = new Vector3 (0, 0, 0),
86
- point2 = new Vector3 (0, 0, 0),
87
- line = new Line3 (Vector3 .Zero, Vector3 .zAxis),
88
- point = new Vector3 (0, 0, 0),
89
- vector = new Vector3 (0, 0, 0),
90
- clipPoint = new Vector3 (0, 0, 0);
91
-
92
- return function (hitRay, clipPlanes, modelViewMatrix, intersections)
109
+ bbox = new Box3 (),
110
+ min = new Vector3 (0, 0, 0),
111
+ max = new Vector3 (0, 0, 0),
112
+ screenScale1_ = new Vector3 (0, 0, 0),
113
+ screenScale2_ = new Vector3 (0, 0, 0),
114
+ modelViewProjectionMatrix = new Matrix4 (),
115
+ point1 = new Vector3 (0, 0, 0),
116
+ point2 = new Vector3 (0, 0, 0),
117
+ projected1 = new Vector2 (0, 0),
118
+ projected2 = new Vector2 (0, 0),
119
+ projected = new Line2 (Vector2 .Zero, Vector2 .yAxis),
120
+ closest = new Vector2 (0, 0),
121
+ ray = new Line3 (Vector3 .Zero, Vector3 .zAxis),
122
+ line = new Line3 (Vector3 .Zero, Vector3 .zAxis),
123
+ point = new Vector3 (0, 0, 0),
124
+ rotation = new Matrix2 (),
125
+ clipPoint = new Vector3 (0, 0, 0);
126
+
127
+ return function (hitRay, renderObject, invModelViewMatrix, appearanceNode, intersections)
93
128
  {
94
- if (this .intersectsBBox (hitRay, 1))
129
+ const
130
+ modelViewMatrix = renderObject .getModelViewMatrix () .get (),
131
+ viewport = renderObject .getViewVolume () .getViewport (),
132
+ extents = bbox .assign (this .getBBox ()) .multRight (modelViewMatrix) .getExtents (min, max),
133
+ linePropertiesNode = appearanceNode .getLineProperties (),
134
+ lineWidth1_2 = Math .max (1.5, linePropertiesNode .getApplied () ? linePropertiesNode .getLinewidthScaleFactor () / 2 : 0),
135
+ screenScale1 = renderObject .getViewpoint () .getScreenScale (min, viewport, screenScale1_), // in m/px
136
+ offsets1 = invModelViewMatrix .multDirMatrix (screenScale1 .multiply (lineWidth1_2)),
137
+ screenScale2 = renderObject .getViewpoint () .getScreenScale (max, viewport, screenScale2_), // in m/px
138
+ offsets2 = invModelViewMatrix .multDirMatrix (screenScale2 .multiply (lineWidth1_2));
139
+
140
+ if (this .intersectsBBox (hitRay, offsets1 .abs () .max (offsets2 .abs ())))
95
141
  {
96
- const vertices = this .getVertices ();
142
+ const
143
+ pointer = renderObject .getBrowser () .getPointer (),
144
+ projectionMatrix = renderObject .getProjectionMatrix () .get (),
145
+ clipPlanes = renderObject .getLocalObjects (),
146
+ vertices = this .getVertices (),
147
+ numVertices = vertices .length;
148
+
149
+ modelViewProjectionMatrix .assign (modelViewMatrix) .multRight (projectionMatrix);
97
150
 
98
- for (let i = 0, length = vertices .length; i < length; i += 8)
151
+ for (let i = 0; i < numVertices; i += 8)
99
152
  {
100
153
  point1 .set (vertices [i + 0], vertices [i + 1], vertices [i + 2]);
101
154
  point2 .set (vertices [i + 4], vertices [i + 5], vertices [i + 6]);
102
155
 
103
- line .setPoints (point1, point2);
156
+ ViewVolume .projectPointMatrix (point1, modelViewProjectionMatrix, viewport, projected1);
157
+ ViewVolume .projectPointMatrix (point2, modelViewProjectionMatrix, viewport, projected2);
104
158
 
105
- if (line .getClosestPointToLine (hitRay, point))
159
+ projected .setPoints (projected1, projected2);
160
+
161
+ if (projected .getClosestPointToPoint (pointer, closest))
106
162
  {
107
- if (line .getPerpendicularVectorToLine (hitRay, vector) .abs () < hitRay .point .distance (point) * PICK_DISTANCE_FACTOR)
108
- {
109
- const distance = point1 .distance (point2);
163
+ const
164
+ distance = projected1 .distance (projected2),
165
+ distance1 = projected1 .distance (closest),
166
+ distance2 = projected2 .distance (closest);
110
167
 
111
- if (point1 .distance (point) <= distance && point2 .distance (point) <= distance)
168
+ if (distance1 <= distance && distance2 <= distance)
169
+ {
170
+ if (closest .distance (pointer) <= lineWidth1_2)
112
171
  {
113
- if (this .isClipped (modelViewMatrix .multVecMatrix (clipPoint .assign (point)), clipPlanes))
114
- continue;
172
+ if (clipPlanes .length)
173
+ {
174
+ if (this .isClipped (modelViewMatrix .multVecMatrix (clipPoint .assign (closest)), clipPlanes))
175
+ continue;
176
+ }
177
+
178
+ const
179
+ direction = projected .direction,
180
+ texCoordY = rotation .set (direction .x, direction .y, -direction .y, direction .x) .inverse () .multVecMatrix (pointer .copy () .subtract (closest)),
181
+ texCoord = texCoordY .set (distance1 / distance, (texCoordY .y / lineWidth1_2 + 1) / 2),
182
+ normal = point2 .copy () .subtract (point1) .normalize ();
115
183
 
116
- intersections .push ({ texCoord: new Vector2 (0, 0), normal: new Vector3 (0, 0, 0), point: point .copy () });
117
- return true;
184
+ ViewVolume .unProjectRay (closest .x, closest .y, modelViewMatrix, projectionMatrix, viewport, ray);
185
+
186
+ line .setPoints (point1, point2) .getClosestPointToLine (ray, point);
187
+
188
+ intersections .push ({ texCoord: texCoord, normal: normal, point: point .copy () });
118
189
  }
119
190
  }
120
191
  }
121
192
  }
122
193
  }
123
194
 
124
- return false;
195
+ return intersections .length;
125
196
  };
126
197
  })(),
198
+ intersectsLineWithGeometry: function ()
199
+ {
200
+ return false;
201
+ },
127
202
  intersectsBox: function (box, clipPlanes, modelViewMatrix)
128
203
  {
129
204
  return false;
130
205
  },
131
- transfer: function ()
206
+ buildTexCoords: function ()
132
207
  {
133
208
  // Line stipple support.
134
209
 
135
- const
136
- texCoords = this .getTexCoords (),
137
- vertices = this .getVertices ();
138
-
139
- this .getMultiTexCoords () .push (texCoords);
210
+ const texCoords = this .getTexCoords ();
140
211
 
141
- for (let i = 0, length = vertices .length; i < length; i += 8)
212
+ if (texCoords .getValue () .length !== this .getVertices () .length)
142
213
  {
143
- texCoords .push (vertices [i],
144
- vertices [i + 1],
145
- vertices [i + 2],
146
- vertices [i + 3],
147
- vertices [i],
148
- vertices [i + 1],
149
- vertices [i + 2],
150
- vertices [i + 3]);
151
- }
214
+ const
215
+ gl = this .getBrowser () .getContext (),
216
+ numLines = this .getVertices () .length / 8;
217
+
218
+ texCoords .length = this .getVertices () .length;
152
219
 
153
- texCoords .shrinkToFit ();
220
+ texCoords .fill (0);
221
+ texCoords .shrinkToFit ();
154
222
 
155
- X3DGeometryNode .prototype .transfer .call (this);
223
+ gl .bindBuffer (gl .ARRAY_BUFFER, this .trianglesBuffer);
224
+ gl .bufferData (gl .ARRAY_BUFFER, new Float32Array (13 * 6 * numLines), gl .DYNAMIC_DRAW);
225
+ }
226
+
227
+ this .getMultiTexCoords () .push (texCoords);
156
228
  },
157
- display: function (gl, context)
229
+ updateLengthSoFar: (function ()
158
230
  {
159
- try
231
+ const
232
+ modelViewProjectionMatrix = new Matrix4 (),
233
+ point0 = new Vector4 (0, 0, 0),
234
+ point1 = new Vector4 (0, 0, 0),
235
+ projectedPoint0 = new Vector2 (0, 0),
236
+ projectedPoint1 = new Vector2 (0, 0);
237
+
238
+ return function (gl, context)
160
239
  {
161
240
  const
162
- browser = context .browser,
163
- appearanceNode = context .shapeNode .getAppearance (),
164
- shaderNode = appearanceNode .shaderNode || browser .getLineShader ();
241
+ viewport = context .renderer .getViewVolume () .getViewport (),
242
+ projectionMatrix = context .renderer .getProjectionMatrix () .get (),
243
+ texCoordArray = this .getTexCoords () .getValue (),
244
+ vertices = this .getVertices (),
245
+ numVertices = vertices .length;
246
+
247
+ modelViewProjectionMatrix .assign (context .modelViewMatrix) .multRight (projectionMatrix);
248
+
249
+ let lengthSoFar = 0;
165
250
 
166
- if (shaderNode .getValid ())
251
+ for (let i = 0; i < numVertices; i += 8)
167
252
  {
168
- const
169
- blendModeNode = appearanceNode .blendModeNode,
170
- attribNodes = this .attribNodes,
171
- attribBuffers = this .attribBuffers;
253
+ point0 .set (vertices [i], vertices [i + 1], vertices [i + 2], vertices [i + 3]);
254
+ point1 .set (vertices [i + 4], vertices [i + 5], vertices [i + 6], vertices [i + 7]);
172
255
 
173
- if (blendModeNode)
174
- blendModeNode .enable (gl);
256
+ ViewVolume .projectPointMatrix (point0, modelViewProjectionMatrix, viewport, projectedPoint0);
257
+ ViewVolume .projectPointMatrix (point1, modelViewProjectionMatrix, viewport, projectedPoint1);
175
258
 
176
- // Setup shader.
259
+ texCoordArray [i] = projectedPoint1 .x;
260
+ texCoordArray [i + 1] = projectedPoint1 .y;
177
261
 
178
- shaderNode .enable (gl);
179
- shaderNode .setLocalUniforms (gl, context);
262
+ texCoordArray [i + 4] = projectedPoint0 .x;
263
+ texCoordArray [i + 5] = projectedPoint0 .y;
264
+ texCoordArray [i + 6] = lengthSoFar;
180
265
 
181
- // Setup vertex attributes.
266
+ lengthSoFar += projectedPoint1 .subtract (projectedPoint0) .magnitude ();
267
+ }
182
268
 
183
- for (let i = 0, length = attribNodes .length; i < length; ++ i)
184
- attribNodes [i] .enable (gl, shaderNode, attribBuffers [i]);
269
+ gl .bindBuffer (gl .ARRAY_BUFFER, this .texCoordBuffers [0]);
270
+ gl .bufferData (gl .ARRAY_BUFFER, texCoordArray, gl .DYNAMIC_DRAW);
271
+ };
272
+ })(),
273
+ display: (function ()
274
+ {
275
+ const
276
+ matrix = new Matrix4 (),
277
+ modelViewProjectionMatrixArray = new Float32Array (16),
278
+ invModelViewProjectionMatrixArray = new Float32Array (16);
185
279
 
186
- if (this .fogCoords)
187
- shaderNode .enableFogDepthAttribute (gl, this .fogDepthBuffer);
280
+ return function (gl, context)
281
+ {
282
+ const
283
+ browser = context .browser,
284
+ appearanceNode = context .shapeNode .getAppearance (),
285
+ linePropertiesNode = appearanceNode .getLineProperties (),
286
+ shaderNode = appearanceNode .getShader () || browser .getLineShader (),
287
+ blendModeNode = appearanceNode .getBlendMode (),
288
+ attribNodes = this .getAttrib (),
289
+ attribBuffers = this .getAttribBuffers ();
290
+
291
+ if (linePropertiesNode .getApplied () && linePropertiesNode .getLinetype () !== 1)
292
+ this .updateLengthSoFar (gl, context);
293
+
294
+ if (linePropertiesNode .getMustTransformLines ())
295
+ {
296
+ const transformShaderNode = browser .getLineTransformShader ();
188
297
 
189
- if (this .colorMaterial)
190
- shaderNode .enableColorAttribute (gl, this .colorBuffer);
298
+ if (transformShaderNode .isValid ())
299
+ {
300
+ const
301
+ viewport = context .renderer .getViewVolume () .getViewport (),
302
+ projectionMatrix = context .renderer .getProjectionMatrix () .get (),
303
+ primitiveMode = shaderNode .getPrimitiveMode (gl .TRIANGLES);
191
304
 
192
- if (this .getMultiTexCoords () .length)
193
- shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers, true);
305
+ modelViewProjectionMatrixArray .set (matrix .assign (context .modelViewMatrix) .multRight (projectionMatrix));
306
+ invModelViewProjectionMatrixArray .set (matrix .inverse ());
194
307
 
195
- shaderNode .enableVertexAttribute (gl, this .vertexBuffer);
308
+ // Start
196
309
 
197
- // WireFrames are always solid so only one drawing call is needed.
310
+ transformShaderNode .enable (gl);
198
311
 
199
- gl .drawArrays (shaderNode .primitiveMode === gl .POINTS ? gl .POINTS : this .primitiveMode, 0, this .vertexCount);
312
+ gl .uniform4f (transformShaderNode .viewport, viewport .x, viewport .y, viewport .z, viewport .w);
313
+ gl .uniformMatrix4fv (transformShaderNode .modelViewProjectionMatrix, false, modelViewProjectionMatrixArray);
314
+ gl .uniformMatrix4fv (transformShaderNode .invModelViewProjectionMatrix, false, invModelViewProjectionMatrixArray);
315
+ gl .uniform1f (transformShaderNode .scale, linePropertiesNode .getLinewidthScaleFactor () / 2);
200
316
 
201
- for (const attribNode of attribNodes)
202
- attribNode .disable (gl, shaderNode);
317
+ // Setup vertex attributes.
203
318
 
204
- if (this .fogCoords)
205
- shaderNode .disableFogDepthAttribute (gl);
319
+ if (this .transformVertexArrayObject .enable (gl, shaderNode))
320
+ {
321
+ const
322
+ fogDepthStride = 2 * Float32Array .BYTES_PER_ELEMENT,
323
+ fogDepthOffset0 = 0,
324
+ fogDepthOffset1 = 1 * Float32Array .BYTES_PER_ELEMENT,
325
+ colorStride = 8 * Float32Array .BYTES_PER_ELEMENT,
326
+ colorOffset0 = 0,
327
+ colorOffset1 = 4 * Float32Array .BYTES_PER_ELEMENT,
328
+ texCoordStride = 8 * Float32Array .BYTES_PER_ELEMENT,
329
+ texCoordOffset0 = 0,
330
+ texCoordOffset1 = 4 * Float32Array .BYTES_PER_ELEMENT,
331
+ vertexStride = 8 * Float32Array .BYTES_PER_ELEMENT,
332
+ vertexOffset0 = 0,
333
+ vertexOffset1 = 4 * Float32Array .BYTES_PER_ELEMENT;
334
+
335
+ // for (let i = 0, length = attribNodes .length; i < length; ++ i)
336
+ // attribNodes [i] .enable (gl, shaderNode, attribBuffers [i]);
337
+
338
+ if (this .fogCoords)
339
+ {
340
+ transformShaderNode .enableFloatAttrib (gl, "x3d_FogDepth0", this .fogDepthBuffer, 1, fogDepthStride, fogDepthOffset0);
341
+ transformShaderNode .enableFloatAttrib (gl, "x3d_FogDepth1", this .fogDepthBuffer, 1, fogDepthStride, fogDepthOffset1);
342
+ }
206
343
 
207
- if (this .colorMaterial)
208
- shaderNode .disableColorAttribute (gl);
344
+ if (this .colorMaterial)
345
+ {
346
+ transformShaderNode .enableFloatAttrib (gl, "x3d_Color0", this .colorBuffer, 4, colorStride, colorOffset0);
347
+ transformShaderNode .enableFloatAttrib (gl, "x3d_Color1", this .colorBuffer, 4, colorStride, colorOffset1);
348
+ }
209
349
 
210
- if (this .getMultiTexCoords () .length)
211
- shaderNode .disableTexCoordAttribute (gl);
350
+ transformShaderNode .enableFloatAttrib (gl, "x3d_TexCoord0", this .texCoordBuffers [0], 4, texCoordStride, texCoordOffset0);
351
+ transformShaderNode .enableFloatAttrib (gl, "x3d_TexCoord1", this .texCoordBuffers [0], 4, texCoordStride, texCoordOffset1);
212
352
 
213
- if (blendModeNode)
214
- blendModeNode .disable (gl);
215
- }
216
- }
217
- catch (error)
218
- {
219
- // Catch error from setLocalUniforms.
220
- console .error (error);
221
- }
222
- },
223
- displayParticles: function (gl, context, particles, numParticles)
224
- {
225
- try
226
- {
227
- const
228
- browser = context .browser,
229
- appearanceNode = context .shapeNode .getAppearance (),
230
- shaderNode = appearanceNode .shaderNode || this .getShader (browser);
353
+ transformShaderNode .enableFloatAttrib (gl, "x3d_Vertex0", this .vertexBuffer, 4, vertexStride, vertexOffset0);
354
+ transformShaderNode .enableFloatAttrib (gl, "x3d_Vertex1", this .vertexBuffer, 4, vertexStride, vertexOffset1);
355
+ }
356
+
357
+ // Transform lines.
358
+
359
+ gl .bindTransformFeedback (gl .TRANSFORM_FEEDBACK, browser .getLineTransformFeedback ());
360
+ gl .bindBufferBase (gl .TRANSFORM_FEEDBACK_BUFFER, 0, this .trianglesBuffer);
361
+ gl .enable (gl .RASTERIZER_DISCARD);
362
+ gl .beginTransformFeedback (gl .POINTS);
363
+ gl .drawArraysInstanced (gl .POINTS, 0, this .vertexCount / 2, 2);
364
+ gl .endTransformFeedback ();
365
+ gl .disable (gl .RASTERIZER_DISCARD);
366
+ gl .bindTransformFeedback (gl .TRANSFORM_FEEDBACK, null);
367
+
368
+ // DEBUG
369
+
370
+ // const data = new Float32Array (13 * 6 * this .vertexCount / 2);
371
+ // gl .bindBuffer (gl .ARRAY_BUFFER, this .trianglesBuffer);
372
+ // gl .getBufferSubData (gl .ARRAY_BUFFER, 0, data);
373
+ // console .log (data);
374
+
375
+ // Render triangles.
376
+
377
+ if (blendModeNode)
378
+ blendModeNode .enable (gl);
379
+
380
+ // Setup shader.
381
+
382
+ shaderNode .enable (gl);
383
+ shaderNode .setLocalUniforms (gl, context);
384
+
385
+ // Setup vertex attributes.
386
+
387
+ if (this .thickVertexArrayObject .enable (gl, shaderNode))
388
+ {
389
+ const
390
+ stride = 13 * Float32Array .BYTES_PER_ELEMENT,
391
+ fogCoordOffset = 0,
392
+ colorOffset = 1 * Float32Array .BYTES_PER_ELEMENT,
393
+ texCoordOffset = 5 * Float32Array .BYTES_PER_ELEMENT,
394
+ vertexOffset = 9 * Float32Array .BYTES_PER_ELEMENT;
395
+
396
+ // for (let i = 0, length = attribNodes .length; i < length; ++ i)
397
+ // attribNodes [i] .enable (gl, shaderNode, attribBuffers [i]);
398
+
399
+ if (this .fogCoords)
400
+ shaderNode .enableFogDepthAttribute (gl, this .trianglesBuffer, stride, fogCoordOffset);
401
+
402
+ if (this .colorMaterial)
403
+ shaderNode .enableColorAttribute (gl, this .trianglesBuffer, stride, colorOffset);
404
+
405
+ shaderNode .enableTexCoordAttribute (gl, this .trianglesTexCoordBuffers, stride, texCoordOffset);
406
+ shaderNode .enableVertexAttribute (gl, this .trianglesBuffer, stride, vertexOffset);
407
+
408
+ gl .bindBuffer (gl .ARRAY_BUFFER, null);
409
+ }
410
+
411
+ if (shaderNode .getWireframe ())
412
+ {
413
+ for (let i = 0, length = this .vertexCount * 3; i < length; i += 3)
414
+ gl .drawArrays (primitiveMode, i, 3);
415
+ }
416
+ else
417
+ {
418
+ gl .frontFace (gl .CCW);
419
+ gl .enable (gl .CULL_FACE);
420
+ gl .drawArrays (primitiveMode, 0, this .vertexCount * 3);
421
+ }
231
422
 
232
- if (shaderNode .getValid ())
423
+ if (blendModeNode)
424
+ blendModeNode .disable (gl);
425
+ }
426
+ }
427
+ else if (shaderNode .isValid ())
233
428
  {
234
- const
235
- blendModeNode = appearanceNode .blendModeNode,
236
- attribNodes = this .attribNodes,
237
- attribBuffers = this .attribBuffers;
429
+ const primitiveMode = shaderNode .getPrimitiveMode (this .primitiveMode);
238
430
 
239
431
  if (blendModeNode)
240
432
  blendModeNode .enable (gl);
@@ -246,63 +438,81 @@ function (X3DGeometryNode,
246
438
 
247
439
  // Setup vertex attributes.
248
440
 
249
- for (let i = 0, length = attribNodes .length; i < length; ++ i)
250
- attribNodes [i] .enable (gl, shaderNode, attribBuffers [i]);
441
+ if (this .vertexArrayObject .enable (gl, shaderNode))
442
+ {
443
+ for (let i = 0, length = attribNodes .length; i < length; ++ i)
444
+ attribNodes [i] .enable (gl, shaderNode, attribBuffers [i]);
251
445
 
252
- if (this .fogCoords)
253
- shaderNode .enableFogDepthAttribute (gl, this .fogDepthBuffer);
446
+ if (this .fogCoords)
447
+ shaderNode .enableFogDepthAttribute (gl, this .fogDepthBuffer, 0, 0);
254
448
 
255
- if (this .colorMaterial)
256
- shaderNode .enableColorAttribute (gl, this .colorBuffer);
449
+ if (this .colorMaterial)
450
+ shaderNode .enableColorAttribute (gl, this .colorBuffer, 0, 0);
257
451
 
258
- if (this .getMultiTexCoords () .length)
259
- shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers);
452
+ shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers, 0, 0);
453
+ shaderNode .enableVertexAttribute (gl, this .vertexBuffer, 0, 0);
454
+ }
260
455
 
261
- shaderNode .enableVertexAttribute (gl, this .vertexBuffer);
456
+ gl .drawArrays (primitiveMode, 0, this .vertexCount);
262
457
 
263
- // Wireframes are always solid so only one drawing call is needed.
458
+ if (blendModeNode)
459
+ blendModeNode .disable (gl);
460
+ }
461
+ };
462
+ })(),
463
+ displayParticles: function (gl, context, particleSystem)
464
+ {
465
+ const
466
+ browser = context .browser,
467
+ appearanceNode = context .shapeNode .getAppearance (),
468
+ shaderNode = appearanceNode .getShader () || browser .getLineShader (),
469
+ blendModeNode = appearanceNode .getBlendMode (),
470
+ attribNodes = this .getAttrib (),
471
+ attribBuffers = this .getAttribBuffers (),
472
+ primitiveMode = shaderNode .getPrimitiveMode (this .primitiveMode);
473
+
474
+ if (shaderNode .isValid ())
475
+ {
476
+ if (blendModeNode)
477
+ blendModeNode .enable (gl);
264
478
 
265
- const
266
- modelViewMatrix = context .modelViewMatrix,
267
- x = modelViewMatrix [12],
268
- y = modelViewMatrix [13],
269
- z = modelViewMatrix [14],
270
- primitiveMode = shaderNode .primitiveMode === gl .POINTS ? gl .POINTS : this .primitiveMode;
479
+ // Setup shader.
271
480
 
272
- for (let p = 0; p < numParticles; ++ p)
273
- {
274
- const particle = particles [p];
481
+ shaderNode .enable (gl);
482
+ shaderNode .setLocalUniforms (gl, context);
275
483
 
276
- modelViewMatrix [12] = x;
277
- modelViewMatrix [13] = y;
278
- modelViewMatrix [14] = z;
484
+ // Setup vertex attributes.
279
485
 
280
- Matrix4 .prototype .translate .call (modelViewMatrix, particle .position);
486
+ const outputParticles = particleSystem .outputParticles;
281
487
 
282
- shaderNode .setParticle (gl, particle, modelViewMatrix);
488
+ if (outputParticles .vertexArrayObject .update (this .updateParticles) .enable (gl, shaderNode))
489
+ {
490
+ const particleStride = particleSystem .particleStride;
283
491
 
284
- gl .drawArrays (primitiveMode, 0, this .vertexCount);
285
- }
492
+ shaderNode .enableParticleAttribute (gl, outputParticles, particleStride, particleSystem .particleOffset, 1);
493
+ shaderNode .enableParticleMatrixAttribute (gl, outputParticles, particleStride, particleSystem .matrixOffset, 1);
286
494
 
287
- for (const attribNode of attribNodes)
288
- attribNode .disable (gl, shaderNode);
495
+ for (let i = 0, length = attribNodes .length; i < length; ++ i)
496
+ attribNodes [i] .enable (gl, shaderNode, attribBuffers [i]);
289
497
 
290
498
  if (this .fogCoords)
291
- shaderNode .disableFogDepthAttribute (gl);
499
+ shaderNode .enableFogDepthAttribute (gl, this .fogDepthBuffer, 0, 0);
292
500
 
293
501
  if (this .colorMaterial)
294
- shaderNode .disableColorAttribute (gl);
502
+ shaderNode .enableColorAttribute (gl, this .colorBuffer, 0, 0);
295
503
 
296
- shaderNode .disableTexCoordAttribute (gl);
504
+ shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers, 0, 0);
505
+ shaderNode .enableVertexAttribute (gl, this .vertexBuffer, 0, 0);
297
506
 
298
- if (blendModeNode)
299
- blendModeNode .disable (gl);
507
+ this .updateParticles = false;
300
508
  }
301
- }
302
- catch (error)
303
- {
304
- // Catch error from setLocalUniforms.
305
- console .error (error);
509
+
510
+ // Wireframes are always solid so only one drawing call is needed.
511
+
512
+ gl .drawArraysInstanced (primitiveMode, 0, this .vertexCount, particleSystem .numParticles);
513
+
514
+ if (blendModeNode)
515
+ blendModeNode .disable (gl);
306
516
  }
307
517
  },
308
518
  });