From 334a56f97239d6a07191af897c6f43813b0c449b Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 5 Aug 2020 22:03:47 +0300 Subject: [PATCH] Package name refactoring --- README.md | 24 ++++++------- build.gradle.kts | 4 +-- dataforge-vis-jsroot/build.gradle.kts | 2 +- dataforge-vis-jsroot/src/main/web/index.html | 2 +- demo/gdml/build.gradle.kts | 4 +-- .../spatial/gdml/demo/cubes.kt | 2 +- .../spatial/gdml/GDMLVisualTest.kt | 6 ++-- .../spatial/gdml/demo/GDMLAppComponent.kt | 34 +++++++++--------- .../spatial/gdml/demo/GDMLDemoApp.kt | 10 +++--- .../spatial/gdml/demo/fileDrop.kt | 2 +- .../spatial/gdml/demo/GDMLDemoApp.kt | 16 ++++----- .../spatial/gdml/demo/readFile.kt | 14 ++++---- .../spatial/gdml/demo/saveToJson.kt | 12 +++---- .../spatial/FileSerializationTest.kt | 2 +- demo/muon-monitor/README.md | 2 +- demo/muon-monitor/build.gradle.kts | 2 +- .../kotlin/ru/mipt/npm/muon/monitor/Event.kt | 4 +-- .../kotlin/ru/mipt/npm/muon/monitor/Model.kt | 8 ++--- .../ru/mipt/npm/muon/monitor/Monitor.kt | 4 +-- .../mipt/npm/muon/monitor/MMAppComponent.kt | 24 ++++++------- .../ru/mipt/npm/muon/monitor/MMDemoApp.kt | 2 +- .../mipt/npm/muon/monitor/server/MMServer.kt | 2 +- .../ru/mipt/npm/muon/monitor/sim/line.kt | 2 +- demo/spatial-showcase/build.gradle.kts | 8 +++-- .../{vis => vision}/spatial/demo/demo.kt | 14 ++++---- .../spatial/demo/ThreeDemoApp.kt | 2 +- .../spatial/demo/ThreeDemoGrid.kt | 10 +++--- .../spatial/demo/VariableBox.kt | 16 ++++----- .../{vis => vision}/spatial/demo/FXDemoApp.kt | 4 +-- .../spatial/demo/FXDemoGrid.kt | 11 +++--- playground/build.gradle.kts | 4 +-- playground/src/jsMain/kotlin/PlayGroundApp.kt | 16 ++++----- settings.gradle.kts | 8 ++--- .../bootstrap/MetaViewerComponent.kt | 2 +- .../{vis => vision}/bootstrap/ObjectTree.kt | 12 +++---- .../{vis => vision}/bootstrap/bootstrap.kt | 2 +- .../bootstrap/propertyEditor.kt | 6 ++-- .../{vis => vision}/material/icons.kt | 7 +--- .../{vis => vision}/material/misc.kt | 7 ++-- .../{vis => vision}/material/objectTree.kt | 12 +++---- ui/react/build.gradle.kts | 2 +- .../{vis => vision}/react/TreeStyles.kt | 2 +- .../{vis => vision}/react/configEditor.kt | 2 +- .../dataforge/{vis => vision}/react/layout.kt | 2 +- .../dataforge/{vis => vision}/react/react.kt | 2 +- .../dataforge/{vis => vision}/react/styles.kt | 2 +- .../{vis => vision}/react/valueChooser.kt | 6 ++-- .../build.gradle.kts | 0 .../dataforge/properties/ConfigProperty.kt | 0 .../hep/dataforge/properties/Property.kt | 0 .../dataforge/vision}/AbstractVisualGroup.kt | 2 +- .../dataforge/vision}/AbstractVisualObject.kt | 4 +-- .../kotlin/hep/dataforge/vision}/Colors.kt | 2 +- .../dataforge/vision}/SimpleVisualGroup.kt | 2 +- .../hep/dataforge/vision}/StyleSheet.kt | 2 +- .../kotlin/hep/dataforge/vision}/Visual.kt | 2 +- .../hep/dataforge/vision}/VisualGroup.kt | 2 +- .../hep/dataforge/vision}/VisualObject.kt | 4 +-- .../kotlin/hep/dataforge/vision}/misc.kt | 2 +- .../hep/dataforge/vision}/valueWidget.kt | 9 ++--- .../kotlin/hep/dataforge/js/Application.kt | 0 .../kotlin/hep/dataforge/js/bindings.kt | 0 .../jsMain/kotlin/hep/dataforge/js/jsExtra.kt | 0 .../kotlin/hep/dataforge/vision}/FXPlugin.kt | 2 +- .../vision}/editor/ColorValueChooser.kt | 2 +- .../vision}/editor/ComboBoxValueChooser.kt | 2 +- .../dataforge/vision}/editor/ConfigEditor.kt | 4 +-- .../hep/dataforge/vision}/editor/FXMeta.kt | 2 +- .../dataforge/vision}/editor/MetaViewer.kt | 4 +-- .../vision}/editor/TextValueChooser.kt | 2 +- .../dataforge/vision}/editor/ValueCallback.kt | 2 +- .../dataforge/vision}/editor/ValueChooser.kt | 6 ++-- .../vision}/editor/ValueChooserBase.kt | 2 +- .../editor/VisualObjectEditorFragment.kt | 6 ++-- .../editor/VisualObjectTreeFragment.kt | 6 ++-- .../src/jvmMain/resources/img/df.png | Bin .../dataforge/vision}/demo/MetaEditorDemo.kt | 8 ++--- .../build.gradle.kts | 2 +- .../vision}/spatial/gdml/GDMLTransformer.kt | 8 ++--- .../dataforge/vision}/spatial/gdml/units.kt | 2 +- .../vision}/spatial/gdml/visualGDML.kt | 12 +++---- .../vision}/spatial/gdml/visualGDMLJvm.kt | 4 +-- .../vision}/spatial/gdml/TestConvertor.kt | 4 +-- .../src/jvmTest/resources/gdml/BM@N.gdml | 0 .../src/jvmTest/resources/gdml/cubes.gdml | 0 .../src/jvmTest/resources/gdml/simple1.gdml | 0 .../build.gradle.kts | 4 +-- .../hep/dataforge/vision}/spatial/Box.kt | 6 ++-- .../dataforge/vision}/spatial/Composite.kt | 4 +-- .../dataforge/vision}/spatial/ConeSegment.kt | 8 ++--- .../hep/dataforge/vision}/spatial/Convex.kt | 8 ++--- .../hep/dataforge/vision}/spatial/Extruded.kt | 8 ++--- .../vision}/spatial/GeometryBuilder.kt | 2 +- .../hep/dataforge/vision}/spatial/Label3D.kt | 8 ++--- .../dataforge/vision}/spatial/Material3D.kt | 12 +++---- .../hep/dataforge/vision}/spatial/PolyLine.kt | 8 ++--- .../hep/dataforge/vision}/spatial/Proxy.kt | 8 ++--- .../hep/dataforge/vision}/spatial/Sphere.kt | 8 ++--- .../hep/dataforge/vision}/spatial/Tube.kt | 17 ++++----- .../hep/dataforge/vision}/spatial/Visual3D.kt | 8 ++--- .../vision}/spatial/VisualGroup3D.kt | 4 +-- .../vision}/spatial/VisualObject3D.kt | 14 ++++---- .../hep/dataforge/vision}/spatial/geometry.kt | 2 +- .../vision}/spatial/serialization.kt | 8 ++--- .../vision}/spatial/specifications/Axes.kt | 2 +- .../vision}/spatial/specifications/Camera.kt | 2 +- .../spatial/specifications/Canvas3DOptions.kt | 6 ++-- .../spatial/specifications/Controls.kt | 2 +- .../spatial/transform/RemoveSingleChild.kt | 10 +++--- .../vision}/spatial/transform/UnRef.kt | 10 +++--- .../spatial/transform/VisualTreeTransform.kt | 4 +-- .../dataforge/vision}/spatial/ConvexTest.kt | 2 +- .../dataforge/vision}/spatial/GroupTest.kt | 6 ++-- .../dataforge/vision}/spatial/PropertyTest.kt | 4 +-- .../vision}/spatial/SerializationTest.kt | 6 ++-- .../dataforge/vision}/spatial/geometryJs.kt | 2 +- .../vision}/spatial/three/MeshThreeFactory.kt | 10 +++--- .../vision}/spatial/three/ThreeBoxFactory.kt | 6 ++-- .../vision}/spatial/three/ThreeCanvas.kt | 32 ++++++++--------- .../spatial/three/ThreeCanvasComponent.kt | 14 ++++---- .../spatial/three/ThreeCanvasLabelFactory.kt | 8 ++--- .../spatial/three/ThreeCompositeFactory.kt | 6 ++-- .../spatial/three/ThreeConvexFactory.kt | 4 +-- .../spatial/three/ThreeCylinderFactory.kt | 6 ++-- .../vision}/spatial/three/ThreeFactory.kt | 12 +++---- .../spatial/three/ThreeGeometryBuilder.kt | 6 ++-- .../spatial/three/ThreeLabelFactory.kt | 6 ++-- .../vision}/spatial/three/ThreeLineFactory.kt | 8 ++--- .../vision}/spatial/three/ThreeMaterials.kt | 8 ++--- .../vision}/spatial/three/ThreePlugin.kt | 6 ++-- .../spatial/three/ThreeProxyFactory.kt | 8 ++--- .../spatial/three/ThreeSphereFactory.kt | 6 ++-- .../spatial/three/ThreeVisualObject.kt | 10 +++--- .../dataforge/vision}/spatial/three/csg.kt | 2 +- .../vision}/spatial/three/outputConfig.kt | 10 +++--- .../dataforge/vision}/spatial/three/three.kt | 4 +-- .../jsMain/kotlin/info/laht/threekt/THREE.kt | 0 .../laht/threekt/animation/AnimationAction.kt | 0 .../laht/threekt/animation/AnimationClip.kt | 0 .../laht/threekt/animation/AnimationMixer.kt | 0 .../laht/threekt/animation/AnimationUtils.kt | 0 .../laht/threekt/animation/KeyFrameTrack.kt | 0 .../kotlin/info/laht/threekt/audio/Audio.kt | 0 .../info/laht/threekt/audio/AudioContext.kt | 0 .../info/laht/threekt/audio/AudioListener.kt | 0 .../laht/threekt/audio/PositionalAudio.kt | 0 .../info/laht/threekt/cameras/Camera.kt | 0 .../threekt/cameras/OrthographicCamera.kt | 0 .../laht/threekt/cameras/PerspectiveCamera.kt | 0 .../info/laht/threekt/core/BufferAttribute.kt | 0 .../info/laht/threekt/core/BufferGeometry.kt | 0 .../kotlin/info/laht/threekt/core/Clock.kt | 0 .../info/laht/threekt/core/DirectGeometry.kt | 0 .../info/laht/threekt/core/EventDispatcher.kt | 0 .../kotlin/info/laht/threekt/core/Face3.kt | 0 .../kotlin/info/laht/threekt/core/Geometry.kt | 0 .../threekt/core/InstancedBufferGeometry.kt | 0 .../kotlin/info/laht/threekt/core/Layers.kt | 0 .../kotlin/info/laht/threekt/core/Object3D.kt | 0 .../info/laht/threekt/core/Raycaster.kt | 0 .../kotlin/info/laht/threekt/core/Uniform.kt | 0 .../info/laht/threekt/external/Detector.kt | 0 .../laht/threekt/external/ImprovedNoise.kt | 0 .../laht/threekt/external/SimplexNoise.kt | 0 .../threekt/external/controls/FlyControls.kt | 0 .../external/controls/OrbitControls.kt | 0 .../external/controls/TrackballControls.kt | 0 .../external/controls/TransformControls.kt | 0 .../threekt/external/exporters/OBJExporter.kt | 0 .../threekt/external/exporters/STLExporter.kt | 0 .../external/geometries/ConvexGeometry.kt | 0 .../laht/threekt/external/libs/GUIParams.kt | 0 .../info/laht/threekt/external/libs/Stats.kt | 0 .../info/laht/threekt/external/libs/datgui.kt | 0 .../threekt/external/loaders/BabylonLoader.kt | 0 .../threekt/external/loaders/GLTFLoader.kt | 0 .../threekt/external/loaders/LoaderSupport.kt | 0 .../threekt/external/loaders/MTLLoader.kt | 0 .../threekt/external/loaders/OBJLoader.kt | 0 .../threekt/external/loaders/OBJLoader2.kt | 0 .../threekt/external/loaders/STLLoader.kt | 0 .../info/laht/threekt/external/objects/Sky.kt | 0 .../laht/threekt/external/objects/Water.kt | 0 .../threekt/external/objects/WaterOptions.kt | 0 .../info/laht/threekt/extras/SceneUtils.kt | 0 .../info/laht/threekt/extras/core/Curve.kt | 0 .../laht/threekt/extras/core/CurvePath.kt | 0 .../info/laht/threekt/extras/core/Path.kt | 0 .../info/laht/threekt/extras/core/Shape.kt | 0 .../laht/threekt/extras/core/ShapePath.kt | 0 .../laht/threekt/extras/curves/ArcCurve.kt | 0 .../threekt/extras/curves/CatmullRomCurve3.kt | 0 .../threekt/extras/curves/EllipseCurve.kt | 0 .../laht/threekt/extras/curves/LineCurve.kt | 0 .../laht/threekt/extras/curves/LineCurve3.kt | 0 .../extras/curves/QuadricBezierCurve.kt | 0 .../extras/curves/QuadricBezierCurve3.kt | 0 .../laht/threekt/extras/curves/SplineCurve.kt | 0 .../laht/threekt/geometries/BoxGeometry.kt | 0 .../laht/threekt/geometries/ConeGeometry.kt | 0 .../threekt/geometries/CylinderGeometry.kt | 0 .../laht/threekt/geometries/EdgesGeometry.kt | 0 .../threekt/geometries/ExtrudedGeometry.kt | 0 .../laht/threekt/geometries/PlaneGeometry.kt | 0 .../laht/threekt/geometries/SphereGeometry.kt | 0 .../threekt/geometries/TextBufferGeometry.kt | 0 .../laht/threekt/geometries/TorusGeometry.kt | 0 .../laht/threekt/geometries/TubeGeometry.kt | 0 .../threekt/geometries/WireframeGeometry.kt | 0 .../info/laht/threekt/helpers/ArrowHelper.kt | 0 .../info/laht/threekt/helpers/AxesHelper.kt | 0 .../info/laht/threekt/helpers/Box3Helper.kt | 0 .../info/laht/threekt/helpers/CameraHelper.kt | 0 .../info/laht/threekt/helpers/GridHelper.kt | 0 .../threekt/helpers/HemisphereLightHelper.kt | 0 .../kotlin/info/laht/threekt/ktutils.kt | 0 .../info/laht/threekt/lights/AmbientLight.kt | 0 .../laht/threekt/lights/DirectionalLight.kt | 0 .../threekt/lights/DirectionalLightShadow.kt | 0 .../laht/threekt/lights/HemiSphereLight.kt | 0 .../kotlin/info/laht/threekt/lights/Light.kt | 0 .../info/laht/threekt/lights/LightShadow.kt | 0 .../info/laht/threekt/lights/PointLight.kt | 0 .../info/laht/threekt/lights/SpotLight.kt | 0 .../laht/threekt/lights/SpotLightShadow.kt | 0 .../kotlin/info/laht/threekt/loaders/Cache.kt | 0 .../loaders/CompressedTextureLoader.kt | 0 .../info/laht/threekt/loaders/ImageLoader.kt | 0 .../info/laht/threekt/loaders/JSONLoader.kt | 0 .../info/laht/threekt/loaders/Loader.kt | 0 .../laht/threekt/loaders/LoadingManager.kt | 0 .../laht/threekt/loaders/MaterialLoader.kt | 0 .../laht/threekt/loaders/TextureLoader.kt | 0 .../threekt/materials/LineBasicMaterial.kt | 0 .../threekt/materials/LineDashedMaterial.kt | 0 .../info/laht/threekt/materials/Material.kt | 0 .../threekt/materials/MeshBasicMaterial.kt | 0 .../threekt/materials/MeshDepthMaterial.kt | 0 .../threekt/materials/MeshLambertMaterial.kt | 0 .../threekt/materials/MeshNormalMaterial.kt | 0 .../threekt/materials/MeshPhongMaterial.kt | 0 .../threekt/materials/MeshPhysicalMaterial.kt | 0 .../threekt/materials/MeshStandardMaterial.kt | 0 .../laht/threekt/materials/PointsMaterial.kt | 0 .../threekt/materials/RawShaderMaterial.kt | 0 .../laht/threekt/materials/ShaderMaterial.kt | 0 .../laht/threekt/materials/SpriteMaterial.kt | 0 .../kotlin/info/laht/threekt/math/Box2.kt | 0 .../kotlin/info/laht/threekt/math/Box3.kt | 0 .../kotlin/info/laht/threekt/math/Color.kt | 0 .../info/laht/threekt/math/ColorConstants.kt | 0 .../info/laht/threekt/math/Cylindrical.kt | 0 .../kotlin/info/laht/threekt/math/Euler.kt | 0 .../kotlin/info/laht/threekt/math/Frustrum.kt | 0 .../kotlin/info/laht/threekt/math/Line3.kt | 0 .../kotlin/info/laht/threekt/math/Math.kt | 0 .../kotlin/info/laht/threekt/math/Matrix3.kt | 0 .../kotlin/info/laht/threekt/math/Matrix4.kt | 0 .../kotlin/info/laht/threekt/math/Plane.kt | 0 .../info/laht/threekt/math/Quaternion.kt | 0 .../kotlin/info/laht/threekt/math/Ray.kt | 0 .../kotlin/info/laht/threekt/math/Sphere.kt | 0 .../info/laht/threekt/math/Spherical.kt | 0 .../kotlin/info/laht/threekt/math/Triangle.kt | 0 .../kotlin/info/laht/threekt/math/Vector2.kt | 0 .../kotlin/info/laht/threekt/math/Vector3.kt | 0 .../kotlin/info/laht/threekt/math/Vector4.kt | 0 .../info/laht/threekt/math/operators.kt | 0 .../kotlin/info/laht/threekt/objects/Group.kt | 0 .../kotlin/info/laht/threekt/objects/LOD.kt | 0 .../kotlin/info/laht/threekt/objects/Line.kt | 0 .../info/laht/threekt/objects/LineLoop.kt | 0 .../info/laht/threekt/objects/LineSegments.kt | 0 .../kotlin/info/laht/threekt/objects/Mesh.kt | 0 .../info/laht/threekt/objects/Points.kt | 0 .../info/laht/threekt/objects/Sprite.kt | 0 .../laht/threekt/renderers/WebGL2Renderer.kt | 0 .../threekt/renderers/WebGL2RendererParams.kt | 0 .../threekt/renderers/WebGLRenderTarget.kt | 0 .../renderers/WebGLRenderTargetOptions.kt | 0 .../laht/threekt/renderers/WebGLRenderer.kt | 0 .../threekt/renderers/WebGLRendererParams.kt | 0 .../threekt/renderers/shaders/ShaderChunk.kt | 0 .../threekt/renderers/shaders/ShaderLib.kt | 0 .../threekt/renderers/shaders/UniformsUtil.kt | 0 .../kotlin/info/laht/threekt/scenes/Fog.kt | 0 .../info/laht/threekt/scenes/FogExp2.kt | 0 .../kotlin/info/laht/threekt/scenes/Scene.kt | 0 .../threekt/textures/CompressedTexture.kt | 0 .../info/laht/threekt/textures/CubeTexture.kt | 0 .../laht/threekt/textures/DepthTexture.kt | 0 .../info/laht/threekt/textures/Texture.kt | 0 .../vision}/spatial/fx/FX3DPlugin.kt | 12 +++---- .../vision}/spatial/fx/FXCanvas3D.kt | 8 ++--- .../vision}/spatial/fx/FXCompositeFactory.kt | 6 ++-- .../vision}/spatial/fx/FXConvexFactory.kt | 4 +-- .../vision}/spatial/fx/FXMaterials.kt | 6 ++-- .../vision}/spatial/fx/FXProxyFactory.kt | 6 ++-- .../vision}/spatial/fx/FXShapeFactory.kt | 8 ++--- .../vision}/spatial/fx/OrbitControls.kt | 4 +-- .../spatial/fx/VisualObjectFXBinding.kt | 4 +-- .../vision}/spatial/generateSchema.kt | 2 +- .../dataforge/vision}/spatial/geometryJVM.kt | 2 +- wrappers/build.gradle.kts | 2 +- 304 files changed, 437 insertions(+), 446 deletions(-) rename demo/gdml/src/commonMain/kotlin/hep/dataforge/{vis => vision}/spatial/gdml/demo/cubes.kt (97%) rename demo/gdml/src/commonTest/kotlin/hep/dataforge/{vis => vision}/spatial/gdml/GDMLVisualTest.kt (79%) rename demo/gdml/src/jsMain/kotlin/hep/dataforge/{vis => vision}/spatial/gdml/demo/GDMLAppComponent.kt (84%) rename demo/gdml/src/jsMain/kotlin/hep/dataforge/{vis => vision}/spatial/gdml/demo/GDMLDemoApp.kt (89%) rename demo/gdml/src/jsMain/kotlin/hep/dataforge/{vis => vision}/spatial/gdml/demo/fileDrop.kt (93%) rename demo/gdml/src/jvmMain/kotlin/hep/dataforge/{vis => vision}/spatial/gdml/demo/GDMLDemoApp.kt (83%) rename demo/gdml/src/jvmMain/kotlin/hep/dataforge/{vis => vision}/spatial/gdml/demo/readFile.kt (80%) rename demo/gdml/src/jvmMain/kotlin/hep/dataforge/{vis => vision}/spatial/gdml/demo/saveToJson.kt (63%) rename demo/gdml/src/jvmTest/kotlin/hep/dataforge/{vis => vision}/spatial/FileSerializationTest.kt (90%) rename demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/{vis => vision}/spatial/demo/demo.kt (93%) rename demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/{vis => vision}/spatial/demo/ThreeDemoApp.kt (96%) rename demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/{vis => vision}/spatial/demo/ThreeDemoGrid.kt (87%) rename demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/{vis => vision}/spatial/demo/VariableBox.kt (89%) rename demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/{vis => vision}/spatial/demo/FXDemoApp.kt (86%) rename demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/{vis => vision}/spatial/demo/FXDemoGrid.kt (76%) rename ui/bootstrap/src/main/kotlin/hep/dataforge/{vis => vision}/bootstrap/MetaViewerComponent.kt (98%) rename ui/bootstrap/src/main/kotlin/hep/dataforge/{vis => vision}/bootstrap/ObjectTree.kt (93%) rename ui/bootstrap/src/main/kotlin/hep/dataforge/{vis => vision}/bootstrap/bootstrap.kt (99%) rename ui/bootstrap/src/main/kotlin/hep/dataforge/{vis => vision}/bootstrap/propertyEditor.kt (90%) rename ui/material/src/main/kotlin/hep/dataforge/{vis => vision}/material/icons.kt (70%) rename ui/material/src/main/kotlin/hep/dataforge/{vis => vision}/material/misc.kt (94%) rename ui/material/src/main/kotlin/hep/dataforge/{vis => vision}/material/objectTree.kt (91%) rename ui/react/src/main/kotlin/hep/dataforge/{vis => vision}/react/TreeStyles.kt (97%) rename ui/react/src/main/kotlin/hep/dataforge/{vis => vision}/react/configEditor.kt (99%) rename ui/react/src/main/kotlin/hep/dataforge/{vis => vision}/react/layout.kt (94%) rename ui/react/src/main/kotlin/hep/dataforge/{vis => vision}/react/react.kt (96%) rename ui/react/src/main/kotlin/hep/dataforge/{vis => vision}/react/styles.kt (66%) rename ui/react/src/main/kotlin/hep/dataforge/{vis => vision}/react/valueChooser.kt (98%) rename {dataforge-vis-common => visionforge-common}/build.gradle.kts (100%) rename {dataforge-vis-common => visionforge-common}/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt (100%) rename {dataforge-vis-common => visionforge-common}/src/commonMain/kotlin/hep/dataforge/properties/Property.kt (100%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/AbstractVisualGroup.kt (99%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/AbstractVisualObject.kt (97%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/Colors.kt (99%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/SimpleVisualGroup.kt (96%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/StyleSheet.kt (98%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/Visual.kt (97%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/VisualGroup.kt (97%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/VisualObject.kt (96%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/misc.kt (96%) rename {dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis => visionforge-common/src/commonMain/kotlin/hep/dataforge/vision}/valueWidget.kt (79%) rename {dataforge-vis-common => visionforge-common}/src/jsMain/kotlin/hep/dataforge/js/Application.kt (100%) rename {dataforge-vis-common => visionforge-common}/src/jsMain/kotlin/hep/dataforge/js/bindings.kt (100%) rename {dataforge-vis-common => visionforge-common}/src/jsMain/kotlin/hep/dataforge/js/jsExtra.kt (100%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/FXPlugin.kt (99%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/ColorValueChooser.kt (97%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/ComboBoxValueChooser.kt (98%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/ConfigEditor.kt (99%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/FXMeta.kt (99%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/MetaViewer.kt (96%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/TextValueChooser.kt (98%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/ValueCallback.kt (94%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/ValueChooser.kt (97%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/ValueChooserBase.kt (98%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/VisualObjectEditorFragment.kt (95%) rename {dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision}/editor/VisualObjectTreeFragment.kt (93%) rename {dataforge-vis-common => visionforge-common}/src/jvmMain/resources/img/df.png (100%) rename {dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis => visionforge-common/src/jvmTest/kotlin/hep/dataforge/vision}/demo/MetaEditorDemo.kt (88%) rename {dataforge-vis-spatial-gdml => visionforge-gdml}/build.gradle.kts (84%) rename {dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis => visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision}/spatial/gdml/GDMLTransformer.kt (92%) rename {dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis => visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision}/spatial/gdml/units.kt (97%) rename {dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis => visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision}/spatial/gdml/visualGDML.kt (97%) rename {dataforge-vis-spatial-gdml/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/gdml/visualGDMLJvm.kt (83%) rename {dataforge-vis-spatial-gdml/src/jvmTest/kotlin/hep/dataforge/vis => visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision}/spatial/gdml/TestConvertor.kt (92%) rename {dataforge-vis-spatial-gdml => visionforge-gdml}/src/jvmTest/resources/gdml/BM@N.gdml (100%) rename {dataforge-vis-spatial-gdml => visionforge-gdml}/src/jvmTest/resources/gdml/cubes.gdml (100%) rename {dataforge-vis-spatial-gdml => visionforge-gdml}/src/jvmTest/resources/gdml/simple1.gdml (100%) rename {dataforge-vis-spatial => visionforge-spatial}/build.gradle.kts (91%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Box.kt (93%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Composite.kt (94%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/ConeSegment.kt (93%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Convex.kt (85%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Extruded.kt (93%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/GeometryBuilder.kt (97%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Label3D.kt (80%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Material3D.kt (90%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/PolyLine.kt (85%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Proxy.kt (97%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Sphere.kt (92%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Tube.kt (93%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/Visual3D.kt (94%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/VisualGroup3D.kt (98%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/VisualObject3D.kt (93%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/geometry.kt (96%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/serialization.kt (96%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/specifications/Axes.kt (84%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/specifications/Camera.kt (93%) rename dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Canvas.kt => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Canvas3DOptions.kt (65%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/specifications/Controls.kt (74%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/transform/RemoveSingleChild.kt (89%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/transform/UnRef.kt (86%) rename {dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision}/spatial/transform/VisualTreeTransform.kt (89%) rename {dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision}/spatial/ConvexTest.kt (96%) rename {dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision}/spatial/GroupTest.kt (92%) rename {dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision}/spatial/PropertyTest.kt (96%) rename {dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis => visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision}/spatial/SerializationTest.kt (90%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/geometryJs.kt (87%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/MeshThreeFactory.kt (93%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeBoxFactory.kt (73%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeCanvas.kt (86%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeCanvasComponent.kt (85%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeCanvasLabelFactory.kt (89%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeCompositeFactory.kt (87%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeConvexFactory.kt (81%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeCylinderFactory.kt (89%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeFactory.kt (86%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeGeometryBuilder.kt (91%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeLabelFactory.kt (84%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeLineFactory.kt (83%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeMaterials.kt (94%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreePlugin.kt (97%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeProxyFactory.kt (85%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeSphereFactory.kt (86%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/ThreeVisualObject.kt (75%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/csg.kt (98%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/outputConfig.kt (96%) rename {dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision}/spatial/three/three.kt (96%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/THREE.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/ktutils.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Color.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Math.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/math/operators.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt (100%) rename {dataforge-vis-spatial => visionforge-spatial}/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt (100%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/fx/FX3DPlugin.kt (94%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/fx/FXCanvas3D.kt (89%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/fx/FXCompositeFactory.kt (94%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/fx/FXConvexFactory.kt (85%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/fx/FXMaterials.kt (94%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/fx/FXProxyFactory.kt (92%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/fx/FXShapeFactory.kt (90%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/fx/OrbitControls.kt (97%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/fx/VisualObjectFXBinding.kt (96%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/generateSchema.kt (99%) rename {dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis => visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision}/spatial/geometryJVM.kt (96%) diff --git a/README.md b/README.md index 68cddca3..01c11d87 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ * [Features](#features) * [About DataForge](#about-dataforge) * [Modules contained in this repository](#modules-contained-in-this-repository) - * [dataforge-vis-common](#dataforge-vis-common) - * [dataforge-vis-spatial](#dataforge-vis-spatial) - * [dataforge-vis-spatial-gdml](#dataforge-vis-spatial-gdml) - * [dataforge-vis-jsroot](#dataforge-vis-jsroot) + * [visionforge-common](#visionforge-common) + * [visionforge-spatial](#visionforge-spatial) + * [visionforge-spatial-gdml](#visionforge-spatial-gdml) + * [visionforge-jsroot](#visionforge-jsroot) * [Visualization for External Systems](#visualization-for-external-systems) * [Demonstrations](#demonstrations) * [Simple Example - Spatial Showcase](#simple-example---spatial-showcase) @@ -56,19 +56,19 @@ To learn more about DataForge, please consult the following URLs: ## Modules contained in this repository -### dataforge-vis-common +### visionforge-common Contains a general hierarchy of classes and interfaces useful for visualization. This module is not specific to 3D-visualization. -The `dataforge-vis-common` module also includes configuration editors for JS (in `jsMain`) and JVM (in `jvmMain`). +The `visionforge-common` module also includes configuration editors for JS (in `jsMain`) and JVM (in `jvmMain`). **Class diagram:** ![](doc/resources/class-diag-common.png) -### dataforge-vis-spatial +### visionforge-spatial Includes common classes and serializers for 3D visualization, Three.js and JavaFX implementations. @@ -91,12 +91,12 @@ level. Styles are applied to child (descendant) objects using `styles: ListThree js demo for particle physics - +
) { val outputFileName = args.getOrNull(1)?:inputFileName.replace(".gdml",".json") val gdml = GDML.readFile(Paths.get(inputFileName)) - //GDML.readFile(Paths.get("D:\\Work\\Projects\\dataforge-vis\\dataforge-vis-spatial-gdml\\src\\jvmTest\\resources\\gdml\\simple1.gdml")) + //GDML.readFile(Paths.get("D:\\Work\\Projects\\visionforge\\visionforge-spatial-gdml\\src\\jvmTest\\resources\\gdml\\simple1.gdml")) val visual = gdml.toVisual { lUnit = LUnit.CM diff --git a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/FileSerializationTest.kt b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/FileSerializationTest.kt similarity index 90% rename from demo/gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/FileSerializationTest.kt rename to demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/FileSerializationTest.kt index af51354b..cd9efe74 100644 --- a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/FileSerializationTest.kt +++ b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/FileSerializationTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.names.asName import org.junit.jupiter.api.Test diff --git a/demo/muon-monitor/README.md b/demo/muon-monitor/README.md index 322056fc..39837c03 100644 --- a/demo/muon-monitor/README.md +++ b/demo/muon-monitor/README.md @@ -1,7 +1,7 @@ ### Muon Monitor Visualization -This directory contains a full-stack application example built with `dataforge-vis`. +This directory contains a full-stack application example built with `visionforge`. It is visualizing the [Muon Monitor](http://npm.mipt.ru/projects/physics.html#mounMonitor) experiment set-up, including experiment's geometry and events (particle tracks). diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts index 16bcd681..71fe9f8a 100644 --- a/demo/muon-monitor/build.gradle.kts +++ b/demo/muon-monitor/build.gradle.kts @@ -43,7 +43,7 @@ kotlin { sourceSets { commonMain { dependencies { - implementation(project(":dataforge-vis-spatial")) + implementation(project(":visionforge-spatial")) } } jvmMain { diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt index 5eddd7a4..cbffcc56 100644 --- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt +++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt @@ -1,8 +1,8 @@ @file:UseSerializers(Point3DSerializer::class) package ru.mipt.npm.muon.monitor -import hep.dataforge.vis.spatial.Point3D -import hep.dataforge.vis.spatial.Point3DSerializer +import hep.dataforge.vision.spatial.Point3D +import hep.dataforge.vision.spatial.Point3DSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt index 9c1c5115..d9572f83 100644 --- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt +++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt @@ -1,7 +1,7 @@ package ru.mipt.npm.muon.monitor -import hep.dataforge.vis.removeAll -import hep.dataforge.vis.spatial.* +import hep.dataforge.vision.removeAll +import hep.dataforge.vision.spatial.* import ru.mipt.npm.muon.monitor.Monitor.CENTRAL_LAYER_Z import ru.mipt.npm.muon.monitor.Monitor.LOWER_LAYER_Z import ru.mipt.npm.muon.monitor.Monitor.UPPER_LAYER_Z @@ -16,7 +16,7 @@ class Model { position = Point3D(pixel.center.x, pixel.center.y, pixel.center.z) box(pixel.xSize, pixel.ySize, pixel.zSize) label(pixel.name) { - z = - Monitor.PIXEL_Z_SIZE / 2 - 5 + z = -Monitor.PIXEL_Z_SIZE / 2 - 5 rotationY = PI } } @@ -74,7 +74,7 @@ class Model { highlight(it) } event.track?.let { - tracks.polyline(*it.toTypedArray(), name = "track[${event.id}]"){ + tracks.polyline(*it.toTypedArray(), name = "track[${event.id}]") { thickness = 4 } } diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt index bd414abb..b01e637f 100644 --- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt +++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt @@ -1,7 +1,7 @@ package ru.mipt.npm.muon.monitor -import hep.dataforge.vis.spatial.Point3D -import hep.dataforge.vis.spatial.plus +import hep.dataforge.vision.spatial.Point3D +import hep.dataforge.vision.spatial.plus import ru.mipt.npm.muon.monitor.Monitor.PIXEL_XY_SIZE import ru.mipt.npm.muon.monitor.Monitor.PIXEL_Z_SIZE diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt index 060de478..dd7ecd09 100644 --- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt +++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt @@ -4,17 +4,17 @@ import hep.dataforge.context.Context import hep.dataforge.names.Name import hep.dataforge.names.NameToken import hep.dataforge.names.isEmpty -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.bootstrap.card -import hep.dataforge.vis.bootstrap.objectTree -import hep.dataforge.vis.react.component -import hep.dataforge.vis.react.configEditor -import hep.dataforge.vis.react.state -import hep.dataforge.vis.spatial.specifications.Camera -import hep.dataforge.vis.spatial.specifications.Canvas -import hep.dataforge.vis.spatial.three.ThreeCanvas -import hep.dataforge.vis.spatial.three.ThreeCanvasComponent -import hep.dataforge.vis.spatial.three.canvasControls +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.bootstrap.card +import hep.dataforge.vision.bootstrap.objectTree +import hep.dataforge.vision.react.component +import hep.dataforge.vision.react.configEditor +import hep.dataforge.vision.react.state +import hep.dataforge.vision.spatial.specifications.Camera +import hep.dataforge.vision.spatial.specifications.Canvas3DOptions +import hep.dataforge.vision.spatial.three.ThreeCanvas +import hep.dataforge.vision.spatial.three.ThreeCanvasComponent +import hep.dataforge.vision.spatial.three.canvasControls import io.ktor.client.HttpClient import io.ktor.client.request.get import kotlinx.coroutines.GlobalScope @@ -31,7 +31,7 @@ interface MMAppProps : RProps { var selected: Name? } -private val canvasConfig = Canvas { +private val canvasConfig = Canvas3DOptions { camera = Camera { distance = 2100.0 latitude = PI / 6 diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt index 50792b82..b500fee8 100644 --- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt +++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt @@ -3,7 +3,7 @@ package ru.mipt.npm.muon.monitor import hep.dataforge.context.Global import hep.dataforge.js.Application import hep.dataforge.js.startApplication -import hep.dataforge.vis.spatial.Visual3D +import hep.dataforge.vision.spatial.Visual3D import io.ktor.client.HttpClient import io.ktor.client.features.json.JsonFeature import io.ktor.client.features.json.serializer.KotlinxSerializer diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt index 15df64ef..97320bac 100644 --- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt +++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt @@ -1,7 +1,7 @@ package ru.mipt.npm.muon.monitor.server -import hep.dataforge.vis.spatial.Visual3D +import hep.dataforge.vision.spatial.Visual3D import io.ktor.application.Application import io.ktor.application.call import io.ktor.application.install diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt index 488140de..9f32df4a 100644 --- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt +++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt @@ -1,6 +1,6 @@ package ru.mipt.npm.muon.monitor.sim -import hep.dataforge.vis.spatial.Point3D +import hep.dataforge.vision.spatial.Point3D import org.apache.commons.math3.geometry.euclidean.threed.Line import org.apache.commons.math3.geometry.euclidean.threed.Plane import org.apache.commons.math3.geometry.euclidean.threed.Vector3D diff --git a/demo/spatial-showcase/build.gradle.kts b/demo/spatial-showcase/build.gradle.kts index f83aaaa1..fa287c5d 100644 --- a/demo/spatial-showcase/build.gradle.kts +++ b/demo/spatial-showcase/build.gradle.kts @@ -1,4 +1,6 @@ -import scientifik.* +import scientifik.DependencyConfiguration +import scientifik.FXModule +import scientifik.useFx plugins { id("scientifik.mpp") @@ -17,8 +19,8 @@ kotlin { sourceSets { commonMain { dependencies { - api(project(":dataforge-vis-spatial")) - api(project(":dataforge-vis-spatial-gdml")) + api(project(":visionforge-spatial")) + api(project(":visionforge-gdml")) } } } diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vis/spatial/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/spatial/demo/demo.kt similarity index 93% rename from demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vis/spatial/demo/demo.kt rename to demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/spatial/demo/demo.kt index 836e6c2e..92e0d926 100644 --- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vis/spatial/demo/demo.kt +++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/spatial/demo/demo.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vis.spatial.demo +package hep.dataforge.vision.spatial.demo import hep.dataforge.meta.Meta import hep.dataforge.meta.invoke import hep.dataforge.names.toName import hep.dataforge.output.OutputManager -import hep.dataforge.vis.Colors -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.spatial.* -import hep.dataforge.vis.spatial.specifications.Canvas +import hep.dataforge.vision.Colors +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.spatial.specifications.Canvas3DOptions import kotlinx.coroutines.* import kotlin.math.PI import kotlin.math.cos @@ -20,10 +20,10 @@ fun OutputManager.demo(name: String, title: String = name, block: VisualGroup3D. "title" put title } val output = get(VisualObject::class, name.toName(), meta = meta) - output.render(action = block) + output.render (action = block) } -val canvasOptions = Canvas { +val canvasOptions = Canvas3DOptions { minSize = 500 axes { size = 500.0 diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoApp.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoApp.kt similarity index 96% rename from demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoApp.kt rename to demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoApp.kt index c773f7f7..0cead930 100644 --- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoApp.kt +++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoApp.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.demo +package hep.dataforge.vision.spatial.demo import hep.dataforge.js.Application import hep.dataforge.js.startApplication diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoGrid.kt similarity index 87% rename from demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoGrid.kt rename to demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoGrid.kt index e9f3cb8d..66c0918d 100644 --- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/ThreeDemoGrid.kt +++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoGrid.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.demo +package hep.dataforge.vision.spatial.demo import hep.dataforge.context.Global import hep.dataforge.meta.Meta @@ -7,10 +7,10 @@ import hep.dataforge.meta.string import hep.dataforge.names.Name import hep.dataforge.output.OutputManager import hep.dataforge.output.Renderer -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.spatial.three.ThreeCanvas -import hep.dataforge.vis.spatial.three.ThreePlugin -import hep.dataforge.vis.spatial.three.output +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.spatial.three.ThreeCanvas +import hep.dataforge.vision.spatial.three.ThreePlugin +import hep.dataforge.vision.spatial.three.output import kotlinx.html.dom.append import kotlinx.html.dom.create import kotlinx.html.h2 diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/VariableBox.kt similarity index 89% rename from demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/VariableBox.kt rename to demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/VariableBox.kt index 5154c84f..de11586c 100644 --- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vis/spatial/demo/VariableBox.kt +++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/VariableBox.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial.demo +package hep.dataforge.vision.spatial.demo import hep.dataforge.meta.int import hep.dataforge.meta.number @@ -8,13 +8,13 @@ import hep.dataforge.meta.setItem import hep.dataforge.names.plus import hep.dataforge.names.startsWith import hep.dataforge.values.asValue -import hep.dataforge.vis.getProperty -import hep.dataforge.vis.set -import hep.dataforge.vis.spatial.* -import hep.dataforge.vis.spatial.VisualObject3D.Companion.GEOMETRY_KEY -import hep.dataforge.vis.spatial.demo.VariableBoxThreeFactory.Z_SIZE_KEY -import hep.dataforge.vis.spatial.three.* -import hep.dataforge.vis.spatial.three.ThreeMaterials.getMaterial +import hep.dataforge.vision.getProperty +import hep.dataforge.vision.set +import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.spatial.VisualObject3D.Companion.GEOMETRY_KEY +import hep.dataforge.vision.spatial.demo.VariableBoxThreeFactory.Z_SIZE_KEY +import hep.dataforge.vision.spatial.three.* +import hep.dataforge.vision.spatial.three.ThreeMaterials.getMaterial import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Object3D import info.laht.threekt.geometries.BoxBufferGeometry diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoApp.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoApp.kt similarity index 86% rename from demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoApp.kt rename to demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoApp.kt index 109ed1da..c8649ddc 100644 --- a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoApp.kt +++ b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoApp.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vis.spatial.demo +package hep.dataforge.vision.spatial.demo -import hep.dataforge.vis.spatial.gdml.gdml +import hep.dataforge.vision.spatial.gdml.gdml import javafx.stage.Stage import tornadofx.* import java.nio.file.Paths diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoGrid.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoGrid.kt similarity index 76% rename from demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoGrid.kt rename to demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoGrid.kt index 8211f4fd..81fc18e1 100644 --- a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vis/spatial/demo/FXDemoGrid.kt +++ b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoGrid.kt @@ -1,16 +1,13 @@ -package hep.dataforge.vis.spatial.demo +package hep.dataforge.vision.spatial.demo import hep.dataforge.context.Global import hep.dataforge.meta.Meta -import hep.dataforge.meta.buildMeta import hep.dataforge.names.Name import hep.dataforge.output.OutputManager import hep.dataforge.output.Renderer -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.spatial.fx.FX3DPlugin -import hep.dataforge.vis.spatial.fx.FXCanvas3D -import hep.dataforge.vis.spatial.specifications.Axes as AxesSpec -import hep.dataforge.vis.spatial.specifications.Canvas as CanvasSpec +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.spatial.fx.FX3DPlugin +import hep.dataforge.vision.spatial.fx.FXCanvas3D import javafx.collections.FXCollections import javafx.scene.Parent import javafx.scene.control.Tab diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts index 5c53e40d..23d817e4 100644 --- a/playground/build.gradle.kts +++ b/playground/build.gradle.kts @@ -19,8 +19,8 @@ kotlin { sourceSets { commonMain { dependencies { - api(project(":dataforge-vis-spatial")) - api(project(":dataforge-vis-spatial-gdml")) + api(project(":visionforge-spatial")) + api(project(":visionforge-gdml")) api(project(":ui:bootstrap")) } } diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt index 59a52021..659b8f5d 100644 --- a/playground/src/jsMain/kotlin/PlayGroundApp.kt +++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt @@ -2,14 +2,14 @@ import hep.dataforge.context.Global import hep.dataforge.js.Application import hep.dataforge.js.startApplication import hep.dataforge.names.Name -import hep.dataforge.vis.bootstrap.objectTree -import hep.dataforge.vis.bootstrap.visualPropertyEditor -import hep.dataforge.vis.spatial.Point3D -import hep.dataforge.vis.spatial.VisualGroup3D -import hep.dataforge.vis.spatial.box -import hep.dataforge.vis.spatial.group -import hep.dataforge.vis.spatial.three.ThreePlugin -import hep.dataforge.vis.spatial.three.threeCanvas +import hep.dataforge.vision.bootstrap.objectTree +import hep.dataforge.vision.bootstrap.visualPropertyEditor +import hep.dataforge.vision.spatial.Point3D +import hep.dataforge.vision.spatial.VisualGroup3D +import hep.dataforge.vision.spatial.box +import hep.dataforge.vision.spatial.group +import hep.dataforge.vision.spatial.three.ThreePlugin +import hep.dataforge.vision.spatial.three.threeCanvas import org.w3c.dom.HTMLElement import react.dom.div import react.dom.render diff --git a/settings.gradle.kts b/settings.gradle.kts index 954a8e0b..b9635379 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,7 +32,7 @@ pluginManagement { //enableFeaturePreview("GRADLE_METADATA") -rootProject.name = "dataforge-vis" +rootProject.name = "visionforge" include( ":ui", @@ -40,9 +40,9 @@ include( ":ui:ring", ":ui:material", ":ui:bootstrap", - ":dataforge-vis-common", - ":dataforge-vis-spatial", - ":dataforge-vis-spatial-gdml", + ":visionforge-common", + ":visionforge-spatial", + ":visionforge-gdml", ":demo:spatial-showcase", ":demo:gdml", ":demo:muon-monitor", diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/MetaViewerComponent.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt similarity index 98% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/MetaViewerComponent.kt rename to ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt index 0a287e07..a8bd0f26 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/MetaViewerComponent.kt +++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.bootstrap +package hep.dataforge.vision.bootstrap import hep.dataforge.meta.Meta import hep.dataforge.meta.MetaItem diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/ObjectTree.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/ObjectTree.kt similarity index 93% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/ObjectTree.kt rename to ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/ObjectTree.kt index 1862a0bb..bf20f744 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/ObjectTree.kt +++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/ObjectTree.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vis.bootstrap +package hep.dataforge.vision.bootstrap import hep.dataforge.names.Name import hep.dataforge.names.plus import hep.dataforge.names.startsWith -import hep.dataforge.vis.VisualGroup -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.isEmpty -import hep.dataforge.vis.react.RFBuilder -import hep.dataforge.vis.react.component +import hep.dataforge.vision.VisualGroup +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.isEmpty +import hep.dataforge.vision.react.RFBuilder +import hep.dataforge.vision.react.component import kotlinx.html.classes import kotlinx.html.js.onClickFunction import org.w3c.dom.Element diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/bootstrap.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt similarity index 99% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/bootstrap.kt rename to ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt index 3eaa8c3e..a0561bd1 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/bootstrap.kt +++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.bootstrap +package hep.dataforge.vision.bootstrap import hep.dataforge.names.Name import hep.dataforge.names.NameToken diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/propertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/propertyEditor.kt similarity index 90% rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/propertyEditor.kt rename to ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/propertyEditor.kt index 07721392..edc4a89c 100644 --- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vis/bootstrap/propertyEditor.kt +++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/propertyEditor.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vis.bootstrap +package hep.dataforge.vision.bootstrap import hep.dataforge.meta.Meta import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.names.Name import hep.dataforge.names.isEmpty -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.react.configEditor +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.react.configEditor import org.w3c.dom.Element import react.RBuilder import react.dom.li diff --git a/ui/material/src/main/kotlin/hep/dataforge/vis/material/icons.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt similarity index 70% rename from ui/material/src/main/kotlin/hep/dataforge/vis/material/icons.kt rename to ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt index 1025b8ba..eae580ab 100644 --- a/ui/material/src/main/kotlin/hep/dataforge/vis/material/icons.kt +++ b/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt @@ -1,9 +1,4 @@ -package hep.dataforge.vis.material - -import react.Component -import react.RClass -import react.RProps -import react.RState +package hep.dataforge.vision.material //@JsModule("@material-ui/icons/ExpandMore") //external class ExpandMoreIcon : Component{ diff --git a/ui/material/src/main/kotlin/hep/dataforge/vis/material/misc.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt similarity index 94% rename from ui/material/src/main/kotlin/hep/dataforge/vis/material/misc.kt rename to ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt index 2967cae1..72dcaf4a 100644 --- a/ui/material/src/main/kotlin/hep/dataforge/vis/material/misc.kt +++ b/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vis.material +package hep.dataforge.vision.material -import hep.dataforge.vis.react.component -import hep.dataforge.vis.react.state +import hep.dataforge.vision.react.component +import hep.dataforge.vision.react.state import kotlinx.html.DIV import materialui.components.card.card import materialui.components.cardcontent.cardContent @@ -16,7 +16,6 @@ import materialui.components.grid.enums.GridDirection import materialui.components.grid.enums.GridStyle import materialui.components.grid.grid import materialui.components.paper.paper -import materialui.components.typography.typographyH3 import materialui.components.typography.typographyH5 import react.RBuilder import react.RProps diff --git a/ui/material/src/main/kotlin/hep/dataforge/vis/material/objectTree.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt similarity index 91% rename from ui/material/src/main/kotlin/hep/dataforge/vis/material/objectTree.kt rename to ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt index bb265c63..63b99385 100644 --- a/ui/material/src/main/kotlin/hep/dataforge/vis/material/objectTree.kt +++ b/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vis.material +package hep.dataforge.vision.material import hep.dataforge.names.Name import hep.dataforge.names.plus import hep.dataforge.names.toName -import hep.dataforge.vis.VisualGroup -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.isEmpty -import hep.dataforge.vis.react.component -import hep.dataforge.vis.react.state +import hep.dataforge.vision.VisualGroup +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.isEmpty +import hep.dataforge.vision.react.component +import hep.dataforge.vision.react.state import kotlinx.html.UL import materialui.lab.components.treeItem.treeItem import materialui.lab.components.treeView.SingleSelectTreeViewElementBuilder diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts index 3c250174..0050f585 100644 --- a/ui/react/build.gradle.kts +++ b/ui/react/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { dependencies{ - api(project(":dataforge-vis-common")) + api(project(":visionforge-common")) //api("org.jetbrains:kotlin-react:16.13.1-pre.104-kotlin-1.3.72") api("org.jetbrains:kotlin-react-dom:16.13.1-pre.104-kotlin-1.3.72") diff --git a/ui/react/src/main/kotlin/hep/dataforge/vis/react/TreeStyles.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt similarity index 97% rename from ui/react/src/main/kotlin/hep/dataforge/vis/react/TreeStyles.kt rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt index db6eb1fe..d28a6ede 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vis/react/TreeStyles.kt +++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.react +package hep.dataforge.vision.react import kotlinx.css.* import kotlinx.css.properties.deg diff --git a/ui/react/src/main/kotlin/hep/dataforge/vis/react/configEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/configEditor.kt similarity index 99% rename from ui/react/src/main/kotlin/hep/dataforge/vis/react/configEditor.kt rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/configEditor.kt index 32789854..7f99d087 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vis/react/configEditor.kt +++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/configEditor.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.react +package hep.dataforge.vision.react import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.* diff --git a/ui/react/src/main/kotlin/hep/dataforge/vis/react/layout.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt similarity index 94% rename from ui/react/src/main/kotlin/hep/dataforge/vis/react/layout.kt rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt index b911633c..5a13a089 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vis/react/layout.kt +++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.react +package hep.dataforge.vision.react import kotlinx.css.Display import kotlinx.css.FlexDirection diff --git a/ui/react/src/main/kotlin/hep/dataforge/vis/react/react.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt similarity index 96% rename from ui/react/src/main/kotlin/hep/dataforge/vis/react/react.kt rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt index 489a30e7..718a21b7 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vis/react/react.kt +++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.react +package hep.dataforge.vision.react import react.* import kotlin.properties.ReadWriteProperty diff --git a/ui/react/src/main/kotlin/hep/dataforge/vis/react/styles.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/styles.kt similarity index 66% rename from ui/react/src/main/kotlin/hep/dataforge/vis/react/styles.kt rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/styles.kt index daa1043d..5a3a7576 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vis/react/styles.kt +++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/styles.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.react +package hep.dataforge.vision.react import styled.StyleSheet diff --git a/ui/react/src/main/kotlin/hep/dataforge/vis/react/valueChooser.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt similarity index 98% rename from ui/react/src/main/kotlin/hep/dataforge/vis/react/valueChooser.kt rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt index cae3e5ec..fd579c62 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vis/react/valueChooser.kt +++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vis.react +package hep.dataforge.vision.react import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.ValueDescriptor import hep.dataforge.names.Name import hep.dataforge.values.* -import hep.dataforge.vis.Colors -import hep.dataforge.vis.widgetType +import hep.dataforge.vision.Colors +import hep.dataforge.vision.widgetType import kotlinx.css.Align import kotlinx.css.alignSelf import kotlinx.html.InputType diff --git a/dataforge-vis-common/build.gradle.kts b/visionforge-common/build.gradle.kts similarity index 100% rename from dataforge-vis-common/build.gradle.kts rename to visionforge-common/build.gradle.kts diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt similarity index 100% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/properties/Property.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/properties/Property.kt similarity index 100% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/properties/Property.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/properties/Property.kt diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualGroup.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisualGroup.kt similarity index 99% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualGroup.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisualGroup.kt index 540e9627..e7c8b279 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualGroup.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisualGroup.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.meta.MetaItem import hep.dataforge.names.Name diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisualObject.kt similarity index 97% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisualObject.kt index 82d92f48..5cae43e4 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/AbstractVisualObject.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisualObject.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.NodeDescriptor @@ -6,7 +6,7 @@ import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.values.Value import hep.dataforge.values.ValueType -import hep.dataforge.vis.VisualObject.Companion.STYLE_KEY +import hep.dataforge.vision.VisualObject.Companion.STYLE_KEY import kotlinx.serialization.Transient internal data class PropertyListener( diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Colors.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt similarity index 99% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Colors.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt index b91dbcff..4918b6c5 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Colors.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.meta.Meta import hep.dataforge.meta.MetaItem diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/SimpleVisualGroup.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisualGroup.kt similarity index 96% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/SimpleVisualGroup.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisualGroup.kt index f68b5a4c..03f8c79a 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/SimpleVisualGroup.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisualGroup.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.meta.Config import hep.dataforge.names.NameToken diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/StyleSheet.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt similarity index 98% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/StyleSheet.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt index ffecb662..f81ea5a2 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/StyleSheet.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt @@ -1,6 +1,6 @@ @file:UseSerializers(MetaSerializer::class) -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.meta.* import hep.dataforge.names.Name diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Visual.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/Visual.kt similarity index 97% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Visual.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/Visual.kt index 8aeb32a4..14c94121 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/Visual.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/Visual.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.context.* import hep.dataforge.meta.Meta diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualGroup.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/VisualGroup.kt similarity index 97% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualGroup.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/VisualGroup.kt index 2a7c76d7..d81f8cc8 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualGroup.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/VisualGroup.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.names.* import hep.dataforge.provider.Provider diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/VisualObject.kt similarity index 96% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/VisualObject.kt index 1f7afba0..38fdc48f 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/VisualObject.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/VisualObject.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.meta.Configurable import hep.dataforge.meta.Laminate @@ -8,7 +8,7 @@ import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.names.toName import hep.dataforge.provider.Type -import hep.dataforge.vis.VisualObject.Companion.TYPE +import hep.dataforge.vision.VisualObject.Companion.TYPE import kotlinx.serialization.PolymorphicSerializer import kotlinx.serialization.Transient diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/misc.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/misc.kt similarity index 96% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/misc.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/misc.kt index 6f10d798..14e5fb3c 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/misc.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/misc.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.meta.Laminate import hep.dataforge.meta.MetaItem diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt similarity index 79% rename from dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt rename to visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt index 7227a7f0..4edc70e4 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/valueWidget.kt +++ b/visionforge-common/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt @@ -1,11 +1,12 @@ -package hep.dataforge.vis +package hep.dataforge.vision -import hep.dataforge.meta.* +import hep.dataforge.meta.Meta import hep.dataforge.meta.descriptors.ValueDescriptor -import hep.dataforge.meta.descriptors.attributes import hep.dataforge.meta.descriptors.setAttribute +import hep.dataforge.meta.get +import hep.dataforge.meta.node +import hep.dataforge.meta.string import hep.dataforge.names.toName -import hep.dataforge.values.asValue /** * Extension property to access the "widget" key of [ValueDescriptor] diff --git a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/js/Application.kt b/visionforge-common/src/jsMain/kotlin/hep/dataforge/js/Application.kt similarity index 100% rename from dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/js/Application.kt rename to visionforge-common/src/jsMain/kotlin/hep/dataforge/js/Application.kt diff --git a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/js/bindings.kt b/visionforge-common/src/jsMain/kotlin/hep/dataforge/js/bindings.kt similarity index 100% rename from dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/js/bindings.kt rename to visionforge-common/src/jsMain/kotlin/hep/dataforge/js/bindings.kt diff --git a/dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/js/jsExtra.kt b/visionforge-common/src/jsMain/kotlin/hep/dataforge/js/jsExtra.kt similarity index 100% rename from dataforge-vis-common/src/jsMain/kotlin/hep/dataforge/js/jsExtra.kt rename to visionforge-common/src/jsMain/kotlin/hep/dataforge/js/jsExtra.kt diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt similarity index 99% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt index ca5a7c24..91d1f0c1 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/FXPlugin.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis +package hep.dataforge.vision import hep.dataforge.context.* import hep.dataforge.meta.Meta diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ColorValueChooser.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt similarity index 97% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ColorValueChooser.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt index b130dc21..fe2101ec 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ColorValueChooser.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import hep.dataforge.meta.Meta import hep.dataforge.names.Name diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ComboBoxValueChooser.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt similarity index 98% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ComboBoxValueChooser.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt index 3b7bdc33..72798444 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ComboBoxValueChooser.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import hep.dataforge.meta.Meta import hep.dataforge.meta.get diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ConfigEditor.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt similarity index 99% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ConfigEditor.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt index 0b86456a..bff11a59 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ConfigEditor.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView @@ -11,7 +11,7 @@ import hep.dataforge.context.Global import hep.dataforge.meta.Config import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.names.NameToken -import hep.dataforge.vis.dfIconView +import hep.dataforge.vision.dfIconView import javafx.scene.Node import javafx.scene.control.* import javafx.scene.control.cell.TextFieldTreeTableCell diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt similarity index 99% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt index e4ed11a8..04d954b6 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/FXMeta.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.ItemDescriptor diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/MetaViewer.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/MetaViewer.kt similarity index 96% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/MetaViewer.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/MetaViewer.kt index c433aac6..ca6edcc2 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/MetaViewer.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/MetaViewer.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import hep.dataforge.meta.Meta -import hep.dataforge.vis.dfIconView +import hep.dataforge.vision.dfIconView import javafx.beans.property.SimpleStringProperty import javafx.scene.control.TreeItem import javafx.scene.control.TreeSortMode diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/TextValueChooser.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt similarity index 98% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/TextValueChooser.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt index c1f611fb..e6cff8fe 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/TextValueChooser.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import hep.dataforge.meta.Meta import hep.dataforge.names.Name diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueCallback.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueCallback.kt similarity index 94% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueCallback.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueCallback.kt index 7989eaed..c7c7dd8d 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueCallback.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueCallback.kt @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import hep.dataforge.values.Value diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooser.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt similarity index 97% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooser.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt index 56794fcb..df270f35 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooser.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import hep.dataforge.context.Context import hep.dataforge.context.Named @@ -14,8 +14,8 @@ import hep.dataforge.provider.Type import hep.dataforge.provider.provideByType import hep.dataforge.values.Null import hep.dataforge.values.Value -import hep.dataforge.vis.widget -import hep.dataforge.vis.widgetType +import hep.dataforge.vision.widget +import hep.dataforge.vision.widgetType import javafx.beans.property.ObjectProperty import javafx.beans.value.ObservableValue import javafx.scene.Node diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooserBase.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt similarity index 98% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooserBase.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt index 9c415a43..b05fb4fb 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/ValueChooserBase.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import hep.dataforge.meta.descriptors.ValueDescriptor import hep.dataforge.values.Null diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectEditorFragment.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt similarity index 95% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectEditorFragment.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt index 371259db..56f1e1e0 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectEditorFragment.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor import hep.dataforge.meta.Config import hep.dataforge.meta.Meta import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.meta.update -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.findStyle +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.findStyle import javafx.beans.binding.Binding import javafx.beans.property.SimpleObjectProperty import javafx.scene.Node diff --git a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectTreeFragment.kt b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt similarity index 93% rename from dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectTreeFragment.kt rename to visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt index fad759b9..079abf01 100644 --- a/dataforge-vis-common/src/jvmMain/kotlin/hep/dataforge/vis/editor/VisualObjectTreeFragment.kt +++ b/visionforge-common/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vis.editor +package hep.dataforge.vision.editor -import hep.dataforge.vis.VisualGroup -import hep.dataforge.vis.VisualObject +import hep.dataforge.vision.VisualGroup +import hep.dataforge.vision.VisualObject import javafx.beans.property.SimpleObjectProperty import javafx.scene.control.SelectionMode import javafx.scene.control.TreeItem diff --git a/dataforge-vis-common/src/jvmMain/resources/img/df.png b/visionforge-common/src/jvmMain/resources/img/df.png similarity index 100% rename from dataforge-vis-common/src/jvmMain/resources/img/df.png rename to visionforge-common/src/jvmMain/resources/img/df.png diff --git a/dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/demo/MetaEditorDemo.kt b/visionforge-common/src/jvmTest/kotlin/hep/dataforge/vision/demo/MetaEditorDemo.kt similarity index 88% rename from dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/demo/MetaEditorDemo.kt rename to visionforge-common/src/jvmTest/kotlin/hep/dataforge/vision/demo/MetaEditorDemo.kt index f41a9d41..888812a4 100644 --- a/dataforge-vis-common/src/jvmTest/kotlin/hep/dataforge/vis/demo/MetaEditorDemo.kt +++ b/visionforge-common/src/jvmTest/kotlin/hep/dataforge/vision/demo/MetaEditorDemo.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vis.demo +package hep.dataforge.vision.demo import hep.dataforge.meta.Meta import hep.dataforge.meta.asConfig import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.values.ValueType -import hep.dataforge.vis.editor.ConfigEditor -import hep.dataforge.vis.editor.FXMeta -import hep.dataforge.vis.editor.MetaViewer +import hep.dataforge.vision.editor.ConfigEditor +import hep.dataforge.vision.editor.FXMeta +import hep.dataforge.vision.editor.MetaViewer import javafx.geometry.Orientation import tornadofx.* diff --git a/dataforge-vis-spatial-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts similarity index 84% rename from dataforge-vis-spatial-gdml/build.gradle.kts rename to visionforge-gdml/build.gradle.kts index 9a645843..2439df8c 100644 --- a/dataforge-vis-spatial-gdml/build.gradle.kts +++ b/visionforge-gdml/build.gradle.kts @@ -6,7 +6,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api(project(":dataforge-vis-spatial")) + api(project(":visionforge-spatial")) api("scientifik:gdml:0.1.8") } } diff --git a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GDMLTransformer.kt similarity index 92% rename from dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/GDMLTransformer.kt rename to visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GDMLTransformer.kt index 1ee32597..cb5fe784 100644 --- a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/GDMLTransformer.kt +++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GDMLTransformer.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vis.spatial.gdml +package hep.dataforge.vision.spatial.gdml import hep.dataforge.meta.Meta import hep.dataforge.meta.MetaBuilder import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.names.toName -import hep.dataforge.vis.spatial.* -import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_COLOR_KEY -import hep.dataforge.vis.useStyle +import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_COLOR_KEY +import hep.dataforge.vision.useStyle import scientifik.gdml.* import kotlin.random.Random diff --git a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/units.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/units.kt similarity index 97% rename from dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/units.kt rename to visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/units.kt index b5ade4bf..4b54a0a9 100644 --- a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/units.kt +++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/units.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.gdml +package hep.dataforge.vision.spatial.gdml import scientifik.gdml.AUnit import scientifik.gdml.GDMLPosition diff --git a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDML.kt similarity index 97% rename from dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt rename to visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDML.kt index 3d0ffc63..023875c3 100644 --- a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt +++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDML.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vis.spatial.gdml +package hep.dataforge.vision.spatial.gdml import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.names.plus -import hep.dataforge.vis.get -import hep.dataforge.vis.set -import hep.dataforge.vis.spatial.* -import hep.dataforge.vis.spatial.World.ONE -import hep.dataforge.vis.spatial.World.ZERO +import hep.dataforge.vision.get +import hep.dataforge.vision.set +import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.spatial.World.ONE +import hep.dataforge.vision.spatial.World.ZERO import scientifik.gdml.* import kotlin.math.cos import kotlin.math.sin diff --git a/dataforge-vis-spatial-gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDMLJvm.kt b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDMLJvm.kt similarity index 83% rename from dataforge-vis-spatial-gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDMLJvm.kt rename to visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDMLJvm.kt index 1127cead..178c300f 100644 --- a/dataforge-vis-spatial-gdml/src/jvmMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDMLJvm.kt +++ b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDMLJvm.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vis.spatial.gdml +package hep.dataforge.vision.spatial.gdml -import hep.dataforge.vis.spatial.VisualGroup3D +import hep.dataforge.vision.spatial.VisualGroup3D import nl.adaptivity.xmlutil.StAXReader import scientifik.gdml.GDML import java.nio.file.Files diff --git a/dataforge-vis-spatial-gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/gdml/TestConvertor.kt similarity index 92% rename from dataforge-vis-spatial-gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/gdml/TestConvertor.kt rename to visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/gdml/TestConvertor.kt index 8e1519ed..60d885f7 100644 --- a/dataforge-vis-spatial-gdml/src/jvmTest/kotlin/hep/dataforge/vis/spatial/gdml/TestConvertor.kt +++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/gdml/TestConvertor.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vis.spatial.gdml +package hep.dataforge.vision.spatial.gdml -import hep.dataforge.vis.spatial.stringify +import hep.dataforge.vision.spatial.stringify import nl.adaptivity.xmlutil.StAXReader import org.junit.jupiter.api.Test import scientifik.gdml.GDML diff --git a/dataforge-vis-spatial-gdml/src/jvmTest/resources/gdml/BM@N.gdml b/visionforge-gdml/src/jvmTest/resources/gdml/BM@N.gdml similarity index 100% rename from dataforge-vis-spatial-gdml/src/jvmTest/resources/gdml/BM@N.gdml rename to visionforge-gdml/src/jvmTest/resources/gdml/BM@N.gdml diff --git a/dataforge-vis-spatial-gdml/src/jvmTest/resources/gdml/cubes.gdml b/visionforge-gdml/src/jvmTest/resources/gdml/cubes.gdml similarity index 100% rename from dataforge-vis-spatial-gdml/src/jvmTest/resources/gdml/cubes.gdml rename to visionforge-gdml/src/jvmTest/resources/gdml/cubes.gdml diff --git a/dataforge-vis-spatial-gdml/src/jvmTest/resources/gdml/simple1.gdml b/visionforge-gdml/src/jvmTest/resources/gdml/simple1.gdml similarity index 100% rename from dataforge-vis-spatial-gdml/src/jvmTest/resources/gdml/simple1.gdml rename to visionforge-gdml/src/jvmTest/resources/gdml/simple1.gdml diff --git a/dataforge-vis-spatial/build.gradle.kts b/visionforge-spatial/build.gradle.kts similarity index 91% rename from dataforge-vis-spatial/build.gradle.kts rename to visionforge-spatial/build.gradle.kts index 6cc31048..64479464 100644 --- a/dataforge-vis-spatial/build.gradle.kts +++ b/visionforge-spatial/build.gradle.kts @@ -1,4 +1,4 @@ -import scientifik.* +import scientifik.useSerialization plugins { id("scientifik.mpp") @@ -14,7 +14,7 @@ kotlin { sourceSets { commonMain { dependencies { - api(project(":dataforge-vis-common")) + api(project(":visionforge-common")) } } jvmMain { diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Box.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Box.kt similarity index 93% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Box.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Box.kt index 969dc885..741cec2a 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Box.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Box.kt @@ -1,13 +1,13 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.context.Context import hep.dataforge.meta.Config import hep.dataforge.meta.Meta import hep.dataforge.meta.float import hep.dataforge.meta.get -import hep.dataforge.vis.* -import hep.dataforge.vis.spatial.Box.Companion.TYPE_NAME +import hep.dataforge.vision.* +import hep.dataforge.vision.spatial.Box.Companion.TYPE_NAME import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Composite.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Composite.kt similarity index 94% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Composite.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Composite.kt index bb623ddd..6de1b7be 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Composite.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Composite.kt @@ -1,11 +1,11 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config import hep.dataforge.meta.update import hep.dataforge.names.NameToken -import hep.dataforge.vis.* +import hep.dataforge.vision.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/ConeSegment.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/ConeSegment.kt similarity index 93% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/ConeSegment.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/ConeSegment.kt index acefde7b..f1c7d6e3 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/ConeSegment.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/ConeSegment.kt @@ -1,11 +1,11 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.AbstractVisualObject -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.set +import hep.dataforge.vision.AbstractVisualObject +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Convex.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Convex.kt similarity index 85% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Convex.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Convex.kt index cb67afbf..4e39bfc4 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Convex.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Convex.kt @@ -1,11 +1,11 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.AbstractVisualObject -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.set +import hep.dataforge.vision.AbstractVisualObject +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Extruded.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Extruded.kt similarity index 93% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Extruded.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Extruded.kt index 4c4769ff..47605024 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Extruded.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Extruded.kt @@ -1,10 +1,10 @@ @file:UseSerializers(Point2DSerializer::class, Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.AbstractVisualObject -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.set +import hep.dataforge.vision.AbstractVisualObject +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/GeometryBuilder.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/GeometryBuilder.kt similarity index 97% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/GeometryBuilder.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/GeometryBuilder.kt index f189a007..ec6b39a0 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/GeometryBuilder.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/GeometryBuilder.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Meta diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Label3D.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Label3D.kt similarity index 80% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Label3D.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Label3D.kt index b179464e..867cdd3f 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Label3D.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Label3D.kt @@ -1,11 +1,11 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.AbstractVisualObject -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.set +import hep.dataforge.vision.AbstractVisualObject +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Material3D.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Material3D.kt similarity index 90% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Material3D.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Material3D.kt index b6fb9603..2de4369d 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Material3D.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Material3D.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.NodeDescriptor @@ -7,11 +7,11 @@ import hep.dataforge.names.asName import hep.dataforge.names.plus import hep.dataforge.values.ValueType import hep.dataforge.values.asValue -import hep.dataforge.vis.Colors -import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_COLOR_KEY -import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_KEY -import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY -import hep.dataforge.vis.widgetType +import hep.dataforge.vision.Colors +import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_COLOR_KEY +import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_KEY +import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY +import hep.dataforge.vision.widgetType class Material3D : Scheme() { diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/PolyLine.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/PolyLine.kt similarity index 85% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/PolyLine.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/PolyLine.kt index f2f2a2d0..fdca47d6 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/PolyLine.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/PolyLine.kt @@ -1,14 +1,14 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config import hep.dataforge.meta.number import hep.dataforge.names.asName import hep.dataforge.names.plus -import hep.dataforge.vis.AbstractVisualObject -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.set +import hep.dataforge.vision.AbstractVisualObject +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Proxy.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Proxy.kt similarity index 97% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Proxy.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Proxy.kt index b121fe5d..db9fb05b 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Proxy.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Proxy.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config import hep.dataforge.meta.Laminate @@ -8,13 +8,11 @@ import hep.dataforge.meta.MetaItem import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.meta.get import hep.dataforge.names.* -import hep.dataforge.vis.* +import hep.dataforge.vision.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import kotlinx.serialization.UseSerializers -import kotlin.collections.component1 -import kotlin.collections.component2 import kotlin.collections.set /** @@ -200,6 +198,6 @@ fun VisualGroup3D.proxyGroup( templateName: Name = name.toName(), block: MutableVisualGroup.() -> Unit ): Proxy { - val group = VisualGroup3D().apply(block) + val group = VisualGroup3D().apply (block) return proxy(name, group, templateName) } diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Sphere.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Sphere.kt similarity index 92% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Sphere.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Sphere.kt index 1a9a74ce..43e23b6f 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Sphere.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Sphere.kt @@ -1,11 +1,11 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.AbstractVisualObject -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.set +import hep.dataforge.vision.AbstractVisualObject +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Tube.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Tube.kt similarity index 93% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Tube.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Tube.kt index 04d2e0a7..c8a2f846 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Tube.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Tube.kt @@ -1,10 +1,11 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial + +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config -import hep.dataforge.vis.AbstractVisualObject -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.set +import hep.dataforge.vision.AbstractVisualObject +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.set import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers @@ -53,8 +54,8 @@ class Tube( geometryBuilder.apply { //creating shape in x-y plane with z = 0 - val bottomOuterPoints = shape(radius, -height/2) - val upperOuterPoints = shape(radius, height/2) + val bottomOuterPoints = shape(radius, -height / 2) + val upperOuterPoints = shape(radius, height / 2) //outer face (1 until segments).forEach { face4(bottomOuterPoints[it - 1], bottomOuterPoints[it], upperOuterPoints[it], upperOuterPoints[it - 1]) @@ -78,8 +79,8 @@ class Tube( face4(zeroTop, zeroBottom, bottomOuterPoints.last(), upperOuterPoints.last()) } } else { - val bottomInnerPoints = shape(innerRadius, -height/2) - val upperInnerPoints = shape(innerRadius, height/2) + val bottomInnerPoints = shape(innerRadius, -height / 2) + val upperInnerPoints = shape(innerRadius, height / 2) //outer face (1 until segments).forEach { // inner surface diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Visual3D.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Visual3D.kt similarity index 94% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Visual3D.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Visual3D.kt index 02c4d139..6ccd9cfb 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Visual3D.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Visual3D.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.context.AbstractPlugin import hep.dataforge.context.Context @@ -7,9 +7,9 @@ import hep.dataforge.context.PluginTag import hep.dataforge.meta.* import hep.dataforge.names.Name import hep.dataforge.names.toName -import hep.dataforge.vis.SimpleVisualGroup -import hep.dataforge.vis.Visual -import hep.dataforge.vis.VisualObject +import hep.dataforge.vision.SimpleVisualGroup +import hep.dataforge.vision.Visual +import hep.dataforge.vision.VisualObject import kotlinx.serialization.UnstableDefault import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonConfiguration diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualGroup3D.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisualGroup3D.kt similarity index 98% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualGroup3D.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisualGroup3D.kt index 1f596665..6c4cd8cb 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualGroup3D.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisualGroup3D.kt @@ -2,13 +2,13 @@ Point3DSerializer::class ) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Config import hep.dataforge.names.Name import hep.dataforge.names.NameToken import hep.dataforge.names.asName -import hep.dataforge.vis.* +import hep.dataforge.vision.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualObject3D.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisualObject3D.kt similarity index 93% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualObject3D.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisualObject3D.kt index 849206a2..e31ba99c 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/VisualObject3D.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisualObject3D.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.NodeDescriptor @@ -9,12 +9,12 @@ import hep.dataforge.names.plus import hep.dataforge.output.Renderer import hep.dataforge.values.ValueType import hep.dataforge.values.asValue -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.enum -import hep.dataforge.vis.spatial.VisualObject3D.Companion.DETAIL_KEY -import hep.dataforge.vis.spatial.VisualObject3D.Companion.IGNORE_KEY -import hep.dataforge.vis.spatial.VisualObject3D.Companion.LAYER_KEY -import hep.dataforge.vis.spatial.VisualObject3D.Companion.VISIBLE_KEY +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.enum +import hep.dataforge.vision.spatial.VisualObject3D.Companion.DETAIL_KEY +import hep.dataforge.vision.spatial.VisualObject3D.Companion.IGNORE_KEY +import hep.dataforge.vision.spatial.VisualObject3D.Companion.LAYER_KEY +import hep.dataforge.vision.spatial.VisualObject3D.Companion.VISIBLE_KEY import kotlinx.serialization.UseSerializers /** diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/geometry.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/geometry.kt similarity index 96% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/geometry.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/geometry.kt index 5eb71cd2..6eaa23f1 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/geometry.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/geometry.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.Meta import hep.dataforge.meta.get diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/serialization.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/serialization.kt similarity index 96% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/serialization.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/serialization.kt index d4164529..628c2b9f 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/serialization.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/serialization.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.double import hep.dataforge.names.NameToken -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.VisualGroup -import hep.dataforge.vis.VisualObject +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.VisualGroup +import hep.dataforge.vision.VisualObject import kotlinx.serialization.* import kotlinx.serialization.builtins.MapSerializer import kotlinx.serialization.builtins.nullable diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Axes.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Axes.kt similarity index 84% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Axes.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Axes.kt index eace3211..71fd7402 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Axes.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Axes.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.specifications +package hep.dataforge.vision.spatial.specifications import hep.dataforge.meta.* diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Camera.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Camera.kt similarity index 93% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Camera.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Camera.kt index 0ff4534b..1745e075 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Camera.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Camera.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.specifications +package hep.dataforge.vision.spatial.specifications import hep.dataforge.meta.Scheme import hep.dataforge.meta.SchemeSpec diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Canvas.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Canvas3DOptions.kt similarity index 65% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Canvas.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Canvas3DOptions.kt index ba762d9a..06b9c31b 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Canvas.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Canvas3DOptions.kt @@ -1,15 +1,15 @@ -package hep.dataforge.vis.spatial.specifications +package hep.dataforge.vision.spatial.specifications import hep.dataforge.meta.Scheme import hep.dataforge.meta.SchemeSpec import hep.dataforge.meta.int import hep.dataforge.meta.spec -class Canvas : Scheme() { +class Canvas3DOptions : Scheme() { var axes by spec(Axes, Axes.empty()) var camera by spec(Camera, Camera.empty()) var controls by spec(Controls, Controls.empty()) var minSize by int(300) - companion object : SchemeSpec(::Canvas) + companion object : SchemeSpec(::Canvas3DOptions) } \ No newline at end of file diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Controls.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Controls.kt similarity index 74% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Controls.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Controls.kt index 6b7de59c..5e50316f 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/specifications/Controls.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Controls.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.specifications +package hep.dataforge.vision.spatial.specifications import hep.dataforge.meta.Scheme import hep.dataforge.meta.SchemeSpec diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/RemoveSingleChild.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/RemoveSingleChild.kt similarity index 89% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/RemoveSingleChild.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/RemoveSingleChild.kt index 309bc873..666b0935 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/RemoveSingleChild.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/RemoveSingleChild.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vis.spatial.transform +package hep.dataforge.vision.spatial.transform import hep.dataforge.meta.update import hep.dataforge.names.asName -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.VisualGroup -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.spatial.* +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.VisualGroup +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.spatial.* internal fun mergeChild(parent: VisualGroup, child: VisualObject): VisualObject { return child.apply { diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/UnRef.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/UnRef.kt similarity index 86% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/UnRef.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/UnRef.kt index e619a8c5..a72d766e 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/UnRef.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/UnRef.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vis.spatial.transform +package hep.dataforge.vision.spatial.transform import hep.dataforge.names.Name import hep.dataforge.names.asName -import hep.dataforge.vis.MutableVisualGroup -import hep.dataforge.vis.VisualGroup -import hep.dataforge.vis.spatial.Proxy -import hep.dataforge.vis.spatial.VisualGroup3D +import hep.dataforge.vision.MutableVisualGroup +import hep.dataforge.vision.VisualGroup +import hep.dataforge.vision.spatial.Proxy +import hep.dataforge.vision.spatial.VisualGroup3D object UnRef : VisualTreeTransform() { private fun VisualGroup.countRefs(): Map { diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/VisualTreeTransform.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/VisualTreeTransform.kt similarity index 89% rename from dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/VisualTreeTransform.kt rename to visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/VisualTreeTransform.kt index 88c6fd12..f1615dbe 100644 --- a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/transform/VisualTreeTransform.kt +++ b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/VisualTreeTransform.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vis.spatial.transform +package hep.dataforge.vision.spatial.transform -import hep.dataforge.vis.VisualObject +import hep.dataforge.vision.VisualObject /** * A root class for [VisualObject] tree optimization diff --git a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/ConvexTest.kt b/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/ConvexTest.kt similarity index 96% rename from dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/ConvexTest.kt rename to visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/ConvexTest.kt index b20e47c8..6f455d48 100644 --- a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/ConvexTest.kt +++ b/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/ConvexTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.MetaItem import hep.dataforge.meta.getIndexed diff --git a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/GroupTest.kt b/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/GroupTest.kt similarity index 92% rename from dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/GroupTest.kt rename to visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/GroupTest.kt index 2f627526..a816701f 100644 --- a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/GroupTest.kt +++ b/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/GroupTest.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial -import hep.dataforge.vis.Colors -import hep.dataforge.vis.get +import hep.dataforge.vision.Colors +import hep.dataforge.vision.get import kotlin.math.PI import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/PropertyTest.kt b/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/PropertyTest.kt similarity index 96% rename from dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/PropertyTest.kt rename to visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/PropertyTest.kt index e219d6b0..21bde40d 100644 --- a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/PropertyTest.kt +++ b/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/PropertyTest.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.int import hep.dataforge.meta.set import hep.dataforge.names.asName -import hep.dataforge.vis.useStyle +import hep.dataforge.vision.useStyle import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/SerializationTest.kt b/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/SerializationTest.kt similarity index 90% rename from dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/SerializationTest.kt rename to visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/SerializationTest.kt index 6dd4cd5a..00707d68 100644 --- a/dataforge-vis-spatial/src/commonTest/kotlin/hep/dataforge/vis/spatial/SerializationTest.kt +++ b/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/SerializationTest.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.names.toName -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.get +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.get import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/geometryJs.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/geometryJs.kt similarity index 87% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/geometryJs.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/geometryJs.kt index cba5d958..89e01ab4 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/geometryJs.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/geometryJs.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import info.laht.threekt.math.Vector2 diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/MeshThreeFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/MeshThreeFactory.kt similarity index 93% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/MeshThreeFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/MeshThreeFactory.kt index 3fe11462..b2d9c592 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/MeshThreeFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/MeshThreeFactory.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.meta.boolean import hep.dataforge.meta.node import hep.dataforge.names.asName import hep.dataforge.names.plus import hep.dataforge.names.startsWith -import hep.dataforge.vis.spatial.Material3D -import hep.dataforge.vis.spatial.VisualObject3D -import hep.dataforge.vis.spatial.layer -import hep.dataforge.vis.spatial.three.ThreeMaterials.getMaterial +import hep.dataforge.vision.spatial.Material3D +import hep.dataforge.vision.spatial.VisualObject3D +import hep.dataforge.vision.spatial.layer +import hep.dataforge.vision.spatial.three.ThreeMaterials.getMaterial import info.laht.threekt.core.BufferGeometry import info.laht.threekt.geometries.EdgesGeometry import info.laht.threekt.geometries.WireframeGeometry diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeBoxFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeBoxFactory.kt similarity index 73% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeBoxFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeBoxFactory.kt index 3d09e744..89737fa5 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeBoxFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeBoxFactory.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three -import hep.dataforge.vis.spatial.Box -import hep.dataforge.vis.spatial.detail +import hep.dataforge.vision.spatial.Box +import hep.dataforge.vision.spatial.detail import info.laht.threekt.geometries.BoxBufferGeometry object ThreeBoxFactory : MeshThreeFactory(Box::class) { diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvas.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvas.kt similarity index 86% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvas.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvas.kt index 7e16160f..c4d5cd06 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvas.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvas.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.context.Context import hep.dataforge.meta.Meta @@ -8,13 +8,13 @@ import hep.dataforge.names.Name import hep.dataforge.names.plus import hep.dataforge.names.toName import hep.dataforge.output.Renderer -import hep.dataforge.vis.Colors -import hep.dataforge.vis.spatial.VisualObject3D -import hep.dataforge.vis.spatial.specifications.Camera -import hep.dataforge.vis.spatial.specifications.Canvas -import hep.dataforge.vis.spatial.specifications.Controls -import hep.dataforge.vis.spatial.three.ThreeMaterials.HIGHLIGHT_MATERIAL -import hep.dataforge.vis.spatial.three.ThreeMaterials.SELECTED_MATERIAL +import hep.dataforge.vision.Colors +import hep.dataforge.vision.spatial.VisualObject3D +import hep.dataforge.vision.spatial.specifications.Camera +import hep.dataforge.vision.spatial.specifications.Canvas3DOptions +import hep.dataforge.vision.spatial.specifications.Controls +import hep.dataforge.vision.spatial.three.ThreeMaterials.HIGHLIGHT_MATERIAL +import hep.dataforge.vision.spatial.three.ThreeMaterials.SELECTED_MATERIAL import info.laht.threekt.WebGLRenderer import info.laht.threekt.cameras.PerspectiveCamera import info.laht.threekt.core.BufferGeometry @@ -41,7 +41,7 @@ import kotlin.math.sin /** * */ -class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val canvas: Canvas) : Renderer { +class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Canvas3DOptions) : Renderer { override val context: Context get() = three.context @@ -55,15 +55,15 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val canvas: Canv var onClick: ((Name?) -> Unit)? = null - val axes = AxesHelper(canvas.axes.size.toInt()).apply { - visible = canvas.axes.visible + val axes = AxesHelper(options.axes.size.toInt()).apply { + visible = options.axes.visible } val scene: Scene = Scene().apply { add(axes) } - val camera = buildCamera(canvas.camera) + val camera = buildCamera(options.camera) private var picked: Object3D? = null @@ -90,7 +90,7 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val canvas: Canv setClearColor(Colors.skyblue, 1) } - addControls(renderer.domElement, canvas.controls) + addControls(renderer.domElement, options.controls) fun animate() { val picked = pick() @@ -109,7 +109,7 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val canvas: Canv element.appendChild(renderer.domElement) - renderer.setSize(max(canvas.minSize, element.clientWidth), max(canvas.minSize, element.clientWidth)) + renderer.setSize(max(options.minSize, element.clientWidth), max(options.minSize, element.clientWidth)) window.onresize = { renderer.setSize(element.clientWidth, element.clientWidth) @@ -241,8 +241,8 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val canvas: Canv } } -fun ThreePlugin.output(element: HTMLElement, spec: Canvas = Canvas.empty()): ThreeCanvas = +fun ThreePlugin.output(element: HTMLElement, spec: Canvas3DOptions = Canvas3DOptions.empty()): ThreeCanvas = ThreeCanvas(element, this, spec) -fun ThreePlugin.render(element: HTMLElement, obj: VisualObject3D, spec: Canvas = Canvas.empty()): Unit = +fun ThreePlugin.render(element: HTMLElement, obj: VisualObject3D, spec: Canvas3DOptions = Canvas3DOptions.empty()): Unit = output(element, spec).render(obj) \ No newline at end of file diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvasComponent.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasComponent.kt similarity index 85% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvasComponent.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasComponent.kt index a5618284..d48ae96f 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvasComponent.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasComponent.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.context.Context import hep.dataforge.names.Name -import hep.dataforge.vis.spatial.VisualObject3D -import hep.dataforge.vis.spatial.specifications.Canvas +import hep.dataforge.vision.spatial.VisualObject3D +import hep.dataforge.vision.spatial.specifications.Canvas3DOptions import org.w3c.dom.Element import org.w3c.dom.HTMLElement import react.RBuilder @@ -16,7 +16,7 @@ import react.dom.findDOMNode interface ThreeCanvasProps : RProps { var context: Context var obj: VisualObject3D - var options: Canvas? + var options: Canvas3DOptions? var selected: Name? var clickCallback: (Name?) -> Unit var canvasCallback: ((ThreeCanvas?) -> Unit)? @@ -35,7 +35,7 @@ class ThreeCanvasComponent : RComponent() { if(canvas == null) { val element = state.element as? HTMLElement ?: error("Canvas element not found") val three: ThreePlugin = props.context.plugins.fetch(ThreePlugin) - canvas = three.output(element, props.options ?: Canvas.empty()).apply { + canvas = three.output(element, props.options ?: Canvas3DOptions.empty()).apply { onClick = props.clickCallback } props.canvasCallback?.invoke(canvas) @@ -61,11 +61,11 @@ class ThreeCanvasComponent : RComponent() { } } -fun RBuilder.threeCanvas(object3D: VisualObject3D, options: Canvas.() -> Unit = {}) { +fun RBuilder.threeCanvas(object3D: VisualObject3D, options: Canvas3DOptions.() -> Unit = {}) { child(ThreeCanvasComponent::class) { attrs { this.obj = object3D - this.options = Canvas.invoke(options) + this.options = Canvas3DOptions.invoke(options) } } } \ No newline at end of file diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvasLabelFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasLabelFactory.kt similarity index 89% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvasLabelFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasLabelFactory.kt index 50b6c0c5..1a9bae69 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCanvasLabelFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasLabelFactory.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three -import hep.dataforge.vis.spatial.Label3D -import hep.dataforge.vis.spatial.color -import hep.dataforge.vis.spatial.three.ThreeCanvas.Companion.DO_NOT_HIGHLIGHT_TAG +import hep.dataforge.vision.spatial.Label3D +import hep.dataforge.vision.spatial.color +import hep.dataforge.vision.spatial.three.ThreeCanvas.Companion.DO_NOT_HIGHLIGHT_TAG import info.laht.threekt.DoubleSide import info.laht.threekt.core.Object3D import info.laht.threekt.geometries.PlaneBufferGeometry diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCompositeFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCompositeFactory.kt similarity index 87% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCompositeFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCompositeFactory.kt index 8b88208d..816e8356 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCompositeFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCompositeFactory.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three -import hep.dataforge.vis.spatial.Composite -import hep.dataforge.vis.spatial.CompositeType +import hep.dataforge.vision.spatial.Composite +import hep.dataforge.vision.spatial.CompositeType import info.laht.threekt.core.BufferGeometry import info.laht.threekt.objects.Mesh diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeConvexFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeConvexFactory.kt similarity index 81% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeConvexFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeConvexFactory.kt index 728e19fb..536d6f7f 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeConvexFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeConvexFactory.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three -import hep.dataforge.vis.spatial.Convex +import hep.dataforge.vision.spatial.Convex import info.laht.threekt.external.geometries.ConvexBufferGeometry import info.laht.threekt.math.Vector3 diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCylinderFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCylinderFactory.kt similarity index 89% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCylinderFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCylinderFactory.kt index 9b9e17e9..87d4d8e9 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCylinderFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCylinderFactory.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three -import hep.dataforge.vis.spatial.ConeSegment -import hep.dataforge.vis.spatial.detail +import hep.dataforge.vision.spatial.ConeSegment +import hep.dataforge.vision.spatial.detail import info.laht.threekt.core.BufferGeometry import info.laht.threekt.geometries.CylinderBufferGeometry import kotlin.math.PI diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeFactory.kt similarity index 86% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeFactory.kt index f12a0a47..9889da23 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeFactory.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.names.Name import hep.dataforge.names.startsWith import hep.dataforge.provider.Type -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.spatial.* -import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_KEY -import hep.dataforge.vis.spatial.three.ThreeFactory.Companion.TYPE -import hep.dataforge.vis.spatial.three.ThreeMaterials.getMaterial +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_KEY +import hep.dataforge.vision.spatial.three.ThreeFactory.Companion.TYPE +import hep.dataforge.vision.spatial.three.ThreeMaterials.getMaterial import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Object3D import info.laht.threekt.objects.Mesh diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeGeometryBuilder.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeGeometryBuilder.kt similarity index 91% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeGeometryBuilder.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeGeometryBuilder.kt index c263e031..fb9ce1b2 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeGeometryBuilder.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeGeometryBuilder.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.meta.Meta import hep.dataforge.meta.get import hep.dataforge.meta.int -import hep.dataforge.vis.spatial.GeometryBuilder -import hep.dataforge.vis.spatial.Point3D +import hep.dataforge.vision.spatial.GeometryBuilder +import hep.dataforge.vision.spatial.Point3D import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Face3 import info.laht.threekt.core.Geometry diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeLabelFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLabelFactory.kt similarity index 84% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeLabelFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLabelFactory.kt index 54e0ae03..f1097c82 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeLabelFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLabelFactory.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.js.jsObject import hep.dataforge.meta.MetaItem import hep.dataforge.names.Name -import hep.dataforge.vis.spatial.Label3D -import hep.dataforge.vis.spatial.three.ThreeMaterials.getMaterial +import hep.dataforge.vision.spatial.Label3D +import hep.dataforge.vision.spatial.three.ThreeMaterials.getMaterial import info.laht.threekt.core.Object3D import info.laht.threekt.geometries.TextBufferGeometry import info.laht.threekt.objects.Mesh diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeLineFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLineFactory.kt similarity index 83% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeLineFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLineFactory.kt index f8e5bb01..b1f96663 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeLineFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLineFactory.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.meta.node -import hep.dataforge.vis.spatial.PolyLine -import hep.dataforge.vis.spatial.color -import hep.dataforge.vis.spatial.three.ThreeMaterials.DEFAULT_LINE_COLOR +import hep.dataforge.vision.spatial.PolyLine +import hep.dataforge.vision.spatial.color +import hep.dataforge.vision.spatial.three.ThreeMaterials.DEFAULT_LINE_COLOR import info.laht.threekt.core.Geometry import info.laht.threekt.core.Object3D import info.laht.threekt.math.Color diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeMaterials.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeMaterials.kt similarity index 94% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeMaterials.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeMaterials.kt index 6a36ddeb..61d09ec7 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeMaterials.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeMaterials.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.meta.* import hep.dataforge.values.ValueType -import hep.dataforge.vis.Colors -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.spatial.Material3D +import hep.dataforge.vision.Colors +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.spatial.Material3D import info.laht.threekt.materials.LineBasicMaterial import info.laht.threekt.materials.Material import info.laht.threekt.materials.MeshBasicMaterial diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreePlugin.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreePlugin.kt similarity index 97% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreePlugin.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreePlugin.kt index 223ef6d6..705424b2 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreePlugin.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreePlugin.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.context.* import hep.dataforge.meta.Meta import hep.dataforge.names.* -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.spatial.* +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.spatial.* import info.laht.threekt.core.Object3D import kotlin.collections.set import kotlin.reflect.KClass diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeProxyFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeProxyFactory.kt similarity index 85% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeProxyFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeProxyFactory.kt index 05bdd9e1..32723f2f 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeProxyFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeProxyFactory.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.names.toName -import hep.dataforge.vis.spatial.Proxy -import hep.dataforge.vis.spatial.Proxy.Companion.PROXY_CHILD_PROPERTY_PREFIX -import hep.dataforge.vis.spatial.VisualObject3D +import hep.dataforge.vision.spatial.Proxy +import hep.dataforge.vision.spatial.Proxy.Companion.PROXY_CHILD_PROPERTY_PREFIX +import hep.dataforge.vision.spatial.VisualObject3D import info.laht.threekt.core.Object3D class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory { diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeSphereFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeSphereFactory.kt similarity index 86% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeSphereFactory.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeSphereFactory.kt index d81bdcb9..bc993997 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeSphereFactory.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeSphereFactory.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three -import hep.dataforge.vis.spatial.Sphere -import hep.dataforge.vis.spatial.detail +import hep.dataforge.vision.spatial.Sphere +import hep.dataforge.vision.spatial.detail import info.laht.threekt.core.BufferGeometry import info.laht.threekt.geometries.SphereBufferGeometry diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeVisualObject.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeVisualObject.kt similarity index 75% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeVisualObject.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeVisualObject.kt index 7d2d6126..e0e6afbf 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeVisualObject.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeVisualObject.kt @@ -1,12 +1,12 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.meta.Config -import hep.dataforge.vis.AbstractVisualObject -import hep.dataforge.vis.spatial.Point3D -import hep.dataforge.vis.spatial.Point3DSerializer -import hep.dataforge.vis.spatial.VisualObject3D +import hep.dataforge.vision.AbstractVisualObject +import hep.dataforge.vision.spatial.Point3D +import hep.dataforge.vision.spatial.Point3DSerializer +import hep.dataforge.vision.spatial.VisualObject3D import info.laht.threekt.core.Object3D import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/csg.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/csg.kt similarity index 98% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/csg.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/csg.kt index 615e4624..7d1547a4 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/csg.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/csg.kt @@ -9,7 +9,7 @@ "NESTED_CLASS_IN_EXTERNAL_INTERFACE" ) -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import info.laht.threekt.math.Matrix4 diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/outputConfig.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/outputConfig.kt similarity index 96% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/outputConfig.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/outputConfig.kt index 196651b9..b881d4e3 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/outputConfig.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/outputConfig.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.js.requireJS -import hep.dataforge.vis.bootstrap.accordion -import hep.dataforge.vis.bootstrap.entry -import hep.dataforge.vis.spatial.Visual3D -import hep.dataforge.vis.spatial.VisualGroup3D +import hep.dataforge.vision.bootstrap.accordion +import hep.dataforge.vision.bootstrap.entry +import hep.dataforge.vision.spatial.Visual3D +import hep.dataforge.vision.spatial.VisualGroup3D import kotlinx.html.* import kotlinx.html.dom.append import kotlinx.html.js.onChangeFunction diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/three.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/three.kt similarity index 96% rename from dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/three.kt rename to visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/three.kt index 9f3a7985..52d8fe2e 100644 --- a/dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/three.kt +++ b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/three.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial.three +package hep.dataforge.vision.spatial.three import hep.dataforge.meta.MetaItem import hep.dataforge.meta.float import hep.dataforge.meta.get import hep.dataforge.meta.node -import hep.dataforge.vis.spatial.* +import hep.dataforge.vision.spatial.* import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.DirectGeometry import info.laht.threekt.core.Face3 diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/THREE.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/THREE.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/THREE.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/THREE.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/ktutils.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/ktutils.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/ktutils.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/ktutils.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Color.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Color.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Color.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Color.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Math.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Math.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Math.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Math.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/operators.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/operators.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/math/operators.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/operators.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt diff --git a/dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt b/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt similarity index 100% rename from dataforge-vis-spatial/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt rename to visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FX3DPlugin.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FX3DPlugin.kt similarity index 94% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FX3DPlugin.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FX3DPlugin.kt index 081d5fdb..4d675833 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FX3DPlugin.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FX3DPlugin.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vis.spatial.fx +package hep.dataforge.vision.spatial.fx import hep.dataforge.context.* import hep.dataforge.meta.Meta import hep.dataforge.meta.boolean import hep.dataforge.provider.Type -import hep.dataforge.vis.spatial.* -import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_KEY -import hep.dataforge.vis.spatial.Material3D.Companion.MATERIAL_WIREFRAME_KEY -import hep.dataforge.vis.spatial.fx.FX3DFactory.Companion.TYPE +import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_KEY +import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_WIREFRAME_KEY +import hep.dataforge.vision.spatial.fx.FX3DFactory.Companion.TYPE import javafx.scene.Group import javafx.scene.Node import javafx.scene.shape.CullFace @@ -19,8 +19,6 @@ import javafx.scene.transform.Rotate import org.fxyz3d.shapes.composites.PolyLine3D import org.fxyz3d.shapes.primitives.CuboidMesh import org.fxyz3d.shapes.primitives.SpheroidMesh -import kotlin.collections.component1 -import kotlin.collections.component2 import kotlin.collections.set import kotlin.math.PI import kotlin.reflect.KClass diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXCanvas3D.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCanvas3D.kt similarity index 89% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXCanvas3D.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCanvas3D.kt index 499a2e5d..18354607 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXCanvas3D.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCanvas3D.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vis.spatial.fx +package hep.dataforge.vision.spatial.fx import hep.dataforge.context.Context import hep.dataforge.context.ContextAware import hep.dataforge.meta.Meta import hep.dataforge.output.Renderer -import hep.dataforge.vis.spatial.VisualObject3D -import hep.dataforge.vis.spatial.specifications.Canvas +import hep.dataforge.vision.spatial.VisualObject3D +import hep.dataforge.vision.spatial.specifications.Canvas3DOptions import javafx.application.Platform import javafx.beans.property.ObjectProperty import javafx.beans.property.SimpleObjectProperty @@ -14,7 +14,7 @@ import javafx.scene.paint.Color import org.fxyz3d.scene.Axes import tornadofx.* -class FXCanvas3D(val plugin: FX3DPlugin, val spec: Canvas = Canvas.empty()) : +class FXCanvas3D(val plugin: FX3DPlugin, val spec: Canvas3DOptions = Canvas3DOptions.empty()) : Fragment(), Renderer, ContextAware { override val context: Context get() = plugin.context diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXCompositeFactory.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCompositeFactory.kt similarity index 94% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXCompositeFactory.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCompositeFactory.kt index a4af60f6..a9f7f04c 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXCompositeFactory.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCompositeFactory.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial.fx +package hep.dataforge.vision.spatial.fx import eu.mihosoft.jcsg.CSG import eu.mihosoft.jcsg.Polygon import eu.mihosoft.vvecmath.Vector3d -import hep.dataforge.vis.spatial.Composite -import hep.dataforge.vis.spatial.CompositeType +import hep.dataforge.vision.spatial.Composite +import hep.dataforge.vision.spatial.CompositeType import javafx.scene.Group import javafx.scene.Node import javafx.scene.shape.MeshView diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXConvexFactory.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXConvexFactory.kt similarity index 85% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXConvexFactory.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXConvexFactory.kt index aeeb2cac..2d8c76fa 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXConvexFactory.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXConvexFactory.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vis.spatial.fx +package hep.dataforge.vision.spatial.fx import eu.mihosoft.jcsg.PropertyStorage import eu.mihosoft.jcsg.ext.quickhull3d.HullUtil import eu.mihosoft.vvecmath.Vector3d -import hep.dataforge.vis.spatial.Convex +import hep.dataforge.vision.spatial.Convex import javafx.scene.Node import kotlin.reflect.KClass diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXMaterials.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXMaterials.kt similarity index 94% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXMaterials.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXMaterials.kt index 1e78d8d5..c80b03fb 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXMaterials.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXMaterials.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vis.spatial.fx +package hep.dataforge.vision.spatial.fx import hep.dataforge.meta.MetaItem import hep.dataforge.meta.double import hep.dataforge.meta.get import hep.dataforge.meta.int import hep.dataforge.values.ValueType -import hep.dataforge.vis.Colors -import hep.dataforge.vis.spatial.Material3D +import hep.dataforge.vision.Colors +import hep.dataforge.vision.spatial.Material3D import javafx.scene.paint.Color import javafx.scene.paint.Material import javafx.scene.paint.PhongMaterial diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXProxyFactory.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXProxyFactory.kt similarity index 92% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXProxyFactory.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXProxyFactory.kt index 47900222..760a6121 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXProxyFactory.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXProxyFactory.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial.fx +package hep.dataforge.vision.spatial.fx import hep.dataforge.names.Name import hep.dataforge.names.isEmpty import hep.dataforge.names.toName -import hep.dataforge.vis.VisualObject -import hep.dataforge.vis.spatial.Proxy +import hep.dataforge.vision.VisualObject +import hep.dataforge.vision.spatial.Proxy import javafx.scene.Group import javafx.scene.Node import kotlin.reflect.KClass diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXShapeFactory.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXShapeFactory.kt similarity index 90% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXShapeFactory.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXShapeFactory.kt index 0dd58c45..3f49ad57 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/FXShapeFactory.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXShapeFactory.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vis.spatial.fx +package hep.dataforge.vision.spatial.fx import hep.dataforge.meta.Meta -import hep.dataforge.vis.spatial.GeometryBuilder -import hep.dataforge.vis.spatial.Point3D -import hep.dataforge.vis.spatial.Shape +import hep.dataforge.vision.spatial.GeometryBuilder +import hep.dataforge.vision.spatial.Point3D +import hep.dataforge.vision.spatial.Shape import javafx.scene.shape.Mesh import javafx.scene.shape.MeshView import javafx.scene.shape.TriangleMesh diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/OrbitControls.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/OrbitControls.kt similarity index 97% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/OrbitControls.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/OrbitControls.kt index ce3f2d7d..ff3b838a 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/OrbitControls.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/OrbitControls.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.fx +package hep.dataforge.vision.spatial.fx import javafx.beans.InvalidationListener import javafx.beans.property.SimpleDoubleProperty @@ -14,7 +14,7 @@ import javafx.scene.transform.Rotate import javafx.scene.transform.Translate import tornadofx.* import kotlin.math.* -import hep.dataforge.vis.spatial.specifications.Camera as CameraSpec +import hep.dataforge.vision.spatial.specifications.Camera as CameraSpec class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec: CameraSpec) { diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/VisualObjectFXBinding.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/VisualObjectFXBinding.kt similarity index 96% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/VisualObjectFXBinding.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/VisualObjectFXBinding.kt index 7a28da76..34d9d7d6 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/VisualObjectFXBinding.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/VisualObjectFXBinding.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vis.spatial.fx +package hep.dataforge.vision.spatial.fx import hep.dataforge.meta.* import hep.dataforge.names.Name import hep.dataforge.names.startsWith import hep.dataforge.names.toName -import hep.dataforge.vis.VisualObject +import hep.dataforge.vision.VisualObject import javafx.application.Platform import javafx.beans.binding.ObjectBinding import tornadofx.* diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/generateSchema.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/generateSchema.kt similarity index 99% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/generateSchema.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/generateSchema.kt index 54a2c08d..ae1dc8e2 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/generateSchema.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/generateSchema.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import hep.dataforge.meta.JSON_PRETTY import kotlinx.serialization.* diff --git a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/geometryJVM.kt b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/geometryJVM.kt similarity index 96% rename from dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/geometryJVM.kt rename to visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/geometryJVM.kt index 1d9c1a04..2bb29ac1 100644 --- a/dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/geometryJVM.kt +++ b/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/geometryJVM.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial +package hep.dataforge.vision.spatial import org.fxyz3d.geometry.Point3D as FXPoint3D actual data class Point2D(actual var x: Double, actual var y: Double) { diff --git a/wrappers/build.gradle.kts b/wrappers/build.gradle.kts index 0d79fcc0..6baa876c 100644 --- a/wrappers/build.gradle.kts +++ b/wrappers/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - api(project(":dataforge-vis-common")) + api(project(":visionforge-common")) testCompile(kotlin("test-js")) }