From 423b36b3de56c339059dd34d2419298291d4190a Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 8 Aug 2020 09:40:07 +0300 Subject: [PATCH] Final global refactoring --- demo/gdml/build.gradle.kts | 2 +- .../{spatial => solid}/gdml/demo/cubes.kt | 2 +- .../{spatial => solid}/gdml/GDMLVisualTest.kt | 10 +- .../gdml/demo/GDMLAppComponent.kt | 24 +-- .../gdml/demo/GDMLDemoApp.kt | 10 +- .../{spatial => solid}/gdml/demo/fileDrop.kt | 2 +- .../gdml/demo/GDMLDemoApp.kt | 18 +-- .../{spatial => solid}/gdml/demo/readFile.kt | 28 ++-- .../gdml/demo/saveToJson.kt | 10 +- .../FileSerializationTest.kt | 4 +- demo/muon-monitor/build.gradle.kts | 2 +- .../kotlin/ru/mipt/npm/muon/monitor/Event.kt | 4 +- .../kotlin/ru/mipt/npm/muon/monitor/Model.kt | 14 +- .../ru/mipt/npm/muon/monitor/Monitor.kt | 4 +- .../mipt/npm/muon/monitor/MMAppComponent.kt | 12 +- .../ru/mipt/npm/muon/monitor/MMDemoApp.kt | 4 +- .../mipt/npm/muon/monitor/server/MMServer.kt | 4 +- .../ru/mipt/npm/muon/monitor/sim/line.kt | 2 +- demo/spatial-showcase/build.gradle.kts | 4 +- .../vision/{spatial => solid}/demo/demo.kt | 8 +- .../{spatial => solid}/demo/ThreeDemoApp.kt | 2 +- .../{spatial => solid}/demo/ThreeDemoGrid.kt | 8 +- .../{spatial => solid}/demo/VariableBox.kt | 28 ++-- .../{spatial => solid}/demo/FXDemoApp.kt | 4 +- .../{spatial => solid}/demo/FXDemoGrid.kt | 6 +- playground/build.gradle.kts | 2 +- playground/src/jsMain/kotlin/PlayGroundApp.kt | 14 +- settings.gradle.kts | 2 +- .../hep/dataforge/vision/AbstractVision.kt | 49 +++---- .../dataforge/vision/AbstractVisionGroup.kt | 7 +- .../hep/dataforge/vision/SimpleVisionGroup.kt | 2 +- .../kotlin/hep/dataforge/vision/StyleSheet.kt | 41 ++++-- .../kotlin/hep/dataforge/vision/Vision.kt | 29 +--- .../hep/dataforge/vision/VisionGroup.kt | 2 +- .../hep/dataforge/vision/VisionManager.kt | 114 +++++++++++++-- .../editor/VisualObjectEditorFragment.kt | 5 +- visionforge-gdml/build.gradle.kts | 2 +- .../gdml/GDMLTransformer.kt | 18 +-- .../{spatial => solid}/gdml/GdmlVision.kt | 30 ++-- .../vision/{spatial => solid}/gdml/units.kt | 2 +- .../{spatial => solid}/gdml/visualGDMLJvm.kt | 6 +- .../{spatial => solid}/gdml/TestConvertor.kt | 4 +- .../build.gradle.kts | 0 .../kotlin/hep/dataforge/vision/solid}/Box.kt | 47 +++--- .../hep/dataforge/vision/solid}/Composite.kt | 24 +-- .../dataforge/vision/solid}/ConeSegment.kt | 8 +- .../hep/dataforge/vision/solid}/Convex.kt | 12 +- .../hep/dataforge/vision/solid}/Extruded.kt | 8 +- .../vision/solid}/GeometryBuilder.kt | 6 +- .../hep/dataforge/vision/solid}/PolyLine.kt | 10 +- .../hep/dataforge/vision/solid}/Proxy.kt | 52 ++++--- .../hep/dataforge/vision/solid/Solid.kt | 88 ++++++----- .../hep/dataforge/vision/solid/SolidGroup.kt | 32 ++-- .../hep/dataforge/vision/solid/SolidLabel.kt | 12 +- .../dataforge/vision/solid/SolidManager.kt | 137 ++++++++++++++++++ .../dataforge/vision/solid/SolidMaterial.kt | 32 ++-- .../hep/dataforge/vision/solid}/Sphere.kt | 8 +- .../hep/dataforge/vision/solid}/Tube.kt | 8 +- .../hep/dataforge/vision/solid}/geometry.kt | 12 +- .../dataforge/vision/solid}/serialization.kt | 6 +- .../vision/solid}/specifications/Axes.kt | 2 +- .../vision/solid}/specifications/Camera.kt | 2 +- .../solid}/specifications/Canvas3DOptions.kt | 2 +- .../vision/solid}/specifications/Controls.kt | 2 +- .../solid}/transform/RemoveSingleChild.kt | 12 +- .../vision/solid}/transform/UnRef.kt | 14 +- .../solid}/transform/VisualTreeTransform.kt | 2 +- .../hep/dataforge/vision/solid}/ConvexTest.kt | 6 +- .../hep/dataforge/vision/solid}/GroupTest.kt | 8 +- .../dataforge/vision/solid}/PropertyTest.kt | 15 +- .../vision/solid}/SerializationTest.kt | 7 +- .../dataforge/vision/solid/SolidPluginTest.kt | 28 ++++ .../hep/dataforge/vision/solid}/geometryJs.kt | 2 +- .../vision/solid}/three/MeshThreeFactory.kt | 24 +-- .../vision/solid}/three/ThreeBoxFactory.kt | 6 +- .../vision/solid}/three/ThreeCanvas.kt | 22 +-- .../solid}/three/ThreeCanvasComponent.kt | 10 +- .../solid}/three/ThreeCanvasLabelFactory.kt | 14 +- .../solid}/three/ThreeCompositeFactory.kt | 6 +- .../vision/solid}/three/ThreeConvexFactory.kt | 4 +- .../solid}/three/ThreeCylinderFactory.kt | 6 +- .../vision/solid}/three/ThreeFactory.kt | 24 +-- .../solid}/three/ThreeGeometryBuilder.kt | 6 +- .../vision/solid/three/ThreeLabelFactory.kt | 31 ++++ .../vision/solid}/three/ThreeLineFactory.kt | 10 +- .../vision/solid}/three/ThreeMaterials.kt | 26 ++-- .../vision/solid}/three/ThreePlugin.kt | 34 ++--- .../vision/solid}/three/ThreeProxyFactory.kt | 12 +- .../vision/solid}/three/ThreeSphereFactory.kt | 6 +- .../vision/solid}/three/ThreeVision.kt | 14 +- .../hep/dataforge/vision/solid}/three/csg.kt | 2 +- .../vision/solid}/three/outputConfig.kt | 18 +-- .../dataforge/vision/solid}/three/three.kt | 6 +- .../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 .../dataforge/vision/solid}/fx/FX3DPlugin.kt | 50 +++---- .../dataforge/vision/solid}/fx/FXCanvas3D.kt | 14 +- .../vision/solid}/fx/FXCompositeFactory.kt | 6 +- .../vision/solid}/fx/FXConvexFactory.kt | 4 +- .../dataforge/vision/solid}/fx/FXMaterials.kt | 12 +- .../vision/solid}/fx/FXProxyFactory.kt | 6 +- .../vision/solid}/fx/FXShapeFactory.kt | 14 +- .../vision/solid}/fx/OrbitControls.kt | 4 +- .../vision/solid}/fx/VisualObjectFXBinding.kt | 4 +- .../dataforge/vision/solid}/generateSchema.kt | 28 ++-- .../dataforge/vision/solid}/geometryJVM.kt | 2 +- .../vision/spatial/SpatialVisionManager.kt | 81 ----------- .../vision/spatial/three/ThreeLabelFactory.kt | 33 ----- 262 files changed, 943 insertions(+), 745 deletions(-) rename demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/demo/cubes.kt (97%) rename demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/GDMLVisualTest.kt (56%) rename demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/demo/GDMLAppComponent.kt (87%) rename demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/demo/GDMLDemoApp.kt (89%) rename demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/demo/fileDrop.kt (93%) rename demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/demo/GDMLDemoApp.kt (82%) rename demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/demo/readFile.kt (56%) rename demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/demo/saveToJson.kt (76%) rename demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/{spatial => solid}/FileSerializationTest.kt (78%) rename demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/{spatial => solid}/demo/demo.kt (95%) rename demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/{spatial => solid}/demo/ThreeDemoApp.kt (96%) rename demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/{spatial => solid}/demo/ThreeDemoGrid.kt (89%) rename demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/{spatial => solid}/demo/VariableBox.kt (81%) rename demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/{spatial => solid}/demo/FXDemoApp.kt (86%) rename demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/{spatial => solid}/demo/FXDemoGrid.kt (88%) rename visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/GDMLTransformer.kt (77%) rename visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/GdmlVision.kt (93%) rename visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/units.kt (97%) rename visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/visualGDMLJvm.kt (65%) rename visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/{spatial => solid}/gdml/TestConvertor.kt (92%) rename {visionforge-spatial => visionforge-solid}/build.gradle.kts (100%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/Box.kt (65%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/Composite.kt (77%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/ConeSegment.kt (94%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/Convex.kt (77%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/Extruded.kt (94%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/GeometryBuilder.kt (89%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/PolyLine.kt (76%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/Proxy.kt (81%) rename visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Vision3D.kt => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt (65%) rename visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisionGroup3D.kt => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt (78%) rename visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Label3D.kt => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt (64%) create mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt rename visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Material3D.kt => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt (77%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/Sphere.kt (92%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/Tube.kt (96%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/geometry.kt (85%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/serialization.kt (94%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/specifications/Axes.kt (84%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/specifications/Camera.kt (93%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/specifications/Canvas3DOptions.kt (88%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/specifications/Controls.kt (74%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/transform/RemoveSingleChild.kt (84%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/transform/UnRef.kt (78%) rename {visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid}/transform/VisualTreeTransform.kt (94%) rename {visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid}/ConvexTest.kt (85%) rename {visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid}/GroupTest.kt (84%) rename {visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid}/PropertyTest.kt (82%) rename {visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid}/SerializationTest.kt (87%) create mode 100644 visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/geometryJs.kt (87%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/MeshThreeFactory.kt (84%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeBoxFactory.kt (73%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeCanvas.kt (90%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeCanvasComponent.kt (87%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeCanvasLabelFactory.kt (80%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeCompositeFactory.kt (87%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeConvexFactory.kt (81%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeCylinderFactory.kt (89%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeFactory.kt (72%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeGeometryBuilder.kt (91%) create mode 100644 visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeLineFactory.kt (78%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeMaterials.kt (68%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreePlugin.kt (83%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeProxyFactory.kt (79%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeSphereFactory.kt (86%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/ThreeVision.kt (61%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/csg.kt (98%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/outputConfig.kt (89%) rename {visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid}/three/three.kt (93%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/THREE.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/ktutils.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Color.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Math.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/math/operators.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt (100%) rename {visionforge-spatial => visionforge-solid}/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt (100%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/fx/FX3DPlugin.kt (69%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/fx/FXCanvas3D.kt (84%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/fx/FXCompositeFactory.kt (94%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/fx/FXConvexFactory.kt (85%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/fx/FXMaterials.kt (81%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/fx/FXProxyFactory.kt (92%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/fx/FXShapeFactory.kt (79%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/fx/OrbitControls.kt (97%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/fx/VisualObjectFXBinding.kt (96%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/generateSchema.kt (89%) rename {visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial => visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid}/geometryJVM.kt (96%) delete mode 100644 visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/SpatialVisionManager.kt delete mode 100644 visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLabelFactory.kt diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts index f505a6df..f1593d84 100644 --- a/demo/gdml/build.gradle.kts +++ b/demo/gdml/build.gradle.kts @@ -23,7 +23,7 @@ kotlin { sourceSets { commonMain { dependencies { - implementation(project(":visionforge-spatial")) + implementation(project(":visionforge-solid")) implementation(project(":visionforge-gdml")) } } diff --git a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/cubes.kt b/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/demo/cubes.kt similarity index 97% rename from demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/cubes.kt rename to demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/demo/cubes.kt index 53dca27d..d682d25d 100644 --- a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/cubes.kt +++ b/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/demo/cubes.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.gdml.demo +package hep.dataforge.vision.solid.gdml.demo import scientifik.gdml.* diff --git a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/spatial/gdml/GDMLVisualTest.kt b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/solid/gdml/GDMLVisualTest.kt similarity index 56% rename from demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/spatial/gdml/GDMLVisualTest.kt rename to demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/solid/gdml/GDMLVisualTest.kt index 228206ed..3b2679b3 100644 --- a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/spatial/gdml/GDMLVisualTest.kt +++ b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/solid/gdml/GDMLVisualTest.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vision.spatial.gdml +package hep.dataforge.vision.solid.gdml import hep.dataforge.meta.setItem import hep.dataforge.meta.string import hep.dataforge.names.toName import hep.dataforge.values.asValue -import hep.dataforge.vision.spatial.Material3D -import hep.dataforge.vision.spatial.gdml.demo.cubes +import hep.dataforge.vision.solid.SolidMaterial +import hep.dataforge.vision.solid.gdml.demo.cubes import kotlin.test.Test import kotlin.test.assertEquals @@ -14,7 +14,7 @@ class GDMLVisualTest { fun testPrototypeProperty() { val gdml = cubes() val visual = gdml.toVision() - visual["composite000.segment0".toName()]?.setItem(Material3D.MATERIAL_COLOR_KEY, "red".asValue()) - assertEquals("red", visual["composite000.segment0".toName()]?.getItem(Material3D.MATERIAL_COLOR_KEY).string) + visual["composite000.segment0".toName()]?.setItem(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue()) + assertEquals("red", visual["composite000.segment0".toName()]?.getItem(SolidMaterial.MATERIAL_COLOR_KEY).string) } } \ No newline at end of file diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/solid/gdml/demo/GDMLAppComponent.kt similarity index 87% rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLAppComponent.kt rename to demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/solid/gdml/demo/GDMLAppComponent.kt index 791afc70..0fdb7e37 100644 --- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLAppComponent.kt +++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/solid/gdml/demo/GDMLAppComponent.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.gdml.demo +package hep.dataforge.vision.solid.gdml.demo import hep.dataforge.context.Context import hep.dataforge.names.Name @@ -10,14 +10,14 @@ import hep.dataforge.vision.react.component import hep.dataforge.vision.react.configEditor import hep.dataforge.vision.react.flexColumn import hep.dataforge.vision.react.state -import hep.dataforge.vision.spatial.Vision3D -import hep.dataforge.vision.spatial.VisionGroup3D -import hep.dataforge.vision.spatial.gdml.toVision -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 hep.dataforge.vision.solid.Solid +import hep.dataforge.vision.solid.SolidGroup +import hep.dataforge.vision.solid.gdml.toVision +import hep.dataforge.vision.solid.specifications.Camera +import hep.dataforge.vision.solid.specifications.Canvas3DOptions +import hep.dataforge.vision.solid.three.ThreeCanvas +import hep.dataforge.vision.solid.three.ThreeCanvasComponent +import hep.dataforge.vision.solid.three.canvasControls import kotlinx.css.FlexBasis import kotlinx.css.Overflow import kotlinx.css.flex @@ -62,7 +62,7 @@ val GDMLApp = component { props -> val gdml = GDML.parse(data) gdml.toVision(gdmlConfiguration) } - name.endsWith(".json") -> VisionGroup3D.parseJson(data) + name.endsWith(".json") -> SolidGroup.parseJson(data) else -> { window.alert("File extension is not recognized: $name") error("File extension is not recognized: $name") @@ -107,7 +107,7 @@ val GDMLApp = component { props -> gridColumn(6, maxSize= GridMaxSize.XL, classes = "order-1 order-xl-2") { //canvas - (visual as? Vision3D)?.let { visual3D -> + (visual as? Solid)?.let { visual3D -> child(ThreeCanvasComponent::class) { attrs { this.context = props.context @@ -143,7 +143,7 @@ val GDMLApp = component { props -> else -> (visual as? VisionGroup)?.get(selected) } if (selectedObject != null) { - configEditor(selectedObject, default = selectedObject.properties(), key = selected) + configEditor(selectedObject, default = selectedObject.getAllProperties(), key = selected) } } } diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/solid/gdml/demo/GDMLDemoApp.kt similarity index 89% rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLDemoApp.kt rename to demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/solid/gdml/demo/GDMLDemoApp.kt index 4a68d2b1..cd8d38f1 100644 --- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLDemoApp.kt +++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/solid/gdml/demo/GDMLDemoApp.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision.spatial.gdml.demo +package hep.dataforge.vision.solid.gdml.demo import hep.dataforge.context.Global import hep.dataforge.js.Application import hep.dataforge.js.startApplication -import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_OPACITY_KEY -import hep.dataforge.vision.spatial.gdml.GDMLTransformer -import hep.dataforge.vision.spatial.gdml.LUnit -import hep.dataforge.vision.spatial.gdml.toVision +import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY +import hep.dataforge.vision.solid.gdml.GDMLTransformer +import hep.dataforge.vision.solid.gdml.LUnit +import hep.dataforge.vision.solid.gdml.toVision import kotlinx.css.* import react.child import react.dom.render diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/fileDrop.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/solid/gdml/demo/fileDrop.kt similarity index 93% rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/fileDrop.kt rename to demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/solid/gdml/demo/fileDrop.kt index 0a93373f..0d4a7de9 100644 --- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/fileDrop.kt +++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/solid/gdml/demo/fileDrop.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.gdml.demo +package hep.dataforge.vision.solid.gdml.demo import drop.FileDrop import kotlinx.css.* diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/demo/GDMLDemoApp.kt similarity index 82% rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLDemoApp.kt rename to demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/demo/GDMLDemoApp.kt index b937cccf..831eae28 100644 --- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/GDMLDemoApp.kt +++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/demo/GDMLDemoApp.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.spatial.gdml.demo +package hep.dataforge.vision.solid.gdml.demo import hep.dataforge.context.Global import hep.dataforge.vision.editor.VisualObjectEditorFragment import hep.dataforge.vision.editor.VisualObjectTreeFragment -import hep.dataforge.vision.spatial.Material3D -import hep.dataforge.vision.spatial.SpatialVisionManager -import hep.dataforge.vision.spatial.fx.FX3DPlugin -import hep.dataforge.vision.spatial.fx.FXCanvas3D -import hep.dataforge.vision.spatial.gdml.toVision +import hep.dataforge.vision.solid.SolidManager +import hep.dataforge.vision.solid.SolidMaterial +import hep.dataforge.vision.solid.fx.FX3DPlugin +import hep.dataforge.vision.solid.fx.FXCanvas3D +import hep.dataforge.vision.solid.gdml.toVision import javafx.geometry.Orientation import javafx.scene.Parent import javafx.stage.FileChooser @@ -24,9 +24,9 @@ class GDMLView : View() { } private val propertyEditor = VisualObjectEditorFragment { - it.properties() + it.getAllProperties() }.apply { - descriptorProperty.set(Material3D.descriptor) + descriptorProperty.set(SolidMaterial.descriptor) itemProperty.bind(treeFragment.selectedProperty) } @@ -39,7 +39,7 @@ class GDMLView : View() { runAsync { val file = chooseFile("Select a GDML/json file", filters = fileNameFilter).firstOrNull() ?: return@runAsync null - SpatialVisionManager.readFile(file) + SolidManager.readFile(file) } ui { if (it != null) { canvas.render(it) diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/demo/readFile.kt similarity index 56% rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/readFile.kt rename to demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/demo/readFile.kt index dd521aea..87e94e5d 100644 --- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/readFile.kt +++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/demo/readFile.kt @@ -1,51 +1,51 @@ -package hep.dataforge.vision.spatial.gdml.demo +package hep.dataforge.vision.solid.gdml.demo import hep.dataforge.meta.setItem import hep.dataforge.values.asValue -import hep.dataforge.vision.spatial.Material3D -import hep.dataforge.vision.spatial.SpatialVisionManager -import hep.dataforge.vision.spatial.VisionGroup3D -import hep.dataforge.vision.spatial.gdml.LUnit -import hep.dataforge.vision.spatial.gdml.readFile -import hep.dataforge.vision.spatial.gdml.toVision +import hep.dataforge.vision.solid.SolidGroup +import hep.dataforge.vision.solid.SolidManager +import hep.dataforge.vision.solid.SolidMaterial +import hep.dataforge.vision.solid.gdml.LUnit +import hep.dataforge.vision.solid.gdml.readFile +import hep.dataforge.vision.solid.gdml.toVision import scientifik.gdml.GDML import java.io.File import java.util.zip.GZIPInputStream import java.util.zip.ZipInputStream -fun SpatialVisionManager.Companion.readFile(file: File): VisionGroup3D = when { +fun SolidManager.Companion.readFile(file: File): SolidGroup = when { file.extension == "gdml" || file.extension == "xml" -> { GDML.readFile(file.toPath()).toVision { lUnit = LUnit.CM solidConfiguration = { parent, solid -> if (solid.name == "cave") { - setItem(Material3D.MATERIAL_WIREFRAME_KEY, true.asValue()) + setItem(SolidMaterial.MATERIAL_WIREFRAME_KEY, true.asValue()) } if (parent.physVolumes.isNotEmpty()) { useStyle("opaque") { - Material3D.MATERIAL_OPACITY_KEY put 0.3 + SolidMaterial.MATERIAL_OPACITY_KEY put 0.3 } } } } } - file.extension == "json" -> VisionGroup3D.parseJson(file.readText()) + file.extension == "json" -> SolidGroup.parseJson(file.readText()) file.name.endsWith("json.zip") -> { file.inputStream().use { val unzip = ZipInputStream(it, Charsets.UTF_8) val text = unzip.readBytes().decodeToString() - VisionGroup3D.parseJson(text) + SolidGroup.parseJson(text) } } file.name.endsWith("json.gz") -> { file.inputStream().use { val unzip = GZIPInputStream(it) val text = unzip.readBytes().decodeToString() - VisionGroup3D.parseJson(text) + SolidGroup.parseJson(text) } } else -> error("Unknown extension ${file.extension}") } -fun SpatialVisionManager.Companion.readFile(fileName: String): VisionGroup3D = readFile(File(fileName)) \ No newline at end of file +fun SolidManager.Companion.readFile(fileName: String): SolidGroup = readFile(File(fileName)) \ No newline at end of file diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/saveToJson.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/demo/saveToJson.kt similarity index 76% rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/saveToJson.kt rename to demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/demo/saveToJson.kt index 2cb29af4..092cb00a 100644 --- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/demo/saveToJson.kt +++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/demo/saveToJson.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.spatial.gdml.demo +package hep.dataforge.vision.solid.gdml.demo -import hep.dataforge.vision.spatial.gdml.LUnit -import hep.dataforge.vision.spatial.gdml.readFile -import hep.dataforge.vision.spatial.gdml.toVision -import hep.dataforge.vision.spatial.stringify +import hep.dataforge.vision.solid.gdml.LUnit +import hep.dataforge.vision.solid.gdml.readFile +import hep.dataforge.vision.solid.gdml.toVision +import hep.dataforge.vision.solid.stringify import scientifik.gdml.GDML import java.io.File import java.nio.file.Paths diff --git a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/FileSerializationTest.kt b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt similarity index 78% rename from demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/FileSerializationTest.kt rename to demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt index 0d36ff42..e10acbee 100644 --- a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/FileSerializationTest.kt +++ b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.names.asName import org.junit.jupiter.api.Test @@ -9,7 +9,7 @@ class FileSerializationTest { @Ignore fun testFileRead(){ val text = this::class.java.getResourceAsStream("/cubes.json").readBytes().decodeToString() - val visual = VisionGroup3D.parseJson(text) + val visual = SolidGroup.parseJson(text) visual["composite_001".asName()] } } \ No newline at end of file diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts index 71fe9f8a..ccb4d098 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(":visionforge-spatial")) + implementation(project(":visionforge-solid")) } } 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 cbffcc56..b0f8ca04 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.vision.spatial.Point3D -import hep.dataforge.vision.spatial.Point3DSerializer +import hep.dataforge.vision.solid.Point3D +import hep.dataforge.vision.solid.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 888ee2de..55d88a11 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,17 +1,17 @@ package ru.mipt.npm.muon.monitor import hep.dataforge.vision.removeAll -import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.solid.* 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 import kotlin.math.PI class Model { - private val map = HashMap() + private val map = HashMap() private val events = HashSet() - private fun VisionGroup3D.pixel(pixel: SC1) { + private fun SolidGroup.pixel(pixel: SC1) { val group = group(pixel.name) { position = Point3D(pixel.center.x, pixel.center.y, pixel.center.z) box(pixel.xSize, pixel.ySize, pixel.zSize) @@ -23,7 +23,7 @@ class Model { map[pixel.name] = group } - private fun VisionGroup3D.detector(detector: SC16) { + private fun SolidGroup.detector(detector: SC16) { group(detector.name) { detector.pixels.forEach { pixel(it) @@ -31,9 +31,9 @@ class Model { } } - var tracks: VisionGroup3D + var tracks: SolidGroup - val root: VisionGroup3D = VisionGroup3D().apply { + val root: SolidGroup = SolidGroup().apply { rotationX = PI / 2 group("bottom") { Monitor.detectors.filter { it.center.z == LOWER_LAYER_Z }.forEach { @@ -63,7 +63,7 @@ class Model { fun reset() { map.values.forEach { it.config - it.setItem(Material3D.MATERIAL_COLOR_KEY, null) + it.setItem(SolidMaterial.MATERIAL_COLOR_KEY, null) } tracks.removeAll() } 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 b01e637f..e526c131 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.vision.spatial.Point3D -import hep.dataforge.vision.spatial.plus +import hep.dataforge.vision.solid.Point3D +import hep.dataforge.vision.solid.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 ef800764..99908d0d 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 @@ -10,11 +10,11 @@ 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 hep.dataforge.vision.solid.specifications.Camera +import hep.dataforge.vision.solid.specifications.Canvas3DOptions +import hep.dataforge.vision.solid.three.ThreeCanvas +import hep.dataforge.vision.solid.three.ThreeCanvasComponent +import hep.dataforge.vision.solid.three.canvasControls import io.ktor.client.HttpClient import io.ktor.client.request.get import kotlinx.coroutines.GlobalScope @@ -155,7 +155,7 @@ val MMApp = component { props -> else -> visual[selected] } if (selectedObject != null) { - configEditor(selectedObject, default = selectedObject.properties(), key = selected) + configEditor(selectedObject, default = selectedObject.getAllProperties(), key = selected) } } } 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 90ecaa31..3fc00667 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.vision.spatial.SpatialVisionManager +import hep.dataforge.vision.solid.SolidManager import io.ktor.client.HttpClient import io.ktor.client.features.json.JsonFeature import io.ktor.client.features.json.serializer.KotlinxSerializer @@ -19,7 +19,7 @@ private class MMDemoApp : Application { private val connection = HttpClient { install(JsonFeature) { - serializer = KotlinxSerializer(Json(context = SpatialVisionManager.serialModule)) + serializer = KotlinxSerializer(Json(context = SolidManager.serialModule)) } } 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 10f24f13..2052ffe8 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.vision.spatial.SpatialVisionManager +import hep.dataforge.vision.solid.SolidManager import io.ktor.application.Application import io.ktor.application.call import io.ktor.application.install @@ -36,7 +36,7 @@ fun Application.module() { install(DefaultHeaders) install(CallLogging) install(ContentNegotiation) { - json(module = SpatialVisionManager.serialModule) + json(module = SolidManager.serialModule) } install(Routing) { get("/event") { 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 9f32df4a..afa017d1 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.vision.spatial.Point3D +import hep.dataforge.vision.solid.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 fa287c5d..61cf59c9 100644 --- a/demo/spatial-showcase/build.gradle.kts +++ b/demo/spatial-showcase/build.gradle.kts @@ -19,7 +19,7 @@ kotlin { sourceSets { commonMain { dependencies { - api(project(":visionforge-spatial")) + api(project(":visionforge-solid")) api(project(":visionforge-gdml")) } } @@ -27,5 +27,5 @@ kotlin { } application { - mainClassName = "hep.dataforge.vis.spatial.demo.FXDemoAppKt" + mainClassName = "hep.dataforge.vis.solid.demo.FXDemoAppKt" } \ No newline at end of file diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/spatial/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt similarity index 95% rename from demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/spatial/demo/demo.kt rename to demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt index 084ddd4c..a2786881 100644 --- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/spatial/demo/demo.kt +++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.demo +package hep.dataforge.vision.solid.demo import hep.dataforge.meta.Meta import hep.dataforge.meta.invoke @@ -6,8 +6,8 @@ import hep.dataforge.names.toName import hep.dataforge.output.OutputManager import hep.dataforge.vision.Colors import hep.dataforge.vision.Vision -import hep.dataforge.vision.spatial.* -import hep.dataforge.vision.spatial.specifications.Canvas3DOptions +import hep.dataforge.vision.solid.* +import hep.dataforge.vision.solid.specifications.Canvas3DOptions import kotlinx.coroutines.* import kotlin.math.PI import kotlin.math.cos @@ -15,7 +15,7 @@ import kotlin.math.sin import kotlin.random.Random -fun OutputManager.demo(name: String, title: String = name, block: VisionGroup3D.() -> Unit) { +fun OutputManager.demo(name: String, title: String = name, block: SolidGroup.() -> Unit) { val meta = Meta { "title" put title } diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoApp.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt similarity index 96% rename from demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoApp.kt rename to demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt index 0cead930..2be73f5e 100644 --- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoApp.kt +++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.demo +package hep.dataforge.vision.solid.demo import hep.dataforge.js.Application import hep.dataforge.js.startApplication diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt similarity index 89% rename from demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoGrid.kt rename to demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt index 11a6f1de..84a73d0d 100644 --- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/ThreeDemoGrid.kt +++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.demo +package hep.dataforge.vision.solid.demo import hep.dataforge.context.Global import hep.dataforge.meta.Meta @@ -8,9 +8,9 @@ import hep.dataforge.names.Name import hep.dataforge.output.OutputManager import hep.dataforge.output.Renderer import hep.dataforge.vision.Vision -import hep.dataforge.vision.spatial.three.ThreeCanvas -import hep.dataforge.vision.spatial.three.ThreePlugin -import hep.dataforge.vision.spatial.three.output +import hep.dataforge.vision.solid.three.ThreeCanvas +import hep.dataforge.vision.solid.three.ThreePlugin +import hep.dataforge.vision.solid.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/vision/spatial/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt similarity index 81% rename from demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/VariableBox.kt rename to demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt index 8855d173..3664d4a5 100644 --- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/spatial/demo/VariableBox.kt +++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial.demo +package hep.dataforge.vision.solid.demo import hep.dataforge.meta.int import hep.dataforge.meta.number @@ -10,11 +10,11 @@ import hep.dataforge.names.startsWith import hep.dataforge.values.asValue import hep.dataforge.vision.getProperty import hep.dataforge.vision.set -import hep.dataforge.vision.spatial.* -import hep.dataforge.vision.spatial.Vision3D.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 hep.dataforge.vision.solid.* +import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY +import hep.dataforge.vision.solid.demo.VariableBoxThreeFactory.Z_SIZE_KEY +import hep.dataforge.vision.solid.three.* +import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Object3D import info.laht.threekt.geometries.BoxBufferGeometry @@ -23,13 +23,13 @@ import kotlinx.serialization.UseSerializers import kotlin.math.max import kotlin.reflect.KClass -internal var Vision3D.variableZSize: Number +internal var Solid.variableZSize: Number get() = getProperty(Z_SIZE_KEY, false).number ?: 0f set(value) { setItem(Z_SIZE_KEY, value.asValue()) } -internal var Vision3D.value: Int +internal var Solid.value: Int get() = getProperty("value", false).int ?: 0 set(value) { setItem("value", value.asValue()) @@ -43,26 +43,26 @@ internal var Vision3D.value: Int color(r.toUByte(), g.toUByte(), b.toUByte()) } -fun VisionGroup3D.varBox( +fun SolidGroup.varBox( xSize: Number, ySize: Number, zSize: Number, name: String = "", - action: Vision3D.() -> Unit = {} + action: Solid.() -> Unit = {} ) = CustomThreeVision(VariableBoxThreeFactory).apply { scaleX = xSize scaleY = ySize scaleZ = zSize }.apply(action).also { set(name, it) } -private object VariableBoxThreeFactory : ThreeFactory { +private object VariableBoxThreeFactory : ThreeFactory { val X_SIZE_KEY = GEOMETRY_KEY + "xSize" val Y_SIZE_KEY = GEOMETRY_KEY + "ySize" val Z_SIZE_KEY = GEOMETRY_KEY + "zSize" - override val type: KClass get() = Vision3D::class + override val type: KClass get() = Solid::class - override fun invoke(obj: Vision3D): Object3D { + override fun invoke(obj: Solid): Object3D { val xSize = obj.getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0 val ySize = obj.getProperty(Y_SIZE_KEY, false).number?.toDouble() ?: 1.0 val zSize = obj.getProperty(Z_SIZE_KEY, false).number?.toDouble() ?: 1.0 @@ -87,7 +87,7 @@ private object VariableBoxThreeFactory : ThreeFactory { mesh.scale.set(xSize, ySize, zSize) //add listener to object properties - obj.onPropertyChange(this) { name, _, _ -> + obj.onPropertyChange(this) { name -> when { // name.startsWith(GEOMETRY_KEY) -> { // val newXSize = obj.getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0 diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoApp.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt similarity index 86% rename from demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoApp.kt rename to demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt index c8649ddc..51da0f98 100644 --- a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoApp.kt +++ b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vision.spatial.demo +package hep.dataforge.vision.solid.demo -import hep.dataforge.vision.spatial.gdml.gdml +import hep.dataforge.vision.solid.gdml.gdml import javafx.stage.Stage import tornadofx.* import java.nio.file.Paths diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoGrid.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt similarity index 88% rename from demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoGrid.kt rename to demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt index 83cce18e..3fb8c1e5 100644 --- a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/spatial/demo/FXDemoGrid.kt +++ b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.demo +package hep.dataforge.vision.solid.demo import hep.dataforge.context.Global import hep.dataforge.meta.Meta @@ -6,8 +6,8 @@ import hep.dataforge.names.Name import hep.dataforge.output.OutputManager import hep.dataforge.output.Renderer import hep.dataforge.vision.Vision -import hep.dataforge.vision.spatial.fx.FX3DPlugin -import hep.dataforge.vision.spatial.fx.FXCanvas3D +import hep.dataforge.vision.solid.fx.FX3DPlugin +import hep.dataforge.vision.solid.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 23d817e4..4c71daab 100644 --- a/playground/build.gradle.kts +++ b/playground/build.gradle.kts @@ -19,7 +19,7 @@ kotlin { sourceSets { commonMain { dependencies { - api(project(":visionforge-spatial")) + api(project(":visionforge-solid")) 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 1d479294..c4377c05 100644 --- a/playground/src/jsMain/kotlin/PlayGroundApp.kt +++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt @@ -4,12 +4,12 @@ import hep.dataforge.js.startApplication import hep.dataforge.names.Name import hep.dataforge.vision.bootstrap.objectTree import hep.dataforge.vision.bootstrap.visualPropertyEditor -import hep.dataforge.vision.spatial.Point3D -import hep.dataforge.vision.spatial.VisionGroup3D -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 hep.dataforge.vision.solid.Point3D +import hep.dataforge.vision.solid.SolidGroup +import hep.dataforge.vision.solid.box +import hep.dataforge.vision.solid.group +import hep.dataforge.vision.solid.three.ThreePlugin +import hep.dataforge.vision.solid.three.threeCanvas import org.w3c.dom.HTMLElement import react.dom.div import react.dom.render @@ -24,7 +24,7 @@ private class PlayGroundApp : Application { val element = document.getElementById("app") as? HTMLElement ?: error("Element with id 'canvas' not found on page") - val obj = VisionGroup3D().apply { + val obj = SolidGroup().apply { box(100, 100, 100, name = "A") group("B") { position = Point3D(120, 0, 0) diff --git a/settings.gradle.kts b/settings.gradle.kts index 70ac7852..187e5143 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -41,7 +41,7 @@ include( ":ui:material", ":ui:bootstrap", ":visionforge-core", - ":visionforge-spatial", + ":visionforge-solid", ":visionforge-gdml", ":demo:spatial-showcase", ":demo:gdml", diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt index 0365e84d..270f64f2 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt +++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt @@ -4,14 +4,13 @@ import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.names.Name import hep.dataforge.names.asName -import hep.dataforge.values.Value import hep.dataforge.values.ValueType import hep.dataforge.vision.Vision.Companion.STYLE_KEY import kotlinx.serialization.Transient internal data class PropertyListener( val owner: Any? = null, - val action: (name: Name, oldItem: MetaItem<*>?, newItem: MetaItem<*>?) -> Unit + val action: (name: Name) -> Unit ) abstract class AbstractVision : Vision { @@ -22,46 +21,42 @@ abstract class AbstractVision : Vision { /** * Object own properties excluding styles and inheritance */ - protected abstract var ownProperties: Config? - - final override var styles: List - get() = ownProperties?.get(STYLE_KEY).stringList - set(value) { - setItem(STYLE_KEY, Value.of(value)) - updateStyles(value) - } + protected abstract var properties: Config? protected fun updateStyles(names: List) { styleCache = null - names.mapNotNull { findStyle(it) }.asSequence() + names.mapNotNull { resolveStyle(it) }.asSequence() .flatMap { it.items.asSequence() } .distinctBy { it.key } .forEach { - propertyChanged(it.key.asName(), null, it.value) + propertyChanged(it.key.asName()) } } /** * The config is initialized and assigned on-demand. - * To avoid unnecessary allocations, one should access [ownProperties] via [getProperty] instead. + * To avoid unnecessary allocations, one should access [getAllProperties] via [getProperty] instead. */ override val config: Config - get() = ownProperties ?: Config().also { config -> - ownProperties = config.apply { onChange(this, ::propertyChanged) } + get() = properties ?: Config().also { config -> + properties = config.also { + it.onChange(this) { name, _, _ -> propertyChanged(name) } + } } @Transient private val listeners = HashSet() - override fun propertyChanged(name: Name, before: MetaItem<*>?, after: MetaItem<*>?) { - if (before != after) { - for (l in listeners) { - l.action(name, before, after) - } + override fun propertyChanged(name: Name) { + if (name == STYLE_KEY) { + updateStyles(properties?.get(STYLE_KEY)?.stringList ?: emptyList()) + } + for (listener in listeners) { + listener.action(name) } } - override fun onPropertyChange(owner: Any?, action: (Name, before: MetaItem<*>?, after: MetaItem<*>?) -> Unit) { + override fun onPropertyChange(owner: Any?, action: (Name) -> Unit) { listeners.add(PropertyListener(owner, action)) } @@ -75,25 +70,25 @@ abstract class AbstractVision : Vision { * Collect all styles for this object in a single cached meta */ protected val mergedStyles: Meta - get() = styleCache ?: findAllStyles().merge().also { + get() = styleCache ?: Laminate(styles.mapNotNull(::resolveStyle)).merge().also { styleCache = it } /** * All available properties in a layered form */ - override fun properties(): Laminate = Laminate(ownProperties, mergedStyles, parent?.properties()) + override fun getAllProperties(): Laminate = Laminate(properties, mergedStyles, parent?.getAllProperties()) override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? { return if (inherit) { sequence { - yield(ownProperties?.get(name)) + yield(properties?.get(name)) yield(mergedStyles[name]) yield(parent?.getProperty(name, inherit)) }.merge() } else { sequence { - yield(ownProperties?.get(name)) + yield(properties?.get(name)) yield(mergedStyles[name]) }.merge() } @@ -103,8 +98,8 @@ abstract class AbstractVision : Vision { * Reset all properties to their default values */ fun resetProperties() { - ownProperties?.removeListener(this) - ownProperties = null + properties?.removeListener(this) + properties = null } companion object { diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt index a8016397..d1d7f523 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt +++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt @@ -1,6 +1,5 @@ package hep.dataforge.vision -import hep.dataforge.meta.MetaItem import hep.dataforge.names.Name import hep.dataforge.names.NameToken import hep.dataforge.names.asName @@ -31,10 +30,10 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup { res.block() } - override fun propertyChanged(name: Name, before: MetaItem<*>?, after: MetaItem<*>?) { - super.propertyChanged(name, before, after) + override fun propertyChanged(name: Name) { + super.propertyChanged(name) for(obj in this) { - obj.propertyChanged(name, before, after) + obj.propertyChanged(name) } } diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt index 8dc7e716..4a73bd14 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt +++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt @@ -13,7 +13,7 @@ class SimpleVisionGroup : AbstractVisionGroup() { override var styleSheet: StyleSheet? = null //FIXME to be lifted to AbstractVisualGroup after https://github.com/Kotlin/kotlinx.serialization/issues/378 is fixed - override var ownProperties: Config? = null + override var properties: Config? = null @SerialName("children") private val _children = HashMap() diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt index 7a0d93f7..7f995eda 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt +++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt @@ -5,6 +5,7 @@ package hep.dataforge.vision import hep.dataforge.meta.* import hep.dataforge.names.Name import hep.dataforge.names.asName +import hep.dataforge.values.asValue import kotlinx.serialization.* import kotlinx.serialization.builtins.MapSerializer import kotlinx.serialization.builtins.serializer @@ -23,6 +24,21 @@ class StyleSheet private constructor(private val styleMap: MutableMap get() = styleMap + + private fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?) { + if (styles.contains(key)) { + //TODO optimize set concatenation + val tokens: Collection = ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet())) + .map { it.asName() } + tokens.forEach { parent?.propertyChanged(it) } + } + if (this is VisionGroup) { + for (obj in this) { + obj.styleChanged(key, oldStyle, newStyle) + } + } + } + operator fun get(key: String): Meta? { return styleMap[key] ?: owner?.parent?.styleSheet?.get(key) } @@ -73,16 +89,19 @@ class StyleSheet private constructor(private val styleMap: MutableMap = ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet())) - .map { it.asName() } - tokens.forEach { parent?.propertyChanged(it, oldStyle?.get(it), newStyle?.get(it)) } - } - if (this is VisionGroup) { - for (obj in this) { - obj.styleChanged(key, oldStyle, newStyle) - } + +/** + * List of names of styles applied to this object. Order matters. Not inherited + */ +var Vision.styles: List + get() = getItem(Vision.STYLE_KEY).stringList + set(value) { + setItem(Vision.STYLE_KEY,value.map { it.asValue() }.asValue()) } + +/** + * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment. + */ +fun Vision.useStyle(name: String) { + styles = styles + name } \ No newline at end of file diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt index 22ba90d1..19670145 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt +++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt @@ -27,10 +27,10 @@ interface Vision : Configurable { /** * All properties including styles and prototypes if present, including inherited ones */ - fun properties(): Laminate + fun getAllProperties(): Laminate /** - * Get property including or excluding parent properties + * Get property (including styles). [inherit] toggles parent node property lookup */ fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? @@ -42,28 +42,18 @@ interface Vision : Configurable { /** * Trigger property invalidation event. If [name] is empty, notify that the whole object is changed */ - fun propertyChanged(name: Name, before: MetaItem<*>?, after: MetaItem<*>?): Unit - - /** - * Send a signal that property value should be reevaluated - */ - fun propertyInvalidated(name: Name) = propertyChanged(name, null, null) + fun propertyChanged(name: Name): Unit /** * Add listener triggering on property change */ - fun onPropertyChange(owner: Any?, action: (Name, before: MetaItem<*>?, after: MetaItem<*>?) -> Unit): Unit + fun onPropertyChange(owner: Any?, action: (Name) -> Unit): Unit /** * Remove change listeners with given owner. */ fun removeChangeListener(owner: Any?) - /** - * List of names of styles applied to this object. Order matters. Not inherited - */ - var styles: List - companion object { const val TYPE = "visual" val STYLE_KEY = "@style".asName() @@ -81,13 +71,8 @@ fun Vision.getProperty(key: String, inherit: Boolean = true): MetaItem<*>? = getProperty(key.toName(), inherit) /** - * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment. + * Find a style with given name for given [Vision]. The style is not necessary applied to this [Vision]. */ -fun Vision.useStyle(name: String) { - styles = styles + name -} +tailrec fun Vision.resolveStyle(name: String): Meta? = + (this as? VisionGroup)?.styleSheet?.get(name) ?: parent?.resolveStyle(name) -tailrec fun Vision.findStyle(name: String): Meta? = - (this as? VisionGroup)?.styleSheet?.get(name) ?: parent?.findStyle(name) - -fun Vision.findAllStyles(): Laminate = Laminate(styles.mapNotNull(::findStyle)) diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt index af7b871c..cae2e2b0 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt +++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt @@ -16,7 +16,7 @@ interface VisionGroup : Provider, Vision { /** * A stylesheet for this group and its descendants. Stylesheet is not applied directly, - * but instead is just a repository for named configutations + * but instead is just a repository for named configurations. */ val styleSheet: StyleSheet? diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt index 5be76805..4bebd56a 100644 --- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt +++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt @@ -1,39 +1,127 @@ package hep.dataforge.vision import hep.dataforge.context.* -import hep.dataforge.meta.Meta +import hep.dataforge.meta.* +import hep.dataforge.meta.descriptors.NodeDescriptor +import hep.dataforge.names.toName +import kotlinx.serialization.KSerializer +import kotlinx.serialization.UnstableDefault +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonConfiguration +import kotlinx.serialization.modules.SerialModule +import kotlinx.serialization.modules.SerializersModule import kotlin.reflect.KClass -interface VisionFactory : Factory { - val type: KClass + +@DFExperimental +interface VisionForm { + val type: KClass + val serializer: KSerializer + + val name get() = serializer.descriptor.serialName.toName() + + /** + * Apply a patch to given [Vision] + */ + fun patch(obj: T, meta: Meta) + + companion object { + const val TYPE = "visionForm" + } } +@DFExperimental +object SimpleGroupForm: VisionForm{ + override val type: KClass = SimpleVisionGroup::class + override val serializer: KSerializer = SimpleVisionGroup.serializer() + + override fun patch(obj: SimpleVisionGroup, meta: Meta) { + TODO("Not yet implemented") + } + +} + +@DFExperimental +fun VisionForm.visionToMeta(vision: T, module: SerialModule, descriptor: NodeDescriptor? = null): Meta { + val engine = Json(VisionManager.jsonConfiguration, module) + val json = engine.toJson(serializer, vision) + return json.toMetaItem(descriptor).node!! +} + +@DFExperimental +fun VisionForm.buildVision(meta: Meta, module: SerialModule, descriptor: NodeDescriptor? = null): T { + val engine = Json(VisionManager.jsonConfiguration, module) + val json = meta.toJson(descriptor) + return engine.fromJson(serializer, json) +} + +@DFExperimental class VisionManager(meta: Meta) : AbstractPlugin(meta) { override val tag: PluginTag get() = Companion.tag /** * Create a list of factories on first call and cache it */ - private val factories by lazy { - context.content>(VISION_FACTORY_TYPE).mapKeys { it.value.type } + private val forms by lazy { + context.content>(VisionForm.TYPE).mapKeys { it.value.type } } - @Suppress("UNCHECKED_CAST") - fun resolveVisionFactory(type: KClass): VisionFactory? = - factories[type] as VisionFactory - - inline fun buildVision(parent: VisionGroup?, meta: Meta): T? { - return resolveVisionFactory(T::class)?.invoke(meta, context)?.apply { - this.parent = parent + val visionSerialModule + get() = SerializersModule { + include(defaultSerialModule) + context.content(VISION_SERIAL_MODULE_TARGET).values.forEach { + include(it) + } } + + @Suppress("UNCHECKED_CAST") + fun resolveVisionForm(type: KClass): VisionForm? = + forms[type] as VisionForm + + inline fun buildSpecificVision(meta: Meta): T { + val factory = resolveVisionForm(T::class) ?: error("Could not resolve a form for ${meta["type"].string}") + return factory.buildVision(meta, visionSerialModule) + } + + fun buildVision(meta: Meta): Vision { + val type = meta["type"].string ?: SimpleVisionGroup.serializer().descriptor.serialName + val form = forms.values.find { it.name.toString() == type } ?: error("Could not resolve a form for type $type") + return form.buildVision(meta, visionSerialModule) + } + + fun writeVisionToMeta(vision: T): Meta { + val form = resolveVisionForm(vision::class) ?: error("Could not resolve a form for $vision") + val engine = Json(VisionManager.jsonConfiguration, visionSerialModule) + val json = engine.toJson(form.serializer,vision) + return json.toMetaItem().node!! + } + + fun patchVision(vision: Vision, meta: Meta) { + val form = resolveVisionForm(vision::class) ?: error("Could not resolve a form for $vision") + form.patch(vision, meta) } companion object : PluginFactory { override val tag: PluginTag = PluginTag(name = "vision", group = PluginTag.DATAFORGE_GROUP) override val type: KClass = VisionManager::class + const val VISION_SERIAL_MODULE_TARGET = "visionSerialModule" + override fun invoke(meta: Meta, context: Context): VisionManager = VisionManager(meta) - const val VISION_FACTORY_TYPE = "vision.factory" + @OptIn(UnstableDefault::class) + val jsonConfiguration = JsonConfiguration( + prettyPrint = true, + useArrayPolymorphism = false, + encodeDefaults = false, + ignoreUnknownKeys = true + ) + + val defaultSerialModule = SerializersModule { + polymorphic(Vision::class, VisionGroup::class) { + subclass(SimpleVisionGroup.serializer()) + } + } + } } \ No newline at end of file diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt index b541261b..846fad14 100644 --- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt +++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt @@ -5,7 +5,8 @@ import hep.dataforge.meta.Meta import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.meta.update import hep.dataforge.vision.Vision -import hep.dataforge.vision.findStyle +import hep.dataforge.vision.resolveStyle +import hep.dataforge.vision.styles import javafx.beans.binding.Binding import javafx.beans.property.SimpleObjectProperty import javafx.scene.Node @@ -54,7 +55,7 @@ class VisualObjectEditorFragment(val selector: (Vision) -> Meta) : Fragment() { private val styleBoxProperty: Binding = configProperty.objectBinding() { VBox().apply { item?.styles?.forEach { styleName -> - val styleMeta = item?.findStyle(styleName) + val styleMeta = item?.resolveStyle(styleName) if (styleMeta != null) { titledpane(styleName, node = MetaViewer(styleMeta).root) } diff --git a/visionforge-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts index 2439df8c..874523ac 100644 --- a/visionforge-gdml/build.gradle.kts +++ b/visionforge-gdml/build.gradle.kts @@ -6,7 +6,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api(project(":visionforge-spatial")) + api(project(":visionforge-solid")) api("scientifik:gdml:0.1.8") } } diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/GDMLTransformer.kt similarity index 77% rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GDMLTransformer.kt rename to visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/GDMLTransformer.kt index 90aaafd6..b576daf4 100644 --- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GDMLTransformer.kt +++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/GDMLTransformer.kt @@ -1,12 +1,12 @@ -package hep.dataforge.vision.spatial.gdml +package hep.dataforge.vision.solid.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.vision.spatial.* -import hep.dataforge.vision.spatial.Material3D.Companion.MATERIAL_COLOR_KEY +import hep.dataforge.vision.solid.* +import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY import hep.dataforge.vision.useStyle import scientifik.gdml.* import kotlin.random.Random @@ -24,7 +24,7 @@ class GDMLTransformer(val root: GDML) { /** * A special group for local templates */ - val proto by lazy { VisionGroup3D() } + val proto by lazy { SolidGroup() } private val styleCache = HashMap() var lUnit: LUnit = LUnit.MM @@ -33,23 +33,23 @@ class GDMLTransformer(val root: GDML) { var volumeAction: (GDMLGroup) -> Action = { Action.CACHE } - var solidConfiguration: Vision3D.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ -> + var solidConfiguration: Solid.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ -> lUnit = LUnit.CM if (parent.physVolumes.isNotEmpty()) { useStyle("opaque") { - Material3D.MATERIAL_OPACITY_KEY put 0.3 + SolidMaterial.MATERIAL_OPACITY_KEY put 0.3 } } } - fun Vision3D.useStyle(name: String, builder: MetaBuilder.() -> Unit) { + fun Solid.useStyle(name: String, builder: MetaBuilder.() -> Unit) { styleCache.getOrPut(name.toName()) { Meta(builder) } useStyle(name) } - internal fun configureSolid(obj: Vision3D, parent: GDMLVolume, solid: GDMLSolid) { + internal fun configureSolid(obj: Solid, parent: GDMLVolume, solid: GDMLSolid) { val material = parent.materialref.resolve(root) ?: GDMLElement(parent.materialref.ref) val styleName = "material[${material.name}]" @@ -68,7 +68,7 @@ class GDMLTransformer(val root: GDML) { var onFinish: GDMLTransformer.() -> Unit = {} - internal fun finalize(final: VisionGroup3D): VisionGroup3D { + internal fun finalize(final: SolidGroup): SolidGroup { //final.prototypes = proto final.prototypes { proto.children.forEach { (token, item) -> diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GdmlVision.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/GdmlVision.kt similarity index 93% rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GdmlVision.kt rename to visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/GdmlVision.kt index a6ebcf31..105f545c 100644 --- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/GdmlVision.kt +++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/GdmlVision.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.gdml +package hep.dataforge.vision.solid.gdml import hep.dataforge.names.Name @@ -6,20 +6,20 @@ import hep.dataforge.names.asName import hep.dataforge.names.plus 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 hep.dataforge.vision.solid.* +import hep.dataforge.vision.solid.World.ONE +import hep.dataforge.vision.solid.World.ZERO import scientifik.gdml.* import kotlin.math.cos import kotlin.math.sin -private fun Vision3D.withPosition( +private fun Solid.withPosition( lUnit: LUnit, newPos: GDMLPosition? = null, newRotation: GDMLRotation? = null, newScale: GDMLScale? = null -): Vision3D = apply { +): Solid = apply { newPos?.let { val point = Point3D(it.x(lUnit), it.y(lUnit), it.z(lUnit)) if (position != null || point != ZERO) { @@ -48,12 +48,12 @@ private inline operator fun Number.times(d: Double) = toDouble() * d @Suppress("NOTHING_TO_INLINE") private inline operator fun Number.times(f: Float) = toFloat() * f -private fun VisionGroup3D.addSolid( +private fun SolidGroup.addSolid( context: GDMLTransformer, solid: GDMLSolid, name: String = "", - block: Vision3D.() -> Unit = {} -): Vision3D { + block: Solid.() -> Unit = {} +): Solid { //context.solidAdded(solid) val lScale = solid.lscale(context.lUnit) val aScale = solid.ascale() @@ -154,7 +154,7 @@ private fun VisionGroup3D.addSolid( private val volumesName = "volumes".asName() -private fun VisionGroup3D.addPhysicalVolume( +private fun SolidGroup.addPhysicalVolume( context: GDMLTransformer, physVolume: GDMLPhysVolume ) { @@ -194,7 +194,7 @@ private fun VisionGroup3D.addPhysicalVolume( } } -private fun VisionGroup3D.addDivisionVolume( +private fun SolidGroup.addDivisionVolume( context: GDMLTransformer, divisionVolume: GDMLDivisionVolume ) { @@ -216,8 +216,8 @@ private val solidsName = "solids".asName() private fun volume( context: GDMLTransformer, group: GDMLGroup -): VisionGroup3D { - return VisionGroup3D().apply { +): SolidGroup { + return SolidGroup().apply { if (group is GDMLVolume) { val solid = group.solidref.resolve(context.root) ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined") @@ -253,7 +253,7 @@ private fun volume( } } -fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): VisionGroup3D { +fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): SolidGroup { val context = GDMLTransformer(this).apply(block) return context.finalize(volume(context, world)) } @@ -261,7 +261,7 @@ fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): VisionGroup3D { /** * Append gdml node to the group */ -fun VisionGroup3D.gdml(gdml: GDML, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) { +fun SolidGroup.gdml(gdml: GDML, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) { val visual = gdml.toVision(transformer) //println(Visual3DPlugin.json.stringify(VisualGroup3D.serializer(), visual)) set(key, visual) diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/units.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/units.kt similarity index 97% rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/units.kt rename to visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/units.kt index 4b54a0a9..a12aca34 100644 --- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/spatial/gdml/units.kt +++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/solid/gdml/units.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.gdml +package hep.dataforge.vision.solid.gdml import scientifik.gdml.AUnit import scientifik.gdml.GDMLPosition diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDMLJvm.kt b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/visualGDMLJvm.kt similarity index 65% rename from visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDMLJvm.kt rename to visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/visualGDMLJvm.kt index 3d01be2f..92fb50d4 100644 --- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/spatial/gdml/visualGDMLJvm.kt +++ b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/solid/gdml/visualGDMLJvm.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vision.spatial.gdml +package hep.dataforge.vision.solid.gdml -import hep.dataforge.vision.spatial.VisionGroup3D +import hep.dataforge.vision.solid.SolidGroup import nl.adaptivity.xmlutil.StAXReader import scientifik.gdml.GDML import java.nio.file.Files @@ -11,7 +11,7 @@ fun GDML.Companion.readFile(file: Path): GDML { return format.parse(GDML.serializer(), xmlReader) } -fun VisionGroup3D.gdml(file: Path, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) { +fun SolidGroup.gdml(file: Path, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) { val gdml = GDML.readFile(file) gdml(gdml, key, transformer) } diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/gdml/TestConvertor.kt similarity index 92% rename from visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/gdml/TestConvertor.kt rename to visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/gdml/TestConvertor.kt index 51d5182d..6fe347e3 100644 --- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/spatial/gdml/TestConvertor.kt +++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/gdml/TestConvertor.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vision.spatial.gdml +package hep.dataforge.vision.solid.gdml -import hep.dataforge.vision.spatial.stringify +import hep.dataforge.vision.solid.stringify import nl.adaptivity.xmlutil.StAXReader import org.junit.jupiter.api.Test import scientifik.gdml.GDML diff --git a/visionforge-spatial/build.gradle.kts b/visionforge-solid/build.gradle.kts similarity index 100% rename from visionforge-spatial/build.gradle.kts rename to visionforge-solid/build.gradle.kts diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt similarity index 65% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Box.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt index 2a9568cc..1f05d4ef 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Box.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt @@ -1,34 +1,29 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial -import hep.dataforge.context.Context +package hep.dataforge.vision.solid + import hep.dataforge.meta.Config -import hep.dataforge.meta.Meta -import hep.dataforge.meta.float -import hep.dataforge.meta.get import hep.dataforge.vision.AbstractVision import hep.dataforge.vision.MutableVisionGroup -import hep.dataforge.vision.VisionFactory import hep.dataforge.vision.set -import hep.dataforge.vision.spatial.Box.Companion.TYPE_NAME +import hep.dataforge.vision.solid.Solid.Companion.solidEquals import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers -import kotlin.reflect.KClass @Serializable -@SerialName(TYPE_NAME) +@SerialName("solid.box") class Box( val xSize: Float, val ySize: Float, val zSize: Float -) : AbstractVision(), Vision3D, Shape { +) : AbstractVision(), GeometrySolid { override var position: Point3D? = null override var rotation: Point3D? = null override var scale: Point3D? = null - override var ownProperties: Config? = null + override var properties: Config? = null //TODO add helper for color configuration override fun toGeometry(geometryBuilder: GeometryBuilder) { @@ -51,19 +46,29 @@ class Box( geometryBuilder.face4(node8, node5, node6, node7) } - companion object : VisionFactory { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (other == null || this::class != other::class) return false - const val TYPE_NAME = "3d.box" + other as Box - override val type: KClass get() = Box::class + if (xSize != other.xSize) return false + if (ySize != other.ySize) return false + if (zSize != other.zSize) return false + + return solidEquals(this, other) + } + + override fun hashCode(): Int { + var result = xSize.hashCode() + result = 31 * result + ySize.hashCode() + result = 31 * result + zSize.hashCode() + return 31 * result + Solid.solidHashCode(this) + } + + + companion object { - override fun invoke(meta: Meta, context: Context): Box = Box( - meta["xSize"].float!!, - meta["ySize"].float!!, - meta["zSize"].float!! - ).apply { - update(meta) - } } } diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt similarity index 77% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Composite.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt index d0739f82..d2049226 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Composite.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.meta.update @@ -17,12 +17,12 @@ enum class CompositeType { } @Serializable -@SerialName("3d.composite") +@SerialName("solid.composite") class Composite( val compositeType: CompositeType, - val first: Vision3D, - val second: Vision3D -) : AbstractVision(), Vision3D, VisionGroup { + val first: Solid, + val second: Solid +) : AbstractVision(), Solid, VisionGroup { init { first.parent = this @@ -33,7 +33,7 @@ class Composite( override var rotation: Point3D? = null override var scale: Point3D? = null - override var ownProperties: Config? = null + override var properties: Config? = null override val children: Map get() = mapOf(NameToken("first") to first, NameToken("second") to second) @@ -45,10 +45,10 @@ class Composite( inline fun MutableVisionGroup.composite( type: CompositeType, name: String = "", - builder: VisionGroup3D.() -> Unit + builder: SolidGroup.() -> Unit ): Composite { - val group = VisionGroup3D().apply(builder) - val children = group.children.values.filterIsInstance() + val group = SolidGroup().apply(builder) + val children = group.children.values.filterIsInstance() if (children.size != 2) error("Composite requires exactly two children") return Composite(type, children[0], children[1]).also { it.config.update(group.config) @@ -67,11 +67,11 @@ inline fun MutableVisionGroup.composite( } } -inline fun MutableVisionGroup.union(name: String = "", builder: VisionGroup3D.() -> Unit) = +inline fun MutableVisionGroup.union(name: String = "", builder: SolidGroup.() -> Unit) = composite(CompositeType.UNION, name, builder = builder) -inline fun MutableVisionGroup.subtract(name: String = "", builder: VisionGroup3D.() -> Unit) = +inline fun MutableVisionGroup.subtract(name: String = "", builder: SolidGroup.() -> Unit) = composite(CompositeType.SUBTRACT, name, builder = builder) -inline fun MutableVisionGroup.intersect(name: String = "", builder: VisionGroup3D.() -> Unit) = +inline fun MutableVisionGroup.intersect(name: String = "", builder: SolidGroup.() -> Unit) = composite(CompositeType.INTERSECT, name, builder = builder) \ No newline at end of file diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt similarity index 94% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/ConeSegment.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt index 5f8e9c56..805151c9 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/ConeSegment.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.vision.AbstractVision @@ -16,16 +16,16 @@ import kotlin.math.sin * A cylinder or cut cone segment */ @Serializable -@SerialName("3d.cone") +@SerialName("solid.cone") class ConeSegment( var radius: Float, var height: Float, var upperRadius: Float, var startAngle: Float = 0f, var angle: Float = PI2 -) : AbstractVision(), Vision3D, Shape { +) : AbstractVision(), GeometrySolid { - override var ownProperties: Config? = null + override var properties: Config? = null override var position: Point3D? = null override var rotation: Point3D? = null diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Convex.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt similarity index 77% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Convex.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt index d7f63829..ad17c532 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Convex.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.vision.AbstractVision @@ -11,18 +11,16 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers @Serializable -@SerialName("3d.convex") -class Convex(val points: List) : AbstractVision(), Vision3D { +@SerialName("solid.convex") +class Convex(val points: List) : AbstractVision(), Solid { - override var ownProperties: Config? = null + override var properties: Config? = null override var position: Point3D? = null override var rotation: Point3D? = null override var scale: Point3D? = null - companion object { - const val TYPE = "geometry.3d.convex" - } + } inline fun MutableVisionGroup.convex(name: String = "", action: ConvexBuilder.() -> Unit = {}) = diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt similarity index 94% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Extruded.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt index cda80e06..e7f92a57 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Extruded.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt @@ -1,5 +1,5 @@ @file:UseSerializers(Point2DSerializer::class, Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.vision.AbstractVision @@ -39,13 +39,13 @@ fun Shape2DBuilder.polygon(vertices: Int, radius: Number) { data class Layer(var x: Float, var y: Float, var z: Float, var scale: Float) @Serializable -@SerialName("3d.extrude") +@SerialName("solid.extrude") class Extruded( var shape: List = ArrayList(), var layers: MutableList = ArrayList() -) : AbstractVision(), Vision3D, Shape { +) : AbstractVision(), GeometrySolid { - override var ownProperties: Config? = null + override var properties: Config? = null override var position: Point3D? = null override var rotation: Point3D? = null diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/GeometryBuilder.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt similarity index 89% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/GeometryBuilder.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt index b6bad6db..b813da89 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/GeometryBuilder.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Meta @@ -31,9 +31,9 @@ fun GeometryBuilder<*>.face4( } /** - * [Shape] is a [Vision3D] that can represent its own geometry as a set of polygons. + * [GeometrySolid] is a [Solid] that can represent its own geometry as a set of polygons. */ -interface Shape : Vision3D { +interface GeometrySolid : Solid { fun toGeometry(geometryBuilder: GeometryBuilder) } diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt similarity index 76% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/PolyLine.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt index 96cbd6c4..280e6b9b 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/PolyLine.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.meta.number @@ -14,16 +14,16 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers @Serializable -@SerialName("3d.line") -class PolyLine(var points: List) : AbstractVision(), Vision3D { - override var ownProperties: Config? = null +@SerialName("solid.line") +class PolyLine(var points: List) : AbstractVision(), Solid { + override var properties: Config? = null override var position: Point3D? = null override var rotation: Point3D? = null override var scale: Point3D? = null //var lineType by string() - var thickness by number(1.0, key = Material3D.MATERIAL_KEY + THICKNESS_KEY) + var thickness by number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY) companion object { val THICKNESS_KEY = "thickness".asName() diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt similarity index 81% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Proxy.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt index c721df11..80c07326 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Proxy.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.meta.Laminate @@ -16,15 +16,15 @@ import kotlinx.serialization.UseSerializers import kotlin.collections.set /** - * A proxy [Vision3D] to reuse a template object + * A proxy [Solid] to reuse a template object */ @Serializable -@SerialName("3d.proxy") +@SerialName("solid.proxy") class Proxy private constructor( val templateName: Name -) : AbstractVision(), VisionGroup, Vision3D { +) : AbstractVision(), VisionGroup, Solid { - constructor(parent: VisionGroup3D, templateName: Name) : this(templateName) { + constructor(parent: SolidGroup, templateName: Name) : this(templateName) { this.parent = parent } @@ -32,31 +32,29 @@ class Proxy private constructor( override var rotation: Point3D? = null override var scale: Point3D? = null - override var ownProperties: Config? = null + override var properties: Config? = null /** * Recursively search for defined template in the parent */ - val prototype: Vision3D - get() = (parent as? VisionGroup3D)?.getPrototype(templateName) + val prototype: Solid + get() = (parent as? SolidGroup)?.getPrototype(templateName) ?: error("Prototype with name $templateName not found in $parent") override val styleSheet: StyleSheet - get() = parent?.styleSheet ?: StyleSheet( - this - ) + get() = parent?.styleSheet ?: StyleSheet(this) override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? { return if (inherit) { sequence { - yield(ownProperties?.get(name)) + yield(properties?.get(name)) yield(mergedStyles[name]) yield(prototype.getItem(name)) yield(parent?.getProperty(name, inherit)) }.merge() } else { sequence { - yield(ownProperties?.get(name)) + yield(properties?.get(name)) yield(mergedStyles[name]) yield(prototype.getProperty(name, false)) }.merge() @@ -82,8 +80,8 @@ class Proxy private constructor( ?: error("Prototype with name $name not found in $this") } - override fun properties(): Laminate = - Laminate(ownProperties, mergedStyles, prototype.properties(), parent?.properties()) + override fun getAllProperties(): Laminate = + Laminate(properties, mergedStyles, prototype.getAllProperties(), parent?.getAllProperties()) override fun attachChildren() { //do nothing @@ -108,7 +106,7 @@ class Proxy private constructor( ) } ?: emptyMap() - override var ownProperties: Config? + override var properties: Config? get() = propertyCache[name] set(value) { if (value == null) { @@ -118,8 +116,8 @@ class Proxy private constructor( } } else { propertyCache[name] = value.also { - onPropertyChange(this@Proxy) { propertyName, before, after -> - this@Proxy.propertyChanged(childPropertyName(name, propertyName), before, after) + onPropertyChange(this@Proxy) { propertyName -> + this@Proxy.propertyChanged(childPropertyName(name, propertyName)) } } } @@ -128,14 +126,14 @@ class Proxy private constructor( override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? { return if (inherit) { sequence { - yield(ownProperties?.get(name)) + yield(properties?.get(name)) yield(mergedStyles[name]) yield(prototype.getItem(name)) yield(parent?.getProperty(name, inherit)) }.merge() } else { sequence { - yield(ownProperties?.get(name)) + yield(properties?.get(name)) yield(mergedStyles[name]) yield(prototype.getProperty(name, false)) }.merge() @@ -146,8 +144,8 @@ class Proxy private constructor( //do nothing } - override fun properties(): Laminate = - Laminate(ownProperties, mergedStyles, prototype.properties(), parent?.properties()) + override fun getAllProperties(): Laminate = + Laminate(properties, mergedStyles, prototype.getAllProperties(), parent?.getAllProperties()) override val descriptor: NodeDescriptor? @@ -169,7 +167,7 @@ val Vision.prototype: Vision /** * Create ref for existing prototype */ -fun VisionGroup3D.ref( +fun SolidGroup.ref( templateName: Name, name: String = "" ): Proxy = Proxy(this, templateName).also { set(name, it) } @@ -177,9 +175,9 @@ fun VisionGroup3D.ref( /** * Add new proxy wrapping given object and automatically adding it to the prototypes */ -fun VisionGroup3D.proxy( +fun SolidGroup.proxy( name: String, - obj: Vision3D, + obj: Solid, templateName: Name = name.toName() ): Proxy { val existing = getPrototype(templateName) @@ -193,11 +191,11 @@ fun VisionGroup3D.proxy( return ref(templateName, name) } -fun VisionGroup3D.proxyGroup( +fun SolidGroup.proxyGroup( name: String, templateName: Name = name.toName(), block: MutableVisionGroup.() -> Unit ): Proxy { - val group = VisionGroup3D().apply (block) + val group = SolidGroup().apply(block) return proxy(name, group, templateName) } diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Vision3D.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt similarity index 65% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Vision3D.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt index 238741ec..08a018ec 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Vision3D.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.NodeDescriptor @@ -11,20 +11,22 @@ import hep.dataforge.values.ValueType import hep.dataforge.values.asValue import hep.dataforge.vision.Vision import hep.dataforge.vision.enum -import hep.dataforge.vision.spatial.Vision3D.Companion.DETAIL_KEY -import hep.dataforge.vision.spatial.Vision3D.Companion.IGNORE_KEY -import hep.dataforge.vision.spatial.Vision3D.Companion.LAYER_KEY -import hep.dataforge.vision.spatial.Vision3D.Companion.VISIBLE_KEY +import hep.dataforge.vision.solid.Solid.Companion.DETAIL_KEY +import hep.dataforge.vision.solid.Solid.Companion.IGNORE_KEY +import hep.dataforge.vision.solid.Solid.Companion.LAYER_KEY +import hep.dataforge.vision.solid.Solid.Companion.VISIBLE_KEY import kotlinx.serialization.UseSerializers /** * Interface for 3-dimensional [Vision] */ -interface Vision3D : Vision { +interface Solid : Vision { var position: Point3D? var rotation: Point3D? var scale: Point3D? + val properties: Config? + override val descriptor: NodeDescriptor? get() = Companion.descriptor companion object { @@ -75,25 +77,41 @@ interface Vision3D : Vision { multiple = true } - item(Material3D.MATERIAL_KEY.toString(), Material3D.descriptor) + item(SolidMaterial.MATERIAL_KEY.toString(), SolidMaterial.descriptor) enum(ROTATION_ORDER_KEY,default = RotationOrder.XYZ) } } + + internal fun solidEquals(first: Solid, second: Solid): Boolean{ + if (first.position != second.position) return false + if (first.rotation != second.rotation) return false + if (first.scale != second.scale) return false + if (first.properties != second.properties) return false + return true + } + + internal fun solidHashCode(solid: Solid): Int{ + var result = + (solid.position?.hashCode() ?: 0) + result = 31 * result + (solid.rotation?.hashCode() ?: 0) + result = 31 * result + (solid.scale?.hashCode() ?: 0) + result = 31 * result + (solid.properties?.hashCode() ?: 0) + return result + } } } /** * Count number of layers to the top object. Return 1 if this is top layer */ -var Vision3D.layer: Int +var Solid.layer: Int get() = getItem(LAYER_KEY).int ?: 0 set(value) { setItem(LAYER_KEY, value.asValue()) } -fun Renderer.render(meta: Meta = Meta.EMPTY, action: VisionGroup3D.() -> Unit) = - render(VisionGroup3D().apply(action), meta) +fun Renderer.render(meta: Meta = Meta.EMPTY, action: SolidGroup.() -> Unit) = + render(SolidGroup().apply(action), meta) // Common properties @@ -109,15 +127,15 @@ enum class RotationOrder { /** * Rotation order */ -var Vision3D.rotationOrder: RotationOrder - get() = getItem(Vision3D.ROTATION_ORDER_KEY).enum() ?: RotationOrder.XYZ - set(value) = setItem(Vision3D.ROTATION_ORDER_KEY, value.name.asValue()) +var Solid.rotationOrder: RotationOrder + get() = getItem(Solid.ROTATION_ORDER_KEY).enum() ?: RotationOrder.XYZ + set(value) = setItem(Solid.ROTATION_ORDER_KEY, value.name.asValue()) /** * Preferred number of polygons for displaying the object. If not defined, uses shape or renderer default. Not inherited */ -var Vision3D.detail: Int? +var Solid.detail: Int? get() = getProperty(DETAIL_KEY, false).int set(value) = setItem(DETAIL_KEY, value?.asValue()) @@ -137,74 +155,74 @@ var Vision.ignore: Boolean? // get() = getProperty(SELECTED_KEY).boolean // set(value) = setProperty(SELECTED_KEY, value) -private fun Vision3D.position(): Point3D = +private fun Solid.position(): Point3D = position ?: Point3D(0.0, 0.0, 0.0).also { position = it } -var Vision3D.x: Number +var Solid.x: Number get() = position?.x ?: 0f set(value) { position().x = value.toDouble() - propertyInvalidated(Vision3D.X_POSITION_KEY) + propertyChanged(Solid.X_POSITION_KEY) } -var Vision3D.y: Number +var Solid.y: Number get() = position?.y ?: 0f set(value) { position().y = value.toDouble() - propertyInvalidated(Vision3D.Y_POSITION_KEY) + propertyChanged(Solid.Y_POSITION_KEY) } -var Vision3D.z: Number +var Solid.z: Number get() = position?.z ?: 0f set(value) { position().z = value.toDouble() - propertyInvalidated(Vision3D.Z_POSITION_KEY) + propertyChanged(Solid.Z_POSITION_KEY) } -private fun Vision3D.rotation(): Point3D = +private fun Solid.rotation(): Point3D = rotation ?: Point3D(0.0, 0.0, 0.0).also { rotation = it } -var Vision3D.rotationX: Number +var Solid.rotationX: Number get() = rotation?.x ?: 0f set(value) { rotation().x = value.toDouble() - propertyInvalidated(Vision3D.X_ROTATION_KEY) + propertyChanged(Solid.X_ROTATION_KEY) } -var Vision3D.rotationY: Number +var Solid.rotationY: Number get() = rotation?.y ?: 0f set(value) { rotation().y = value.toDouble() - propertyInvalidated(Vision3D.Y_ROTATION_KEY) + propertyChanged(Solid.Y_ROTATION_KEY) } -var Vision3D.rotationZ: Number +var Solid.rotationZ: Number get() = rotation?.z ?: 0f set(value) { rotation().z = value.toDouble() - propertyInvalidated(Vision3D.Z_ROTATION_KEY) + propertyChanged(Solid.Z_ROTATION_KEY) } -private fun Vision3D.scale(): Point3D = +private fun Solid.scale(): Point3D = scale ?: Point3D(1.0, 1.0, 1.0).also { scale = it } -var Vision3D.scaleX: Number +var Solid.scaleX: Number get() = scale?.x ?: 1f set(value) { scale().x = value.toDouble() - propertyInvalidated(Vision3D.X_SCALE_KEY) + propertyChanged(Solid.X_SCALE_KEY) } -var Vision3D.scaleY: Number +var Solid.scaleY: Number get() = scale?.y ?: 1f set(value) { scale().y = value.toDouble() - propertyInvalidated(Vision3D.Y_SCALE_KEY) + propertyChanged(Solid.Y_SCALE_KEY) } -var Vision3D.scaleZ: Number +var Solid.scaleZ: Number get() = scale?.z ?: 1f set(value) { scale().z = value.toDouble() - propertyInvalidated(Vision3D.Z_SCALE_KEY) + propertyChanged(Solid.Z_SCALE_KEY) } \ No newline at end of file diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisionGroup3D.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt similarity index 78% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisionGroup3D.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt index 05b32417..c3b538b3 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/VisionGroup3D.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt @@ -2,7 +2,7 @@ Point3DSerializer::class ) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.names.Name @@ -23,8 +23,8 @@ interface PrototypeHolder { * Represents 3-dimensional Visual Group */ @Serializable -@SerialName("group.3d") -class VisionGroup3D : AbstractVisionGroup(), Vision3D, PrototypeHolder { +@SerialName("group.solid") +class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder { override var styleSheet: StyleSheet? = null @@ -46,7 +46,7 @@ class VisionGroup3D : AbstractVisionGroup(), Vision3D, PrototypeHolder { } //FIXME to be lifted to AbstractVisualGroup after https://github.com/Kotlin/kotlinx.serialization/issues/378 is fixed - override var ownProperties: Config? = null + override var properties: Config? = null override var position: Point3D? = null override var rotation: Point3D? = null @@ -75,31 +75,39 @@ class VisionGroup3D : AbstractVisionGroup(), Vision3D, PrototypeHolder { // */ // override fun addStatic(child: VisualObject) = setChild(NameToken("@static(${child.hashCode()})"), child) - override fun createGroup(): VisionGroup3D = VisionGroup3D() + override fun createGroup(): SolidGroup = SolidGroup() companion object { // val PROTOTYPES_KEY = NameToken("@prototypes") - fun parseJson(json: String): VisionGroup3D = - SpatialVisionManager.json.parse(serializer(), json).also { it.attachChildren() } + fun parseJson(json: String): SolidGroup = + SolidManager.jsonForSolids.parse(serializer(), json).also { it.attachChildren() } } } +@Suppress("FunctionName") +fun SolidGroup(block: SolidGroup.() -> Unit): SolidGroup { + return SolidGroup().apply(block) +} + /** * Ger a prototype redirecting the request to the parent if prototype is not found */ -tailrec fun PrototypeHolder.getPrototype(name: Name): Vision3D? = - prototypes?.get(name) as? Vision3D ?: (parent as? PrototypeHolder)?.getPrototype(name) +tailrec fun PrototypeHolder.getPrototype(name: Name): Solid? = + prototypes?.get(name) as? Solid ?: (parent as? PrototypeHolder)?.getPrototype(name) /** * Define a group with given [name], attach it to this parent and return it. */ -fun MutableVisionGroup.group(name: String = "", action: VisionGroup3D.() -> Unit = {}): VisionGroup3D = - VisionGroup3D().apply(action).also { +fun MutableVisionGroup.group(name: String = "", action: SolidGroup.() -> Unit = {}): SolidGroup = + SolidGroup().apply(action).also { set(name, it) } +/** + * A special class which works as a holder for prototypes + */ internal class Prototypes( override var children: MutableMap = LinkedHashMap() ) : AbstractVisionGroup(), MutableVisionGroup, PrototypeHolder { @@ -121,7 +129,7 @@ internal class Prototypes( override fun createGroup() = SimpleVisionGroup() - override var ownProperties: Config? + override var properties: Config? get() = null set(_) { error("Can't define properties for prototypes block") diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Label3D.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt similarity index 64% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Label3D.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt index 40ecdf37..c740f778 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Label3D.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.vision.AbstractVision @@ -11,9 +11,9 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers @Serializable -@SerialName("3d.label") -class Label3D(var text: String, var fontSize: Double, var fontFamily: String) : AbstractVision(), Vision3D { - override var ownProperties: Config? = null +@SerialName("solid.label") +class SolidLabel(var text: String, var fontSize: Double, var fontFamily: String) : AbstractVision(), Solid { + override var properties: Config? = null override var position: Point3D? = null override var rotation: Point3D? = null @@ -26,6 +26,6 @@ fun MutableVisionGroup.label( fontSize: Number = 20, fontFamily: String = "Arial", name: String = "", - action: Label3D.() -> Unit = {} + action: SolidLabel.() -> Unit = {} ) = - Label3D(text, fontSize.toDouble(), fontFamily).apply(action).also { set(name, it) } \ No newline at end of file + SolidLabel(text, fontSize.toDouble(), fontFamily).apply(action).also { set(name, it) } \ No newline at end of file diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt new file mode 100644 index 00000000..57a89998 --- /dev/null +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt @@ -0,0 +1,137 @@ +package hep.dataforge.vision.solid + +import hep.dataforge.context.AbstractPlugin +import hep.dataforge.context.Context +import hep.dataforge.context.PluginFactory +import hep.dataforge.context.PluginTag +import hep.dataforge.meta.* +import hep.dataforge.names.Name +import hep.dataforge.names.toName +import hep.dataforge.vision.SimpleVisionGroup +import hep.dataforge.vision.Vision +import hep.dataforge.vision.VisionForm +import hep.dataforge.vision.VisionManager +import hep.dataforge.vision.VisionManager.Companion.VISION_SERIAL_MODULE_TARGET +import kotlinx.serialization.KSerializer +import kotlinx.serialization.UnstableDefault +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonConfiguration +import kotlinx.serialization.modules.SerialModule +import kotlinx.serialization.modules.SerialModuleCollector +import kotlinx.serialization.modules.SerializersModule +import kotlinx.serialization.modules.contextual +import kotlin.reflect.KClass + +@DFExperimental +private class SolidForm( + override val type: KClass, + override val serializer: KSerializer +) : VisionForm { + + private fun Solid.update(meta: Meta) { + fun Meta.toVector(default: Float = 0f) = Point3D( + this[Solid.X_KEY].float ?: default, + this[Solid.Y_KEY].float ?: default, + this[Solid.Z_KEY].float ?: default + ) + + meta[Solid.POSITION_KEY].node?.toVector()?.let { position = it } + meta[Solid.ROTATION].node?.toVector()?.let { rotation = it } + meta[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it } + meta["properties"].node?.let { configure(it) } + } + + override fun patch(obj: T, meta: Meta) { + TODO("Not yet implemented") + } +} + +@DFExperimental +@OptIn(UnstableDefault::class) +private fun SerialModule.extractFactories(): List> { + val list = ArrayList>() + + val jsonEngine = Json( + JsonConfiguration( + prettyPrint = true, + useArrayPolymorphism = false, + encodeDefaults = false, + ignoreUnknownKeys = true + ), + context = this + ) + + val collector = object : SerialModuleCollector { + override fun contextual(kClass: KClass, serializer: KSerializer) { + //Do nothing + } + + override fun polymorphic( + baseClass: KClass, + actualClass: KClass, + actualSerializer: KSerializer + ) { + if (baseClass == Vision::class) { + @Suppress("UNCHECKED_CAST") val factory = SolidForm( + actualClass as KClass, + actualSerializer as KSerializer + ) + val name = actualSerializer.descriptor.serialName.toName() + list.add(factory) + } + } + + } + dumpTo(collector) + return list +} + +@DFExperimental +class SolidManager(meta: Meta) : AbstractPlugin(meta) { + + val visionManager by require(VisionManager) + + override val tag: PluginTag get() = Companion.tag + + override fun provideTop(target: String): Map = when (target) { + VisionForm.TYPE -> serialModule.extractFactories().associateBy { it.name } + VISION_SERIAL_MODULE_TARGET -> mapOf(tag.name.toName() to serialModule) + else -> super.provideTop(target) + } + + companion object : PluginFactory { + override val tag: PluginTag = PluginTag(name = "visual.spatial", group = PluginTag.DATAFORGE_GROUP) + override val type: KClass = SolidManager::class + override fun invoke(meta: Meta, context: Context): SolidManager = SolidManager(meta) + + val serialModule = SerializersModule { + contextual(Point3DSerializer) + contextual(Point2DSerializer) + + polymorphic(Vision::class, Solid::class) { + subclass(SimpleVisionGroup.serializer()) + subclass(SolidGroup.serializer()) + subclass(Proxy.serializer()) + subclass(Composite.serializer()) + subclass(Tube.serializer()) + subclass(Box.serializer()) + subclass(Convex.serializer()) + subclass(Extruded.serializer()) + subclass(PolyLine.serializer()) + subclass(SolidLabel.serializer()) + subclass(Sphere.serializer()) + } + } + + @OptIn(UnstableDefault::class) + val jsonForSolids = Json( + JsonConfiguration( + prettyPrint = true, + useArrayPolymorphism = false, + encodeDefaults = false, + ignoreUnknownKeys = true + ), + context = serialModule + ) + } +} diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Material3D.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt similarity index 77% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Material3D.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt index 626c2848..d5a29a55 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Material3D.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.NodeDescriptor @@ -8,12 +8,12 @@ import hep.dataforge.names.plus import hep.dataforge.values.ValueType import hep.dataforge.values.asValue 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.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY +import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY +import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY import hep.dataforge.vision.widgetType -class Material3D : Scheme() { +class SolidMaterial : Scheme() { /** * Primary web-color for the material @@ -35,7 +35,7 @@ class Material3D : Scheme() { */ var wireframe by boolean(false, WIREFRAME_KEY) - companion object : SchemeSpec(::Material3D) { + companion object : SchemeSpec(::SolidMaterial) { val MATERIAL_KEY = "material".asName() internal val COLOR_KEY = "color".asName() @@ -77,18 +77,18 @@ class Material3D : Scheme() { /** * Set color as web-color */ -fun Vision3D.color(webColor: String) { +fun Solid.color(webColor: String) { setItem(MATERIAL_COLOR_KEY, webColor.asValue()) } /** * Set color as integer */ -fun Vision3D.color(rgb: Int) { +fun Solid.color(rgb: Int) { setItem(MATERIAL_COLOR_KEY, rgb.asValue()) } -fun Vision3D.color(r: UByte, g: UByte, b: UByte) = setItem( +fun Solid.color(r: UByte, g: UByte, b: UByte) = setItem( MATERIAL_COLOR_KEY, Colors.rgbToMeta(r, g, b) ) @@ -96,25 +96,25 @@ fun Vision3D.color(r: UByte, g: UByte, b: UByte) = setItem( /** * Web colors representation of the color in `#rrggbb` format or HTML name */ -var Vision3D.color: String? +var Solid.color: String? get() = getItem(MATERIAL_COLOR_KEY)?.let { Colors.fromMeta(it) } set(value) { setItem(MATERIAL_COLOR_KEY, value?.asValue()) } -val Vision3D.material: Material3D? - get() = getItem(MATERIAL_KEY).node?.let { Material3D.wrap(it) } +val Solid.material: SolidMaterial? + get() = getItem(MATERIAL_KEY).node?.let { SolidMaterial.wrap(it) } -fun Vision3D.material(builder: Material3D.() -> Unit) { +fun Solid.material(builder: SolidMaterial.() -> Unit) { val node = config[MATERIAL_KEY].node if (node != null) { - Material3D.update(node, builder) + SolidMaterial.update(node, builder) } else { - config[MATERIAL_KEY] = Material3D(builder) + config[MATERIAL_KEY] = SolidMaterial(builder) } } -var Vision3D.opacity: Double? +var Solid.opacity: Double? get() = getItem(MATERIAL_OPACITY_KEY).double set(value) { setItem(MATERIAL_OPACITY_KEY, value?.asValue()) diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt similarity index 92% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Sphere.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt index b225fad9..13cb7fbd 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Sphere.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.vision.AbstractVision @@ -14,16 +14,16 @@ import kotlin.math.cos import kotlin.math.sin @Serializable -@SerialName("3d.sphere") +@SerialName("solid.sphere") class Sphere( var radius: Float, var phiStart: Float = 0f, var phi: Float = PI2, var thetaStart: Float = 0f, var theta: Float = PI.toFloat() -) : AbstractVision(), Vision3D, Shape { +) : AbstractVision(), GeometrySolid { - override var ownProperties: Config? = null + override var properties: Config? = null override var position: Point3D? = null override var rotation: Point3D? = null diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Tube.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt similarity index 96% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Tube.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt index bc98f217..a8b699c5 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/Tube.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt @@ -1,6 +1,6 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Config import hep.dataforge.vision.AbstractVision @@ -17,20 +17,20 @@ import kotlin.math.sin * Straight tube segment */ @Serializable -@SerialName("3d.tube") +@SerialName("solid.tube") class Tube( var radius: Float, var height: Float, var innerRadius: Float = 0f, var startAngle: Float = 0f, var angle: Float = PI2 -) : AbstractVision(), Vision3D, Shape { +) : AbstractVision(), GeometrySolid { override var position: Point3D? = null override var rotation: Point3D? = null override var scale: Point3D? = null - override var ownProperties: Config? = null + override var properties: Config? = null init { require(radius > 0) diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/geometry.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt similarity index 85% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/geometry.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt index 4c522a0b..8764bc41 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/geometry.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.Meta import hep.dataforge.meta.get @@ -21,8 +21,8 @@ operator fun Point2D.component1() = x operator fun Point2D.component2() = y fun Point2D.toMeta() = Meta { - Vision3D.X_KEY put x - Vision3D.Y_KEY put y + Solid.X_KEY put x + Solid.Y_KEY put y } fun Meta.point2D() = Point2D(this["x"].number ?: 0, this["y"].number ?: 0) @@ -42,7 +42,7 @@ operator fun Point3D.component3() = z fun Meta.point3D() = Point3D(this["x"].number ?: 0, this["y"].number ?: 0, this["y"].number ?: 0) fun Point3D.toMeta() = Meta { - Vision3D.X_KEY put x - Vision3D.Y_KEY put y - Vision3D.Z_KEY put z + Solid.X_KEY put x + Solid.Y_KEY put y + Solid.Z_KEY put z } \ No newline at end of file diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/serialization.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt similarity index 94% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/serialization.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt index 9cb11972..877f9b3b 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/serialization.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.double import hep.dataforge.names.NameToken @@ -118,9 +118,9 @@ internal object PrototypesSerializer : KSerializer { } } -fun Vision.stringify(): String = SpatialVisionManager.json.stringify(Vision.serializer(), this) +fun Vision.stringify(): String = SolidManager.jsonForSolids.stringify(Vision.serializer(), this) -fun Vision.Companion.parseJson(str: String) = SpatialVisionManager.json.parse(Vision.serializer(), str).also { +fun Vision.Companion.parseJson(str: String) = SolidManager.jsonForSolids.parse(Vision.serializer(), str).also { if(it is VisionGroup){ it.attachChildren() } diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Axes.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt similarity index 84% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Axes.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt index 71fd7402..8a45e0a4 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Axes.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.specifications +package hep.dataforge.vision.solid.specifications import hep.dataforge.meta.* diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Camera.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt similarity index 93% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Camera.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt index 1745e075..dbd79bd8 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Camera.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.specifications +package hep.dataforge.vision.solid.specifications import hep.dataforge.meta.Scheme import hep.dataforge.meta.SchemeSpec diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt similarity index 88% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Canvas3DOptions.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt index 06b9c31b..9e4ceed6 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Canvas3DOptions.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.specifications +package hep.dataforge.vision.solid.specifications import hep.dataforge.meta.Scheme import hep.dataforge.meta.SchemeSpec diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Controls.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt similarity index 74% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Controls.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt index 5e50316f..adc22cbf 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/specifications/Controls.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.specifications +package hep.dataforge.vision.solid.specifications import hep.dataforge.meta.Scheme import hep.dataforge.meta.SchemeSpec diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt similarity index 84% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/RemoveSingleChild.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt index 78b556e3..36b6db76 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/RemoveSingleChild.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vision.spatial.transform +package hep.dataforge.vision.solid.transform import hep.dataforge.meta.update import hep.dataforge.names.asName import hep.dataforge.vision.MutableVisionGroup import hep.dataforge.vision.Vision import hep.dataforge.vision.VisionGroup -import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.solid.* internal fun mergeChild(parent: VisionGroup, child: Vision): Vision { return child.apply { @@ -14,7 +14,7 @@ internal fun mergeChild(parent: VisionGroup, child: Vision): Vision { //parent.properties?.let { config.update(it) } - if (this is Vision3D && parent is Vision3D) { + if (this is Solid && parent is Solid) { position = (position ?: World.ZERO) + (parent.position ?: World.ZERO) rotation = (parent.rotation ?: World.ZERO) + (parent.rotation ?: World.ZERO) scale = when { @@ -32,9 +32,9 @@ internal fun mergeChild(parent: VisionGroup, child: Vision): Vision { } } -object RemoveSingleChild : VisualTreeTransform() { +object RemoveSingleChild : VisualTreeTransform() { - override fun VisionGroup3D.transformInPlace() { + override fun SolidGroup.transformInPlace() { fun MutableVisionGroup.replaceChildren() { children.forEach { (childName, parent) -> if (parent is Proxy) return@forEach //ignore refs @@ -56,7 +56,7 @@ object RemoveSingleChild : VisualTreeTransform() { } } - override fun VisionGroup3D.clone(): VisionGroup3D { + override fun SolidGroup.clone(): SolidGroup { TODO() } } \ No newline at end of file diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt similarity index 78% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/UnRef.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt index 8b88e790..1eeec5ad 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/UnRef.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.spatial.transform +package hep.dataforge.vision.solid.transform import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.vision.MutableVisionGroup import hep.dataforge.vision.VisionGroup -import hep.dataforge.vision.spatial.Proxy -import hep.dataforge.vision.spatial.VisionGroup3D +import hep.dataforge.vision.solid.Proxy +import hep.dataforge.vision.solid.SolidGroup -object UnRef : VisualTreeTransform() { +object UnRef : VisualTreeTransform() { private fun VisionGroup.countRefs(): Map { return children.values.fold(HashMap()) { reducer, obj -> if (obj is VisionGroup) { @@ -24,7 +24,7 @@ object UnRef : VisualTreeTransform() { } private fun MutableVisionGroup.unref(name: Name) { - (this as? VisionGroup3D)?.prototypes?.set(name, null) + (this as? SolidGroup)?.prototypes?.set(name, null) children.filter { (it.value as? Proxy)?.templateName == name }.forEach { (key, value) -> val proxy = value as Proxy val newChild = mergeChild(proxy, proxy.prototype) @@ -35,14 +35,14 @@ object UnRef : VisualTreeTransform() { children.values.filterIsInstance().forEach { it.unref(name) } } - override fun VisionGroup3D.transformInPlace() { + override fun SolidGroup.transformInPlace() { val counts = countRefs() counts.filter { it.value <= 1 }.forEach { this.unref(it.key) } } - override fun VisionGroup3D.clone(): VisionGroup3D { + override fun SolidGroup.clone(): SolidGroup { TODO() } diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/VisualTreeTransform.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt similarity index 94% rename from visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/VisualTreeTransform.kt rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt index 2bbd8df6..83d38baa 100644 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/transform/VisualTreeTransform.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.transform +package hep.dataforge.vision.solid.transform import hep.dataforge.vision.Vision diff --git a/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt similarity index 85% rename from visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/ConvexTest.kt rename to visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt index e30d39df..8dc87500 100644 --- a/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/ConvexTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.MetaItem import hep.dataforge.meta.getIndexed @@ -11,7 +11,7 @@ class ConvexTest { @Suppress("UNUSED_VARIABLE") @Test fun testConvexBuilder() { - val group = VisionGroup3D().apply { + val group = SolidGroup().apply { convex { point(50, 50, -50) point(50, -50, -50) @@ -26,7 +26,7 @@ class ConvexTest { val convex = group.children.values.first() as Convex - val json = SpatialVisionManager.json.toJson(Convex.serializer(), convex) + val json = SolidManager.jsonForSolids.toJson(Convex.serializer(), convex) val meta = json.toMetaItem().node!! val points = meta.getIndexed("points").values.map { (it as MetaItem.NodeItem<*>).node.point3D() } diff --git a/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/GroupTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/GroupTest.kt similarity index 84% rename from visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/GroupTest.kt rename to visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/GroupTest.kt index 9992e633..5bfc8382 100644 --- a/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/GroupTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/GroupTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.vision.Colors import hep.dataforge.vision.get @@ -9,7 +9,7 @@ import kotlin.test.assertEquals class GroupTest { @Test fun testGroupWithComposite() { - val group = VisionGroup3D().apply { + val group = SolidGroup().apply { union("union") { box(100, 100, 100) { z = 100 @@ -45,7 +45,7 @@ class GroupTest { } assertEquals(3, group.children.count()) - assertEquals(300.0, (group["intersect"] as Vision3D).y.toDouble()) - assertEquals(-300.0, (group["subtract"] as Vision3D).y.toDouble()) + assertEquals(300.0, (group["intersect"] as Solid).y.toDouble()) + assertEquals(-300.0, (group["subtract"] as Solid).y.toDouble()) } } \ No newline at end of file diff --git a/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt similarity index 82% rename from visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/PropertyTest.kt rename to visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt index c66f7752..efa9e1a0 100644 --- a/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/PropertyTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt @@ -1,8 +1,9 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.int import hep.dataforge.meta.set import hep.dataforge.names.asName +import hep.dataforge.vision.styles import hep.dataforge.vision.useStyle import kotlin.test.Test import kotlin.test.assertEquals @@ -12,7 +13,7 @@ class PropertyTest { @Test fun testInheritedProperty() { var box: Box? = null - val group = VisionGroup3D().apply { + val group = SolidGroup().apply { config["test"] = 22 group { box = box(100, 100, 100) @@ -24,7 +25,7 @@ class PropertyTest { @Test fun testStyleProperty() { var box: Box? = null - val group = VisionGroup3D().apply { + val group = SolidGroup().apply { styleSheet { set("testStyle") { "test" put 22 @@ -42,10 +43,10 @@ class PropertyTest { @Test fun testColor() { var box: Box? = null - val group = VisionGroup3D().apply { + val group = SolidGroup().apply { styleSheet { set("testStyle") { - Material3D.MATERIAL_COLOR_KEY put "#555555" + SolidMaterial.MATERIAL_COLOR_KEY put "#555555" } } group { @@ -60,10 +61,10 @@ class PropertyTest { @Test fun testProxyStyleProperty() { var box: Proxy? = null - val group = VisionGroup3D().apply { + val group = SolidGroup().apply { styleSheet { set("testStyle") { - Material3D.MATERIAL_COLOR_KEY put "#555555" + SolidMaterial.MATERIAL_COLOR_KEY put "#555555" } } prototypes { diff --git a/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt similarity index 87% rename from visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/SerializationTest.kt rename to visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt index 8be6fcfa..f52b5c25 100644 --- a/visionforge-spatial/src/commonTest/kotlin/hep/dataforge/vision/spatial/SerializationTest.kt +++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.names.toName import hep.dataforge.vision.Vision @@ -27,7 +27,7 @@ class SerializationTest { x = 100 z = -100 } - val group = VisionGroup3D().apply { + val group = SolidGroup{ proxy("cube", cube) proxyGroup("pg", "pg.content".toName()){ sphere(50){ @@ -37,7 +37,8 @@ class SerializationTest { } val string = group.stringify() println(string) - val reconstructed = VisionGroup3D.parseJson(string) + val reconstructed = SolidGroup.parseJson(string) assertEquals(group["cube"]?.config, reconstructed["cube"]?.config) } + } \ No newline at end of file diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt new file mode 100644 index 00000000..7bbb5f4e --- /dev/null +++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt @@ -0,0 +1,28 @@ +package hep.dataforge.vision.solid + +import hep.dataforge.context.Global +import hep.dataforge.meta.DFExperimental +import hep.dataforge.vision.get +import kotlin.test.Test +import kotlin.test.assertEquals + +class SolidPluginTest { + val vision = SolidGroup { + box(100,100,100, name = "aBox") + + sphere(100,name = "aSphere"){ + z = 200 + } + } + + @DFExperimental + @Test + fun testPluginConverter(){ + val plugin = Global.plugins.fetch(SolidManager).visionManager + val meta = plugin.writeVisionToMeta(vision) + + val reconstructed = plugin.buildSpecificVision(meta) + + assertEquals(vision["aBox"],reconstructed["aBox"]) + } +} \ No newline at end of file diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/geometryJs.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt similarity index 87% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/geometryJs.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt index 89e01ab4..8aa5fe91 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/geometryJs.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import info.laht.threekt.math.Vector2 diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/MeshThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt similarity index 84% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/MeshThreeFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt index 06127ff0..f3b2d30f 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/MeshThreeFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt @@ -1,14 +1,14 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.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.vision.spatial.Material3D -import hep.dataforge.vision.spatial.Vision3D -import hep.dataforge.vision.spatial.layer -import hep.dataforge.vision.spatial.three.ThreeMaterials.getMaterial +import hep.dataforge.vision.solid.Solid +import hep.dataforge.vision.solid.SolidMaterial +import hep.dataforge.vision.solid.layer +import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial import info.laht.threekt.core.BufferGeometry import info.laht.threekt.geometries.EdgesGeometry import info.laht.threekt.geometries.WireframeGeometry @@ -19,7 +19,7 @@ import kotlin.reflect.KClass /** * Basic geometry-based factory */ -abstract class MeshThreeFactory( +abstract class MeshThreeFactory( override val type: KClass ) : ThreeFactory { /** @@ -50,9 +50,9 @@ abstract class MeshThreeFactory( } //add listener to object properties - obj.onPropertyChange(this) { name, _, _ -> + obj.onPropertyChange(this) { name-> when { - name.startsWith(Vision3D.GEOMETRY_KEY) -> { + name.startsWith(Solid.GEOMETRY_KEY) -> { val oldGeometry = mesh.geometry as BufferGeometry val newGeometry = buildGeometry(obj) oldGeometry.attributes = newGeometry.attributes @@ -73,13 +73,13 @@ abstract class MeshThreeFactory( val WIREFRAME_KEY = "wireframe".asName() val ENABLED_KEY = "enabled".asName() val EDGES_ENABLED_KEY = EDGES_KEY + ENABLED_KEY - val EDGES_MATERIAL_KEY = EDGES_KEY + Material3D.MATERIAL_KEY + val EDGES_MATERIAL_KEY = EDGES_KEY + SolidMaterial.MATERIAL_KEY val WIREFRAME_ENABLED_KEY = WIREFRAME_KEY + ENABLED_KEY - val WIREFRAME_MATERIAL_KEY = WIREFRAME_KEY + Material3D.MATERIAL_KEY + val WIREFRAME_MATERIAL_KEY = WIREFRAME_KEY + SolidMaterial.MATERIAL_KEY } } -fun Mesh.applyEdges(obj: Vision3D) { +fun Mesh.applyEdges(obj: Solid) { children.find { it.name == "@edges" }?.let { remove(it) (it as LineSegments).dispose() @@ -99,7 +99,7 @@ fun Mesh.applyEdges(obj: Vision3D) { } } -fun Mesh.applyWireFrame(obj: Vision3D) { +fun Mesh.applyWireFrame(obj: Solid) { children.find { it.name == "@wireframe" }?.let { remove(it) (it as LineSegments).dispose() diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeBoxFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt similarity index 73% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeBoxFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt index 89737fa5..18f98942 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeBoxFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three -import hep.dataforge.vision.spatial.Box -import hep.dataforge.vision.spatial.detail +import hep.dataforge.vision.solid.Box +import hep.dataforge.vision.solid.detail import info.laht.threekt.geometries.BoxBufferGeometry object ThreeBoxFactory : MeshThreeFactory(Box::class) { diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvas.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt similarity index 90% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvas.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt index 85f83ce5..a4e44f35 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvas.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.context.Context import hep.dataforge.meta.Meta @@ -9,12 +9,12 @@ import hep.dataforge.names.plus import hep.dataforge.names.toName import hep.dataforge.output.Renderer import hep.dataforge.vision.Colors -import hep.dataforge.vision.spatial.Vision3D -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 hep.dataforge.vision.solid.Solid +import hep.dataforge.vision.solid.specifications.Camera +import hep.dataforge.vision.solid.specifications.Canvas3DOptions +import hep.dataforge.vision.solid.specifications.Controls +import hep.dataforge.vision.solid.three.ThreeMaterials.HIGHLIGHT_MATERIAL +import hep.dataforge.vision.solid.three.ThreeMaterials.SELECTED_MATERIAL import info.laht.threekt.WebGLRenderer import info.laht.threekt.cameras.PerspectiveCamera import info.laht.threekt.core.BufferGeometry @@ -41,11 +41,11 @@ import kotlin.math.sin /** * */ -class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Canvas3DOptions) : Renderer { +class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Canvas3DOptions) : Renderer { override val context: Context get() = three.context - var content: Vision3D? = null + var content: Solid? = null private set private var root: Object3D? = null @@ -172,7 +172,7 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Can } } - override fun render(obj: Vision3D, meta: Meta) { + override fun render(obj: Solid, meta: Meta) { //clear old root clear() @@ -244,5 +244,5 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Can fun ThreePlugin.output(element: HTMLElement, spec: Canvas3DOptions = Canvas3DOptions.empty()): ThreeCanvas = ThreeCanvas(element, this, spec) -fun ThreePlugin.render(element: HTMLElement, obj: Vision3D, spec: Canvas3DOptions = Canvas3DOptions.empty()): Unit = +fun ThreePlugin.render(element: HTMLElement, obj: Solid, spec: Canvas3DOptions = Canvas3DOptions.empty()): Unit = output(element, spec).render(obj) \ No newline at end of file diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasComponent.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt similarity index 87% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasComponent.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt index 886578d3..eb9ed292 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasComponent.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.context.Context import hep.dataforge.names.Name -import hep.dataforge.vision.spatial.Vision3D -import hep.dataforge.vision.spatial.specifications.Canvas3DOptions +import hep.dataforge.vision.solid.Solid +import hep.dataforge.vision.solid.specifications.Canvas3DOptions import org.w3c.dom.Element import org.w3c.dom.HTMLElement import react.RBuilder @@ -15,7 +15,7 @@ import react.dom.findDOMNode interface ThreeCanvasProps : RProps { var context: Context - var obj: Vision3D + var obj: Solid var options: Canvas3DOptions? var selected: Name? var clickCallback: (Name?) -> Unit @@ -61,7 +61,7 @@ class ThreeCanvasComponent : RComponent() { } } -fun RBuilder.threeCanvas(object3D: Vision3D, options: Canvas3DOptions.() -> Unit = {}) { +fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) { child(ThreeCanvasComponent::class) { attrs { this.obj = object3D diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasLabelFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt similarity index 80% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasLabelFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt index 1a9bae69..793a3c1a 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCanvasLabelFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt @@ -1,8 +1,8 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three -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 hep.dataforge.vision.solid.SolidLabel +import hep.dataforge.vision.solid.color +import hep.dataforge.vision.solid.three.ThreeCanvas.Companion.DO_NOT_HIGHLIGHT_TAG import info.laht.threekt.DoubleSide import info.laht.threekt.core.Object3D import info.laht.threekt.geometries.PlaneBufferGeometry @@ -19,10 +19,10 @@ import kotlin.reflect.KClass /** * Using example from http://stemkoski.github.io/Three.js/Texture-From-Canvas.html */ -object ThreeCanvasLabelFactory : ThreeFactory { - override val type: KClass get() = Label3D::class +object ThreeCanvasLabelFactory : ThreeFactory { + override val type: KClass get() = SolidLabel::class - override fun invoke(obj: Label3D): Object3D { + override fun invoke(obj: SolidLabel): Object3D { val canvas = document.createElement("canvas") as HTMLCanvasElement val context = canvas.getContext("2d") as CanvasRenderingContext2D context.font = "Bold ${obj.fontSize}pt ${obj.fontFamily}" diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCompositeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt similarity index 87% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCompositeFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt index 816e8356..59c513a5 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCompositeFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three -import hep.dataforge.vision.spatial.Composite -import hep.dataforge.vision.spatial.CompositeType +import hep.dataforge.vision.solid.Composite +import hep.dataforge.vision.solid.CompositeType import info.laht.threekt.core.BufferGeometry import info.laht.threekt.objects.Mesh diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeConvexFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt similarity index 81% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeConvexFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt index 536d6f7f..6652047e 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeConvexFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt @@ -1,6 +1,6 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three -import hep.dataforge.vision.spatial.Convex +import hep.dataforge.vision.solid.Convex import info.laht.threekt.external.geometries.ConvexBufferGeometry import info.laht.threekt.math.Vector3 diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCylinderFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt similarity index 89% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCylinderFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt index 87d4d8e9..9ba89cbf 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeCylinderFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three -import hep.dataforge.vision.spatial.ConeSegment -import hep.dataforge.vision.spatial.detail +import hep.dataforge.vision.solid.ConeSegment +import hep.dataforge.vision.solid.detail import info.laht.threekt.core.BufferGeometry import info.laht.threekt.geometries.CylinderBufferGeometry import kotlin.math.PI diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt similarity index 72% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt index 9dd3f519..8bbd55a3 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.names.Name import hep.dataforge.names.startsWith import hep.dataforge.provider.Type import hep.dataforge.vision.Vision -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 hep.dataforge.vision.solid.* +import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY +import hep.dataforge.vision.solid.three.ThreeFactory.Companion.TYPE +import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Object3D import info.laht.threekt.objects.Mesh @@ -33,7 +33,7 @@ interface ThreeFactory { */ fun Object3D.updatePosition(obj: Vision) { visible = obj.visible ?: true - if(obj is Vision3D) { + if(obj is Solid) { position.set(obj.x, obj.y, obj.z) setRotationFromEuler(obj.euler) scale.set(obj.scaleX, obj.scaleY, obj.scaleZ) @@ -60,13 +60,13 @@ fun Object3D.updateProperty(source: Vision, propertyName: Name) { if (this is Mesh && propertyName.startsWith(MATERIAL_KEY)) { this.material = getMaterial(source) } else if ( - propertyName.startsWith(Vision3D.POSITION_KEY) - || propertyName.startsWith(Vision3D.ROTATION) - || propertyName.startsWith(Vision3D.SCALE_KEY) + propertyName.startsWith(Solid.POSITION_KEY) + || propertyName.startsWith(Solid.ROTATION) + || propertyName.startsWith(Solid.SCALE_KEY) ) { //update position of mesh using this object updatePosition(source) - } else if (propertyName == Vision3D.VISIBLE_KEY) { + } else if (propertyName == Solid.VISIBLE_KEY) { visible = source.visible ?: true } } @@ -74,8 +74,8 @@ fun Object3D.updateProperty(source: Vision, propertyName: Name) { /** * Generic factory for elements which provide inside geometry builder */ -object ThreeShapeFactory : MeshThreeFactory(Shape::class) { - override fun buildGeometry(obj: Shape): BufferGeometry { +object ThreeShapeFactory : MeshThreeFactory(GeometrySolid::class) { + override fun buildGeometry(obj: GeometrySolid): BufferGeometry { return obj.run { ThreeGeometryBuilder().apply { toGeometry(this) }.build() } diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeGeometryBuilder.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt similarity index 91% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeGeometryBuilder.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt index fb9ce1b2..152af45a 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeGeometryBuilder.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.meta.Meta import hep.dataforge.meta.get import hep.dataforge.meta.int -import hep.dataforge.vision.spatial.GeometryBuilder -import hep.dataforge.vision.spatial.Point3D +import hep.dataforge.vision.solid.GeometryBuilder +import hep.dataforge.vision.solid.Point3D import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Face3 import info.laht.threekt.core.Geometry diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt new file mode 100644 index 00000000..60b0352a --- /dev/null +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt @@ -0,0 +1,31 @@ +package hep.dataforge.vision.solid.three + +import hep.dataforge.js.jsObject +import hep.dataforge.vision.solid.SolidLabel +import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial +import info.laht.threekt.core.Object3D +import info.laht.threekt.geometries.TextBufferGeometry +import info.laht.threekt.objects.Mesh +import kotlin.reflect.KClass + +/** + * + */ +object ThreeLabelFactory : ThreeFactory { + override val type: KClass get() = SolidLabel::class + + override fun invoke(obj: SolidLabel): Object3D { + val textGeo = TextBufferGeometry(obj.text, jsObject { + font = obj.fontFamily + size = 20 + height = 1 + curveSegments = 1 + }) + return Mesh(textGeo, getMaterial(obj)).apply { + updatePosition(obj) + obj.onPropertyChange(this@ThreeLabelFactory) { _ -> + //TODO + } + } + } +} \ No newline at end of file diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLineFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt similarity index 78% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLineFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt index b1f96663..c0b67e25 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLineFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.meta.node -import hep.dataforge.vision.spatial.PolyLine -import hep.dataforge.vision.spatial.color -import hep.dataforge.vision.spatial.three.ThreeMaterials.DEFAULT_LINE_COLOR +import hep.dataforge.vision.solid.PolyLine +import hep.dataforge.vision.solid.color +import hep.dataforge.vision.solid.three.ThreeMaterials.DEFAULT_LINE_COLOR import info.laht.threekt.core.Geometry import info.laht.threekt.core.Object3D import info.laht.threekt.math.Color @@ -27,7 +27,7 @@ object ThreeLineFactory : ThreeFactory { updatePosition(obj) //layers.enable(obj.layer) //add listener to object properties - obj.onPropertyChange(this) { propertyName, _, _ -> + obj.onPropertyChange(this) { propertyName-> updateProperty(obj, propertyName) } } diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeMaterials.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt similarity index 68% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeMaterials.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt index bec36997..f8110d73 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeMaterials.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.meta.* import hep.dataforge.values.ValueType import hep.dataforge.vision.Colors import hep.dataforge.vision.Vision -import hep.dataforge.vision.spatial.Material3D +import hep.dataforge.vision.solid.SolidMaterial import info.laht.threekt.materials.LineBasicMaterial import info.laht.threekt.materials.Material import info.laht.threekt.materials.MeshBasicMaterial @@ -36,30 +36,30 @@ object ThreeMaterials { fun getLineMaterial(meta: Meta?): LineBasicMaterial { if (meta == null) return DEFAULT_LINE return LineBasicMaterial().apply { - color = meta[Material3D.COLOR_KEY]?.getColor() ?: DEFAULT_LINE_COLOR - opacity = meta[Material3D.OPACITY_KEY].double ?: 1.0 + color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_LINE_COLOR + opacity = meta[SolidMaterial.OPACITY_KEY].double ?: 1.0 transparent = opacity < 1.0 linewidth = meta["thickness"].double ?: 1.0 } } fun getMaterial(vision3D: Vision): Material { - val meta = vision3D.getItem(Material3D.MATERIAL_KEY).node ?: return ThreeMaterials.DEFAULT - return if (meta[Material3D.SPECULAR_COLOR_KEY] != null) { + val meta = vision3D.getItem(SolidMaterial.MATERIAL_KEY).node ?: return ThreeMaterials.DEFAULT + return if (meta[SolidMaterial.SPECULAR_COLOR_KEY] != null) { MeshPhongMaterial().apply { - color = meta[Material3D.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR - specular = meta[Material3D.SPECULAR_COLOR_KEY]!!.getColor() - opacity = meta[Material3D.OPACITY_KEY]?.double ?: 1.0 + color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR + specular = meta[SolidMaterial.SPECULAR_COLOR_KEY]!!.getColor() + opacity = meta[SolidMaterial.OPACITY_KEY]?.double ?: 1.0 transparent = opacity < 1.0 - wireframe = meta[Material3D.WIREFRAME_KEY].boolean ?: false + wireframe = meta[SolidMaterial.WIREFRAME_KEY].boolean ?: false needsUpdate = true } } else { MeshBasicMaterial().apply { - color = meta[Material3D.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR - opacity = meta[Material3D.OPACITY_KEY]?.double ?: 1.0 + color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR + opacity = meta[SolidMaterial.OPACITY_KEY]?.double ?: 1.0 transparent = opacity < 1.0 - wireframe = meta[Material3D.WIREFRAME_KEY].boolean ?: false + wireframe = meta[SolidMaterial.WIREFRAME_KEY].boolean ?: false needsUpdate = true } } diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreePlugin.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt similarity index 83% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreePlugin.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt index b8a1d943..a3af79d4 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreePlugin.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.context.* import hep.dataforge.meta.Meta import hep.dataforge.names.* import hep.dataforge.vision.Vision -import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.solid.* import info.laht.threekt.core.Object3D import kotlin.collections.set import kotlin.reflect.KClass @@ -13,7 +13,7 @@ import info.laht.threekt.objects.Group as ThreeGroup class ThreePlugin : AbstractPlugin() { override val tag: PluginTag get() = Companion.tag - private val objectFactories = HashMap, ThreeFactory<*>>() + private val objectFactories = HashMap, ThreeFactory<*>>() private val compositeFactory = ThreeCompositeFactory(this) private val proxyFactory = ThreeProxyFactory(this) @@ -24,24 +24,24 @@ class ThreePlugin : AbstractPlugin() { objectFactories[Sphere::class] = ThreeSphereFactory objectFactories[ConeSegment::class] = ThreeCylinderFactory objectFactories[PolyLine::class] = ThreeLineFactory - objectFactories[Label3D::class] = ThreeCanvasLabelFactory + objectFactories[SolidLabel::class] = ThreeCanvasLabelFactory } @Suppress("UNCHECKED_CAST") - private fun findObjectFactory(type: KClass): ThreeFactory? { + private fun findObjectFactory(type: KClass): ThreeFactory? { return (objectFactories[type] ?: context.content>(ThreeFactory.TYPE).values.find { it.type == type }) - as ThreeFactory? + as ThreeFactory? } - fun buildObject3D(obj: Vision3D): Object3D { + fun buildObject3D(obj: Solid): Object3D { return when (obj) { is ThreeVision -> obj.toObject3D() is Proxy -> proxyFactory(obj) - is VisionGroup3D -> { + is SolidGroup -> { val group = ThreeGroup() obj.children.forEach { (token, child) -> - if (child is Vision3D && child.ignore != true) { + if (child is Solid && child.ignore != true) { try { val object3D = buildObject3D(child) group[token] = object3D @@ -55,15 +55,15 @@ class ThreePlugin : AbstractPlugin() { updatePosition(obj) //obj.onChildrenChange() - obj.onPropertyChange(this) { name, _, _ -> + obj.onPropertyChange(this) { name-> if ( - name.startsWith(Vision3D.POSITION_KEY) || - name.startsWith(Vision3D.ROTATION) || - name.startsWith(Vision3D.SCALE_KEY) + name.startsWith(Solid.POSITION_KEY) || + name.startsWith(Solid.ROTATION) || + name.startsWith(Solid.SCALE_KEY) ) { //update position of mesh using this object updatePosition(obj) - } else if (name == Vision3D.VISIBLE_KEY) { + } else if (name == Solid.VISIBLE_KEY) { visible = obj.visible ?: true } } @@ -83,7 +83,7 @@ class ThreePlugin : AbstractPlugin() { } //adding new object - if (child != null && child is Vision3D) { + if (child != null && child is Solid) { try { val object3D = buildObject3D(child) set(name, object3D) @@ -97,10 +97,10 @@ class ThreePlugin : AbstractPlugin() { is Composite -> compositeFactory(obj) else -> { //find specialized factory for this type if it is present - val factory: ThreeFactory? = findObjectFactory(obj::class) + val factory: ThreeFactory? = findObjectFactory(obj::class) when { factory != null -> factory(obj) - obj is Shape -> ThreeShapeFactory(obj) + obj is GeometrySolid -> ThreeShapeFactory(obj) else -> error("Renderer for ${obj::class} not found") } } diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeProxyFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt similarity index 79% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeProxyFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt index 9dbc69fa..9ae86b4d 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeProxyFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.names.toName -import hep.dataforge.vision.spatial.Proxy -import hep.dataforge.vision.spatial.Proxy.Companion.PROXY_CHILD_PROPERTY_PREFIX -import hep.dataforge.vision.spatial.Vision3D +import hep.dataforge.vision.solid.Proxy +import hep.dataforge.vision.solid.Proxy.Companion.PROXY_CHILD_PROPERTY_PREFIX +import hep.dataforge.vision.solid.Solid import info.laht.threekt.core.Object3D class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory { - private val cache = HashMap() + private val cache = HashMap() override val type = Proxy::class @@ -21,7 +21,7 @@ class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory { val object3D = cachedObject.clone() object3D.updatePosition(obj) - obj.onPropertyChange(this) { name, _, _ -> + obj.onPropertyChange(this) { name-> if (name.first()?.body == PROXY_CHILD_PROPERTY_PREFIX) { val childName = name.first()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'") val propertyName = name.cutFirst() diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeSphereFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt similarity index 86% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeSphereFactory.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt index bc993997..ffed6a45 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeSphereFactory.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt @@ -1,7 +1,7 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three -import hep.dataforge.vision.spatial.Sphere -import hep.dataforge.vision.spatial.detail +import hep.dataforge.vision.solid.Sphere +import hep.dataforge.vision.solid.detail import info.laht.threekt.core.BufferGeometry import info.laht.threekt.geometries.SphereBufferGeometry diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeVision.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt similarity index 61% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeVision.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt index f17adef3..9aeb96e0 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeVision.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt @@ -1,12 +1,12 @@ @file:UseSerializers(Point3DSerializer::class) -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.meta.Config import hep.dataforge.vision.AbstractVision -import hep.dataforge.vision.spatial.Point3D -import hep.dataforge.vision.spatial.Point3DSerializer -import hep.dataforge.vision.spatial.Vision3D +import hep.dataforge.vision.solid.Point3D +import hep.dataforge.vision.solid.Point3DSerializer +import hep.dataforge.vision.solid.Solid import info.laht.threekt.core.Object3D import kotlinx.serialization.Serializable import kotlinx.serialization.UseSerializers @@ -14,18 +14,18 @@ import kotlinx.serialization.UseSerializers /** * A custom visual object that has its own Three.js renderer */ -interface ThreeVision : Vision3D { +interface ThreeVision : Solid { fun toObject3D(): Object3D } @Serializable -class CustomThreeVision(val threeFactory: ThreeFactory) : AbstractVision(), +class CustomThreeVision(val threeFactory: ThreeFactory) : AbstractVision(), ThreeVision { override var position: Point3D? = null override var rotation: Point3D? = null override var scale: Point3D? = null - override var ownProperties: Config? = null + override var properties: Config? = null override fun toObject3D(): Object3D = threeFactory(this) diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/csg.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/csg.kt similarity index 98% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/csg.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/csg.kt index 7d1547a4..a67d5439 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/csg.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/csg.kt @@ -9,7 +9,7 @@ "NESTED_CLASS_IN_EXTERNAL_INTERFACE" ) -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import info.laht.threekt.math.Matrix4 diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/outputConfig.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt similarity index 89% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/outputConfig.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt index 74f3a8f3..fe01bba8 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/outputConfig.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.js.requireJS import hep.dataforge.vision.bootstrap.accordion import hep.dataforge.vision.bootstrap.entry -import hep.dataforge.vision.spatial.SpatialVisionManager -import hep.dataforge.vision.spatial.VisionGroup3D +import hep.dataforge.vision.solid.SolidGroup +import hep.dataforge.vision.solid.SolidManager import kotlinx.html.* import kotlinx.html.dom.append import kotlinx.html.js.onChangeFunction @@ -52,9 +52,9 @@ fun RBuilder.canvasControls(canvas: ThreeCanvas) = accordion("controls") { +"Export" attrs { onClickFunction = { - val json = (canvas.content as? VisionGroup3D)?.let { group -> - SpatialVisionManager.json.stringify( - VisionGroup3D.serializer(), + val json = (canvas.content as? SolidGroup)?.let { group -> + SolidManager.jsonForSolids.stringify( + SolidGroup.serializer(), group ) } @@ -116,9 +116,9 @@ fun Element.displayCanvasControls(canvas: ThreeCanvas, block: TagConsumer - SpatialVisionManager.json.stringify( - VisionGroup3D.serializer(), + val json = (canvas.content as? SolidGroup)?.let { group -> + SolidManager.jsonForSolids.stringify( + SolidGroup.serializer(), group ) } diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/three.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt similarity index 93% rename from visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/three.kt rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt index 096bc12a..fc497c11 100644 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/three.kt +++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.spatial.three +package hep.dataforge.vision.solid.three import hep.dataforge.meta.MetaItem import hep.dataforge.meta.float import hep.dataforge.meta.get import hep.dataforge.meta.node -import hep.dataforge.vision.spatial.* +import hep.dataforge.vision.solid.* import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.DirectGeometry import info.laht.threekt.core.Face3 @@ -17,7 +17,7 @@ import info.laht.threekt.objects.Mesh import info.laht.threekt.textures.Texture import kotlin.math.PI -val Vision3D.euler get() = Euler(rotationX, rotationY, rotationZ, rotationOrder.name) +val Solid.euler get() = Euler(rotationX, rotationY, rotationZ, rotationOrder.name) val MetaItem<*>.vector get() = Vector3(node["x"].float ?: 0f, node["y"].float ?: 0f, node["z"].float ?: 0f) diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/THREE.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/THREE.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/THREE.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/THREE.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/ktutils.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/ktutils.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/ktutils.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/ktutils.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Color.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Color.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Color.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Color.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Math.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Math.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Math.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Math.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/operators.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/operators.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/math/operators.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/operators.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt diff --git a/visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt similarity index 100% rename from visionforge-spatial/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt rename to visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FX3DPlugin.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt similarity index 69% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FX3DPlugin.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt index a300156c..0b2f064f 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FX3DPlugin.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt @@ -1,13 +1,13 @@ -package hep.dataforge.vision.spatial.fx +package hep.dataforge.vision.solid.fx import hep.dataforge.context.* import hep.dataforge.meta.Meta import hep.dataforge.meta.boolean import hep.dataforge.provider.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 hep.dataforge.vision.solid.* +import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY +import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_WIREFRAME_KEY +import hep.dataforge.vision.solid.fx.FX3DFactory.Companion.TYPE import javafx.scene.Group import javafx.scene.Node import javafx.scene.shape.CullFace @@ -26,7 +26,7 @@ import kotlin.reflect.KClass class FX3DPlugin : AbstractPlugin() { override val tag: PluginTag get() = Companion.tag - private val objectFactories = HashMap, FX3DFactory<*>>() + private val objectFactories = HashMap, FX3DFactory<*>>() private val compositeFactory = FXCompositeFactory(this) private val proxyFactory = FXProxyFactory(this) @@ -37,18 +37,18 @@ class FX3DPlugin : AbstractPlugin() { @Suppress("UNCHECKED_CAST") - private fun findObjectFactory(type: KClass): FX3DFactory? { + private fun findObjectFactory(type: KClass): FX3DFactory? { return (objectFactories[type] ?: context.content>(TYPE).values.find { it.type == type }) - as FX3DFactory? + as FX3DFactory? } - fun buildNode(obj: Vision3D): Node { + fun buildNode(obj: Solid): Node { val binding = VisualObjectFXBinding(obj) return when (obj) { is Proxy -> proxyFactory(obj, binding) - is VisionGroup3D -> { + is SolidGroup -> { Group(obj.children.mapNotNull { (token, obj) -> - (obj as? Vision3D)?.let { + (obj as? Solid)?.let { buildNode(it).apply { properties["name"] = token.toString() } @@ -63,7 +63,7 @@ class FX3DPlugin : AbstractPlugin() { } else { FXShapeFactory(obj, binding) } - is Label3D -> Text(obj.text).apply { + is SolidLabel -> Text(obj.text).apply { font = Font.font(obj.fontFamily, obj.fontSize) x = -layoutBounds.width / 2 y = layoutBounds.height / 2 @@ -71,37 +71,37 @@ class FX3DPlugin : AbstractPlugin() { is PolyLine -> PolyLine3D( obj.points.map { it.point }, obj.thickness.toFloat(), - obj.getItem(Material3D.MATERIAL_COLOR_KEY)?.color() + obj.getItem(SolidMaterial.MATERIAL_COLOR_KEY)?.color() ).apply { this.meshView.cullFace = CullFace.FRONT } else -> { //find specialized factory for this type if it is present - val factory: FX3DFactory? = findObjectFactory(obj::class) + val factory: FX3DFactory? = findObjectFactory(obj::class) when { factory != null -> factory(obj, binding) - obj is Shape -> FXShapeFactory(obj, binding) + obj is GeometrySolid -> FXShapeFactory(obj, binding) else -> error("Renderer for ${obj::class} not found") } } }.apply { - translateXProperty().bind(binding[Vision3D.X_POSITION_KEY].float(obj.x.toFloat())) - translateYProperty().bind(binding[Vision3D.Y_POSITION_KEY].float(obj.y.toFloat())) - translateZProperty().bind(binding[Vision3D.Z_POSITION_KEY].float(obj.z.toFloat())) - scaleXProperty().bind(binding[Vision3D.X_SCALE_KEY].float(obj.scaleX.toFloat())) - scaleYProperty().bind(binding[Vision3D.Y_SCALE_KEY].float(obj.scaleY.toFloat())) - scaleZProperty().bind(binding[Vision3D.Z_SCALE_KEY].float(obj.scaleZ.toFloat())) + translateXProperty().bind(binding[Solid.X_POSITION_KEY].float(obj.x.toFloat())) + translateYProperty().bind(binding[Solid.Y_POSITION_KEY].float(obj.y.toFloat())) + translateZProperty().bind(binding[Solid.Z_POSITION_KEY].float(obj.z.toFloat())) + scaleXProperty().bind(binding[Solid.X_SCALE_KEY].float(obj.scaleX.toFloat())) + scaleYProperty().bind(binding[Solid.Y_SCALE_KEY].float(obj.scaleY.toFloat())) + scaleZProperty().bind(binding[Solid.Z_SCALE_KEY].float(obj.scaleZ.toFloat())) val rotateX = Rotate(0.0, Rotate.X_AXIS).apply { - angleProperty().bind(binding[Vision3D.X_ROTATION_KEY].float(obj.rotationX.toFloat()).multiply(180.0 / PI)) + angleProperty().bind(binding[Solid.X_ROTATION_KEY].float(obj.rotationX.toFloat()).multiply(180.0 / PI)) } val rotateY = Rotate(0.0, Rotate.Y_AXIS).apply { - angleProperty().bind(binding[Vision3D.Y_ROTATION_KEY].float(obj.rotationY.toFloat()).multiply(180.0 / PI)) + angleProperty().bind(binding[Solid.Y_ROTATION_KEY].float(obj.rotationY.toFloat()).multiply(180.0 / PI)) } val rotateZ = Rotate(0.0, Rotate.Z_AXIS).apply { - angleProperty().bind(binding[Vision3D.Z_ROTATION_KEY].float(obj.rotationZ.toFloat()).multiply(180.0 / PI)) + angleProperty().bind(binding[Solid.Z_ROTATION_KEY].float(obj.rotationZ.toFloat()).multiply(180.0 / PI)) } when (obj.rotationOrder) { @@ -140,7 +140,7 @@ class FX3DPlugin : AbstractPlugin() { * Builder and updater for three.js object */ @Type(TYPE) -interface FX3DFactory { +interface FX3DFactory { val type: KClass diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCanvas3D.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt similarity index 84% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCanvas3D.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt index 69bb828a..996d4fe5 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCanvas3D.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt @@ -1,11 +1,11 @@ -package hep.dataforge.vision.spatial.fx +package hep.dataforge.vision.solid.fx import hep.dataforge.context.Context import hep.dataforge.context.ContextAware import hep.dataforge.meta.Meta import hep.dataforge.output.Renderer -import hep.dataforge.vision.spatial.Vision3D -import hep.dataforge.vision.spatial.specifications.Canvas3DOptions +import hep.dataforge.vision.solid.Solid +import hep.dataforge.vision.solid.specifications.Canvas3DOptions import javafx.application.Platform import javafx.beans.property.ObjectProperty import javafx.beans.property.SimpleObjectProperty @@ -15,7 +15,7 @@ import org.fxyz3d.scene.Axes import tornadofx.* class FXCanvas3D(val plugin: FX3DPlugin, val spec: Canvas3DOptions = Canvas3DOptions.empty()) : - Fragment(), Renderer, ContextAware { + Fragment(), Renderer, ContextAware { override val context: Context get() = plugin.context @@ -58,8 +58,8 @@ class FXCanvas3D(val plugin: FX3DPlugin, val spec: Canvas3DOptions = Canvas3DOpt world.add(it.centerMarker) } - val rootObjectProperty: ObjectProperty = SimpleObjectProperty() - var rootObject: Vision3D? by rootObjectProperty + val rootObjectProperty: ObjectProperty = SimpleObjectProperty() + var rootObject: Solid? by rootObjectProperty private val rootNodeProperty = rootObjectProperty.objectBinding { it?.let { plugin.buildNode(it) } @@ -80,7 +80,7 @@ class FXCanvas3D(val plugin: FX3DPlugin, val spec: Canvas3DOptions = Canvas3DOpt } } - override fun render(obj: Vision3D, meta: Meta) { + override fun render(obj: Solid, meta: Meta) { rootObject = obj } } \ No newline at end of file diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCompositeFactory.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCompositeFactory.kt similarity index 94% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCompositeFactory.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCompositeFactory.kt index a9f7f04c..8a97e3c3 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXCompositeFactory.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCompositeFactory.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.spatial.fx +package hep.dataforge.vision.solid.fx import eu.mihosoft.jcsg.CSG import eu.mihosoft.jcsg.Polygon import eu.mihosoft.vvecmath.Vector3d -import hep.dataforge.vision.spatial.Composite -import hep.dataforge.vision.spatial.CompositeType +import hep.dataforge.vision.solid.Composite +import hep.dataforge.vision.solid.CompositeType import javafx.scene.Group import javafx.scene.Node import javafx.scene.shape.MeshView diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXConvexFactory.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXConvexFactory.kt similarity index 85% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXConvexFactory.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXConvexFactory.kt index 2d8c76fa..f27d4edf 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXConvexFactory.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXConvexFactory.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.spatial.fx +package hep.dataforge.vision.solid.fx import eu.mihosoft.jcsg.PropertyStorage import eu.mihosoft.jcsg.ext.quickhull3d.HullUtil import eu.mihosoft.vvecmath.Vector3d -import hep.dataforge.vision.spatial.Convex +import hep.dataforge.vision.solid.Convex import javafx.scene.Node import kotlin.reflect.KClass diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXMaterials.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXMaterials.kt similarity index 81% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXMaterials.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXMaterials.kt index c80b03fb..bfd01745 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXMaterials.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXMaterials.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.fx +package hep.dataforge.vision.solid.fx import hep.dataforge.meta.MetaItem import hep.dataforge.meta.double @@ -6,7 +6,7 @@ import hep.dataforge.meta.get import hep.dataforge.meta.int import hep.dataforge.values.ValueType import hep.dataforge.vision.Colors -import hep.dataforge.vision.spatial.Material3D +import hep.dataforge.vision.solid.SolidMaterial import javafx.scene.paint.Color import javafx.scene.paint.Material import javafx.scene.paint.PhongMaterial @@ -50,7 +50,7 @@ fun MetaItem<*>.color(opacity: Double = 1.0): Color { node[Colors.RED_KEY]?.int ?: 0, node[Colors.GREEN_KEY]?.int ?: 0, node[Colors.BLUE_KEY]?.int ?: 0, - node[Material3D.OPACITY_KEY]?.double ?: opacity + node[SolidMaterial.OPACITY_KEY]?.double ?: opacity ) } } @@ -64,9 +64,9 @@ fun MetaItem<*>?.material(): Material { null -> FXMaterials.GREY is MetaItem.ValueItem -> PhongMaterial(color()) is MetaItem.NodeItem -> PhongMaterial().apply { - val opacity = node[Material3D.OPACITY_KEY].double ?: 1.0 - diffuseColor = node[Material3D.COLOR_KEY]?.color(opacity) ?: Color.DARKGREY - specularColor = node[Material3D.SPECULAR_COLOR_KEY]?.color(opacity) ?: Color.WHITE + val opacity = node[SolidMaterial.OPACITY_KEY].double ?: 1.0 + diffuseColor = node[SolidMaterial.COLOR_KEY]?.color(opacity) ?: Color.DARKGREY + specularColor = node[SolidMaterial.SPECULAR_COLOR_KEY]?.color(opacity) ?: Color.WHITE } } } diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXProxyFactory.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt similarity index 92% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXProxyFactory.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt index c76317c3..6a171854 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXProxyFactory.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt @@ -1,10 +1,10 @@ -package hep.dataforge.vision.spatial.fx +package hep.dataforge.vision.solid.fx import hep.dataforge.names.Name import hep.dataforge.names.isEmpty import hep.dataforge.names.toName import hep.dataforge.vision.Vision -import hep.dataforge.vision.spatial.Proxy +import hep.dataforge.vision.solid.Proxy import javafx.scene.Group import javafx.scene.Node import kotlin.reflect.KClass @@ -16,7 +16,7 @@ class FXProxyFactory(val plugin: FX3DPlugin) : FX3DFactory { val prototype = obj.prototype val node = plugin.buildNode(prototype) - obj.onPropertyChange(this) { name, _, _ -> + obj.onPropertyChange(this) { name-> if (name.first()?.body == Proxy.PROXY_CHILD_PROPERTY_PREFIX) { val childName = name.first()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'") val propertyName = name.cutFirst() diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXShapeFactory.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXShapeFactory.kt similarity index 79% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXShapeFactory.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXShapeFactory.kt index 3f49ad57..a6ce41d1 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/FXShapeFactory.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXShapeFactory.kt @@ -1,9 +1,9 @@ -package hep.dataforge.vision.spatial.fx +package hep.dataforge.vision.solid.fx import hep.dataforge.meta.Meta -import hep.dataforge.vision.spatial.GeometryBuilder -import hep.dataforge.vision.spatial.Point3D -import hep.dataforge.vision.spatial.Shape +import hep.dataforge.vision.solid.GeometryBuilder +import hep.dataforge.vision.solid.GeometrySolid +import hep.dataforge.vision.solid.Point3D import javafx.scene.shape.Mesh import javafx.scene.shape.MeshView import javafx.scene.shape.TriangleMesh @@ -11,10 +11,10 @@ import javafx.scene.shape.VertexFormat import org.fxyz3d.geometry.Face3 import kotlin.reflect.KClass -object FXShapeFactory : FX3DFactory { - override val type: KClass get() = Shape::class +object FXShapeFactory : FX3DFactory { + override val type: KClass get() = GeometrySolid::class - override fun invoke(obj: Shape, binding: VisualObjectFXBinding): MeshView { + override fun invoke(obj: GeometrySolid, binding: VisualObjectFXBinding): MeshView { val mesh = FXGeometryBuilder().apply { obj.toGeometry(this) }.build() return MeshView(mesh) } diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/OrbitControls.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/OrbitControls.kt similarity index 97% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/OrbitControls.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/OrbitControls.kt index ff3b838a..b9bf8031 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/OrbitControls.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/OrbitControls.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.fx +package hep.dataforge.vision.solid.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.vision.spatial.specifications.Camera as CameraSpec +import hep.dataforge.vision.solid.specifications.Camera as CameraSpec class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec: CameraSpec) { diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/VisualObjectFXBinding.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt similarity index 96% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/VisualObjectFXBinding.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt index bf1fa70e..164110ad 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/fx/VisualObjectFXBinding.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial.fx +package hep.dataforge.vision.solid.fx import hep.dataforge.meta.* import hep.dataforge.names.Name @@ -16,7 +16,7 @@ class VisualObjectFXBinding(val obj: Vision) { private val bindings = HashMap?>>() init { - obj.onPropertyChange(this) { name, _, _ -> + obj.onPropertyChange(this) { name -> bindings.filter { it.key.startsWith(name) }.forEach { entry -> Platform.runLater { entry.value.invalidate() diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/generateSchema.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt similarity index 89% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/generateSchema.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt index f1ae19d1..122f051b 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/generateSchema.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import hep.dataforge.meta.JSON_PRETTY import kotlinx.serialization.* @@ -16,7 +16,7 @@ private fun SerialDescriptor.getJsonType() = when (this.kind) { else -> "object" } -private fun SerialDescriptor.isVisualObject() = serialName.startsWith("3d")||serialName.startsWith("group") +private fun SerialDescriptor.isVisualObject() = serialName.startsWith("solid")||serialName.startsWith("group.solid") private const val definitionNode = "\$defs" @@ -62,10 +62,10 @@ private fun SerialModule.enumerate(type: KClass<*>): Sequence private fun jsonSchema(descriptor: SerialDescriptor, context: SerialModule): JsonObject { if (descriptor.serialName in arrayOf( - "hep.dataforge.vis.spatial.Point3D", - "hep.dataforge.vis.spatial.Point3D?", - "hep.dataforge.vis.spatial.Point2D", - "hep.dataforge.vis.spatial.Point2D?", + "hep.dataforge.vision.solid.Point3D", + "hep.dataforge.vision.solid.Point3D?", + "hep.dataforge.vision.solid.Point2D", + "hep.dataforge.vision.solid.Point2D?", "hep.dataforge.meta.Meta", "hep.dataforge.meta.Meta?" ) @@ -142,12 +142,12 @@ private fun jsonSchema(descriptor: SerialDescriptor, context: SerialModule): Jso } fun main() { - val context = SpatialVisionManager.serialModule + val context = SolidManager.serialModule val definitions = json { "children" to json { "anyOf" to jsonArray { - context.enumerate(Vision3D::class).forEach { - if (it.serialName == "hep.dataforge.vis.spatial.VisualGroup3D") { + context.enumerate(Solid::class).forEach { + if (it.serialName == "hep.dataforge.vis.spatial.SolidGroup") { +json { "\$ref" to "#/$definitionNode/${it.serialName}" } @@ -160,7 +160,7 @@ fun main() { "hep.dataforge.meta.Meta" to json { "type" to "object" } - "hep.dataforge.vis.spatial.Point3D" to json { + "hep.dataforge.vision.solid.Point3D" to json { "type" to "object" "properties" to json { "x" to json { @@ -174,7 +174,7 @@ fun main() { } } } - "hep.dataforge.vis.spatial.Point2D" to json { + "hep.dataforge.vision.solid.Point2D" to json { "type" to "object" "properties" to json { "x" to json { @@ -185,8 +185,8 @@ fun main() { } } } - "hep.dataforge.vis.spatial.VisualGroup3D" to jsonSchema( - VisionGroup3D.serializer().descriptor, + "hep.dataforge.vision.solid.SolidGroup" to jsonSchema( + SolidGroup.serializer().descriptor, context ) @@ -197,7 +197,7 @@ fun main() { JsonObjectSerializer, json { "\$defs" to definitions - "\$ref" to "#/$definitionNode/hep.dataforge.vis.spatial.VisualGroup3D" + "\$ref" to "#/$definitionNode/hep.dataforge.vision.solid.SolidGroup" } ) ) diff --git a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/geometryJVM.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt similarity index 96% rename from visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/geometryJVM.kt rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt index 2bb29ac1..96f40d81 100644 --- a/visionforge-spatial/src/jvmMain/kotlin/hep/dataforge/vision/spatial/geometryJVM.kt +++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vision.spatial +package hep.dataforge.vision.solid import org.fxyz3d.geometry.Point3D as FXPoint3D actual data class Point2D(actual var x: Double, actual var y: Double) { diff --git a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/SpatialVisionManager.kt b/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/SpatialVisionManager.kt deleted file mode 100644 index 99155dcd..00000000 --- a/visionforge-spatial/src/commonMain/kotlin/hep/dataforge/vision/spatial/SpatialVisionManager.kt +++ /dev/null @@ -1,81 +0,0 @@ -package hep.dataforge.vision.spatial - -import hep.dataforge.context.AbstractPlugin -import hep.dataforge.context.Context -import hep.dataforge.context.PluginFactory -import hep.dataforge.context.PluginTag -import hep.dataforge.meta.* -import hep.dataforge.names.Name -import hep.dataforge.names.toName -import hep.dataforge.vision.SimpleVisionGroup -import hep.dataforge.vision.Vision -import hep.dataforge.vision.VisionManager -import kotlinx.serialization.UnstableDefault -import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonConfiguration -import kotlinx.serialization.modules.SerializersModule -import kotlinx.serialization.modules.contextual -import kotlin.reflect.KClass - -class SpatialVisionManager(meta: Meta) : AbstractPlugin(meta) { - - val visionManager by require(VisionManager) - - override val tag: PluginTag get() = Companion.tag - - override fun provideTop(target: String): Map = if (target == VisionManager.VISION_FACTORY_TYPE) { - mapOf(Box.TYPE_NAME.toName() to Box) - } else { - super.provideTop(target) - } - - - companion object : PluginFactory { - override val tag: PluginTag = PluginTag(name = "visual.spatial", group = PluginTag.DATAFORGE_GROUP) - override val type: KClass = SpatialVisionManager::class - override fun invoke(meta: Meta, context: Context): SpatialVisionManager = SpatialVisionManager(meta) - - val serialModule = SerializersModule { - contextual(Point3DSerializer) - contextual(Point2DSerializer) - - polymorphic(Vision::class, Vision3D::class) { - subclass(SimpleVisionGroup.serializer()) - subclass(VisionGroup3D.serializer()) - subclass(Proxy.serializer()) - subclass(Composite.serializer()) - subclass(Tube.serializer()) - subclass(Box.serializer()) - subclass(Convex.serializer()) - subclass(Extruded.serializer()) - subclass(PolyLine.serializer()) - subclass(Label3D.serializer()) - subclass(Sphere.serializer()) - } - } - - @OptIn(UnstableDefault::class) - val json = Json( - JsonConfiguration( - prettyPrint = true, - useArrayPolymorphism = false, - encodeDefaults = false, - ignoreUnknownKeys = true - ), - context = serialModule - ) - } -} - -internal fun Vision3D.update(meta: Meta) { - fun Meta.toVector(default: Float = 0f) = Point3D( - this[Vision3D.X_KEY].float ?: default, - this[Vision3D.Y_KEY].float ?: default, - this[Vision3D.Z_KEY].float ?: default - ) - - meta[Vision3D.POSITION_KEY].node?.toVector()?.let { position = it } - meta[Vision3D.ROTATION].node?.toVector()?.let { rotation = it } - meta[Vision3D.SCALE_KEY].node?.toVector(1f)?.let { scale = it } - meta["properties"].node?.let { configure(it) } -} \ No newline at end of file diff --git a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLabelFactory.kt b/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLabelFactory.kt deleted file mode 100644 index f1097c82..00000000 --- a/visionforge-spatial/src/jsMain/kotlin/hep/dataforge/vision/spatial/three/ThreeLabelFactory.kt +++ /dev/null @@ -1,33 +0,0 @@ -package hep.dataforge.vision.spatial.three - -import hep.dataforge.js.jsObject -import hep.dataforge.meta.MetaItem -import hep.dataforge.names.Name -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 -import kotlin.reflect.KClass - -/** -* - */ -object ThreeLabelFactory : ThreeFactory { - override val type: KClass get() = Label3D::class - - override fun invoke(obj: Label3D): Object3D { - val textGeo = TextBufferGeometry( obj.text, jsObject { - font = obj.fontFamily - size = 20 - height = 1 - curveSegments = 1 - } ) - return Mesh(textGeo, getMaterial(obj)).apply { - updatePosition(obj) - obj.onPropertyChange(this@ThreeLabelFactory){ _: Name, _: MetaItem<*>?, _: MetaItem<*>? -> - //TODO - } - } - } -} \ No newline at end of file