From e44096e8446ca79d0ba174c5a8502c1c41b4d454 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 21 Nov 2020 11:17:18 +0300 Subject: [PATCH] Moved ThreeJS to a separate module --- CHANGELOG.md | 3 +++ build.gradle.kts | 7 +------ demo/gdml/build.gradle.kts | 1 + .../dataforge/vision/gdml/demo/GDMLAppComponent.kt | 1 - demo/muon-monitor/build.gradle.kts | 1 + .../ru/mipt/npm/muon/monitor/MMAppComponent.kt | 1 - demo/sat-demo/build.gradle.kts | 2 +- .../src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt | 4 ++-- demo/spatial-showcase/build.gradle.kts | 1 + .../hep/dataforge/vision/solid/demo/VariableBox.kt | 4 +--- playground/src/jsMain/kotlin/PlayGroundApp.kt | 1 - settings.gradle.kts | 1 + ui/react/build.gradle.kts | 1 + .../dataforge/vision/react/ThreeCanvasComponent.kt | 1 - visionforge-core/build.gradle.kts | 3 +++ visionforge-fx/build.gradle.kts | 1 + .../kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt | 1 - .../hep/dataforge/vision/solid/SolidMaterial.kt | 2 +- visionforge-threejs/build.gradle.kts | 13 +++++++++++++ .../vision/solid/three/MeshThreeFactory.kt | 0 .../dataforge/vision/solid/three/ThreeBoxFactory.kt | 0 .../hep/dataforge/vision/solid/three/ThreeCanvas.kt | 0 .../vision/solid/three/ThreeCanvasLabelFactory.kt | 0 .../vision/solid/three/ThreeCompositeFactory.kt | 0 .../vision/solid/three/ThreeConvexFactory.kt | 0 .../vision/solid/three/ThreeCylinderFactory.kt | 0 .../dataforge/vision/solid/three/ThreeFactory.kt | 0 .../vision/solid/three/ThreeGeometryBuilder.kt | 0 .../vision/solid/three/ThreeLabelFactory.kt | 0 .../vision/solid/three/ThreeLineFactory.kt | 0 .../dataforge/vision/solid/three/ThreeMaterials.kt | 0 .../hep/dataforge/vision/solid/three/ThreePlugin.kt | 2 -- .../vision/solid/three/ThreeReferenceFactory.kt | 0 .../vision/solid/three/ThreeSphereFactory.kt | 0 .../hep/dataforge/vision/solid/three/ThreeVision.kt | 2 -- .../kotlin/hep/dataforge/vision/solid/three/csg.kt | 0 .../hep/dataforge/vision/solid/three/three.kt | 0 .../src/main}/kotlin/info/laht/threekt/THREE.kt | 0 .../info/laht/threekt/animation/AnimationAction.kt | 0 .../info/laht/threekt/animation/AnimationClip.kt | 0 .../info/laht/threekt/animation/AnimationMixer.kt | 0 .../info/laht/threekt/animation/AnimationUtils.kt | 0 .../info/laht/threekt/animation/KeyFrameTrack.kt | 0 .../main}/kotlin/info/laht/threekt/audio/Audio.kt | 0 .../kotlin/info/laht/threekt/audio/AudioContext.kt | 0 .../kotlin/info/laht/threekt/audio/AudioListener.kt | 0 .../info/laht/threekt/audio/PositionalAudio.kt | 0 .../kotlin/info/laht/threekt/cameras/Camera.kt | 0 .../info/laht/threekt/cameras/OrthographicCamera.kt | 0 .../info/laht/threekt/cameras/PerspectiveCamera.kt | 0 .../info/laht/threekt/core/BufferAttribute.kt | 0 .../kotlin/info/laht/threekt/core/BufferGeometry.kt | 0 .../main}/kotlin/info/laht/threekt/core/Clock.kt | 0 .../kotlin/info/laht/threekt/core/DirectGeometry.kt | 0 .../info/laht/threekt/core/EventDispatcher.kt | 0 .../main}/kotlin/info/laht/threekt/core/Face3.kt | 0 .../main}/kotlin/info/laht/threekt/core/Geometry.kt | 0 .../laht/threekt/core/InstancedBufferGeometry.kt | 0 .../main}/kotlin/info/laht/threekt/core/Layers.kt | 0 .../main}/kotlin/info/laht/threekt/core/Object3D.kt | 0 .../kotlin/info/laht/threekt/core/Raycaster.kt | 0 .../main}/kotlin/info/laht/threekt/core/Uniform.kt | 0 .../kotlin/info/laht/threekt/external/Detector.kt | 0 .../info/laht/threekt/external/ImprovedNoise.kt | 0 .../info/laht/threekt/external/SimplexNoise.kt | 0 .../laht/threekt/external/controls/FlyControls.kt | 0 .../laht/threekt/external/controls/OrbitControls.kt | 0 .../threekt/external/controls/TrackballControls.kt | 0 .../threekt/external/controls/TransformControls.kt | 0 .../laht/threekt/external/exporters/OBJExporter.kt | 0 .../laht/threekt/external/exporters/STLExporter.kt | 0 .../threekt/external/geometries/ConvexGeometry.kt | 0 .../info/laht/threekt/external/libs/GUIParams.kt | 0 .../kotlin/info/laht/threekt/external/libs/Stats.kt | 0 .../info/laht/threekt/external/libs/datgui.kt | 0 .../laht/threekt/external/loaders/BabylonLoader.kt | 0 .../laht/threekt/external/loaders/GLTFLoader.kt | 0 .../laht/threekt/external/loaders/LoaderSupport.kt | 0 .../info/laht/threekt/external/loaders/MTLLoader.kt | 0 .../info/laht/threekt/external/loaders/OBJLoader.kt | 0 .../laht/threekt/external/loaders/OBJLoader2.kt | 0 .../info/laht/threekt/external/loaders/STLLoader.kt | 0 .../info/laht/threekt/external/objects/Sky.kt | 0 .../info/laht/threekt/external/objects/Water.kt | 0 .../laht/threekt/external/objects/WaterOptions.kt | 0 .../kotlin/info/laht/threekt/extras/SceneUtils.kt | 0 .../kotlin/info/laht/threekt/extras/core/Curve.kt | 0 .../info/laht/threekt/extras/core/CurvePath.kt | 0 .../kotlin/info/laht/threekt/extras/core/Path.kt | 0 .../kotlin/info/laht/threekt/extras/core/Shape.kt | 0 .../info/laht/threekt/extras/core/ShapePath.kt | 0 .../info/laht/threekt/extras/curves/ArcCurve.kt | 0 .../laht/threekt/extras/curves/CatmullRomCurve3.kt | 0 .../info/laht/threekt/extras/curves/EllipseCurve.kt | 0 .../info/laht/threekt/extras/curves/LineCurve.kt | 0 .../info/laht/threekt/extras/curves/LineCurve3.kt | 0 .../threekt/extras/curves/QuadricBezierCurve.kt | 0 .../threekt/extras/curves/QuadricBezierCurve3.kt | 0 .../info/laht/threekt/extras/curves/SplineCurve.kt | 0 .../info/laht/threekt/geometries/BoxGeometry.kt | 0 .../info/laht/threekt/geometries/ConeGeometry.kt | 0 .../laht/threekt/geometries/CylinderGeometry.kt | 0 .../info/laht/threekt/geometries/EdgesGeometry.kt | 0 .../laht/threekt/geometries/ExtrudedGeometry.kt | 0 .../info/laht/threekt/geometries/PlaneGeometry.kt | 0 .../info/laht/threekt/geometries/SphereGeometry.kt | 0 .../laht/threekt/geometries/TextBufferGeometry.kt | 0 .../info/laht/threekt/geometries/TorusGeometry.kt | 0 .../info/laht/threekt/geometries/TubeGeometry.kt | 0 .../laht/threekt/geometries/WireframeGeometry.kt | 0 .../kotlin/info/laht/threekt/helpers/ArrowHelper.kt | 0 .../kotlin/info/laht/threekt/helpers/AxesHelper.kt | 0 .../kotlin/info/laht/threekt/helpers/Box3Helper.kt | 0 .../info/laht/threekt/helpers/CameraHelper.kt | 0 .../kotlin/info/laht/threekt/helpers/GridHelper.kt | 0 .../laht/threekt/helpers/HemisphereLightHelper.kt | 0 .../src/main}/kotlin/info/laht/threekt/ktutils.kt | 0 .../kotlin/info/laht/threekt/lights/AmbientLight.kt | 0 .../info/laht/threekt/lights/DirectionalLight.kt | 0 .../laht/threekt/lights/DirectionalLightShadow.kt | 0 .../info/laht/threekt/lights/HemiSphereLight.kt | 0 .../main}/kotlin/info/laht/threekt/lights/Light.kt | 0 .../kotlin/info/laht/threekt/lights/LightShadow.kt | 0 .../kotlin/info/laht/threekt/lights/PointLight.kt | 0 .../kotlin/info/laht/threekt/lights/SpotLight.kt | 0 .../info/laht/threekt/lights/SpotLightShadow.kt | 0 .../main}/kotlin/info/laht/threekt/loaders/Cache.kt | 0 .../laht/threekt/loaders/CompressedTextureLoader.kt | 0 .../kotlin/info/laht/threekt/loaders/ImageLoader.kt | 0 .../kotlin/info/laht/threekt/loaders/JSONLoader.kt | 0 .../kotlin/info/laht/threekt/loaders/Loader.kt | 0 .../info/laht/threekt/loaders/LoadingManager.kt | 0 .../info/laht/threekt/loaders/MaterialLoader.kt | 0 .../info/laht/threekt/loaders/TextureLoader.kt | 0 .../laht/threekt/materials/LineBasicMaterial.kt | 0 .../laht/threekt/materials/LineDashedMaterial.kt | 0 .../kotlin/info/laht/threekt/materials/Material.kt | 0 .../laht/threekt/materials/MeshBasicMaterial.kt | 0 .../laht/threekt/materials/MeshDepthMaterial.kt | 0 .../laht/threekt/materials/MeshLambertMaterial.kt | 0 .../laht/threekt/materials/MeshNormalMaterial.kt | 0 .../laht/threekt/materials/MeshPhongMaterial.kt | 0 .../laht/threekt/materials/MeshPhysicalMaterial.kt | 0 .../laht/threekt/materials/MeshStandardMaterial.kt | 0 .../info/laht/threekt/materials/PointsMaterial.kt | 0 .../laht/threekt/materials/RawShaderMaterial.kt | 0 .../info/laht/threekt/materials/ShaderMaterial.kt | 0 .../info/laht/threekt/materials/SpriteMaterial.kt | 0 .../src/main}/kotlin/info/laht/threekt/math/Box2.kt | 0 .../src/main}/kotlin/info/laht/threekt/math/Box3.kt | 0 .../main}/kotlin/info/laht/threekt/math/Color.kt | 0 .../kotlin/info/laht/threekt/math/ColorConstants.kt | 0 .../kotlin/info/laht/threekt/math/Cylindrical.kt | 0 .../main}/kotlin/info/laht/threekt/math/Euler.kt | 0 .../main}/kotlin/info/laht/threekt/math/Frustrum.kt | 0 .../main}/kotlin/info/laht/threekt/math/Line3.kt | 0 .../src/main}/kotlin/info/laht/threekt/math/Math.kt | 0 .../main}/kotlin/info/laht/threekt/math/Matrix3.kt | 0 .../main}/kotlin/info/laht/threekt/math/Matrix4.kt | 0 .../main}/kotlin/info/laht/threekt/math/Plane.kt | 0 .../kotlin/info/laht/threekt/math/Quaternion.kt | 0 .../src/main}/kotlin/info/laht/threekt/math/Ray.kt | 0 .../main}/kotlin/info/laht/threekt/math/Sphere.kt | 0 .../kotlin/info/laht/threekt/math/Spherical.kt | 0 .../main}/kotlin/info/laht/threekt/math/Triangle.kt | 0 .../main}/kotlin/info/laht/threekt/math/Vector2.kt | 0 .../main}/kotlin/info/laht/threekt/math/Vector3.kt | 0 .../main}/kotlin/info/laht/threekt/math/Vector4.kt | 0 .../kotlin/info/laht/threekt/math/operators.kt | 0 .../main}/kotlin/info/laht/threekt/objects/Group.kt | 0 .../main}/kotlin/info/laht/threekt/objects/LOD.kt | 0 .../main}/kotlin/info/laht/threekt/objects/Line.kt | 0 .../kotlin/info/laht/threekt/objects/LineLoop.kt | 0 .../info/laht/threekt/objects/LineSegments.kt | 0 .../main}/kotlin/info/laht/threekt/objects/Mesh.kt | 0 .../kotlin/info/laht/threekt/objects/Points.kt | 0 .../kotlin/info/laht/threekt/objects/Sprite.kt | 0 .../info/laht/threekt/renderers/WebGL2Renderer.kt | 0 .../laht/threekt/renderers/WebGL2RendererParams.kt | 0 .../laht/threekt/renderers/WebGLRenderTarget.kt | 0 .../threekt/renderers/WebGLRenderTargetOptions.kt | 0 .../info/laht/threekt/renderers/WebGLRenderer.kt | 0 .../laht/threekt/renderers/WebGLRendererParams.kt | 0 .../laht/threekt/renderers/shaders/ShaderChunk.kt | 0 .../laht/threekt/renderers/shaders/ShaderLib.kt | 0 .../laht/threekt/renderers/shaders/UniformsUtil.kt | 0 .../main}/kotlin/info/laht/threekt/scenes/Fog.kt | 0 .../kotlin/info/laht/threekt/scenes/FogExp2.kt | 0 .../main}/kotlin/info/laht/threekt/scenes/Scene.kt | 0 .../info/laht/threekt/textures/CompressedTexture.kt | 0 .../info/laht/threekt/textures/CubeTexture.kt | 0 .../info/laht/threekt/textures/DepthTexture.kt | 0 .../kotlin/info/laht/threekt/textures/Texture.kt | 0 193 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 visionforge-threejs/build.gradle.kts rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt (99%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt (78%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/csg.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/three.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/THREE.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/AnimationAction.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/AnimationClip.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/AnimationMixer.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/AnimationUtils.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/audio/Audio.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/audio/AudioContext.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/audio/AudioListener.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/audio/PositionalAudio.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/cameras/Camera.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/BufferAttribute.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/BufferGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Clock.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/DirectGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/EventDispatcher.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Face3.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Geometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Layers.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Object3D.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Raycaster.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Uniform.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/Detector.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/ImprovedNoise.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/SimplexNoise.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/controls/FlyControls.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/controls/OrbitControls.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/controls/TrackballControls.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/controls/TransformControls.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/exporters/STLExporter.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/libs/GUIParams.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/libs/Stats.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/libs/datgui.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/STLLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/objects/Sky.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/objects/Water.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/objects/WaterOptions.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/SceneUtils.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/Curve.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/CurvePath.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/Path.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/Shape.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/ShapePath.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/LineCurve.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/BoxGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/ConeGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/SphereGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/TorusGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/TubeGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/ArrowHelper.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/AxesHelper.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/Box3Helper.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/CameraHelper.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/GridHelper.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/ktutils.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/AmbientLight.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/DirectionalLight.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/HemiSphereLight.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/Light.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/LightShadow.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/PointLight.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/SpotLight.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/SpotLightShadow.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/Cache.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/ImageLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/JSONLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/Loader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/LoadingManager.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/MaterialLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/TextureLoader.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/Material.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/PointsMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/ShaderMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/SpriteMaterial.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Box2.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Box3.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Color.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/ColorConstants.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Cylindrical.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Euler.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Frustrum.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Line3.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Math.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Matrix3.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Matrix4.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Plane.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Quaternion.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Ray.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Sphere.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Spherical.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Triangle.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Vector2.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Vector3.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Vector4.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/operators.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Group.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/LOD.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Line.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/LineLoop.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/LineSegments.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Mesh.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Points.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Sprite.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/scenes/Fog.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/scenes/FogExp2.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/scenes/Scene.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/textures/CompressedTexture.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/textures/CubeTexture.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/textures/DepthTexture.kt (100%) rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/textures/Texture.kt (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a158a449..a47fa13a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ ### Changed - Vision does not implement ItemProvider anymore. Property changes are done via `getProperty`/`setProperty` and `property` delegate. +- Point3D and Point2D are made separate classes instead of expect/actual (to split up different engines. +- JavaFX support moved to a separate module +- Threejs support moved to a separate module ### Deprecated diff --git a/build.gradle.kts b/build.gradle.kts index e2a4a66a..9cc59d77 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("ru.mipt.npm.project") } -val dataforgeVersion by extra("0.2.0-dev-7") +val dataforgeVersion by extra("0.2.0-dev-8") val ktorVersion by extra("1.4.2") val htmlVersion by extra("0.7.2") val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.10") @@ -27,11 +27,6 @@ subprojects { if(name.startsWith("visionforge")) { apply() } - afterEvaluate { - extensions.findByType()?.run { - useSerialization() - } - } } apiValidation { diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts index a4870646..86e8b80c 100644 --- a/demo/gdml/build.gradle.kts +++ b/demo/gdml/build.gradle.kts @@ -32,6 +32,7 @@ kotlin { jsMain { dependencies { implementation(project(":ui:bootstrap")) + implementation(project(":visionforge-threejs")) implementation(npm("react-file-drop", "3.0.6")) } } diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt index 09ae9a66..041150c0 100644 --- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt +++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt @@ -1,7 +1,6 @@ package hep.dataforge.vision.gdml.demo import hep.dataforge.context.Context -import hep.dataforge.meta.invoke import hep.dataforge.names.Name import hep.dataforge.vision.Vision import hep.dataforge.vision.bootstrap.nameCrumbs diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts index ba7092f0..7b4b09ef 100644 --- a/demo/muon-monitor/build.gradle.kts +++ b/demo/muon-monitor/build.gradle.kts @@ -49,6 +49,7 @@ kotlin { implementation(project(":ui:bootstrap")) implementation("io.ktor:ktor-client-js:$ktorVersion") implementation("io.ktor:ktor-client-serialization:$ktorVersion") + implementation(project(":visionforge-threejs")) } } } 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 a36379bf..8af687d9 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 @@ -1,7 +1,6 @@ package ru.mipt.npm.muon.monitor import hep.dataforge.context.Context -import hep.dataforge.meta.invoke import hep.dataforge.names.Name import hep.dataforge.names.NameToken import hep.dataforge.names.isEmpty diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts index 0e623614..d3a7d140 100644 --- a/demo/sat-demo/build.gradle.kts +++ b/demo/sat-demo/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { } jsMain { dependencies { - + implementation(project(":visionforge-threejs")) } } } diff --git a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt index d3c03541..dad0e45f 100644 --- a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt +++ b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt @@ -3,10 +3,10 @@ package ru.mipt.npm.sat import hep.dataforge.context.Global import hep.dataforge.js.Application import hep.dataforge.js.startApplication +import hep.dataforge.meta.invoke import hep.dataforge.vision.solid.three.ThreePlugin import hep.dataforge.vision.solid.three.render import kotlinx.browser.document -import hep.dataforge.meta.invoke import org.w3c.dom.HTMLElement private class SatDemoApp : Application { @@ -20,7 +20,7 @@ private class SatDemoApp : Application { ) three.render(element, sat){ minSize = 500 - axes { + axes{ size = 500.0 visible = true } diff --git a/demo/spatial-showcase/build.gradle.kts b/demo/spatial-showcase/build.gradle.kts index 4502f7c0..f984b9b3 100644 --- a/demo/spatial-showcase/build.gradle.kts +++ b/demo/spatial-showcase/build.gradle.kts @@ -36,6 +36,7 @@ kotlin { } jsMain{ dependencies { + implementation(project(":visionforge-threejs")) implementation("org.jetbrains:kotlin-css:1.0.0-pre.129-kotlin-1.4.10") } } diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt index 983b92b7..ff610211 100644 --- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt +++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt @@ -1,8 +1,6 @@ package hep.dataforge.vision.solid.demo -import hep.dataforge.meta.int -import hep.dataforge.meta.number -import hep.dataforge.meta.set +import hep.dataforge.meta.* import hep.dataforge.names.plus import hep.dataforge.names.startsWith import hep.dataforge.values.asValue diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt index d5d1ce13..a1e46705 100644 --- a/playground/src/jsMain/kotlin/PlayGroundApp.kt +++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt @@ -1,7 +1,6 @@ import hep.dataforge.context.Global import hep.dataforge.js.Application import hep.dataforge.js.startApplication -import hep.dataforge.meta.invoke import hep.dataforge.vision.bootstrap.visionPropertyEditor import hep.dataforge.vision.react.ThreeCanvasComponent import hep.dataforge.vision.react.objectTree diff --git a/settings.gradle.kts b/settings.gradle.kts index 1a45cf80..b4de270e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -39,6 +39,7 @@ include( ":visionforge-core", ":visionforge-solid", ":visionforge-fx", + ":visionforge-threejs", ":visionforge-gdml", ":visionforge-server", ":demo:spatial-showcase", diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts index b57cba20..ebfa3cdd 100644 --- a/ui/react/build.gradle.kts +++ b/ui/react/build.gradle.kts @@ -9,4 +9,5 @@ dependencies{ api(project(":visionforge-solid")) api("org.jetbrains:kotlin-styled:5.2.0-$kotlinWrappersVersion") api("org.jetbrains:kotlin-react-dom:$reactVersion-$kotlinWrappersVersion") + implementation(project(":visionforge-threejs")) } \ No newline at end of file diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt index 7b30b2c9..a0ef757f 100644 --- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt +++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt @@ -1,7 +1,6 @@ package hep.dataforge.vision.react import hep.dataforge.context.Context -import hep.dataforge.meta.empty import hep.dataforge.names.Name import hep.dataforge.vision.solid.Solid import hep.dataforge.vision.solid.specifications.Canvas3DOptions diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts index 7b2bd238..a12e4954 100644 --- a/visionforge-core/build.gradle.kts +++ b/visionforge-core/build.gradle.kts @@ -6,6 +6,9 @@ val dataforgeVersion: String by rootProject.extra val kotlinWrappersVersion: String by rootProject.extra val htmlVersion: String by rootProject.extra +kscience{ + useSerialization() +} kotlin { sourceSets { diff --git a/visionforge-fx/build.gradle.kts b/visionforge-fx/build.gradle.kts index 52da9f01..c7626def 100644 --- a/visionforge-fx/build.gradle.kts +++ b/visionforge-fx/build.gradle.kts @@ -11,6 +11,7 @@ val fxVersion: String by rootProject.extra kscience{ useFx(ru.mipt.npm.gradle.FXModule.CONTROLS, version = fxVersion) + useSerialization() } dependencies { diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt index 149f9d36..69f484fd 100644 --- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt +++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt @@ -2,7 +2,6 @@ package hep.dataforge.vision.solid import hep.dataforge.context.Context import hep.dataforge.context.ContextAware -import hep.dataforge.meta.empty import hep.dataforge.vision.layout.Output import hep.dataforge.vision.solid.specifications.Canvas3DOptions import javafx.application.Platform diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt index 34b7ca4d..3b7cee8a 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt @@ -104,7 +104,7 @@ public var Solid.color: String? } public val Solid.material: SolidMaterial? - get() = getProperty(MATERIAL_KEY).node?.let { SolidMaterial.wrap(it) } + get() = getProperty(MATERIAL_KEY).node?.let { SolidMaterial.read(it) } public fun Solid.material(builder: SolidMaterial.() -> Unit) { val node = config[MATERIAL_KEY].node diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts new file mode 100644 index 00000000..612ad129 --- /dev/null +++ b/visionforge-threejs/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + id("ru.mipt.npm.js") +} + +kscience { + useSerialization() +} + +dependencies { + api(project(":visionforge-solid")) + implementation(npm("three", "0.122.0")) + implementation(npm("three-csg-ts", "1.0.6")) +} diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt similarity index 99% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt index cbe62240..fafaeb6c 100644 --- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt +++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt @@ -2,8 +2,6 @@ package hep.dataforge.vision.solid.three import hep.dataforge.context.* import hep.dataforge.meta.Meta -import hep.dataforge.meta.empty -import hep.dataforge.meta.invoke import hep.dataforge.names.* import hep.dataforge.vision.Vision import hep.dataforge.vision.html.HtmlVisionBinding diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt similarity index 78% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt index 8c8362a0..16d90280 100644 --- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt +++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt @@ -1,9 +1,7 @@ package hep.dataforge.vision.solid.three import hep.dataforge.vision.solid.BasicSolid -import hep.dataforge.vision.solid.Solid import info.laht.threekt.core.Object3D -import kotlinx.serialization.Serializable /** * A custom visual object that has its own Three.js renderer diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/csg.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/csg.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/THREE.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/THREE.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/THREE.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/THREE.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationAction.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationAction.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationClip.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationClip.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationMixer.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationMixer.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationUtils.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationUtils.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/Audio.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/Audio.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/AudioContext.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/AudioContext.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/AudioListener.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/AudioListener.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/PositionalAudio.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/PositionalAudio.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/Camera.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/Camera.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Clock.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Clock.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/DirectGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/DirectGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/EventDispatcher.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/EventDispatcher.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Face3.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Face3.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Geometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Geometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Layers.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Layers.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Object3D.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Object3D.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Raycaster.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Raycaster.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Uniform.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Uniform.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/Detector.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/Detector.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/ImprovedNoise.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/ImprovedNoise.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/SimplexNoise.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/SimplexNoise.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/FlyControls.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/FlyControls.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/OrbitControls.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/OrbitControls.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/TrackballControls.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/TrackballControls.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/TransformControls.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/TransformControls.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/exporters/STLExporter.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/exporters/STLExporter.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/GUIParams.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/GUIParams.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/Stats.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/Stats.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/datgui.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/datgui.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/STLLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/STLLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/Sky.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/Sky.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/Water.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/Water.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/WaterOptions.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/WaterOptions.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/SceneUtils.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/SceneUtils.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Curve.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Curve.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/CurvePath.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/CurvePath.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Path.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Path.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Shape.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Shape.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/ShapePath.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/ShapePath.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/LineCurve.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/LineCurve.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/BoxGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/BoxGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ConeGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ConeGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/SphereGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/SphereGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TorusGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TorusGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TubeGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TubeGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/ArrowHelper.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/ArrowHelper.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/AxesHelper.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/AxesHelper.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/Box3Helper.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/Box3Helper.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/CameraHelper.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/CameraHelper.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/GridHelper.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/GridHelper.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/ktutils.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/ktutils.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/ktutils.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/ktutils.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/AmbientLight.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/AmbientLight.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/DirectionalLight.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/DirectionalLight.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemiSphereLight.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemiSphereLight.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/Light.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/Light.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/LightShadow.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/LightShadow.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/PointLight.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/PointLight.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/SpotLight.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/SpotLight.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/SpotLightShadow.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/SpotLightShadow.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/Cache.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/Cache.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/ImageLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/ImageLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/JSONLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/JSONLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/Loader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/Loader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/LoadingManager.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/LoadingManager.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/MaterialLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/MaterialLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/TextureLoader.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/TextureLoader.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/Material.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/Material.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/PointsMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/PointsMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/ShaderMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/ShaderMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/SpriteMaterial.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/SpriteMaterial.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Box2.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Box2.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Box3.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Box3.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Color.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Color.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Color.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Color.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/ColorConstants.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/ColorConstants.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Cylindrical.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Cylindrical.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Euler.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Euler.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Frustrum.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Frustrum.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Line3.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Line3.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Math.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Math.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Math.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Math.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Matrix3.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Matrix3.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Matrix4.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Matrix4.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Plane.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Plane.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Quaternion.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Quaternion.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Ray.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Ray.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Sphere.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Sphere.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Spherical.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Spherical.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Triangle.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Triangle.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector2.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector2.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector3.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector3.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector4.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector4.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/operators.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/operators.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/operators.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/operators.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Group.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Group.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LOD.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LOD.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Line.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Line.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineLoop.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineLoop.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineSegments.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineSegments.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Points.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Points.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Sprite.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Sprite.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/Fog.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/Fog.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/FogExp2.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/FogExp2.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/Scene.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/Scene.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/CompressedTexture.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/CompressedTexture.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/CubeTexture.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/CubeTexture.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/DepthTexture.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/DepthTexture.kt diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/Texture.kt similarity index 100% rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/Texture.kt