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.
- package/.vscode/settings.json +12 -5
- package/.vscode/tasks.json +25 -1
- package/Makefile +36 -28
- package/README.md +6 -11
- package/build/bin/dist.pl +0 -6
- package/build/bin/examples-and-tests.pl +75 -0
- package/build/bin/tests-menu.pl +57 -0
- package/build/bin/version.pl +7 -4
- package/build/parts/default.start.frag.js +3 -2
- package/dist/assets/components/annotation.js +3 -2
- package/dist/assets/components/annotation.min.js +1 -1
- package/dist/assets/components/cad-geometry.js +3 -2
- package/dist/assets/components/cad-geometry.min.js +1 -1
- package/dist/assets/components/cube-map-texturing.js +8 -20
- package/dist/assets/components/cube-map-texturing.min.js +1 -1
- package/dist/assets/components/dis.js +3 -2
- package/dist/assets/components/dis.min.js +1 -1
- package/dist/assets/components/event-utilities.js +4 -3
- package/dist/assets/components/event-utilities.min.js +1 -1
- package/dist/assets/components/geometry2d.js +38 -52
- package/dist/assets/components/geometry2d.min.js +1 -1
- package/dist/assets/components/geospatial.js +34 -1686
- package/dist/assets/components/geospatial.min.js +1 -1
- package/dist/assets/components/h-anim.js +71 -77
- package/dist/assets/components/h-anim.min.js +1 -1
- package/dist/assets/components/key-device-sensor.js +4 -3
- package/dist/assets/components/key-device-sensor.min.js +1 -1
- package/dist/assets/components/layout.js +101 -173
- package/dist/assets/components/layout.min.js +1 -1
- package/dist/assets/components/nurbs.js +3 -2
- package/dist/assets/components/nurbs.min.js +1 -1
- package/dist/assets/components/particle-systems.js +1926 -1669
- package/dist/assets/components/particle-systems.min.js +1 -1
- package/dist/assets/components/picking.js +34 -41
- package/dist/assets/components/picking.min.js +1 -1
- package/dist/assets/components/projective-texture-mapping.js +73 -86
- package/dist/assets/components/projective-texture-mapping.min.js +1 -1
- package/dist/assets/components/rigid-body-physics.js +37 -57
- package/dist/assets/components/rigid-body-physics.min.js +1 -1
- package/dist/assets/components/scripting.js +3 -2
- package/dist/assets/components/scripting.min.js +1 -1
- package/dist/assets/components/texturing-3d.js +27 -33
- package/dist/assets/components/texturing-3d.min.js +3 -3
- package/dist/assets/components/volume-rendering.js +12 -11
- package/dist/assets/components/volume-rendering.min.js +1 -1
- package/dist/assets/components/x_ite.js +3 -2
- package/dist/assets/components/x_ite.min.js +1 -1
- package/dist/assets/images/Shading.png +0 -0
- package/dist/assets/linetype/1.png +0 -0
- package/dist/assets/linetype/10.png +0 -0
- package/dist/assets/linetype/11.png +0 -0
- package/dist/assets/linetype/12.png +0 -0
- package/dist/assets/linetype/13.png +0 -0
- package/dist/assets/linetype/14.png +0 -0
- package/dist/assets/linetype/15.png +0 -0
- package/dist/assets/linetype/16.png +0 -0
- package/dist/assets/linetype/2.png +0 -0
- package/dist/assets/linetype/3.png +0 -0
- package/dist/assets/linetype/4.png +0 -0
- package/dist/assets/linetype/5.png +0 -0
- package/dist/assets/linetype/6.png +0 -0
- package/dist/assets/linetype/7.png +0 -0
- package/dist/assets/linetype/8.png +0 -0
- package/dist/assets/linetype/9.png +0 -0
- package/dist/assets/shaders/webgl1/Gouraud.vs +1 -1
- package/dist/assets/shaders/webgl1/Line.fs +0 -21
- package/dist/assets/shaders/webgl1/Line.vs +0 -10
- package/dist/assets/shaders/webgl1/PBR.fs +1 -1
- package/dist/assets/shaders/webgl1/PBR.vs +1 -1
- package/dist/assets/shaders/webgl1/Phong.fs +1 -1
- package/dist/assets/shaders/webgl1/Point.vs +1 -1
- package/dist/assets/shaders/webgl2/Depth.vs +29 -1
- package/dist/assets/shaders/webgl2/Gouraud.vs +32 -4
- package/dist/assets/shaders/webgl2/Line.fs +24 -12
- package/dist/assets/shaders/webgl2/Line.vs +36 -11
- package/dist/assets/shaders/webgl2/LineTransform.fs +4 -0
- package/dist/assets/shaders/webgl2/LineTransform.vs +57 -0
- package/dist/assets/shaders/webgl2/PBR.fs +1 -1
- package/dist/assets/shaders/webgl2/PBR.vs +35 -7
- package/dist/assets/shaders/webgl2/Phong.fs +1 -1
- package/dist/assets/shaders/webgl2/Phong.vs +31 -3
- package/dist/assets/shaders/webgl2/Point.vs +30 -2
- package/dist/assets/shaders/webgl2/Unlit.vs +31 -3
- package/dist/example.html +6 -6
- package/dist/x_ite.css +199 -224
- package/dist/x_ite.js +16335 -15917
- package/dist/x_ite.min.js +17 -17
- package/dist/x_ite.zip +0 -0
- package/docs/404.md +6 -0
- package/docs/Accessing-the-External-Browser.md +21 -15
- package/docs/Browser-Support.md +6 -0
- package/docs/Custom-Shaders.md +18 -25
- package/docs/Features.md +11 -5
- package/docs/Gemfile +44 -0
- package/docs/Gemfile.lock +122 -0
- package/docs/Glossary.md +6 -0
- package/docs/How-To-Configure-Your-Web-Server.md +6 -0
- package/docs/Supported-Nodes.md +9 -1
- package/docs/What's-New.md +93 -39
- package/docs/XHTML-DOM-Integration.md +6 -0
- package/docs/_config.yml +2 -2
- package/docs/assets/css/main.scss +26 -0
- package/docs/index.md +42 -50
- package/docs/reference/Browser-Services.md +9 -3
- package/docs/reference/Constants-Services.md +6 -0
- package/docs/reference/ECMAScript-Object-and-Function-Definitions.md +12 -6
- package/docs/reference/Field-Services-and-Objects.md +105 -1
- package/docs/reference/Prototype-Services.md +11 -0
- package/docs/reference/Route-Services.md +9 -0
- package/docs/reference/Scene-Services.md +17 -2
- package/docs/reference/Script-Node-Authoring-Interface.md +7 -1
- package/docs/tutorials/Adding-backgrounds.md +6 -0
- package/docs/tutorials/Adding-fog.md +6 -0
- package/docs/tutorials/Adding-sound.md +6 -0
- package/docs/tutorials/Animating-transforms.md +6 -0
- package/docs/tutorials/Basic-Nodes.md +6 -0
- package/docs/tutorials/Building-a-X3D-world.md +6 -0
- package/docs/tutorials/Building-elevation-grids.md +6 -0
- package/docs/tutorials/Building-extruded-shapes.md +6 -0
- package/docs/tutorials/Building-primitive-shapes.md +6 -0
- package/docs/tutorials/Building-shapes-out-of-points,-lines,-and-faces.md +6 -0
- package/docs/tutorials/Controlling-appearance-with-materials.md +6 -0
- package/docs/tutorials/Controlling-color-on-coordinate-based-geometry.md +6 -0
- package/docs/tutorials/Controlling-detail.md +6 -0
- package/docs/tutorials/Controlling-how-textures-are-mapped.md +6 -0
- package/docs/tutorials/Controlling-navigation.md +6 -0
- package/docs/tutorials/Controlling-shading-on-coordinate-based-geometry.md +6 -0
- package/docs/tutorials/Controlling-the-viewpoint.md +6 -0
- package/docs/tutorials/Creating-new-node-types.md +6 -0
- package/docs/tutorials/Grouping-nodes.md +6 -0
- package/docs/tutorials/Hello,-World!.md +6 -0
- package/docs/tutorials/Improving-Performance.md +6 -0
- package/docs/tutorials/Increasing-Rendering-Speed.md +6 -0
- package/docs/tutorials/Introducing-X3D.md +6 -0
- package/docs/tutorials/Introducing-animation.md +6 -0
- package/docs/tutorials/Introducing-script-use.md +6 -0
- package/docs/tutorials/Lighting-your-world.md +6 -0
- package/docs/tutorials/Mapping-textures.md +6 -0
- package/docs/tutorials/Naming-nodes.md +6 -0
- package/docs/tutorials/Providing-information-about-your-world.md +6 -0
- package/docs/tutorials/Sensing-the-viewer.md +6 -0
- package/docs/tutorials/Sensing-viewer-actions.md +6 -0
- package/docs/tutorials/Transforming-Shapes.md +6 -0
- package/docs/tutorials/Writing-program-scripts-with-ECMAScript.md +6 -0
- package/docs/tutorials/index.md +42 -36
- package/package.json +6 -7
- package/src/assets/components/geometry2d.js +1 -1
- package/src/assets/components/key-device-sensor.js +1 -1
- package/src/assets/components/layout.js +1 -1
- package/src/assets/components/particle-systems.js +1 -1
- package/src/assets/components/volume-rendering.js +1 -1
- package/src/assets/images/Shading.png +0 -0
- package/src/assets/linetype/1.png +0 -0
- package/src/assets/linetype/10.png +0 -0
- package/src/assets/linetype/11.png +0 -0
- package/src/assets/linetype/12.png +0 -0
- package/src/assets/linetype/13.png +0 -0
- package/src/assets/linetype/14.png +0 -0
- package/src/assets/linetype/15.png +0 -0
- package/src/assets/linetype/16.png +0 -0
- package/src/assets/linetype/2.png +0 -0
- package/src/assets/linetype/3.png +0 -0
- package/src/assets/linetype/4.png +0 -0
- package/src/assets/linetype/5.png +0 -0
- package/src/assets/linetype/6.png +0 -0
- package/src/assets/linetype/7.png +0 -0
- package/src/assets/linetype/8.png +0 -0
- package/src/assets/linetype/9.png +0 -0
- package/src/assets/shaders/Types.glsl +1 -9
- package/src/assets/shaders/webgl1/Gouraud.fs +1 -1
- package/src/assets/shaders/webgl1/Gouraud.vs +2 -3
- package/src/assets/shaders/webgl1/Line.fs +3 -28
- package/src/assets/shaders/webgl1/Line.vs +6 -20
- package/src/assets/shaders/webgl1/PBR.fs +6 -6
- package/src/assets/shaders/webgl1/PBR.vs +1 -1
- package/src/assets/shaders/webgl1/Phong.fs +10 -10
- package/src/assets/shaders/webgl1/Point.vs +2 -2
- package/src/assets/shaders/webgl1/Unlit.fs +4 -4
- package/src/assets/shaders/webgl1/include/Normal.glsl +1 -1
- package/src/assets/shaders/webgl1/include/Texture.glsl +3 -8
- package/src/assets/shaders/webgl2/Depth.vs +4 -1
- package/src/assets/shaders/webgl2/Gouraud.fs +1 -1
- package/src/assets/shaders/webgl2/Gouraud.vs +8 -6
- package/src/assets/shaders/webgl2/Line.fs +11 -17
- package/src/assets/shaders/webgl2/Line.vs +17 -21
- package/src/assets/shaders/webgl2/LineTransform.fs +6 -0
- package/src/assets/shaders/webgl2/LineTransform.vs +77 -0
- package/src/assets/shaders/webgl2/PBR.fs +6 -6
- package/src/assets/shaders/webgl2/PBR.vs +10 -7
- package/src/assets/shaders/webgl2/Phong.fs +11 -11
- package/src/assets/shaders/webgl2/Phong.vs +6 -3
- package/src/assets/shaders/webgl2/Point.vs +5 -4
- package/src/assets/shaders/webgl2/Unlit.fs +5 -5
- package/src/assets/shaders/webgl2/Unlit.vs +6 -3
- package/src/assets/shaders/webgl2/include/Line2.glsl +20 -0
- package/src/assets/shaders/webgl2/include/Normal.glsl +1 -1
- package/src/assets/shaders/webgl2/include/Particle.glsl +36 -0
- package/src/assets/shaders/webgl2/include/Texture.glsl +3 -3
- package/src/example.html +6 -6
- package/src/examples.js +5 -4
- package/src/standard/Math/Algorithm.js +12 -28
- package/src/standard/Math/Geometry/Line2.js +163 -0
- package/src/standard/Math/Geometry/Line3.js +3 -5
- package/src/standard/Math/Geometry/Plane3.js +0 -2
- package/src/standard/Math/Geometry/Triangle3.js +1 -1
- package/src/standard/Math/Geometry/ViewVolume.js +121 -103
- package/src/standard/Math/Numbers/Color3.js +6 -0
- package/src/standard/Math/Numbers/Color4.js +7 -0
- package/src/standard/Math/Numbers/Complex.js +48 -34
- package/src/standard/Math/Numbers/Matrix2.js +62 -2
- package/src/standard/Math/Numbers/Matrix3.js +129 -110
- package/src/standard/Math/Numbers/Matrix4.js +138 -119
- package/src/standard/Math/Numbers/Quaternion.js +12 -5
- package/src/standard/Math/Numbers/Rotation4.js +8 -1
- package/src/standard/Math/Numbers/Vector2.js +42 -9
- package/src/standard/Math/Numbers/Vector3.js +50 -14
- package/src/standard/Math/Numbers/Vector4.js +48 -11
- package/src/standard/Math/Utility/BVH.js +45 -17
- package/src/tests.js +68 -66
- package/src/x_ite/Base/X3DBaseNode.js +22 -11
- package/src/x_ite/Base/X3DField.js +1 -1
- package/src/x_ite/Browser/Core/BrowserOptions.js +24 -143
- package/src/x_ite/Browser/Core/BrowserTimings.js +6 -4
- package/src/x_ite/Browser/Core/Context.js +185 -0
- package/src/x_ite/Browser/Core/ContextMenu.js +398 -211
- package/src/x_ite/Browser/Core/Notification.js +1 -0
- package/src/x_ite/Browser/Core/X3DCoreContext.js +35 -146
- package/src/x_ite/Browser/Followers/X3DArrayFollowerTemplate.js +1 -1
- package/src/x_ite/Browser/Geometry2D/Disk2DOptions.js +1 -0
- package/src/x_ite/Browser/Geometry2D/X3DGeometry2DContext.js +2 -2
- package/src/x_ite/Browser/Geometry3D/X3DGeometry3DContext.js +41 -2
- package/src/x_ite/Browser/Geospatial/Geocentric.js +2 -2
- package/src/x_ite/Browser/Interpolation/CatmullRomSplineInterpolatorTemplate.js +1 -1
- package/src/x_ite/Browser/Layout/ScreenText.js +18 -65
- package/src/x_ite/Browser/Layout/X3DLayoutContext.js +59 -16
- package/src/x_ite/Browser/Navigation/ExamineViewer.js +13 -20
- package/src/x_ite/Browser/Navigation/LookAtViewer.js +1 -4
- package/src/x_ite/Browser/Navigation/PlaneViewer.js +0 -3
- package/src/x_ite/Browser/Navigation/X3DFlyViewer.js +15 -8
- package/src/x_ite/Browser/Navigation/X3DViewer.js +12 -20
- package/src/x_ite/Browser/Networking/X3DNetworkingContext.js +11 -7
- package/src/x_ite/Browser/ParticleSystems/BVH.glsl +183 -0
- package/src/x_ite/Browser/ParticleSystems/Box3.glsl +47 -0
- package/src/x_ite/Browser/ParticleSystems/GeometryTypes.js +66 -0
- package/src/x_ite/Browser/ParticleSystems/Line3.glsl +55 -0
- package/src/x_ite/Browser/ParticleSystems/Plane3.glsl +160 -0
- package/src/x_ite/Browser/PointingDeviceSensor/PointingDevice.js +27 -3
- package/src/x_ite/Browser/PointingDeviceSensor/X3DPointingDeviceSensorContext.js +41 -37
- package/src/x_ite/Browser/Rendering/X3DRenderingContext.js +21 -13
- package/src/x_ite/Browser/Shaders/Shader.js +33 -12
- package/src/x_ite/Browser/Shaders/ShaderSource.js +6 -0
- package/src/x_ite/Browser/Shaders/ShaderTest.js +16 -10
- package/src/x_ite/Browser/Shape/X3DShapeContext.js +50 -9
- package/src/x_ite/Browser/Text/X3DTextContext.js +4 -13
- package/src/x_ite/Browser/Text/X3DTextGeometry.js +2 -1
- package/src/x_ite/Browser/Texturing/X3DTexturingContext.js +71 -34
- package/src/x_ite/Browser/Texturing3D/DICOMParser.js +2 -2
- package/src/x_ite/Browser/Time/X3DTimeContext.js +4 -2
- package/src/x_ite/Browser/VERSION.js +1 -1
- package/src/x_ite/Browser/X3DBrowser.js +7 -6
- package/src/x_ite/Browser/X3DBrowserContext.js +43 -10
- package/src/x_ite/Components/Core/X3DNode.js +4 -0
- package/src/x_ite/Components/Core/X3DPrototypeInstance.js +0 -2
- package/src/x_ite/Components/CubeMapTexturing/ComposedCubeMapTexture.js +3 -4
- package/src/x_ite/Components/CubeMapTexturing/GeneratedCubeMapTexture.js +1 -12
- package/src/x_ite/Components/CubeMapTexturing/ImageCubeMapTexture.js +1 -2
- package/src/x_ite/Components/EnvironmentalEffects/TextureBackground.js +1 -1
- package/src/x_ite/Components/EnvironmentalEffects/X3DBackgroundNode.js +76 -77
- package/src/x_ite/Components/EnvironmentalEffects/X3DFogObject.js +2 -9
- package/src/x_ite/Components/EnvironmentalSensor/ProximitySensor.js +51 -65
- package/src/x_ite/Components/EventUtilities/X3DSequencerNode.js +1 -1
- package/src/x_ite/Components/Followers/ColorDamper.js +1 -1
- package/src/x_ite/Components/Followers/X3DChaserNode.js +18 -32
- package/src/x_ite/Components/Followers/X3DDamperNode.js +1 -6
- package/src/x_ite/Components/Followers/X3DFollowerNode.js +1 -1
- package/src/x_ite/Components/Geometry2D/Disk2D.js +30 -46
- package/src/x_ite/Components/Geometry2D/TriangleSet2D.js +1 -1
- package/src/x_ite/Components/Geometry3D/ElevationGrid.js +12 -4
- package/src/x_ite/Components/Geometry3D/IndexedFaceSet.js +4 -4
- package/src/x_ite/Components/Geospatial/GeoCoordinate.js +10 -27
- package/src/x_ite/Components/Geospatial/GeoLOD.js +1 -1
- package/src/x_ite/Components/Geospatial/GeoPositionInterpolator.js +5 -10
- package/src/x_ite/Components/Geospatial/GeoTouchSensor.js +9 -16
- package/src/x_ite/Components/Geospatial/GeoTransform.js +6 -18
- package/src/x_ite/Components/Geospatial/GeoViewpoint.js +26 -30
- package/src/x_ite/Components/Geospatial/X3DGeospatialObject.js +20 -27
- package/src/x_ite/Components/Grouping/X3DGroupingNode.js +8 -8
- package/src/x_ite/Components/Grouping/X3DTransformNode.js +0 -4
- package/src/x_ite/Components/HAnim/HAnimHumanoid.js +68 -75
- package/src/x_ite/Components/Interpolation/OrientationInterpolator.js +4 -11
- package/src/x_ite/Components/Interpolation/X3DInterpolatorNode.js +1 -1
- package/src/x_ite/Components/Layout/LayoutGroup.js +4 -9
- package/src/x_ite/Components/Layout/ScreenFontStyle.js +1 -1
- package/src/x_ite/Components/Layout/ScreenGroup.js +16 -80
- package/src/x_ite/Components/Lighting/DirectionalLight.js +28 -36
- package/src/x_ite/Components/Lighting/PointLight.js +32 -47
- package/src/x_ite/Components/Lighting/SpotLight.js +33 -48
- package/src/x_ite/Components/Navigation/Billboard.js +49 -56
- package/src/x_ite/Components/Navigation/LOD.js +2 -2
- package/src/x_ite/Components/Navigation/OrthoViewpoint.js +29 -30
- package/src/x_ite/Components/Navigation/Viewpoint.js +16 -20
- package/src/x_ite/Components/Navigation/X3DViewpointNode.js +82 -111
- package/src/x_ite/Components/Networking/Anchor.js +18 -7
- package/src/x_ite/Components/ParticleSystems/BoundedPhysicsModel.js +6 -6
- package/src/x_ite/Components/ParticleSystems/ConeEmitter.js +44 -36
- package/src/x_ite/Components/ParticleSystems/ExplosionEmitter.js +26 -17
- package/src/x_ite/Components/ParticleSystems/ForcePhysicsModel.js +20 -7
- package/src/x_ite/Components/ParticleSystems/ParticleSystem.js +463 -882
- package/src/x_ite/Components/ParticleSystems/PointEmitter.js +39 -35
- package/src/x_ite/Components/ParticleSystems/PolylineEmitter.js +112 -128
- package/src/x_ite/Components/ParticleSystems/SurfaceEmitter.js +105 -112
- package/src/x_ite/Components/ParticleSystems/VolumeEmitter.js +138 -176
- package/src/x_ite/Components/ParticleSystems/WindPhysicsModel.js +16 -11
- package/src/x_ite/Components/ParticleSystems/X3DParticleEmitterNode.js +807 -217
- package/src/x_ite/Components/Picking/LinePickSensor.js +31 -39
- package/src/x_ite/Components/PointingDeviceSensor/CylinderSensor.js +91 -108
- package/src/x_ite/Components/PointingDeviceSensor/PlaneSensor.js +56 -59
- package/src/x_ite/Components/PointingDeviceSensor/SphereSensor.js +54 -71
- package/src/x_ite/Components/PointingDeviceSensor/TouchSensor.js +8 -15
- package/src/x_ite/Components/ProjectiveTextureMapping/TextureProjectorParallel.js +43 -50
- package/src/x_ite/Components/ProjectiveTextureMapping/TextureProjectorPerspective.js +32 -39
- package/src/x_ite/Components/Rendering/ClipPlane.js +3 -11
- package/src/x_ite/Components/Rendering/Color.js +12 -24
- package/src/x_ite/Components/Rendering/ColorRGBA.js +13 -25
- package/src/x_ite/Components/Rendering/IndexedLineSet.js +26 -4
- package/src/x_ite/Components/Rendering/LineSet.js +35 -13
- package/src/x_ite/Components/Rendering/PointSet.js +35 -13
- package/src/x_ite/Components/Rendering/X3DComposedGeometryNode.js +13 -5
- package/src/x_ite/Components/Rendering/X3DGeometryNode.js +331 -387
- package/src/x_ite/Components/Rendering/X3DLineGeometryNode.js +350 -140
- package/src/x_ite/Components/Rendering/X3DPointGeometryNode.js +116 -126
- package/src/x_ite/Components/RigidBodyPhysics/DoubleAxisHingeJoint.js +24 -38
- package/src/x_ite/Components/RigidBodyPhysics/SingleAxisHingeJoint.js +10 -17
- package/src/x_ite/Components/Shaders/ComposedShader.js +35 -75
- package/src/x_ite/Components/Shaders/FloatVertexAttribute.js +8 -11
- package/src/x_ite/Components/Shaders/Matrix3VertexAttribute.js +10 -14
- package/src/x_ite/Components/Shaders/Matrix4VertexAttribute.js +10 -14
- package/src/x_ite/Components/Shaders/ShaderPart.js +1 -10
- package/src/x_ite/Components/Shaders/X3DProgrammableShaderObject.js +220 -210
- package/src/x_ite/Components/Shaders/X3DShaderNode.js +28 -10
- package/src/x_ite/Components/Shaders/X3DVertexAttributeNode.js +15 -1
- package/src/x_ite/Components/Shape/Appearance.js +37 -4
- package/src/x_ite/Components/Shape/FillProperties.js +12 -1
- package/src/x_ite/Components/Shape/LineProperties.js +33 -1
- package/src/x_ite/Components/Shape/PointProperties.js +24 -3
- package/src/x_ite/Components/Shape/Shape.js +30 -39
- package/src/x_ite/Components/Shape/TwoSidedMaterial.js +3 -1
- package/src/x_ite/Components/Sound/Sound.js +31 -41
- package/src/x_ite/Components/Text/Text.js +6 -20
- package/src/x_ite/Components/Texturing/ImageTexture.js +1 -1
- package/src/x_ite/Components/Texturing/MovieTexture.js +1 -1
- package/src/x_ite/Components/Texturing/PixelTexture.js +2 -2
- package/src/x_ite/Components/Texturing/TextureCoordinate.js +5 -5
- package/src/x_ite/Components/Texturing/TextureProperties.js +4 -4
- package/src/x_ite/Components/Texturing/X3DSingleTextureNode.js +5 -4
- package/src/x_ite/Components/Texturing/X3DTexture2DNode.js +24 -33
- package/src/x_ite/Components/Texturing3D/TextureCoordinate3D.js +5 -5
- package/src/x_ite/Components/Texturing3D/TextureCoordinate4D.js +5 -5
- package/src/x_ite/Components/Texturing3D/X3DTexture3DNode.js +12 -19
- package/src/x_ite/Components/VolumeRendering/X3DVolumeDataNode.js +8 -8
- package/src/x_ite/Components.js +2 -2
- package/src/x_ite/Fallback.js +9 -3
- package/src/x_ite/Fields/SFColor.js +4 -0
- package/src/x_ite/Fields/SFColorRGBA.js +4 -0
- package/src/x_ite/Fields/SFImage.js +2 -11
- package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js +4 -0
- package/src/x_ite/Fields/SFRotation.js +4 -0
- package/src/x_ite/Fields/SFString.js +4 -0
- package/src/x_ite/Fields/SFVecPrototypeTemplate.js +22 -2
- package/src/x_ite/Parser/XMLParser.js +1 -1
- package/src/x_ite/Rendering/TextureBuffer.js +43 -36
- package/src/x_ite/Rendering/VertexArray.js +103 -0
- package/src/x_ite/Rendering/X3DRenderObject.js +127 -148
- package/src/x_ite/X3D.js +32 -26
- package/src/x_ite.config.js +0 -5
- package/src/x_ite.css +216 -175
- package/src/x_ite.html +15 -10
- package/src/x_ite.js +49 -1
- package/x_ite.min.html +15 -10
- package/dist/assets/hatching/0.png +0 -0
- package/dist/assets/linetype/0.png +0 -0
- package/src/assets/hatching/0.png +0 -0
- package/src/assets/linetype/0.png +0 -0
- package/src/spinner.css +0 -67
- package/src/x_ite/Browser/Shape/LineStipples.xcf +0 -0
|
@@ -79,10 +79,6 @@ function (X3DTransformMatrix3DNode,
|
|
|
79
79
|
},
|
|
80
80
|
eventsProcessed: function ()
|
|
81
81
|
{
|
|
82
|
-
this .setHidden (this ._scale .x === 0 ||
|
|
83
|
-
this ._scale .y === 0 ||
|
|
84
|
-
this ._scale .z === 0);
|
|
85
|
-
|
|
86
82
|
this .setTransform (this ._translation .getValue (),
|
|
87
83
|
this ._rotation .getValue (),
|
|
88
84
|
this ._scale .getValue (),
|
|
@@ -255,103 +255,96 @@ function (Fields,
|
|
|
255
255
|
|
|
256
256
|
return function (type, renderObject)
|
|
257
257
|
{
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
if (type !== TraverseType .CAMERA)
|
|
261
|
-
return;
|
|
258
|
+
if (type !== TraverseType .CAMERA)
|
|
259
|
+
return;
|
|
262
260
|
|
|
263
|
-
|
|
264
|
-
|
|
261
|
+
if (! this .skinCoordNode)
|
|
262
|
+
return;
|
|
265
263
|
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
264
|
+
var
|
|
265
|
+
jointNodes = this .jointNodes,
|
|
266
|
+
skinNormalNode = this .skinNormalNode,
|
|
267
|
+
skinCoordNode = this .skinCoordNode,
|
|
268
|
+
restNormalNode = this .restNormalNode,
|
|
269
|
+
restCoordNode = this .restCoordNode;
|
|
272
270
|
|
|
273
|
-
|
|
271
|
+
// Reset skin normals and coords.
|
|
274
272
|
|
|
275
|
-
|
|
276
|
-
|
|
273
|
+
if (skinNormalNode)
|
|
274
|
+
skinNormalNode ._vector .assign (restNormalNode ._vector);
|
|
277
275
|
|
|
278
|
-
|
|
276
|
+
skinCoordNode ._point .assign (restCoordNode ._point);
|
|
279
277
|
|
|
280
|
-
|
|
278
|
+
// Determine inverse model matrix of humanoid.
|
|
281
279
|
|
|
282
|
-
|
|
280
|
+
invModelMatrix .assign (this .transformNode .getMatrix ()) .multRight (renderObject .getModelViewMatrix () .get ()) .inverse ();
|
|
283
281
|
|
|
284
|
-
|
|
282
|
+
// Apply joint transformations.
|
|
285
283
|
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
284
|
+
for (var j = 0, jointNodesLength = jointNodes .length; j < jointNodesLength; ++ j)
|
|
285
|
+
{
|
|
286
|
+
var
|
|
287
|
+
jointNode = jointNodes [j],
|
|
288
|
+
skinCoordIndexLength = jointNode ._skinCoordIndex .length;
|
|
291
289
|
|
|
292
|
-
|
|
293
|
-
|
|
290
|
+
if (skinCoordIndexLength === 0)
|
|
291
|
+
continue;
|
|
294
292
|
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
293
|
+
var
|
|
294
|
+
jointMatrix = jointNode .getModelMatrix () .multRight (invModelMatrix),
|
|
295
|
+
displacerNodes = jointNode .getDisplacers ();
|
|
298
296
|
|
|
299
|
-
|
|
297
|
+
for (var d = 0, displacerNodesLength = displacerNodes .length; d < displacerNodesLength; ++ d)
|
|
298
|
+
{
|
|
299
|
+
var
|
|
300
|
+
displacerNode = displacerNodes [d],
|
|
301
|
+
coordIndex = displacerNode ._coordIndex .getValue (),
|
|
302
|
+
coordIndexLength = displacerNode ._coordIndex .length,
|
|
303
|
+
weight = displacerNode ._weight .getValue (),
|
|
304
|
+
displacements = displacerNode ._displacements .getValue (),
|
|
305
|
+
displacementsLength = displacerNode ._displacements .length;
|
|
306
|
+
|
|
307
|
+
for (var i = 0; i < coordIndexLength; ++ i)
|
|
300
308
|
{
|
|
301
309
|
var
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
for (var i = 0; i < coordIndexLength; ++ i)
|
|
310
|
-
{
|
|
311
|
-
var
|
|
312
|
-
i3 = i * 3,
|
|
313
|
-
index = coordIndex [i],
|
|
314
|
-
displacement = i < displacementsLength ? point .set (displacements [i3], displacements [i3 + 1], displacements [i3 + 2]) : point .assign (Vector3 .Zero);
|
|
315
|
-
|
|
316
|
-
skinCoordNode .get1Point (index, skin);
|
|
317
|
-
jointMatrix .multDirMatrix (displacement) .multiply (weight) .add (skin);
|
|
318
|
-
skinCoordNode .set1Point (index, displacement);
|
|
319
|
-
}
|
|
310
|
+
i3 = i * 3,
|
|
311
|
+
index = coordIndex [i],
|
|
312
|
+
displacement = i < displacementsLength ? point .set (displacements [i3], displacements [i3 + 1], displacements [i3 + 2]) : point .assign (Vector3 .Zero);
|
|
313
|
+
|
|
314
|
+
skinCoordNode .get1Point (index, skin);
|
|
315
|
+
jointMatrix .multDirMatrix (displacement) .multiply (weight) .add (skin);
|
|
316
|
+
skinCoordNode .set1Point (index, displacement);
|
|
320
317
|
}
|
|
318
|
+
}
|
|
321
319
|
|
|
320
|
+
var
|
|
321
|
+
normalMatrix = skinNormalNode ? jointMatrix .submatrix .transpose () .inverse () : null,
|
|
322
|
+
skinCoordIndex = jointNode ._skinCoordIndex .getValue (),
|
|
323
|
+
skinCoordWeight = jointNode ._skinCoordWeight .getValue (),
|
|
324
|
+
skinCoordWeightLength = jointNode ._skinCoordWeight .length;
|
|
325
|
+
|
|
326
|
+
for (var i = 0; i < skinCoordIndexLength; ++ i)
|
|
327
|
+
{
|
|
322
328
|
var
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
skinCoordWeight = jointNode ._skinCoordWeight .getValue (),
|
|
326
|
-
skinCoordWeightLength = jointNode ._skinCoordWeight .length;
|
|
329
|
+
index = skinCoordIndex [i],
|
|
330
|
+
weight = i < skinCoordWeightLength ? skinCoordWeight [i] : 1;
|
|
327
331
|
|
|
328
|
-
|
|
332
|
+
if (skinNormalNode)
|
|
329
333
|
{
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
{
|
|
336
|
-
rest .assign (restNormalNode .get1Vector (index, vector));
|
|
337
|
-
skinNormalNode .get1Vector (index, skin);
|
|
338
|
-
normalMatrix .multVecMatrix (vector) .subtract (rest) .multiply (weight) .add (skin);
|
|
339
|
-
skinNormalNode .set1Vector (index, vector);
|
|
340
|
-
// Should the normals be normalzed at end, or let it the shader do?
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
//skin += (rest * J - rest) * weight
|
|
344
|
-
rest .assign (restCoordNode .get1Point (index, point));
|
|
345
|
-
skinCoordNode .get1Point (index, skin);
|
|
346
|
-
jointMatrix .multVecMatrix (point) .subtract (rest) .multiply (weight) .add (skin);
|
|
347
|
-
skinCoordNode .set1Point (index, point);
|
|
334
|
+
rest .assign (restNormalNode .get1Vector (index, vector));
|
|
335
|
+
skinNormalNode .get1Vector (index, skin);
|
|
336
|
+
normalMatrix .multVecMatrix (vector) .subtract (rest) .multiply (weight) .add (skin);
|
|
337
|
+
skinNormalNode .set1Vector (index, vector);
|
|
338
|
+
// Should the normals be normalized at end, or let it the shader do?
|
|
348
339
|
}
|
|
340
|
+
|
|
341
|
+
//skin += (rest * J - rest) * weight
|
|
342
|
+
rest .assign (restCoordNode .get1Point (index, point));
|
|
343
|
+
skinCoordNode .get1Point (index, skin);
|
|
344
|
+
jointMatrix .multVecMatrix (point) .subtract (rest) .multiply (weight) .add (skin);
|
|
345
|
+
skinCoordNode .set1Point (index, point);
|
|
349
346
|
}
|
|
350
347
|
}
|
|
351
|
-
catch (error)
|
|
352
|
-
{
|
|
353
|
-
console .error (error);
|
|
354
|
-
}
|
|
355
348
|
};
|
|
356
349
|
})(),
|
|
357
350
|
});
|
|
@@ -119,18 +119,11 @@ function (Fields,
|
|
|
119
119
|
|
|
120
120
|
return function (index0, index1, weight)
|
|
121
121
|
{
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
keyValue0 .assign (this ._keyValue [index0] .getValue ());
|
|
126
|
-
keyValue1 .assign (this ._keyValue [index1] .getValue ());
|
|
122
|
+
// Both values can change in slerp.
|
|
123
|
+
keyValue0 .assign (this ._keyValue [index0] .getValue ());
|
|
124
|
+
keyValue1 .assign (this ._keyValue [index1] .getValue ());
|
|
127
125
|
|
|
128
|
-
|
|
129
|
-
}
|
|
130
|
-
catch (error)
|
|
131
|
-
{
|
|
132
|
-
//console .error (error);
|
|
133
|
-
}
|
|
126
|
+
this ._value_changed = keyValue0 .slerp (keyValue1, weight);
|
|
134
127
|
};
|
|
135
128
|
}) (),
|
|
136
129
|
});
|
|
@@ -107,7 +107,7 @@ function (X3DChildNode,
|
|
|
107
107
|
if (fraction <= key [0])
|
|
108
108
|
return this .interpolate (0, 1, 0);
|
|
109
109
|
|
|
110
|
-
const index1 = Algorithm .upperBound (key, 0, length, fraction
|
|
110
|
+
const index1 = Algorithm .upperBound (key, 0, length, fraction);
|
|
111
111
|
|
|
112
112
|
if (index1 !== length)
|
|
113
113
|
{
|
|
@@ -131,15 +131,10 @@ function (Fields,
|
|
|
131
131
|
},
|
|
132
132
|
getMatrix: function ()
|
|
133
133
|
{
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
else
|
|
139
|
-
this .matrix .identity ();
|
|
140
|
-
}
|
|
141
|
-
catch (error)
|
|
142
|
-
{ }
|
|
134
|
+
if (this .layoutNode)
|
|
135
|
+
this .matrix .assign (this .modelViewMatrix) .inverse () .multLeft (this .screenMatrix);
|
|
136
|
+
else
|
|
137
|
+
this .matrix .identity ();
|
|
143
138
|
|
|
144
139
|
return this .matrix;
|
|
145
140
|
},
|
|
@@ -54,10 +54,7 @@ define ([
|
|
|
54
54
|
"x_ite/Components/Grouping/X3DGroupingNode",
|
|
55
55
|
"x_ite/Base/X3DConstants",
|
|
56
56
|
"x_ite/Rendering/TraverseType",
|
|
57
|
-
"standard/Math/Numbers/Vector3",
|
|
58
|
-
"standard/Math/Numbers/Vector4",
|
|
59
57
|
"standard/Math/Numbers/Matrix4",
|
|
60
|
-
"standard/Math/Geometry/ViewVolume",
|
|
61
58
|
],
|
|
62
59
|
function (Fields,
|
|
63
60
|
X3DFieldDefinition,
|
|
@@ -65,10 +62,7 @@ function (Fields,
|
|
|
65
62
|
X3DGroupingNode,
|
|
66
63
|
X3DConstants,
|
|
67
64
|
TraverseType,
|
|
68
|
-
|
|
69
|
-
Vector4,
|
|
70
|
-
Matrix4,
|
|
71
|
-
ViewVolume)
|
|
65
|
+
Matrix4,)
|
|
72
66
|
{
|
|
73
67
|
"use strict";
|
|
74
68
|
|
|
@@ -114,86 +108,28 @@ function (Fields,
|
|
|
114
108
|
{
|
|
115
109
|
return this .matrix;
|
|
116
110
|
},
|
|
117
|
-
scale: (function ()
|
|
118
|
-
{
|
|
119
|
-
var
|
|
120
|
-
x = new Vector4 (0, 0, 0, 0),
|
|
121
|
-
y = new Vector4 (0, 0, 0, 0),
|
|
122
|
-
z = new Vector4 (0, 0, 0, 0),
|
|
123
|
-
screenPoint = new Vector3 (0, 0, 0),
|
|
124
|
-
screenMatrix = new Matrix4 ();
|
|
125
|
-
|
|
126
|
-
return function (renderObject)
|
|
127
|
-
{
|
|
128
|
-
// throws domain error
|
|
129
|
-
|
|
130
|
-
var
|
|
131
|
-
modelViewMatrix = renderObject .getModelViewMatrix () .get (),
|
|
132
|
-
projectionMatrix = renderObject .getProjectionMatrix () .get (),
|
|
133
|
-
viewport = renderObject .getViewVolume () .getViewport ();
|
|
134
|
-
|
|
135
|
-
// Determine screenMatrix.
|
|
136
|
-
// Same as in ScreenText.
|
|
137
|
-
|
|
138
|
-
var screenScale = renderObject .getViewpoint () .getScreenScale (modelViewMatrix .origin, viewport); // in meter/pixel
|
|
139
|
-
|
|
140
|
-
x .set (modelViewMatrix [ 0], modelViewMatrix [ 1], modelViewMatrix [ 2], modelViewMatrix [ 3]);
|
|
141
|
-
y .set (modelViewMatrix [ 4], modelViewMatrix [ 5], modelViewMatrix [ 6], modelViewMatrix [ 7]);
|
|
142
|
-
z .set (modelViewMatrix [ 8], modelViewMatrix [ 9], modelViewMatrix [10], modelViewMatrix [11]);
|
|
143
|
-
|
|
144
|
-
x .normalize () .multiply (screenScale .x);
|
|
145
|
-
y .normalize () .multiply (screenScale .y);
|
|
146
|
-
z .normalize () .multiply (screenScale .z);
|
|
147
|
-
|
|
148
|
-
screenMatrix .set (x .x, x .y, x .z, x .w,
|
|
149
|
-
y .x, y .y, y .z, y .w,
|
|
150
|
-
z .x, z .y, z .z, z .w,
|
|
151
|
-
modelViewMatrix [12], modelViewMatrix [13], modelViewMatrix [14], modelViewMatrix [15]);
|
|
152
|
-
|
|
153
|
-
// Snap to whole pixel.
|
|
154
|
-
|
|
155
|
-
ViewVolume .projectPoint (Vector3 .Zero, screenMatrix, projectionMatrix, viewport, screenPoint);
|
|
156
|
-
|
|
157
|
-
screenPoint .x = Math .round (screenPoint .x);
|
|
158
|
-
screenPoint .y = Math .round (screenPoint .y);
|
|
159
|
-
|
|
160
|
-
ViewVolume .unProjectPoint (screenPoint .x, screenPoint .y, screenPoint .z, screenMatrix, projectionMatrix, viewport, screenPoint);
|
|
161
|
-
|
|
162
|
-
screenPoint .z = 0;
|
|
163
|
-
screenMatrix .translate (screenPoint);
|
|
164
|
-
|
|
165
|
-
// Assign relative matrix.
|
|
166
|
-
|
|
167
|
-
this .matrix .assign (modelViewMatrix) .inverse () .multLeft (screenMatrix);
|
|
168
|
-
};
|
|
169
|
-
})(),
|
|
170
111
|
traverse: function (type, renderObject)
|
|
171
112
|
{
|
|
172
|
-
|
|
113
|
+
switch (type)
|
|
173
114
|
{
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
break;
|
|
184
|
-
}
|
|
115
|
+
case TraverseType .CAMERA:
|
|
116
|
+
case TraverseType .PICKING:
|
|
117
|
+
case TraverseType .SHADOW: // ???
|
|
118
|
+
// No clone support for shadow, generated cube map texture and bbox
|
|
119
|
+
break;
|
|
120
|
+
default:
|
|
121
|
+
this .getBrowser () .getScreenScaleMatrix (renderObject, this .matrix);
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
185
124
|
|
|
186
|
-
|
|
125
|
+
const modelViewMatrix = renderObject .getModelViewMatrix ();
|
|
187
126
|
|
|
188
|
-
|
|
189
|
-
|
|
127
|
+
modelViewMatrix .push ();
|
|
128
|
+
modelViewMatrix .multLeft (this .matrix);
|
|
190
129
|
|
|
191
|
-
|
|
130
|
+
X3DGroupingNode .prototype .traverse .call (this, type, renderObject);
|
|
192
131
|
|
|
193
|
-
|
|
194
|
-
}
|
|
195
|
-
catch (error)
|
|
196
|
-
{ }
|
|
132
|
+
modelViewMatrix .pop ();
|
|
197
133
|
},
|
|
198
134
|
});
|
|
199
135
|
|
|
@@ -133,51 +133,43 @@ function (Fields,
|
|
|
133
133
|
},
|
|
134
134
|
renderShadowMap: function (renderObject)
|
|
135
135
|
{
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
if (! this .shadowBuffer)
|
|
139
|
-
return;
|
|
136
|
+
if (! this .shadowBuffer)
|
|
137
|
+
return;
|
|
140
138
|
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
139
|
+
const
|
|
140
|
+
lightNode = this .lightNode,
|
|
141
|
+
cameraSpaceMatrix = renderObject .getCameraSpaceMatrix () .get (),
|
|
142
|
+
modelMatrix = this .modelMatrix .assign (this .modelViewMatrix .get ()) .multRight (cameraSpaceMatrix),
|
|
143
|
+
invLightSpaceMatrix = this .invLightSpaceMatrix .assign (lightNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
|
|
146
144
|
|
|
147
|
-
|
|
148
|
-
|
|
145
|
+
invLightSpaceMatrix .rotate (this .rotation .setFromToVec (Vector3 .zAxis, this .direction .assign (lightNode .getDirection ()) .negate ()));
|
|
146
|
+
invLightSpaceMatrix .inverse ();
|
|
149
147
|
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
148
|
+
const
|
|
149
|
+
groupBBox = this .groupNode .getSubBBox (this .bbox, true), // Group bbox.
|
|
150
|
+
lightBBox = groupBBox .multRight (invLightSpaceMatrix), // Group bbox from the perspective of the light.
|
|
151
|
+
shadowMapSize = lightNode .getShadowMapSize (),
|
|
152
|
+
viewport = this .viewport .set (0, 0, shadowMapSize, shadowMapSize),
|
|
153
|
+
projectionMatrix = Camera .orthoBox (lightBBox, this .projectionMatrix);
|
|
156
154
|
|
|
157
|
-
|
|
155
|
+
this .shadowBuffer .bind ();
|
|
158
156
|
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
157
|
+
renderObject .getViewVolumes () .push (this .viewVolume .set (projectionMatrix, viewport, viewport));
|
|
158
|
+
renderObject .getProjectionMatrix () .pushMatrix (projectionMatrix);
|
|
159
|
+
renderObject .getModelViewMatrix () .pushMatrix (invLightSpaceMatrix);
|
|
162
160
|
|
|
163
|
-
|
|
161
|
+
renderObject .render (TraverseType .SHADOW, X3DGroupingNode .prototype .traverse, this .groupNode);
|
|
164
162
|
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
163
|
+
renderObject .getModelViewMatrix () .pop ();
|
|
164
|
+
renderObject .getProjectionMatrix () .pop ();
|
|
165
|
+
renderObject .getViewVolumes () .pop ();
|
|
168
166
|
|
|
169
|
-
|
|
167
|
+
this .shadowBuffer .unbind ();
|
|
170
168
|
|
|
171
|
-
|
|
172
|
-
|
|
169
|
+
if (! lightNode .getGlobal ())
|
|
170
|
+
invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
|
|
173
171
|
|
|
174
|
-
|
|
175
|
-
}
|
|
176
|
-
catch (error)
|
|
177
|
-
{
|
|
178
|
-
// Catch error from matrix inverse.
|
|
179
|
-
console .error (error);
|
|
180
|
-
}
|
|
172
|
+
this .invLightSpaceProjectionMatrix .assign (invLightSpaceMatrix) .multRight (projectionMatrix) .multRight (lightNode .getBiasMatrix ());
|
|
181
173
|
},
|
|
182
174
|
setGlobalVariables: function (renderObject)
|
|
183
175
|
{
|
|
@@ -224,7 +216,7 @@ function (Fields,
|
|
|
224
216
|
{
|
|
225
217
|
gl .activeTexture (gl .TEXTURE0 + this .textureUnit);
|
|
226
218
|
|
|
227
|
-
if (gl .getVersion () >= 2 ||
|
|
219
|
+
if (gl .getVersion () >= 2 || gl .getExtension ("WEBGL_depth_texture"))
|
|
228
220
|
gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getDepthTexture ());
|
|
229
221
|
else
|
|
230
222
|
gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getColorTexture ());
|
|
@@ -146,14 +146,7 @@ function (Fields,
|
|
|
146
146
|
this .lightNode = lightNode;
|
|
147
147
|
this .groupNode = groupNode;
|
|
148
148
|
|
|
149
|
-
|
|
150
|
-
{
|
|
151
|
-
this .matrixArray .set (modelViewMatrix .submatrix .inverse ());
|
|
152
|
-
}
|
|
153
|
-
catch (error)
|
|
154
|
-
{
|
|
155
|
-
this .matrixArray .set (Matrix3 .Identity);
|
|
156
|
-
}
|
|
149
|
+
this .matrixArray .set (modelViewMatrix .submatrix .inverse ());
|
|
157
150
|
|
|
158
151
|
this .modelViewMatrix .pushMatrix (modelViewMatrix);
|
|
159
152
|
|
|
@@ -169,55 +162,47 @@ function (Fields,
|
|
|
169
162
|
},
|
|
170
163
|
renderShadowMap: function (renderObject)
|
|
171
164
|
{
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
if (! this .shadowBuffer)
|
|
175
|
-
return;
|
|
165
|
+
if (! this .shadowBuffer)
|
|
166
|
+
return;
|
|
176
167
|
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
168
|
+
const
|
|
169
|
+
lightNode = this .lightNode,
|
|
170
|
+
cameraSpaceMatrix = renderObject .getCameraSpaceMatrix () .get (),
|
|
171
|
+
modelMatrix = this .modelMatrix .assign (this .modelViewMatrix .get ()) .multRight (cameraSpaceMatrix),
|
|
172
|
+
invLightSpaceMatrix = this .invLightSpaceMatrix .assign (lightNode .getGlobal () ? modelMatrix : Matrix4 .Identity);
|
|
182
173
|
|
|
183
|
-
|
|
184
|
-
|
|
174
|
+
invLightSpaceMatrix .translate (lightNode .getLocation ());
|
|
175
|
+
invLightSpaceMatrix .inverse ();
|
|
185
176
|
|
|
186
|
-
|
|
177
|
+
const shadowMapSize = lightNode .getShadowMapSize ();
|
|
187
178
|
|
|
188
|
-
|
|
179
|
+
this .shadowBuffer .bind ();
|
|
189
180
|
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
181
|
+
for (let i = 0; i < 6; ++ i)
|
|
182
|
+
{
|
|
183
|
+
const
|
|
184
|
+
v = viewports [i],
|
|
185
|
+
viewport = this .viewport .set (v [0] * shadowMapSize, v [1] * shadowMapSize, v [2] * shadowMapSize, v [3] * shadowMapSize),
|
|
186
|
+
projectionMatrix = Camera .perspective2 (Algorithm .radians (90), 0.125, 10000, viewport [2], viewport [3], this .projectionMatrix); // Use higher far value for better precision.
|
|
196
187
|
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
188
|
+
renderObject .getViewVolumes () .push (this .viewVolume .set (projectionMatrix, viewport, viewport));
|
|
189
|
+
renderObject .getProjectionMatrix () .pushMatrix (this .projectionMatrix);
|
|
190
|
+
renderObject .getModelViewMatrix () .pushMatrix (orientationMatrices [i]);
|
|
191
|
+
renderObject .getModelViewMatrix () .multLeft (invLightSpaceMatrix);
|
|
201
192
|
|
|
202
|
-
|
|
193
|
+
renderObject .render (TraverseType .SHADOW, X3DGroupingNode .prototype .traverse, this .groupNode);
|
|
203
194
|
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
195
|
+
renderObject .getModelViewMatrix () .pop ();
|
|
196
|
+
renderObject .getProjectionMatrix () .pop ();
|
|
197
|
+
renderObject .getViewVolumes () .pop ();
|
|
198
|
+
}
|
|
208
199
|
|
|
209
|
-
|
|
200
|
+
this .shadowBuffer .unbind ();
|
|
210
201
|
|
|
211
|
-
|
|
212
|
-
|
|
202
|
+
if (! lightNode .getGlobal ())
|
|
203
|
+
invLightSpaceMatrix .multLeft (modelMatrix .inverse ());
|
|
213
204
|
|
|
214
|
-
|
|
215
|
-
}
|
|
216
|
-
catch (error)
|
|
217
|
-
{
|
|
218
|
-
// Catch error from matrix inverse.
|
|
219
|
-
console .error (error);
|
|
220
|
-
}
|
|
205
|
+
this .invLightSpaceProjectionMatrix .assign (invLightSpaceMatrix);
|
|
221
206
|
},
|
|
222
207
|
setGlobalVariables: function (renderObject)
|
|
223
208
|
{
|
|
@@ -268,7 +253,7 @@ function (Fields,
|
|
|
268
253
|
{
|
|
269
254
|
gl .activeTexture (gl .TEXTURE0 + this .textureUnit);
|
|
270
255
|
|
|
271
|
-
if (gl .getVersion () >= 2 ||
|
|
256
|
+
if (gl .getVersion () >= 2 || gl .getExtension ("WEBGL_depth_texture"))
|
|
272
257
|
gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getDepthTexture ());
|
|
273
258
|
else
|
|
274
259
|
gl .bindTexture (gl .TEXTURE_2D, this .shadowBuffer .getColorTexture ());
|