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.
- package/.vscode/settings.json +12 -5
- package/.vscode/tasks.json +21 -0
- package/Makefile +10 -15
- package/README.md +6 -11
- package/build/bin/dist.pl +0 -6
- package/build/bin/version.pl +1 -4
- package/dist/assets/components/annotation.js +2 -2
- package/dist/assets/components/annotation.min.js +1 -1
- package/dist/assets/components/cad-geometry.js +2 -2
- package/dist/assets/components/cad-geometry.min.js +1 -1
- package/dist/assets/components/cube-map-texturing.js +6 -19
- package/dist/assets/components/cube-map-texturing.min.js +1 -1
- package/dist/assets/components/dis.js +2 -2
- package/dist/assets/components/dis.min.js +1 -1
- package/dist/assets/components/event-utilities.js +3 -3
- package/dist/assets/components/event-utilities.min.js +1 -1
- package/dist/assets/components/geometry2d.js +4 -4
- package/dist/assets/components/geometry2d.min.js +1 -1
- package/dist/assets/components/geospatial.js +32 -1685
- package/dist/assets/components/geospatial.min.js +1 -1
- package/dist/assets/components/h-anim.js +70 -77
- package/dist/assets/components/h-anim.min.js +1 -1
- package/dist/assets/components/key-device-sensor.js +3 -3
- package/dist/assets/components/key-device-sensor.min.js +1 -1
- package/dist/assets/components/layout.js +38 -52
- package/dist/assets/components/layout.min.js +1 -1
- package/dist/assets/components/nurbs.js +277 -194
- package/dist/assets/components/nurbs.min.js +1 -1
- package/dist/assets/components/particle-systems.js +1918 -1658
- package/dist/assets/components/particle-systems.min.js +1 -1
- package/dist/assets/components/picking.js +33 -41
- package/dist/assets/components/picking.min.js +1 -1
- package/dist/assets/components/projective-texture-mapping.js +72 -86
- package/dist/assets/components/projective-texture-mapping.min.js +1 -1
- package/dist/assets/components/rigid-body-physics.js +36 -57
- package/dist/assets/components/rigid-body-physics.min.js +1 -1
- package/dist/assets/components/scripting.js +2 -2
- package/dist/assets/components/scripting.min.js +1 -1
- package/dist/assets/components/texturing-3d.js +26 -75
- package/dist/assets/components/texturing-3d.min.js +3 -3
- package/dist/assets/components/volume-rendering.js +10 -10
- package/dist/assets/components/volume-rendering.min.js +1 -1
- package/dist/assets/components/x_ite.js +2 -2
- package/dist/assets/components/x_ite.min.js +1 -1
- 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/Line.fs +0 -21
- package/dist/assets/shaders/webgl1/Line.vs +0 -10
- package/dist/assets/shaders/webgl1/PBR.vs +1 -1
- package/dist/assets/shaders/webgl2/Depth.vs +29 -1
- package/dist/assets/shaders/webgl2/Gouraud.vs +31 -3
- 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.vs +35 -7
- package/dist/assets/shaders/webgl2/Phong.vs +31 -3
- package/dist/assets/shaders/webgl2/Point.vs +29 -1
- package/dist/assets/shaders/webgl2/Unlit.vs +31 -3
- package/dist/example.html +6 -6
- package/dist/x_ite.css +180 -208
- package/dist/x_ite.js +16477 -16629
- 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 +20 -14
- package/docs/Browser-Support.md +6 -0
- package/docs/Custom-Shaders.md +17 -24
- package/docs/Features.md +7 -1
- 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 +31 -0
- package/docs/XHTML-DOM-Integration.md +6 -0
- package/docs/_config.yml +1 -1
- package/docs/assets/css/main.scss +26 -0
- package/docs/index.md +38 -46
- 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 +6 -0
- package/docs/reference/Field-Services-and-Objects.md +6 -0
- package/docs/reference/Prototype-Services.md +6 -0
- package/docs/reference/Route-Services.md +6 -0
- package/docs/reference/Scene-Services.md +8 -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 +6 -0
- 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/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/Line.fs +3 -28
- package/src/assets/shaders/webgl1/Line.vs +5 -19
- package/src/assets/shaders/webgl1/PBR.vs +1 -1
- package/src/assets/shaders/webgl1/Point.vs +2 -3
- package/src/assets/shaders/webgl2/Depth.vs +4 -1
- package/src/assets/shaders/webgl2/Gouraud.vs +5 -3
- package/src/assets/shaders/webgl2/Line.fs +11 -17
- package/src/assets/shaders/webgl2/Line.vs +16 -20
- package/src/assets/shaders/webgl2/LineTransform.fs +6 -0
- package/src/assets/shaders/webgl2/LineTransform.vs +77 -0
- package/src/assets/shaders/webgl2/PBR.vs +10 -7
- package/src/assets/shaders/webgl2/Phong.vs +6 -3
- package/src/assets/shaders/webgl2/Point.vs +6 -6
- 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/Particle.glsl +36 -0
- package/src/example.html +6 -6
- package/src/standard/Math/Algorithm.js +12 -28
- package/src/standard/Math/Geometry/Plane3.js +0 -2
- package/src/standard/Math/Geometry/ViewVolume.js +88 -83
- 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 +5 -0
- package/src/standard/Math/Numbers/Matrix2.js +20 -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 +7 -0
- package/src/standard/Math/Numbers/Rotation4.js +7 -0
- package/src/standard/Math/Numbers/Vector2.js +8 -5
- package/src/standard/Math/Numbers/Vector3.js +16 -10
- package/src/standard/Math/Numbers/Vector4.js +12 -7
- package/src/standard/Math/Utility/BVH.js +45 -17
- package/src/tests.js +6 -1
- 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 +2 -2
- package/src/x_ite/Browser/Core/BrowserTimings.js +4 -2
- package/src/x_ite/Browser/Core/Context.js +185 -0
- package/src/x_ite/Browser/Core/ContextMenu.js +299 -193
- 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/Layout/ScreenText.js +11 -4
- package/src/x_ite/Browser/Layout/X3DLayoutContext.js +4 -15
- package/src/x_ite/Browser/Navigation/ExamineViewer.js +12 -19
- package/src/x_ite/Browser/Navigation/LookAtViewer.js +0 -3
- package/src/x_ite/Browser/Navigation/PlaneViewer.js +0 -3
- package/src/x_ite/Browser/Navigation/X3DFlyViewer.js +14 -7
- 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 +37 -37
- package/src/x_ite/Browser/Rendering/X3DRenderingContext.js +19 -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/Texturing/X3DTexturingContext.js +23 -33
- package/src/x_ite/Browser/Texturing3D/DICOMParser.js +2 -2
- package/src/x_ite/Browser/Time/X3DTimeContext.js +3 -1
- 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 +35 -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 +0 -1
- 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/X3DChaserNode.js +18 -32
- package/src/x_ite/Components/Followers/X3DDamperNode.js +1 -6
- 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/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/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 +18 -23
- 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 +1 -1
- package/src/x_ite/Components/Navigation/X3DViewpointNode.js +82 -111
- package/src/x_ite/Components/Networking/Anchor.js +10 -4
- 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 +461 -876
- 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 +90 -107
- package/src/x_ite/Components/PointingDeviceSensor/PlaneSensor.js +48 -55
- package/src/x_ite/Components/PointingDeviceSensor/SphereSensor.js +53 -70
- 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 -37
- package/src/x_ite/Components/Rendering/ColorRGBA.js +13 -38
- package/src/x_ite/Components/Rendering/IndexedLineSet.js +12 -4
- package/src/x_ite/Components/Rendering/LineSet.js +21 -13
- package/src/x_ite/Components/Rendering/PointSet.js +21 -13
- package/src/x_ite/Components/Rendering/X3DColorNode.js +13 -0
- package/src/x_ite/Components/Rendering/X3DComposedGeometryNode.js +13 -5
- package/src/x_ite/Components/Rendering/X3DGeometryNode.js +248 -325
- package/src/x_ite/Components/Rendering/X3DLineGeometryNode.js +305 -134
- package/src/x_ite/Components/Rendering/X3DPointGeometryNode.js +99 -122
- 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 +5 -15
- package/src/x_ite/Components/Shaders/Matrix3VertexAttribute.js +7 -24
- package/src/x_ite/Components/Shaders/Matrix4VertexAttribute.js +7 -24
- package/src/x_ite/Components/Shaders/ShaderPart.js +1 -10
- package/src/x_ite/Components/Shaders/X3DProgrammableShaderObject.js +219 -209
- package/src/x_ite/Components/Shaders/X3DShaderNode.js +1 -1
- package/src/x_ite/Components/Shaders/X3DVertexAttributeNode.js +23 -1
- package/src/x_ite/Components/Shape/Appearance.js +12 -0
- 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 +23 -1
- package/src/x_ite/Components/Shape/Shape.js +27 -34
- package/src/x_ite/Components/Sound/Sound.js +30 -40
- package/src/x_ite/Components/Text/Text.js +6 -20
- package/src/x_ite/Components/Texturing/TextureCoordinate.js +5 -26
- package/src/x_ite/Components/Texturing/TextureProperties.js +4 -4
- package/src/x_ite/Components/Texturing/X3DSingleTextureCoordinateNode.js +21 -0
- 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 -26
- package/src/x_ite/Components/Texturing3D/TextureCoordinate4D.js +5 -26
- package/src/x_ite/Components/Texturing3D/X3DTexture3DNode.js +12 -19
- package/src/x_ite/Components/VolumeRendering/X3DVolumeDataNode.js +7 -7
- 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/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 +4 -0
- 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 +101 -0
- package/src/x_ite/Rendering/X3DRenderObject.js +123 -144
- package/src/x_ite/X3D.js +32 -26
- package/src/x_ite.config.js +0 -5
- package/src/x_ite.css +200 -162
- package/src/x_ite.html +26 -10
- package/src/x_ite.js +42 -0
- package/x_ite.min.html +26 -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
|
@@ -232,58 +232,50 @@ function (Fields,
|
|
|
232
232
|
|
|
233
233
|
for (var t = 0, tLength = targets .size; t < tLength; ++ t)
|
|
234
234
|
{
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
geometryNode = target .geometryNode,
|
|
240
|
-
vertices = this .pickingGeometryNode .getVertices ();
|
|
235
|
+
var
|
|
236
|
+
target = targets [t],
|
|
237
|
+
geometryNode = target .geometryNode,
|
|
238
|
+
vertices = this .pickingGeometryNode .getVertices ();
|
|
241
239
|
|
|
242
|
-
|
|
243
|
-
|
|
240
|
+
targetBBox .assign (geometryNode .getBBox ()) .multRight (target .modelMatrix);
|
|
241
|
+
matrix .assign (target .modelMatrix) .inverse () .multLeft (modelMatrix);
|
|
244
242
|
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
243
|
+
for (var v = 0, vLength = vertices .length; v < vLength; v += 8)
|
|
244
|
+
{
|
|
245
|
+
matrix .multVecMatrix (point1 .set (vertices [v + 0], vertices [v + 1], vertices [v + 2]));
|
|
246
|
+
matrix .multVecMatrix (point2 .set (vertices [v + 4], vertices [v + 5], vertices [v + 6]));
|
|
247
|
+
line .setPoints (point1, point2);
|
|
250
248
|
|
|
251
|
-
|
|
249
|
+
intersections .length = 0;
|
|
252
250
|
|
|
253
|
-
|
|
251
|
+
if (geometryNode .intersectsLine (line, clipPlanes, target .modelMatrix, intersections))
|
|
252
|
+
{
|
|
253
|
+
for (var i = 0, iLength = intersections .length; i < iLength; ++ i)
|
|
254
254
|
{
|
|
255
|
-
|
|
256
|
-
{
|
|
257
|
-
// Test if intersection.point is between point1 and point2.
|
|
255
|
+
// Test if intersection.point is between point1 and point2.
|
|
258
256
|
|
|
259
|
-
|
|
257
|
+
var intersection = intersections [i];
|
|
260
258
|
|
|
261
|
-
|
|
262
|
-
|
|
259
|
+
a .assign (intersection .point) .subtract (point1);
|
|
260
|
+
b .assign (intersection .point) .subtract (point2);
|
|
263
261
|
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
262
|
+
var
|
|
263
|
+
c = a .add (b) .abs (),
|
|
264
|
+
s = point1 .distance (point2);
|
|
267
265
|
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
}
|
|
266
|
+
if (c <= s)
|
|
267
|
+
target .intersections .push (intersection);
|
|
271
268
|
}
|
|
272
269
|
}
|
|
273
|
-
|
|
274
|
-
if (target .intersections .length)
|
|
275
|
-
{
|
|
276
|
-
pickingCenter .assign (pickingBBox .center);
|
|
277
|
-
targetCenter .assign (targetBBox .center);
|
|
278
|
-
|
|
279
|
-
target .intersected = true;
|
|
280
|
-
target .distance = pickingCenter .distance (targetCenter);
|
|
281
|
-
}
|
|
282
270
|
}
|
|
283
|
-
|
|
271
|
+
|
|
272
|
+
if (target .intersections .length)
|
|
284
273
|
{
|
|
285
|
-
|
|
286
|
-
|
|
274
|
+
pickingCenter .assign (pickingBBox .center);
|
|
275
|
+
targetCenter .assign (targetBBox .center);
|
|
276
|
+
|
|
277
|
+
target .intersected = true;
|
|
278
|
+
target .distance = pickingCenter .distance (targetCenter);
|
|
287
279
|
}
|
|
288
280
|
}
|
|
289
281
|
}
|
|
@@ -179,143 +179,126 @@ function (Fields,
|
|
|
179
179
|
{
|
|
180
180
|
X3DDragSensorNode .prototype .set_active__ .call (this, active, hit, modelViewMatrix, projectionMatrix, viewport);
|
|
181
181
|
|
|
182
|
-
|
|
182
|
+
if (this ._isActive .getValue ())
|
|
183
183
|
{
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
this .modelViewMatrix .assign (modelViewMatrix);
|
|
187
|
-
this .invModelViewMatrix .assign (modelViewMatrix) .inverse ();
|
|
184
|
+
this .modelViewMatrix .assign (modelViewMatrix);
|
|
185
|
+
this .invModelViewMatrix .assign (modelViewMatrix) .inverse ();
|
|
188
186
|
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
187
|
+
const
|
|
188
|
+
hitRay = hit .hitRay .copy () .multLineMatrix (this .invModelViewMatrix),
|
|
189
|
+
hitPoint = this .invModelViewMatrix .multVecMatrix (hit .intersection .point .copy ());
|
|
192
190
|
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
191
|
+
const
|
|
192
|
+
yAxis = this ._axisRotation .getValue () .multVecRot (new Vector3 (0, 1, 0)),
|
|
193
|
+
cameraBack = this .invModelViewMatrix .multDirMatrix (new Vector3 (0, 0, 1)) .normalize ();
|
|
196
194
|
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
195
|
+
const
|
|
196
|
+
axis = new Line3 (new Vector3 (0, 0, 0), yAxis),
|
|
197
|
+
radius = axis .getPerpendicularVectorToPoint (hitPoint, new Vector3 (0, 0, 0)) .abs ();
|
|
200
198
|
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
199
|
+
this .cylinder = new Cylinder3 (axis, radius);
|
|
200
|
+
this .disk = Math .abs (Vector3 .dot (cameraBack, yAxis)) > Math .cos (this ._diskAngle .getValue ());
|
|
201
|
+
this .behind = this .isBehind (hitRay, hitPoint);
|
|
202
|
+
this .yPlane = new Plane3 (hitPoint, yAxis); // Sensor aligned y-plane
|
|
203
|
+
this .zPlane = new Plane3 (hitPoint, cameraBack); // Screen aligned z-plane
|
|
206
204
|
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
205
|
+
// Compute normal like in Billboard with yAxis as axis of rotation.
|
|
206
|
+
const
|
|
207
|
+
billboardToViewer = this .invModelViewMatrix .origin,
|
|
208
|
+
sxNormal = Vector3 .cross (yAxis, billboardToViewer) .normalize ();
|
|
211
209
|
|
|
212
|
-
|
|
213
|
-
|
|
210
|
+
this .sxPlane = new Plane3 (new Vector3 (0, 0, 0), sxNormal); // Billboarded special x-plane made parallel to sensors axis.
|
|
211
|
+
this .szNormal = Vector3 .cross (sxNormal, yAxis) .normalize (); // Billboarded special z-normal made parallel to sensors axis.
|
|
214
212
|
|
|
215
|
-
|
|
213
|
+
const trackPoint = new Vector3 (0, 0, 0);
|
|
216
214
|
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
215
|
+
if (this .disk)
|
|
216
|
+
this .yPlane .intersectsLine (hitRay, trackPoint);
|
|
217
|
+
else
|
|
218
|
+
this .getTrackPoint (hitRay, trackPoint);
|
|
221
219
|
|
|
222
|
-
|
|
223
|
-
|
|
220
|
+
this .fromVector = this .cylinder .axis .getPerpendicularVectorToPoint (trackPoint, new Vector3 (0, 0, 0)) .negate ();
|
|
221
|
+
this .startOffset = new Rotation4 (yAxis, this ._offset .getValue ());
|
|
224
222
|
|
|
225
|
-
|
|
226
|
-
|
|
223
|
+
this ._trackPoint_changed = trackPoint;
|
|
224
|
+
this ._rotation_changed = this .startOffset;
|
|
227
225
|
|
|
228
|
-
|
|
226
|
+
// For min/max angle.
|
|
229
227
|
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
}
|
|
233
|
-
else
|
|
234
|
-
{
|
|
235
|
-
if (this ._autoOffset .getValue ())
|
|
236
|
-
this ._offset = this .getAngle (this ._rotation_changed .getValue ());
|
|
237
|
-
}
|
|
228
|
+
this .angle = this ._offset .getValue ();
|
|
229
|
+
this .startVector = this ._rotation_changed .getValue () .multVecRot (this ._axisRotation .getValue () .multVecRot (new Vector3 (0, 0, 1)));
|
|
238
230
|
}
|
|
239
|
-
|
|
231
|
+
else
|
|
240
232
|
{
|
|
241
|
-
|
|
233
|
+
if (this ._autoOffset .getValue ())
|
|
234
|
+
this ._offset = this .getAngle (this ._rotation_changed .getValue ());
|
|
242
235
|
}
|
|
243
236
|
},
|
|
244
237
|
set_motion__: function (hit)
|
|
245
238
|
{
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
hitRay = hit .hitRay .copy () .multLineMatrix (this .invModelViewMatrix),
|
|
250
|
-
trackPoint = new Vector3 (0, 0, 0);
|
|
239
|
+
const
|
|
240
|
+
hitRay = hit .hitRay .copy () .multLineMatrix (this .invModelViewMatrix),
|
|
241
|
+
trackPoint = new Vector3 (0, 0, 0);
|
|
251
242
|
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
243
|
+
if (this .disk)
|
|
244
|
+
this .yPlane .intersectsLine (hitRay, trackPoint);
|
|
245
|
+
else
|
|
246
|
+
this .getTrackPoint (hitRay, trackPoint);
|
|
256
247
|
|
|
257
|
-
|
|
248
|
+
this ._trackPoint_changed = trackPoint;
|
|
258
249
|
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
250
|
+
const
|
|
251
|
+
toVector = this .cylinder .axis .getPerpendicularVectorToPoint (trackPoint, new Vector3 (0, 0, 0)) .negate (),
|
|
252
|
+
rotation = new Rotation4 (this .fromVector, toVector);
|
|
262
253
|
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
254
|
+
if (this .disk)
|
|
255
|
+
{
|
|
256
|
+
// The trackpoint can swap behind the viewpoint if viewpoint is a Viewpoint node
|
|
257
|
+
// as the viewing volume is not a cube where the picking ray goes straight up.
|
|
258
|
+
// This phenomenon is very clear on the viewport corners.
|
|
268
259
|
|
|
269
|
-
|
|
260
|
+
const trackPoint_ = this .modelViewMatrix .multVecMatrix (trackPoint .copy ());
|
|
270
261
|
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
262
|
+
if (trackPoint_ .z > 0)
|
|
263
|
+
rotation .multRight (new Rotation4 (this .yPlane .normal, Math .PI));
|
|
264
|
+
}
|
|
265
|
+
else
|
|
266
|
+
{
|
|
267
|
+
if (this .behind)
|
|
268
|
+
rotation .inverse ();
|
|
269
|
+
}
|
|
279
270
|
|
|
280
|
-
|
|
271
|
+
rotation .multLeft (this .startOffset);
|
|
281
272
|
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
}
|
|
286
|
-
else
|
|
287
|
-
{
|
|
288
|
-
const
|
|
289
|
-
endVector = rotation .multVecRot (this ._axisRotation .getValue () .multVecRot (new Vector3 (0, 0, 1))),
|
|
290
|
-
deltaRotation = new Rotation4 (this .startVector, endVector),
|
|
291
|
-
axis = this ._axisRotation .getValue () .multVecRot (new Vector3 (0, 1, 0)),
|
|
292
|
-
sign = axis .dot (deltaRotation .getAxis ()) > 0 ? 1 : -1,
|
|
293
|
-
min = this ._minAngle .getValue (),
|
|
294
|
-
max = this ._maxAngle .getValue ();
|
|
295
|
-
|
|
296
|
-
this .angle += sign * deltaRotation .angle;
|
|
297
|
-
|
|
298
|
-
this .startVector .assign (endVector);
|
|
299
|
-
|
|
300
|
-
//console .log (this .angle, min, max);
|
|
301
|
-
|
|
302
|
-
if (this .angle < min)
|
|
303
|
-
rotation .setAxisAngle (this .cylinder .axis .direction, min);
|
|
304
|
-
else if (this .angle > max)
|
|
305
|
-
rotation .setAxisAngle (this .cylinder .axis .direction, max);
|
|
306
|
-
else
|
|
307
|
-
rotation .setAxisAngle (this .cylinder .axis .direction, this .angle);
|
|
308
|
-
|
|
309
|
-
if (! this ._rotation_changed .getValue () .equals (rotation))
|
|
310
|
-
this ._rotation_changed = rotation;
|
|
311
|
-
}
|
|
273
|
+
if (this ._minAngle .getValue () > this ._maxAngle .getValue ())
|
|
274
|
+
{
|
|
275
|
+
this ._rotation_changed = rotation;
|
|
312
276
|
}
|
|
313
|
-
|
|
277
|
+
else
|
|
314
278
|
{
|
|
315
|
-
|
|
279
|
+
const
|
|
280
|
+
endVector = rotation .multVecRot (this ._axisRotation .getValue () .multVecRot (new Vector3 (0, 0, 1))),
|
|
281
|
+
deltaRotation = new Rotation4 (this .startVector, endVector),
|
|
282
|
+
axis = this ._axisRotation .getValue () .multVecRot (new Vector3 (0, 1, 0)),
|
|
283
|
+
sign = axis .dot (deltaRotation .getAxis ()) > 0 ? 1 : -1,
|
|
284
|
+
min = this ._minAngle .getValue (),
|
|
285
|
+
max = this ._maxAngle .getValue ();
|
|
286
|
+
|
|
287
|
+
this .angle += sign * deltaRotation .angle;
|
|
316
288
|
|
|
317
|
-
this .
|
|
318
|
-
|
|
289
|
+
this .startVector .assign (endVector);
|
|
290
|
+
|
|
291
|
+
//console .log (this .angle, min, max);
|
|
292
|
+
|
|
293
|
+
if (this .angle < min)
|
|
294
|
+
rotation .setAxisAngle (this .cylinder .axis .direction, min);
|
|
295
|
+
else if (this .angle > max)
|
|
296
|
+
rotation .setAxisAngle (this .cylinder .axis .direction, max);
|
|
297
|
+
else
|
|
298
|
+
rotation .setAxisAngle (this .cylinder .axis .direction, this .angle);
|
|
299
|
+
|
|
300
|
+
if (! this ._rotation_changed .getValue () .equals (rotation))
|
|
301
|
+
this ._rotation_changed = rotation;
|
|
319
302
|
}
|
|
320
303
|
},
|
|
321
304
|
});
|
|
@@ -151,82 +151,75 @@ function (Fields,
|
|
|
151
151
|
{
|
|
152
152
|
X3DDragSensorNode .prototype .set_active__ .call (this, active, hit, modelViewMatrix, projectionMatrix, viewport);
|
|
153
153
|
|
|
154
|
-
|
|
154
|
+
if (this ._isActive .getValue ())
|
|
155
155
|
{
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
this .viewport .assign (viewport);
|
|
161
|
-
this .invModelViewMatrix .assign (modelViewMatrix) .inverse ();
|
|
156
|
+
this .modelViewMatrix .assign (modelViewMatrix);
|
|
157
|
+
this .projectionMatrix .assign (projectionMatrix);
|
|
158
|
+
this .viewport .assign (viewport);
|
|
159
|
+
this .invModelViewMatrix .assign (modelViewMatrix) .inverse ();
|
|
162
160
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
161
|
+
var
|
|
162
|
+
hitRay = hit .hitRay .copy () .multLineMatrix (this .invModelViewMatrix),
|
|
163
|
+
hitPoint = this .invModelViewMatrix .multVecMatrix (hit .intersection .point .copy ());
|
|
166
164
|
|
|
167
|
-
|
|
165
|
+
var axisRotation = this ._axisRotation .getValue ();
|
|
168
166
|
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
167
|
+
if (this ._minPosition .x === this ._maxPosition .x)
|
|
168
|
+
{
|
|
169
|
+
this .planeSensor = false;
|
|
172
170
|
|
|
173
|
-
|
|
171
|
+
var direction = axisRotation .multVecRot (new Vector3 (0, Math .abs (this ._maxPosition .y - this ._minPosition .y), 0));
|
|
174
172
|
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
173
|
+
this .line = new Line3 (hitPoint, direction .normalize ());
|
|
174
|
+
}
|
|
175
|
+
else if (this ._minPosition .y === this ._maxPosition .y)
|
|
176
|
+
{
|
|
177
|
+
this .planeSensor = false;
|
|
180
178
|
|
|
181
|
-
|
|
179
|
+
var direction = axisRotation .multVecRot (new Vector3 (Math .abs (this ._maxPosition .x - this ._minPosition .x), 0, 0));
|
|
182
180
|
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
181
|
+
this .line = new Line3 (hitPoint, direction .normalize ());
|
|
182
|
+
}
|
|
183
|
+
else
|
|
184
|
+
{
|
|
185
|
+
this .planeSensor = true;
|
|
186
|
+
this .plane = new Plane3 (hitPoint, axisRotation .multVecRot (new Vector3 (0, 0, 1)));
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
if (this .planeSensor)
|
|
190
|
+
{
|
|
191
|
+
if (this .plane .intersectsLine (hitRay, this .startPoint))
|
|
186
192
|
{
|
|
187
|
-
this .
|
|
188
|
-
this .plane = new Plane3 (hitPoint, axisRotation .multVecRot (new Vector3 (0, 0, 1)));
|
|
193
|
+
this .trackStart (this .startPoint);
|
|
189
194
|
}
|
|
190
195
|
|
|
191
|
-
|
|
196
|
+
// new Plane3 (new Vector3 (0, 0, 0), this .plane .normal) .intersectsLine (hitRay, trackPoint);
|
|
197
|
+
}
|
|
198
|
+
else
|
|
199
|
+
{
|
|
200
|
+
if (this .getLineTrackPoint (hit, this .line, this .startPoint))
|
|
192
201
|
{
|
|
193
|
-
|
|
202
|
+
var trackPoint = new Vector3 (0, 0, 0);
|
|
203
|
+
|
|
204
|
+
try
|
|
194
205
|
{
|
|
195
|
-
this .
|
|
206
|
+
this .getLineTrackPoint (hit, new Line3 (this .line .direction, this .line .direction), trackPoint);
|
|
196
207
|
}
|
|
197
|
-
|
|
198
|
-
// new Plane3 (new Vector3 (0, 0, 0), this .plane .normal) .intersectsLine (hitRay, trackPoint);
|
|
199
|
-
}
|
|
200
|
-
else
|
|
201
|
-
{
|
|
202
|
-
if (this .getLineTrackPoint (hit, this .line, this .startPoint))
|
|
208
|
+
catch (error)
|
|
203
209
|
{
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
try
|
|
207
|
-
{
|
|
208
|
-
this .getLineTrackPoint (hit, new Line3 (this .line .direction, this .line .direction), trackPoint);
|
|
209
|
-
}
|
|
210
|
-
catch (error)
|
|
211
|
-
{
|
|
212
|
-
//console .error (error);
|
|
210
|
+
//console .error (error);
|
|
213
211
|
|
|
214
|
-
|
|
215
|
-
}
|
|
216
|
-
|
|
217
|
-
this .trackStart (trackPoint);
|
|
212
|
+
trackPoint = this .startPoint;
|
|
218
213
|
}
|
|
214
|
+
|
|
215
|
+
this .trackStart (trackPoint);
|
|
219
216
|
}
|
|
220
217
|
}
|
|
221
|
-
else
|
|
222
|
-
{
|
|
223
|
-
if (this ._autoOffset .getValue ())
|
|
224
|
-
this ._offset = this ._translation_changed;
|
|
225
|
-
}
|
|
226
218
|
}
|
|
227
|
-
|
|
219
|
+
else
|
|
228
220
|
{
|
|
229
|
-
|
|
221
|
+
if (this ._autoOffset .getValue ())
|
|
222
|
+
this ._offset = this ._translation_changed;
|
|
230
223
|
}
|
|
231
224
|
},
|
|
232
225
|
trackStart: function (trackPoint)
|
|
@@ -141,97 +141,80 @@ function (Fields,
|
|
|
141
141
|
{
|
|
142
142
|
X3DDragSensorNode .prototype .set_active__ .call (this, active, hit, modelViewMatrix, projectionMatrix, viewport);
|
|
143
143
|
|
|
144
|
-
|
|
144
|
+
if (this ._isActive .getValue ())
|
|
145
145
|
{
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
this ._trackPoint_changed = hitPoint;
|
|
164
|
-
this ._rotation_changed = this ._offset .getValue ();
|
|
165
|
-
}
|
|
166
|
-
else
|
|
167
|
-
{
|
|
168
|
-
if (this ._autoOffset .getValue ())
|
|
169
|
-
this ._offset = this ._rotation_changed;
|
|
170
|
-
}
|
|
146
|
+
this .modelViewMatrix .assign (modelViewMatrix);
|
|
147
|
+
this .invModelViewMatrix .assign (modelViewMatrix) .inverse ();
|
|
148
|
+
|
|
149
|
+
var
|
|
150
|
+
hitPoint = this .invModelViewMatrix .multVecMatrix (hit .intersection .point .copy ()),
|
|
151
|
+
center = new Vector3 (0, 0, 0);
|
|
152
|
+
|
|
153
|
+
this .zPlane = new Plane3 (center, this .invModelViewMatrix .multDirMatrix (new Vector3 (0, 0, 1)) .normalize ()); // Screen aligned Z-plane
|
|
154
|
+
this .sphere = new Sphere3 (hitPoint .abs (), center);
|
|
155
|
+
this .behind = this .zPlane .getDistanceToPoint (hitPoint) < 0;
|
|
156
|
+
|
|
157
|
+
this .fromVector .assign (hitPoint);
|
|
158
|
+
this .startPoint .assign (hitPoint);
|
|
159
|
+
this .startOffset .assign (this ._offset .getValue ());
|
|
160
|
+
|
|
161
|
+
this ._trackPoint_changed = hitPoint;
|
|
162
|
+
this ._rotation_changed = this ._offset .getValue ();
|
|
171
163
|
}
|
|
172
|
-
|
|
164
|
+
else
|
|
173
165
|
{
|
|
174
|
-
|
|
166
|
+
if (this ._autoOffset .getValue ())
|
|
167
|
+
this ._offset = this ._rotation_changed;
|
|
175
168
|
}
|
|
176
169
|
},
|
|
177
170
|
set_motion__: function (hit)
|
|
178
171
|
{
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
hitRay = hit .hitRay .copy () .multLineMatrix (this .invModelViewMatrix),
|
|
183
|
-
trackPoint = new Vector3 (0, 0, 0);
|
|
172
|
+
var
|
|
173
|
+
hitRay = hit .hitRay .copy () .multLineMatrix (this .invModelViewMatrix),
|
|
174
|
+
trackPoint = new Vector3 (0, 0, 0);
|
|
184
175
|
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
var tangentPoint = new Vector3 (0, 0, 0);
|
|
195
|
-
this .zPlane .intersectsLine (hitRay, tangentPoint);
|
|
176
|
+
if (this .getTrackPoint (hitRay, trackPoint, this .behind))
|
|
177
|
+
{
|
|
178
|
+
var zAxis = this .invModelViewMatrix .multDirMatrix (new Vector3 (0, 0, 1)) .normalize (); // Camera direction
|
|
179
|
+
this .zPlane = new Plane3 (trackPoint, zAxis); // Screen aligned Z-plane
|
|
180
|
+
}
|
|
181
|
+
else
|
|
182
|
+
{
|
|
183
|
+
// Find trackPoint on the plane with sphere
|
|
196
184
|
|
|
197
|
-
|
|
185
|
+
var tangentPoint = new Vector3 (0, 0, 0);
|
|
186
|
+
this .zPlane .intersectsLine (hitRay, tangentPoint);
|
|
198
187
|
|
|
199
|
-
|
|
188
|
+
hitRay = new Line3 (tangentPoint, Vector3 .subtract (this .sphere .center, tangentPoint) .normalize ());
|
|
200
189
|
|
|
201
|
-
|
|
190
|
+
//console .log (hitRay .toString ());
|
|
202
191
|
|
|
203
|
-
|
|
192
|
+
this .getTrackPoint (hitRay, trackPoint, false);
|
|
204
193
|
|
|
205
|
-
|
|
206
|
-
triNormal = Triangle3 .normal (this .sphere .center, trackPoint, this .startPoint, new Vector3 (0, 0, 0)),
|
|
207
|
-
dirFromCenter = Vector3 .subtract (trackPoint, this .sphere .center) .normalize (),
|
|
208
|
-
normal = Vector3 .cross (triNormal, dirFromCenter) .normalize ();
|
|
194
|
+
// Find trackPoint behind sphere
|
|
209
195
|
|
|
210
|
-
|
|
196
|
+
var
|
|
197
|
+
triNormal = Triangle3 .normal (this .sphere .center, trackPoint, this .startPoint, new Vector3 (0, 0, 0)),
|
|
198
|
+
dirFromCenter = Vector3 .subtract (trackPoint, this .sphere .center) .normalize (),
|
|
199
|
+
normal = Vector3 .cross (triNormal, dirFromCenter) .normalize ();
|
|
211
200
|
|
|
212
|
-
|
|
201
|
+
var point1 = Vector3 .subtract (trackPoint, normal .multiply (Vector3 .subtract (tangentPoint, trackPoint) .abs ()));
|
|
213
202
|
|
|
214
|
-
|
|
215
|
-
}
|
|
203
|
+
hitRay = new Line3 (point1, Vector3 .subtract (this .sphere .center, point1) .normalize ());
|
|
216
204
|
|
|
217
|
-
this .
|
|
205
|
+
this .getTrackPoint (hitRay, trackPoint, false);
|
|
206
|
+
}
|
|
218
207
|
|
|
219
|
-
|
|
220
|
-
toVector = Vector3 .subtract (trackPoint, this .sphere .center),
|
|
221
|
-
rotation = new Rotation4 (this .fromVector, toVector);
|
|
208
|
+
this ._trackPoint_changed = trackPoint;
|
|
222
209
|
|
|
223
|
-
|
|
224
|
-
|
|
210
|
+
var
|
|
211
|
+
toVector = Vector3 .subtract (trackPoint, this .sphere .center),
|
|
212
|
+
rotation = new Rotation4 (this .fromVector, toVector);
|
|
225
213
|
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
catch (error)
|
|
229
|
-
{
|
|
230
|
-
//console .error (error);
|
|
214
|
+
if (this .behind)
|
|
215
|
+
rotation .inverse ();
|
|
231
216
|
|
|
232
|
-
|
|
233
|
-
this ._rotation_changed .addEvent ();
|
|
234
|
-
}
|
|
217
|
+
this ._rotation_changed = Rotation4 .multRight (this .startOffset, rotation);
|
|
235
218
|
},
|
|
236
219
|
});
|
|
237
220
|
|
|
@@ -103,24 +103,17 @@ function (Fields,
|
|
|
103
103
|
},
|
|
104
104
|
set_over__: function (over, hit, modelViewMatrix, projectionMatrix, viewport)
|
|
105
105
|
{
|
|
106
|
-
|
|
107
|
-
{
|
|
108
|
-
X3DTouchSensorNode .prototype .set_over__ .call (this, over, hit, modelViewMatrix, projectionMatrix, viewport);
|
|
106
|
+
X3DTouchSensorNode .prototype .set_over__ .call (this, over, hit, modelViewMatrix, projectionMatrix, viewport);
|
|
109
107
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
108
|
+
if (this ._isOver .getValue ())
|
|
109
|
+
{
|
|
110
|
+
var intersection = hit .intersection;
|
|
113
111
|
|
|
114
|
-
|
|
112
|
+
invModelViewMatrix .assign (modelViewMatrix) .inverse ();
|
|
115
113
|
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
catch (error)
|
|
122
|
-
{
|
|
123
|
-
console .error (error);
|
|
114
|
+
this ._hitTexCoord_changed = intersection .texCoord;
|
|
115
|
+
this ._hitNormal_changed = modelViewMatrix .multMatrixDir (intersection .normal .copy ()) .normalize ();
|
|
116
|
+
this ._hitPoint_changed = invModelViewMatrix .multVecMatrix (intersection .point .copy ());
|
|
124
117
|
}
|
|
125
118
|
},
|
|
126
119
|
});
|