From 81bbd9d4c271af893eea1624236bcfc85b5bf3cb Mon Sep 17 00:00:00 2001 From: Lanius Trolling Date: Tue, 16 Jan 2024 12:26:00 -0500 Subject: [PATCH] Move JS external declarations into subproject --- .idea/artifacts/externals_js.xml | 8 ++ .idea/gradle.xml | 1 + .idea/misc.xml | 2 +- build.gradle.kts | 53 +++++------ externals/build.gradle.kts | 26 ++++++ .../kotlin/externals/hammer/HammerJS.kt | 2 +- .../threejs/0_extraDefs.module_three.kt | 19 ++++ .../threejs/AmbientLight.module_three.kt | 2 +- .../threejs/AmbientLightProbe.module_three.kt | 2 +- .../threejs/AnimationAction.module_three.kt | 2 +- .../threejs/AnimationClip.module_three.kt | 2 +- .../threejs/AnimationLoader.module_three.kt | 2 +- .../threejs/AnimationMixer.module_three.kt | 2 +- .../AnimationObjectGroup.module_three.kt | 2 +- ...mationUtils.AnimationUtils.module_three.kt | 0 .../threejs/ArcCurve.module_three.kt | 2 +- .../threejs/ArrayCamera.module_three.kt | 2 +- .../threejs/ArrowHelper.module_three.kt | 2 +- .../threejs/AxesHelper.module_three.kt | 2 +- .../threejs/BattleCameraControls.module.kt | 2 +- .../externals/threejs/Bone.module_three.kt | 2 +- .../BooleanKeyframeTrack.module_three.kt | 2 +- .../externals/threejs/Box2.module_three.kt | 2 +- .../externals/threejs/Box3.module_three.kt | 2 +- .../threejs/Box3Helper.module_three.kt | 2 +- .../threejs/BoxGeometry.module_three.kt | 2 +- .../threejs/BoxHelper.module_three.kt | 2 +- .../threejs/BufferAttribute.module_three.kt | 40 ++++----- .../externals/threejs/BufferGeometry.kt | 17 ++++ .../threejs/BufferGeometry.module_three.kt | 21 +---- .../BufferGeometryLoader.module_three.kt | 2 +- .../threejs/CSS3DObject.module_three.kt | 2 +- .../threejs/CSS3DRenderer.module_three.kt | 2 +- .../threejs/CSS3DSprite.module_three.kt | 2 +- .../threejs/Cache.Cache.module_three.kt | 0 .../externals/threejs/Camera.module_three.kt | 2 +- .../kotlin/externals/threejs/CameraHelper.kt | 7 ++ .../threejs/CameraHelper.module_three.kt | 10 +-- .../threejs/CampaignCameraControls.module.kt | 2 +- .../threejs/CanvasTexture.module_three.kt | 2 +- .../threejs/CatmullRomCurve3.module_three.kt | 2 +- .../threejs/CircleGeometry.module_three.kt | 2 +- .../externals/threejs/Clock.module_three.kt | 2 +- .../externals/threejs/Color.module_three.kt | 2 +- .../ColorKeyframeTrack.module_three.kt | 2 +- .../threejs/CompressedTexture.module_three.kt | 2 +- .../CompressedTextureLoader.module_three.kt | 2 +- .../threejs/ConeGeometry.module_three.kt | 2 +- .../threejs/CubeCamera.module_three.kt | 2 +- .../threejs/CubeTexture.module_three.kt | 2 +- .../threejs/CubeTextureLoader.module_three.kt | 2 +- .../threejs/CubicBezierCurve.module_three.kt | 2 +- .../threejs/CubicBezierCurve3.module_three.kt | 2 +- .../threejs/CubicInterpolant.module_three.kt | 2 +- .../externals/threejs/Curve.module_three.kt | 2 +- .../threejs/CurvePath.module_three.kt | 2 +- .../threejs/CylinderGeometry.module_three.kt | 2 +- .../threejs/Cylindrical.module_three.kt | 2 +- .../threejs/DataTexture.module_three.kt | 2 +- .../DataTexture2DArray.module_three.kt | 2 +- .../threejs/DataTexture3D.module_three.kt | 2 +- .../threejs/DataTextureLoader.module_three.kt | 2 +- .../DataUtils.DataUtils.module_three.kt | 0 .../threejs/DepthTexture.module_three.kt | 2 +- .../threejs/DirectionalLight.module_three.kt | 2 +- .../DirectionalLightHelper.module_three.kt | 2 +- .../DirectionalLightShadow.module_three.kt | 2 +- .../DiscreteInterpolant.module_three.kt | 2 +- .../DodecahedronGeometry.module_three.kt | 2 +- .../threejs/EdgesGeometry.module_three.kt | 2 +- .../threejs/EllipseCurve.module_three.kt | 2 +- .../externals/threejs/Euler.module_three.kt | 2 +- .../threejs/ExtrudeGeometry.module_three.kt | 2 +- .../threejs/FileLoader.module_three.kt | 2 +- .../externals/threejs/Fog.module_three.kt | 2 +- .../externals/threejs/FogExp2.module_three.kt | 2 +- .../externals/threejs/Font.module_three.kt | 2 +- .../threejs/FontLoader.module_three.kt | 2 +- .../externals/threejs/Frustum.module_three.kt | 2 +- .../threejs/GLBufferAttribute.module_three.kt | 2 +- .../threejs/GridHelper.module_three.kt | 2 +- .../externals/threejs/Group.module_three.kt | 2 +- .../threejs/HemisphereLight.module_three.kt | 2 +- .../HemisphereLightHelper.module_three.kt | 2 +- .../HemisphereLightProbe.module_three.kt | 2 +- .../IcosahedronGeometry.module_three.kt | 2 +- .../threejs/ImageBitmapLoader.module_three.kt | 2 +- .../threejs/ImageLoader.module_three.kt | 2 +- .../ImageUtils.ImageUtils.module_three.kt | 0 .../ImmediateRenderObject.module_three.kt | 2 +- .../InstancedBufferAttribute.module_three.kt | 2 +- .../InstancedBufferGeometry.module_three.kt | 2 +- ...InstancedInterleavedBuffer.module_three.kt | 2 +- .../threejs/InstancedMesh.module_three.kt | 2 +- .../threejs/InterleavedBuffer.module_three.kt | 2 +- ...InterleavedBufferAttribute.module_three.kt | 2 +- .../threejs/Interpolant.module_three.kt | 2 +- .../threejs/KeyframeTrack.module_three.kt | 2 +- .../externals/threejs/LOD.module_three.kt | 2 +- .../threejs/LatheGeometry.module_three.kt | 2 +- .../externals/threejs/Layers.module_three.kt | 2 +- .../externals/threejs/Light.module_three.kt | 2 +- .../threejs/LightProbe.module_three.kt | 2 +- .../threejs/LightShadow.module_three.kt | 2 +- .../externals/threejs/Line.module_three.kt | 2 +- .../externals/threejs/Line3.module_three.kt | 2 +- .../threejs/LineBasicMaterial.module_three.kt | 2 +- .../threejs/LineCurve.module_three.kt | 2 +- .../threejs/LineCurve3.module_three.kt | 2 +- .../LineDashedMaterial.module_three.kt | 2 +- .../threejs/LineLoop.module_three.kt | 2 +- .../threejs/LineSegments.module_three.kt | 2 +- .../threejs/LinearInterpolant.module_three.kt | 2 +- .../jsMain/kotlin/externals/threejs/Loader.kt | 7 ++ .../externals/threejs/Loader.module_three.kt | 10 +-- .../threejs/LoaderUtils.module_three.kt | 0 .../threejs/LoadingManager.module_three.kt | 2 +- .../threejs/MTLLoader.module_three.kt | 2 +- .../threejs/Material.module_three.kt | 2 +- .../externals/threejs/MaterialLoader.kt | 7 ++ .../threejs/MaterialLoader.module_three.kt | 10 +-- .../externals/threejs/Matrix3.module_three.kt | 2 +- .../externals/threejs/Matrix4.module_three.kt | 2 +- .../externals/threejs/Mesh.module_three.kt | 2 +- .../threejs/MeshBasicMaterial.module_three.kt | 2 +- .../threejs/MeshDepthMaterial.module_three.kt | 2 +- .../MeshDistanceMaterial.module_three.kt | 2 +- .../MeshLambertMaterial.module_three.kt | 2 +- .../MeshMatcapMaterial.module_three.kt | 2 +- .../MeshNormalMaterial.module_three.kt | 2 +- .../threejs/MeshPhongMaterial.module_three.kt | 2 +- .../MeshPhysicalMaterial.module_three.kt | 2 +- .../MeshStandardMaterial.module_three.kt | 2 +- .../threejs/MeshToonMaterial.module_three.kt | 2 +- .../NumberKeyframeTrack.module_three.kt | 2 +- .../threejs/OBJLoader.module_three.kt | 2 +- .../threejs/Object3D.module_three.kt | 2 +- .../kotlin/externals/threejs/ObjectLoader.kt | 19 ++++ .../threejs/ObjectLoader.module_three.kt | 21 +---- .../OctahedronGeometry.module_three.kt | 2 +- .../OrthographicCamera.module_three.kt | 2 +- .../threejs/PMREMGenerator.module_three.kt | 2 +- .../ParametricGeometry.module_three.kt | 2 +- .../externals/threejs/Path.module_three.kt | 2 +- .../threejs/PerspectiveCamera.module_three.kt | 2 +- .../externals/threejs/Plane.module_three.kt | 2 +- .../threejs/PlaneGeometry.module_three.kt | 2 +- .../threejs/PlaneHelper.module_three.kt | 2 +- .../threejs/PointLight.module_three.kt | 2 +- .../threejs/PointLightHelper.module_three.kt | 2 +- .../threejs/PointLightShadow.module_three.kt | 2 +- .../externals/threejs/Points.module_three.kt | 2 +- .../threejs/PointsMaterial.module_three.kt | 2 +- .../threejs/PolarGridHelper.module_three.kt | 2 +- .../PolyhedronGeometry.module_three.kt | 2 +- .../externals/threejs/PropertyBinding.kt | 7 ++ .../threejs/PropertyBinding.module_three.kt | 10 +-- .../threejs/PropertyMixer.module_three.kt | 2 +- .../QuadraticBezierCurve.module_three.kt | 2 +- .../QuadraticBezierCurve3.module_three.kt | 2 +- .../threejs/Quaternion.module_three.kt | 2 +- .../QuaternionKeyframeTrack.module_three.kt | 2 +- ...uaternionLinearInterpolant.module_three.kt | 2 +- .../threejs/RawShaderMaterial.module_three.kt | 2 +- .../externals/threejs/Ray.module_three.kt | 2 +- .../threejs/Raycaster.module_three.kt | 2 +- .../threejs/RectAreaLight.module_three.kt | 2 +- .../threejs/RingGeometry.module_three.kt | 2 +- .../externals/threejs/Scene.module_three.kt | 2 +- .../kotlin/externals/threejs/ShaderChunk.kt | 7 ++ .../threejs/ShaderChunk.module_three.kt | 5 -- .../kotlin/externals/threejs/ShaderLib.kt | 13 +++ .../threejs/ShaderLib.module_three.kt | 13 +-- .../threejs/ShaderMaterial.module_three.kt | 2 +- .../threejs/ShadowMaterial.module_three.kt | 2 +- .../externals/threejs/Shape.module_three.kt | 2 +- .../threejs/ShapeGeometry.module_three.kt | 2 +- .../threejs/ShapePath.module_three.kt | 2 +- .../ShapeUtils.ShapeUtils.module_three.kt | 0 .../threejs/ShapeUtils.module_three.kt | 0 .../threejs/Skeleton.module_three.kt | 2 +- .../threejs/SkeletonHelper.module_three.kt | 2 +- .../threejs/SkinnedMesh.module_three.kt | 2 +- .../externals/threejs/Sphere.module_three.kt | 2 +- .../threejs/SphereGeometry.module_three.kt | 2 +- .../threejs/Spherical.module_three.kt | 2 +- .../SphericalHarmonics3.module_three.kt | 2 +- .../threejs/SplineCurve.module_three.kt | 2 +- .../threejs/SpotLight.module_three.kt | 2 +- .../threejs/SpotLightHelper.module_three.kt | 2 +- .../threejs/SpotLightShadow.module_three.kt | 2 +- .../externals/threejs/Sprite.module_three.kt | 2 +- .../threejs/SpriteMaterial.module_three.kt | 2 +- .../threejs/StereoCamera.module_three.kt | 2 +- .../StringKeyframeTrack.module_three.kt | 2 +- .../TetrahedronGeometry.module_three.kt | 2 +- .../threejs/TextGeometry.module_three.kt | 2 +- .../externals/threejs/Texture.module_three.kt | 2 +- .../threejs/TextureLoader.module_three.kt | 2 +- .../threejs/TorusGeometry.module_three.kt | 2 +- .../threejs/TorusKnotGeometry.module_three.kt | 2 +- .../threejs/Triangle.module_three.kt | 2 +- .../threejs/TubeGeometry.module_three.kt | 2 +- .../externals/threejs/Uniform.module_three.kt | 2 +- .../threejs/UniformsLib.module_three.kt | 90 +++++++++---------- .../threejs/UniformsUtils.module_three.kt | 2 +- .../externals/threejs/Vector2.module_three.kt | 2 +- .../externals/threejs/Vector3.module_three.kt | 2 +- .../externals/threejs/Vector4.module_three.kt | 2 +- .../VectorKeyframeTrack.module_three.kt | 2 +- .../threejs/VideoTexture.module_three.kt | 2 +- .../threejs/WebGL1Renderer.module_three.kt | 2 +- .../threejs/WebGLAttributes.module_three.kt | 2 +- .../WebGLBindingStates.module_three.kt | 2 +- .../WebGLBufferRenderer.module_three.kt | 2 +- .../threejs/WebGLCapabilities.module_three.kt | 2 +- .../threejs/WebGLClipping.module_three.kt | 2 +- .../threejs/WebGLCubeMaps.module_three.kt | 2 +- .../WebGLCubeRenderTarget.module_three.kt | 2 +- .../threejs/WebGLCubeUVMaps.module_three.kt | 2 +- .../threejs/WebGLExtensions.module_three.kt | 2 +- .../threejs/WebGLGeometries.module_three.kt | 2 +- ...WebGLIndexedBufferRenderer.module_three.kt | 2 +- .../threejs/WebGLInfo.module_three.kt | 2 +- .../threejs/WebGLLights.module_three.kt | 2 +- ...WebGLMultipleRenderTargets.module_three.kt | 2 +- ...bGLMultisampleRenderTarget.module_three.kt | 2 +- .../threejs/WebGLObjects.module_three.kt | 2 +- .../threejs/WebGLProgram.module_three.kt | 2 +- .../threejs/WebGLPrograms.module_three.kt | 2 +- .../threejs/WebGLProperties.module_three.kt | 2 +- .../threejs/WebGLRenderLists.module_three.kt | 4 +- .../threejs/WebGLRenderTarget.module_three.kt | 2 +- .../threejs/WebGLRenderer.module_three.kt | 2 +- .../threejs/WebGLShader.module_three.kt | 0 .../threejs/WebGLShadowMap.module_three.kt | 2 +- .../threejs/WebGLState.module_three.kt | 8 +- .../threejs/WebGLTextures.module_three.kt | 2 +- .../threejs/WebGLUniforms.module_three.kt | 2 +- .../threejs/WebGLUtils.module_three.kt | 2 +- .../threejs/WireframeGeometry.module_three.kt | 2 +- .../threejs/constants.module_three.kt | 62 ++++++------- settings.gradle.kts | 3 + .../threejs/0_extraDefs.module_three.kt | 19 ---- stuff/map-index.html | 3 - 245 files changed, 494 insertions(+), 442 deletions(-) create mode 100644 .idea/artifacts/externals_js.xml create mode 100644 externals/build.gradle.kts rename {src/mapMain => externals/src/jsMain}/kotlin/externals/hammer/HammerJS.kt (98%) create mode 100644 externals/src/jsMain/kotlin/externals/threejs/0_extraDefs.module_three.kt rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/AmbientLight.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/AmbientLightProbe.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/AnimationAction.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/AnimationClip.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/AnimationLoader.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/AnimationMixer.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/AnimationObjectGroup.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/AnimationUtils.AnimationUtils.module_three.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ArcCurve.module_three.kt (82%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ArrayCamera.module_three.kt (82%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ArrowHelper.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/AxesHelper.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/BattleCameraControls.module.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Bone.module_three.kt (87%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/BooleanKeyframeTrack.module_three.kt (81%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Box2.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Box3.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Box3Helper.module_three.kt (80%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/BoxGeometry.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/BoxHelper.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/BufferAttribute.module_three.kt (88%) create mode 100644 externals/src/jsMain/kotlin/externals/threejs/BufferGeometry.kt rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/BufferGeometry.module_three.kt (87%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/BufferGeometryLoader.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CSS3DObject.module_three.kt (79%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CSS3DRenderer.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CSS3DSprite.module_three.kt (79%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Cache.Cache.module_three.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Camera.module_three.kt (91%) create mode 100644 externals/src/jsMain/kotlin/externals/threejs/CameraHelper.kt rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CameraHelper.module_three.kt (57%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CampaignCameraControls.module.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CanvasTexture.module_three.kt (99%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CatmullRomCurve3.module_three.kt (86%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CircleGeometry.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Clock.module_three.kt (87%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Color.module_three.kt (99%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ColorKeyframeTrack.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CompressedTexture.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CompressedTextureLoader.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ConeGeometry.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CubeCamera.module_three.kt (85%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CubeTexture.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CubeTextureLoader.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CubicBezierCurve.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CubicBezierCurve3.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CubicInterpolant.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Curve.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CurvePath.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/CylinderGeometry.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Cylindrical.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DataTexture.module_three.kt (99%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DataTexture2DArray.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DataTexture3D.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DataTextureLoader.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DataUtils.DataUtils.module_three.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DepthTexture.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DirectionalLight.module_three.kt (94%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DirectionalLightHelper.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DirectionalLightShadow.module_three.kt (81%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DiscreteInterpolant.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/DodecahedronGeometry.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/EdgesGeometry.module_three.kt (85%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/EllipseCurve.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Euler.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ExtrudeGeometry.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/FileLoader.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Fog.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/FogExp2.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Font.module_three.kt (87%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/FontLoader.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Frustum.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/GLBufferAttribute.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/GridHelper.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Group.module_three.kt (86%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/HemisphereLight.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/HemisphereLightHelper.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/HemisphereLightProbe.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/IcosahedronGeometry.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ImageBitmapLoader.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ImageLoader.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ImageUtils.ImageUtils.module_three.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ImmediateRenderObject.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/InstancedBufferAttribute.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/InstancedBufferGeometry.module_three.kt (85%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/InstancedInterleavedBuffer.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/InstancedMesh.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/InterleavedBuffer.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/InterleavedBufferAttribute.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Interpolant.module_three.kt (86%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/KeyframeTrack.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LOD.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LatheGeometry.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Layers.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Light.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LightProbe.module_three.kt (85%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LightShadow.module_three.kt (94%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Line.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Line3.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LineBasicMaterial.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LineCurve.module_three.kt (80%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LineCurve3.module_three.kt (80%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LineDashedMaterial.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LineLoop.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LineSegments.module_three.kt (86%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LinearInterpolant.module_three.kt (84%) create mode 100644 externals/src/jsMain/kotlin/externals/threejs/Loader.kt rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Loader.module_three.kt (79%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LoaderUtils.module_three.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/LoadingManager.module_three.kt (94%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MTLLoader.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Material.module_three.kt (99%) create mode 100644 externals/src/jsMain/kotlin/externals/threejs/MaterialLoader.kt rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MaterialLoader.module_three.kt (73%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Matrix3.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Matrix4.module_three.kt (99%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Mesh.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshBasicMaterial.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshDepthMaterial.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshDistanceMaterial.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshLambertMaterial.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshMatcapMaterial.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshNormalMaterial.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshPhongMaterial.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshPhysicalMaterial.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshStandardMaterial.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/MeshToonMaterial.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/NumberKeyframeTrack.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/OBJLoader.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Object3D.module_three.kt (98%) create mode 100644 externals/src/jsMain/kotlin/externals/threejs/ObjectLoader.kt rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ObjectLoader.module_three.kt (72%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/OctahedronGeometry.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/OrthographicCamera.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PMREMGenerator.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ParametricGeometry.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Path.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PerspectiveCamera.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Plane.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PlaneGeometry.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PlaneHelper.module_three.kt (85%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PointLight.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PointLightHelper.module_three.kt (94%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PointLightShadow.module_three.kt (77%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Points.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PointsMaterial.module_three.kt (94%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PolarGridHelper.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PolyhedronGeometry.module_three.kt (90%) create mode 100644 externals/src/jsMain/kotlin/externals/threejs/PropertyBinding.kt rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PropertyBinding.module_three.kt (85%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/PropertyMixer.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/QuadraticBezierCurve.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/QuadraticBezierCurve3.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Quaternion.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/QuaternionKeyframeTrack.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/QuaternionLinearInterpolant.module_three.kt (85%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/RawShaderMaterial.module_three.kt (78%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Ray.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Raycaster.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/RectAreaLight.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/RingGeometry.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Scene.module_three.kt (93%) create mode 100644 externals/src/jsMain/kotlin/externals/threejs/ShaderChunk.kt rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ShaderChunk.module_three.kt (97%) create mode 100644 externals/src/jsMain/kotlin/externals/threejs/ShaderLib.kt rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ShaderLib.module_three.kt (69%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ShaderMaterial.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ShadowMaterial.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Shape.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ShapeGeometry.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ShapePath.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ShapeUtils.ShapeUtils.module_three.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/ShapeUtils.module_three.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Skeleton.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/SkeletonHelper.module_three.kt (87%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/SkinnedMesh.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Sphere.module_three.kt (94%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/SphereGeometry.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Spherical.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/SphericalHarmonics3.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/SplineCurve.module_three.kt (81%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/SpotLight.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/SpotLightHelper.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/SpotLightShadow.module_three.kt (81%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Sprite.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/SpriteMaterial.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/StereoCamera.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/StringKeyframeTrack.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/TetrahedronGeometry.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/TextGeometry.module_three.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Texture.module_three.kt (99%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/TextureLoader.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/TorusGeometry.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/TorusKnotGeometry.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Triangle.module_three.kt (96%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/TubeGeometry.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Uniform.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/UniformsLib.module_three.kt (70%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/UniformsUtils.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Vector2.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Vector3.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/Vector4.module_three.kt (98%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/VectorKeyframeTrack.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/VideoTexture.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGL1Renderer.module_three.kt (80%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLAttributes.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLBindingStates.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLBufferRenderer.module_three.kt (87%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLCapabilities.module_three.kt (94%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLClipping.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLCubeMaps.module_three.kt (79%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLCubeRenderTarget.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLCubeUVMaps.module_three.kt (79%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLExtensions.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLGeometries.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLIndexedBufferRenderer.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLInfo.module_three.kt (92%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLLights.module_three.kt (94%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLMultipleRenderTargets.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLMultisampleRenderTarget.module_three.kt (84%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLObjects.module_three.kt (83%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLProgram.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLPrograms.module_three.kt (91%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLProperties.module_three.kt (89%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLRenderLists.module_three.kt (88%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLRenderTarget.module_three.kt (97%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLRenderer.module_three.kt (99%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLShader.module_three.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLShadowMap.module_three.kt (87%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLState.module_three.kt (94%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLTextures.module_three.kt (93%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLUniforms.module_three.kt (90%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WebGLUtils.module_three.kt (82%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/WireframeGeometry.module_three.kt (78%) rename {src/mapMain => externals/src/jsMain}/kotlin/externals/threejs/constants.module_three.kt (89%) delete mode 100644 src/mapMain/kotlin/externals/threejs/0_extraDefs.module_three.kt diff --git a/.idea/artifacts/externals_js.xml b/.idea/artifacts/externals_js.xml new file mode 100644 index 0000000..84f5125 --- /dev/null +++ b/.idea/artifacts/externals_js.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/externals/build/libs + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 5404067..4090d4d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -9,6 +9,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 0aceffa..1ad7afe 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -94,7 +94,7 @@ - + diff --git a/build.gradle.kts b/build.gradle.kts index fbf0745..b8e052c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,7 +37,7 @@ plugins { group = "info.mechyrdia" -val configFile = (JsonSlurper().parse(File(rootDir, "config.json")) as Map<*, *>).mapKeys { (k, _) -> k as String } +val configFile = (JsonSlurper().parse(File(rootDir, "config.json")) as Map<*, *>).mapKeys { (k, _) -> k.toString() } val isDevMode = (configFile["isDevMode"] as? Boolean) ?: false @@ -81,14 +81,12 @@ val jsTarget: KotlinMultiplatformExtension.(name: String) -> Unit = { name -> repositories { mavenCentral() - maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") } kotlin { jsTarget("map") - jvmToolchain(17) - jvm { + jvm("jvm") { withJava() } @@ -100,13 +98,13 @@ kotlin { } } - val commonMain by getting - val mapMain by getting { dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.10.1") + + implementation(project(":externals")) } } @@ -118,22 +116,23 @@ kotlin { implementation("org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.2") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.2") - implementation("io.ktor:ktor-server-core-jvm:2.3.5") - implementation("io.ktor:ktor-server-cio-jvm:2.3.5") + implementation("io.ktor:ktor-server-core-jvm:2.3.7") + implementation("io.ktor:ktor-server-cio-jvm:2.3.7") - implementation("io.ktor:ktor-server-caching-headers:2.3.5") - implementation("io.ktor:ktor-server-call-id:2.3.5") - implementation("io.ktor:ktor-server-call-logging:2.3.5") - implementation("io.ktor:ktor-server-conditional-headers:2.3.5") - implementation("io.ktor:ktor-server-forwarded-header:2.3.5") - implementation("io.ktor:ktor-server-html-builder:2.3.5") - implementation("io.ktor:ktor-server-sessions-jvm:2.3.5") - implementation("io.ktor:ktor-server-status-pages:2.3.5") + implementation("io.ktor:ktor-server-caching-headers:2.3.7") + implementation("io.ktor:ktor-server-call-id:2.3.7") + implementation("io.ktor:ktor-server-call-logging:2.3.7") + implementation("io.ktor:ktor-server-conditional-headers:2.3.7") + implementation("io.ktor:ktor-server-forwarded-header:2.3.7") + implementation("io.ktor:ktor-server-html-builder:2.3.7") + implementation("io.ktor:ktor-server-sessions-jvm:2.3.7") + implementation("io.ktor:ktor-server-status-pages:2.3.7") implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.10.1") implementation("com.samskivert:jmustache:1.15") implementation("org.apache.groovy:groovy-jsr223:4.0.10") + implementation("org.apache.groovy:groovy-json:4.0.10") implementation(files("libs/nsapi4j.jar")) @@ -142,18 +141,14 @@ kotlin { implementation("org.mongodb:bson-kotlinx:4.11.0") implementation("org.slf4j:slf4j-api:2.0.7") - implementation("ch.qos.logback:logback-classic:1.4.7") + implementation("ch.qos.logback:logback-classic:1.4.14") + + //implementation(project(":fightgame")) } } } } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} - tasks.named("jvmProcessResources") { doLast { val pool = Executors.newWorkStealingPool() @@ -188,6 +183,8 @@ tasks.named("jvmProcessResources") { } } +val browserWebpackSuffix = if (isDevMode) "BrowserDevelopmentWebpack" else "BrowserProductionWebpack" + tasks.named("shadowJar") { mergeServiceFiles() exclude { it.name == "module-info.class" } @@ -197,11 +194,13 @@ application { mainClass.set("info.mechyrdia.Factbooks") } -val browserWebpackSuffix = if (isDevMode) "BrowserDevelopmentWebpack" else "BrowserProductionWebpack" +val buildJsAsset: Task.(name: String) -> Unit = { name -> + val webpackTask = tasks.getByName("$name$browserWebpackSuffix") + dependsOn(webpackTask) +} val copyToAssets: Task.(name: String, destSubDir: String, destFileName: String) -> Unit = { name, destSubDir, destFileName -> val webpackTask = tasks.getByName("$name$browserWebpackSuffix") - dependsOn(webpackTask) doFirst { val assetsDirPath = configFile["assetDir"]?.let { "$it" } @@ -238,6 +237,10 @@ val copyToAssets: Task.(name: String, destSubDir: String, destFileName: String) } tasks.withType { + buildJsAsset("map") +} + +tasks.getByName("runShadow") { copyToAssets("map", "map", "main") } diff --git a/externals/build.gradle.kts b/externals/build.gradle.kts new file mode 100644 index 0000000..ae9afb0 --- /dev/null +++ b/externals/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + kotlin("multiplatform") +} + +group = "info.mechyrdia" + +repositories { + mavenCentral() +} + +kotlin { + js(IR) { + browser() + binaries.library() + } + + sourceSets { + all { + languageSettings { + optIn("kotlin.RequiresOptIn") + } + } + + val jsMain by getting + } +} diff --git a/src/mapMain/kotlin/externals/hammer/HammerJS.kt b/externals/src/jsMain/kotlin/externals/hammer/HammerJS.kt similarity index 98% rename from src/mapMain/kotlin/externals/hammer/HammerJS.kt rename to externals/src/jsMain/kotlin/externals/hammer/HammerJS.kt index 1a62312..325912d 100644 --- a/src/mapMain/kotlin/externals/hammer/HammerJS.kt +++ b/externals/src/jsMain/kotlin/externals/hammer/HammerJS.kt @@ -1,4 +1,4 @@ -@file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS", "EXTERNAL_DELEGATION", "unused", "UNUSED_PARAMETER", "NOTHING_TO_INLINE", "PropertyName") +@file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS", "EXTERNAL_DELEGATION", "unused", "UNUSED_PARAMETER", "PropertyName") package externals.hammer diff --git a/externals/src/jsMain/kotlin/externals/threejs/0_extraDefs.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/0_extraDefs.module_three.kt new file mode 100644 index 0000000..aaf98c3 --- /dev/null +++ b/externals/src/jsMain/kotlin/externals/threejs/0_extraDefs.module_three.kt @@ -0,0 +1,19 @@ +@file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS") + +package externals.threejs + +external interface StringDict<@Suppress("unused") Type> + +inline operator fun StringDict.get(key: String): Type? = asDynamic()[key].unsafeCast() + +inline operator fun StringDict.set(key: String, value: Type) { + asDynamic()[key] = value +} + +external interface ArrayLike<@Suppress("unused") Type> + +inline operator fun ArrayLike.get(key: Number): Type? = asDynamic()[key].unsafeCast() + +inline operator fun ArrayLike.set(key: Number, value: Type) { + asDynamic()[key] = value +} diff --git a/src/mapMain/kotlin/externals/threejs/AmbientLight.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/AmbientLight.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/AmbientLight.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/AmbientLight.module_three.kt index 75fd964..0db4997 100644 --- a/src/mapMain/kotlin/externals/threejs/AmbientLight.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/AmbientLight.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class AmbientLight : Light { +open external class AmbientLight : Light { constructor(color: Color = definedExternally, intensity: Number = definedExternally) constructor() constructor(color: Color = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/AmbientLightProbe.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/AmbientLightProbe.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/AmbientLightProbe.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/AmbientLightProbe.module_three.kt index a810a15..c6506e3 100644 --- a/src/mapMain/kotlin/externals/threejs/AmbientLightProbe.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/AmbientLightProbe.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class AmbientLightProbe : LightProbe { +open external class AmbientLightProbe : LightProbe { constructor(color: Color = definedExternally, intensity: Number = definedExternally) constructor() constructor(color: Color = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/AnimationAction.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/AnimationAction.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/AnimationAction.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/AnimationAction.module_three.kt index 05a22fd..19e14d5 100644 --- a/src/mapMain/kotlin/externals/threejs/AnimationAction.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/AnimationAction.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class AnimationAction(mixer: AnimationMixer, clip: AnimationClip, localRoot: Object3D = definedExternally, blendMode: AnimationBlendMode = definedExternally) { +open external class AnimationAction(mixer: AnimationMixer, clip: AnimationClip, localRoot: Object3D = definedExternally, blendMode: AnimationBlendMode = definedExternally) { open var blendMode: AnimationBlendMode open var loop: AnimationActionLoopStyles open var time: Number diff --git a/src/mapMain/kotlin/externals/threejs/AnimationClip.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/AnimationClip.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/AnimationClip.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/AnimationClip.module_three.kt index 32792aa..c76c356 100644 --- a/src/mapMain/kotlin/externals/threejs/AnimationClip.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/AnimationClip.module_three.kt @@ -8,7 +8,7 @@ external interface MorphTarget { var vertices: Array } -external open class AnimationClip(name: String = definedExternally, duration: Number = definedExternally, tracks: Array = definedExternally, blendMode: AnimationBlendMode = definedExternally) { +open external class AnimationClip(name: String = definedExternally, duration: Number = definedExternally, tracks: Array = definedExternally, blendMode: AnimationBlendMode = definedExternally) { open var name: String open var tracks: Array open var blendMode: AnimationBlendMode diff --git a/src/mapMain/kotlin/externals/threejs/AnimationLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/AnimationLoader.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/AnimationLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/AnimationLoader.module_three.kt index e1fac41..c5b6690 100644 --- a/src/mapMain/kotlin/externals/threejs/AnimationLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/AnimationLoader.module_three.kt @@ -6,7 +6,7 @@ package externals.threejs import org.w3c.dom.ErrorEvent import org.w3c.xhr.ProgressEvent -external open class AnimationLoader(manager: LoadingManager = definedExternally) : Loader> { +open external class AnimationLoader(manager: LoadingManager = definedExternally) : Loader> { open fun load(url: String, onLoad: (response: Array) -> Unit, onProgress: (request: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally) open fun parse(json: Any): Array } diff --git a/src/mapMain/kotlin/externals/threejs/AnimationMixer.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/AnimationMixer.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/AnimationMixer.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/AnimationMixer.module_three.kt index db9ebfe..805a756 100644 --- a/src/mapMain/kotlin/externals/threejs/AnimationMixer.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/AnimationMixer.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.w3c.dom.events.EventTarget -external open class AnimationMixer : EventTarget { +open external class AnimationMixer : EventTarget { constructor(root: Object3D) constructor(root: AnimationObjectGroup) diff --git a/src/mapMain/kotlin/externals/threejs/AnimationObjectGroup.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/AnimationObjectGroup.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/AnimationObjectGroup.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/AnimationObjectGroup.module_three.kt index 8aa71de..968eb5b 100644 --- a/src/mapMain/kotlin/externals/threejs/AnimationObjectGroup.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/AnimationObjectGroup.module_three.kt @@ -13,7 +13,7 @@ external interface AnonymousStruct57 { var objects: AnonymousStruct56 } -external open class AnimationObjectGroup(vararg args: Any) { +open external class AnimationObjectGroup(vararg args: Any) { open var uuid: String open var stats: AnonymousStruct57 open var isAnimationObjectGroup: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/AnimationUtils.AnimationUtils.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/AnimationUtils.AnimationUtils.module_three.kt similarity index 100% rename from src/mapMain/kotlin/externals/threejs/AnimationUtils.AnimationUtils.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/AnimationUtils.AnimationUtils.module_three.kt diff --git a/src/mapMain/kotlin/externals/threejs/ArcCurve.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ArcCurve.module_three.kt similarity index 82% rename from src/mapMain/kotlin/externals/threejs/ArcCurve.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ArcCurve.module_three.kt index 41f5ccc..5ce98da 100644 --- a/src/mapMain/kotlin/externals/threejs/ArcCurve.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ArcCurve.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class ArcCurve(aX: Number, aY: Number, aRadius: Number, aStartAngle: Number, aEndAngle: Number, aClockwise: Boolean) : EllipseCurve { +open external class ArcCurve(aX: Number, aY: Number, aRadius: Number, aStartAngle: Number, aEndAngle: Number, aClockwise: Boolean) : EllipseCurve { override var type: String } diff --git a/src/mapMain/kotlin/externals/threejs/ArrayCamera.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ArrayCamera.module_three.kt similarity index 82% rename from src/mapMain/kotlin/externals/threejs/ArrayCamera.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ArrayCamera.module_three.kt index 037eca9..f59925c 100644 --- a/src/mapMain/kotlin/externals/threejs/ArrayCamera.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ArrayCamera.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class ArrayCamera(cameras: Array = definedExternally) : PerspectiveCamera { +open external class ArrayCamera(cameras: Array = definedExternally) : PerspectiveCamera { open var cameras: Array open var isArrayCamera: Boolean } diff --git a/src/mapMain/kotlin/externals/threejs/ArrowHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ArrowHelper.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/ArrowHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ArrowHelper.module_three.kt index 840c2db..805455b 100644 --- a/src/mapMain/kotlin/externals/threejs/ArrowHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ArrowHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class ArrowHelper : Object3D { +open external class ArrowHelper : Object3D { constructor(dir: Vector3 = definedExternally, origin: Vector3 = definedExternally, length: Number = definedExternally, color: Color = definedExternally, headLength: Number = definedExternally, headWidth: Number = definedExternally) constructor() constructor(dir: Vector3 = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/AxesHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/AxesHelper.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/AxesHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/AxesHelper.module_three.kt index ed6df88..2ba18ef 100644 --- a/src/mapMain/kotlin/externals/threejs/AxesHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/AxesHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class AxesHelper(size: Number = definedExternally) : LineSegments { +open external class AxesHelper(size: Number = definedExternally) : LineSegments { override var type: String open fun setColors(xAxisColor: Color, yAxisColor: Color, zAxisColor: Color): AxesHelper /* this */ open fun dispose() diff --git a/src/mapMain/kotlin/externals/threejs/BattleCameraControls.module.kt b/externals/src/jsMain/kotlin/externals/threejs/BattleCameraControls.module.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/BattleCameraControls.module.kt rename to externals/src/jsMain/kotlin/externals/threejs/BattleCameraControls.module.kt index 628808b..b9d717d 100644 --- a/src/mapMain/kotlin/externals/threejs/BattleCameraControls.module.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/BattleCameraControls.module.kt @@ -30,7 +30,7 @@ external interface BattleCameraControlsSettings { var keyDomElement: EventTarget? } -external open class BattleCameraControls(camera: Camera, settings: BattleCameraControlsSettings) { +open external class BattleCameraControls(camera: Camera, settings: BattleCameraControlsSettings) { open fun update(dt: Double) open fun dispose() diff --git a/src/mapMain/kotlin/externals/threejs/Bone.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Bone.module_three.kt similarity index 87% rename from src/mapMain/kotlin/externals/threejs/Bone.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Bone.module_three.kt index 0297a27..b449b05 100644 --- a/src/mapMain/kotlin/externals/threejs/Bone.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Bone.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Bone : Object3D { +open external class Bone : Object3D { open var isBone: Boolean override var type: String /* "Bone" */ } diff --git a/src/mapMain/kotlin/externals/threejs/BooleanKeyframeTrack.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/BooleanKeyframeTrack.module_three.kt similarity index 81% rename from src/mapMain/kotlin/externals/threejs/BooleanKeyframeTrack.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/BooleanKeyframeTrack.module_three.kt index e199c44..281b3fe 100644 --- a/src/mapMain/kotlin/externals/threejs/BooleanKeyframeTrack.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/BooleanKeyframeTrack.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class BooleanKeyframeTrack(name: String, times: Array, values: Array) : KeyframeTrack { +open external class BooleanKeyframeTrack(name: String, times: Array, values: Array) : KeyframeTrack { override var ValueTypeName: String } diff --git a/src/mapMain/kotlin/externals/threejs/Box2.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Box2.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/Box2.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Box2.module_three.kt index 76efe87..1f9f9df 100644 --- a/src/mapMain/kotlin/externals/threejs/Box2.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Box2.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Box2(min: Vector2 = definedExternally, max: Vector2 = definedExternally) { +open external class Box2(min: Vector2 = definedExternally, max: Vector2 = definedExternally) { open var min: Vector2 open var max: Vector2 open fun set(min: Vector2, max: Vector2): Box2 diff --git a/src/mapMain/kotlin/externals/threejs/Box3.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Box3.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/Box3.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Box3.module_three.kt index dfa76f2..9773ddb 100644 --- a/src/mapMain/kotlin/externals/threejs/Box3.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Box3.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Box3(min: Vector3 = definedExternally, max: Vector3 = definedExternally) { +open external class Box3(min: Vector3 = definedExternally, max: Vector3 = definedExternally) { open var min: Vector3 open var max: Vector3 open var isBox3: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/Box3Helper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Box3Helper.module_three.kt similarity index 80% rename from src/mapMain/kotlin/externals/threejs/Box3Helper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Box3Helper.module_three.kt index 4a2b8d4..dc5c34a 100644 --- a/src/mapMain/kotlin/externals/threejs/Box3Helper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Box3Helper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Box3Helper(box: Box3, color: Color = definedExternally) : LineSegments { +open external class Box3Helper(box: Box3, color: Color = definedExternally) : LineSegments { override var type: String open var box: Box3 } diff --git a/src/mapMain/kotlin/externals/threejs/BoxGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/BoxGeometry.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/BoxGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/BoxGeometry.module_three.kt index b06dba9..2b02740 100644 --- a/src/mapMain/kotlin/externals/threejs/BoxGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/BoxGeometry.module_three.kt @@ -12,7 +12,7 @@ external interface AnonymousStruct62 { var depthSegments: Number } -external open class BoxGeometry(width: Number = definedExternally, height: Number = definedExternally, depth: Number = definedExternally, widthSegments: Number = definedExternally, heightSegments: Number = definedExternally, depthSegments: Number = definedExternally) : BufferGeometry { +open external class BoxGeometry(width: Number = definedExternally, height: Number = definedExternally, depth: Number = definedExternally, widthSegments: Number = definedExternally, heightSegments: Number = definedExternally, depthSegments: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct62 diff --git a/src/mapMain/kotlin/externals/threejs/BoxHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/BoxHelper.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/BoxHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/BoxHelper.module_three.kt index db07780..98b5344 100644 --- a/src/mapMain/kotlin/externals/threejs/BoxHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/BoxHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class BoxHelper : LineSegments { +open external class BoxHelper : LineSegments { constructor(obj: Object3D, color: Color = definedExternally) constructor(obj: Object3D) constructor(obj: Object3D, color: String = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/BufferAttribute.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/BufferAttribute.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/BufferAttribute.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/BufferAttribute.module_three.kt index c33769b..19e433d 100644 --- a/src/mapMain/kotlin/externals/threejs/BufferAttribute.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/BufferAttribute.module_three.kt @@ -42,7 +42,7 @@ external interface AnonymousStruct5 { var normalized: Boolean } -external open class BufferAttribute(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) { +open external class BufferAttribute(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) { open var name: String open var array: ArrayLike open var itemSize: Number @@ -85,25 +85,25 @@ external open class BufferAttribute(array: ArrayLike, itemSize: Number, open fun toJSON(): AnonymousStruct5 } -external open class Int8Attribute(array: Any, itemSize: Number) : BufferAttribute +open external class Int8Attribute(array: Any, itemSize: Number) : BufferAttribute -external open class Uint8Attribute(array: Any, itemSize: Number) : BufferAttribute +open external class Uint8Attribute(array: Any, itemSize: Number) : BufferAttribute -external open class Uint8ClampedAttribute(array: Any, itemSize: Number) : BufferAttribute +open external class Uint8ClampedAttribute(array: Any, itemSize: Number) : BufferAttribute -external open class Int16Attribute(array: Any, itemSize: Number) : BufferAttribute +open external class Int16Attribute(array: Any, itemSize: Number) : BufferAttribute -external open class Uint16Attribute(array: Any, itemSize: Number) : BufferAttribute +open external class Uint16Attribute(array: Any, itemSize: Number) : BufferAttribute -external open class Int32Attribute(array: Any, itemSize: Number) : BufferAttribute +open external class Int32Attribute(array: Any, itemSize: Number) : BufferAttribute -external open class Uint32Attribute(array: Any, itemSize: Number) : BufferAttribute +open external class Uint32Attribute(array: Any, itemSize: Number) : BufferAttribute -external open class Float32Attribute(array: Any, itemSize: Number) : BufferAttribute +open external class Float32Attribute(array: Any, itemSize: Number) : BufferAttribute -external open class Float64Attribute(array: Any, itemSize: Number) : BufferAttribute +open external class Float64Attribute(array: Any, itemSize: Number) : BufferAttribute -external open class Int8BufferAttribute : BufferAttribute { +open external class Int8BufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) @@ -114,7 +114,7 @@ external open class Int8BufferAttribute : BufferAttribute { constructor(array: Number, itemSize: Number) } -external open class Uint8BufferAttribute : BufferAttribute { +open external class Uint8BufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) @@ -125,7 +125,7 @@ external open class Uint8BufferAttribute : BufferAttribute { constructor(array: Number, itemSize: Number) } -external open class Uint8ClampedBufferAttribute : BufferAttribute { +open external class Uint8ClampedBufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) @@ -136,7 +136,7 @@ external open class Uint8ClampedBufferAttribute : BufferAttribute { constructor(array: Number, itemSize: Number) } -external open class Int16BufferAttribute : BufferAttribute { +open external class Int16BufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) @@ -147,7 +147,7 @@ external open class Int16BufferAttribute : BufferAttribute { constructor(array: Number, itemSize: Number) } -external open class Uint16BufferAttribute : BufferAttribute { +open external class Uint16BufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) @@ -158,7 +158,7 @@ external open class Uint16BufferAttribute : BufferAttribute { constructor(array: Number, itemSize: Number) } -external open class Int32BufferAttribute : BufferAttribute { +open external class Int32BufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) @@ -169,7 +169,7 @@ external open class Int32BufferAttribute : BufferAttribute { constructor(array: Number, itemSize: Number) } -external open class Uint32BufferAttribute : BufferAttribute { +open external class Uint32BufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) @@ -180,7 +180,7 @@ external open class Uint32BufferAttribute : BufferAttribute { constructor(array: Number, itemSize: Number) } -external open class Float16BufferAttribute : BufferAttribute { +open external class Float16BufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) @@ -191,7 +191,7 @@ external open class Float16BufferAttribute : BufferAttribute { constructor(array: Number, itemSize: Number) } -external open class Float32BufferAttribute : BufferAttribute { +open external class Float32BufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) @@ -202,7 +202,7 @@ external open class Float32BufferAttribute : BufferAttribute { constructor(array: Number, itemSize: Number) } -external open class Float64BufferAttribute : BufferAttribute { +open external class Float64BufferAttribute : BufferAttribute { constructor(array: Iterable, itemSize: Number, normalized: Boolean = definedExternally) constructor(array: Iterable, itemSize: Number) constructor(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally) diff --git a/externals/src/jsMain/kotlin/externals/threejs/BufferGeometry.kt b/externals/src/jsMain/kotlin/externals/threejs/BufferGeometry.kt new file mode 100644 index 0000000..edae09b --- /dev/null +++ b/externals/src/jsMain/kotlin/externals/threejs/BufferGeometry.kt @@ -0,0 +1,17 @@ +package externals.threejs + +inline operator fun AnonymousStruct44.get(name: String): dynamic /* BufferAttribute? | InterleavedBufferAttribute? */ = asDynamic()[name] + +inline operator fun AnonymousStruct44.set(name: String, value: BufferAttribute) { + asDynamic()[name] = value +} + +inline operator fun AnonymousStruct44.set(name: String, value: InterleavedBufferAttribute) { + asDynamic()[name] = value +} + +inline operator fun AnonymousStruct45.get(name: String): Array? = asDynamic()[name].unsafeCast?>() + +inline operator fun AnonymousStruct45.set(name: String, value: Array) { + asDynamic()[name] = value +} diff --git a/src/mapMain/kotlin/externals/threejs/BufferGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/BufferGeometry.module_three.kt similarity index 87% rename from src/mapMain/kotlin/externals/threejs/BufferGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/BufferGeometry.module_three.kt index 94c9185..d51ce53 100644 --- a/src/mapMain/kotlin/externals/threejs/BufferGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/BufferGeometry.module_three.kt @@ -5,24 +5,9 @@ package externals.threejs import org.w3c.dom.events.EventTarget -external interface AnonymousStruct44 { - @nativeGetter - operator fun get(name: String): dynamic /* BufferAttribute? | InterleavedBufferAttribute? */ - - @nativeSetter - operator fun set(name: String, value: BufferAttribute) - - @nativeSetter - operator fun set(name: String, value: InterleavedBufferAttribute) -} +external interface AnonymousStruct44 -external interface AnonymousStruct45 { - @nativeGetter - operator fun get(name: String): Array? - - @nativeSetter - operator fun set(name: String, value: Array) -} +external interface AnonymousStruct45 external interface AnonymousStruct46 { var start: Number @@ -37,7 +22,7 @@ external interface AnonymousStruct47 { var count: Number } -external open class BufferGeometry : EventTarget { +open external class BufferGeometry : EventTarget { open var id: Number open var uuid: String open var name: String diff --git a/src/mapMain/kotlin/externals/threejs/BufferGeometryLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/BufferGeometryLoader.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/BufferGeometryLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/BufferGeometryLoader.module_three.kt index 931f364..2906f33 100644 --- a/src/mapMain/kotlin/externals/threejs/BufferGeometryLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/BufferGeometryLoader.module_three.kt @@ -6,7 +6,7 @@ package externals.threejs import org.w3c.dom.ErrorEvent import org.w3c.xhr.ProgressEvent -external open class BufferGeometryLoader(manager: LoadingManager = definedExternally) : Loader { +open external class BufferGeometryLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(url: String, onLoad: (bufferGeometry: Any /* InstancedBufferGeometry | BufferGeometry */) -> Unit, onProgress: (request: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally) open fun parse(json: Any): dynamic /* InstancedBufferGeometry | BufferGeometry */ } diff --git a/src/mapMain/kotlin/externals/threejs/CSS3DObject.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CSS3DObject.module_three.kt similarity index 79% rename from src/mapMain/kotlin/externals/threejs/CSS3DObject.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CSS3DObject.module_three.kt index 79935c8..4e856e0 100644 --- a/src/mapMain/kotlin/externals/threejs/CSS3DObject.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CSS3DObject.module_three.kt @@ -5,6 +5,6 @@ package externals.threejs import org.w3c.dom.HTMLElement -external open class CSS3DObject(element: HTMLElement) : Object3D { +open external class CSS3DObject(element: HTMLElement) : Object3D { open var element: HTMLElement } diff --git a/src/mapMain/kotlin/externals/threejs/CSS3DRenderer.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CSS3DRenderer.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/CSS3DRenderer.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CSS3DRenderer.module_three.kt index 014860b..3fa69b3 100644 --- a/src/mapMain/kotlin/externals/threejs/CSS3DRenderer.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CSS3DRenderer.module_three.kt @@ -11,7 +11,7 @@ external interface CSS3DRendererParameters { set(value) = definedExternally } -external open class CSS3DRenderer(parameters: CSS3DRendererParameters = definedExternally) : Renderer { +open external class CSS3DRenderer(parameters: CSS3DRendererParameters = definedExternally) : Renderer { override var domElement: HTMLElement override fun render(scene: Object3D, camera: Camera) override fun setSize(width: Number, height: Number, updateStyle: Boolean) diff --git a/src/mapMain/kotlin/externals/threejs/CSS3DSprite.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CSS3DSprite.module_three.kt similarity index 79% rename from src/mapMain/kotlin/externals/threejs/CSS3DSprite.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CSS3DSprite.module_three.kt index b8d11cb..645170a 100644 --- a/src/mapMain/kotlin/externals/threejs/CSS3DSprite.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CSS3DSprite.module_three.kt @@ -5,6 +5,6 @@ package externals.threejs import org.w3c.dom.HTMLElement -external open class CSS3DSprite(element: HTMLElement) : Object3D { +open external class CSS3DSprite(element: HTMLElement) : Object3D { open var element: HTMLElement } diff --git a/src/mapMain/kotlin/externals/threejs/Cache.Cache.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Cache.Cache.module_three.kt similarity index 100% rename from src/mapMain/kotlin/externals/threejs/Cache.Cache.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Cache.Cache.module_three.kt diff --git a/src/mapMain/kotlin/externals/threejs/Camera.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Camera.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/Camera.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Camera.module_three.kt index 003f25b..8c01f82 100644 --- a/src/mapMain/kotlin/externals/threejs/Camera.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Camera.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Camera : Object3D { +open external class Camera : Object3D { open var matrixWorldInverse: Matrix4 open var projectionMatrix: Matrix4 open var projectionMatrixInverse: Matrix4 diff --git a/externals/src/jsMain/kotlin/externals/threejs/CameraHelper.kt b/externals/src/jsMain/kotlin/externals/threejs/CameraHelper.kt new file mode 100644 index 0000000..6cd71a0 --- /dev/null +++ b/externals/src/jsMain/kotlin/externals/threejs/CameraHelper.kt @@ -0,0 +1,7 @@ +package externals.threejs + +inline operator fun AnonymousStruct76.get(id: String): Array? = asDynamic()[id].unsafeCast?>() + +inline operator fun AnonymousStruct76.set(id: String, value: Array) { + asDynamic()[id] = value +} diff --git a/src/mapMain/kotlin/externals/threejs/CameraHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CameraHelper.module_three.kt similarity index 57% rename from src/mapMain/kotlin/externals/threejs/CameraHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CameraHelper.module_three.kt index c5bd704..f8685ba 100644 --- a/src/mapMain/kotlin/externals/threejs/CameraHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CameraHelper.module_three.kt @@ -3,15 +3,9 @@ package externals.threejs -external interface AnonymousStruct76 { - @nativeGetter - operator fun get(id: String): Array? - - @nativeSetter - operator fun set(id: String, value: Array) -} +external interface AnonymousStruct76 -external open class CameraHelper(camera: Camera) : LineSegments { +open external class CameraHelper(camera: Camera) : LineSegments { open var camera: Camera open var pointMap: AnonymousStruct76 override var type: String diff --git a/src/mapMain/kotlin/externals/threejs/CampaignCameraControls.module.kt b/externals/src/jsMain/kotlin/externals/threejs/CampaignCameraControls.module.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/CampaignCameraControls.module.kt rename to externals/src/jsMain/kotlin/externals/threejs/CampaignCameraControls.module.kt index 4469c3c..e3cf042 100644 --- a/src/mapMain/kotlin/externals/threejs/CampaignCameraControls.module.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CampaignCameraControls.module.kt @@ -26,7 +26,7 @@ external interface CampaignCameraControlsSettings { var keyDomElement: EventTarget? } -external open class CampaignCameraControls(camera: Camera, settings: CampaignCameraControlsSettings) { +open external class CampaignCameraControls(camera: Camera, settings: CampaignCameraControlsSettings) { open fun update(dt: Double) open fun dispose() diff --git a/src/mapMain/kotlin/externals/threejs/CanvasTexture.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CanvasTexture.module_three.kt similarity index 99% rename from src/mapMain/kotlin/externals/threejs/CanvasTexture.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CanvasTexture.module_three.kt index 6ae797f..280d329 100644 --- a/src/mapMain/kotlin/externals/threejs/CanvasTexture.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CanvasTexture.module_three.kt @@ -8,7 +8,7 @@ import org.w3c.dom.HTMLImageElement import org.w3c.dom.HTMLVideoElement import org.w3c.dom.ImageBitmap -external open class CanvasTexture : Texture { +open external class CanvasTexture : Texture { constructor(canvas: HTMLImageElement, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, format: PixelFormat = definedExternally, type: TextureDataType = definedExternally, anisotropy: Number = definedExternally) constructor(canvas: HTMLImageElement) constructor(canvas: HTMLImageElement, mapping: Mapping = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/CatmullRomCurve3.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CatmullRomCurve3.module_three.kt similarity index 86% rename from src/mapMain/kotlin/externals/threejs/CatmullRomCurve3.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CatmullRomCurve3.module_three.kt index 50160f1..966bf01 100644 --- a/src/mapMain/kotlin/externals/threejs/CatmullRomCurve3.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CatmullRomCurve3.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class CatmullRomCurve3(points: Array = definedExternally, closed: Boolean = definedExternally, curveType: String = definedExternally, tension: Number = definedExternally) : Curve { +open external class CatmullRomCurve3(points: Array = definedExternally, closed: Boolean = definedExternally, curveType: String = definedExternally, tension: Number = definedExternally) : Curve { override var type: String open var points: Array } diff --git a/src/mapMain/kotlin/externals/threejs/CircleGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CircleGeometry.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/CircleGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CircleGeometry.module_three.kt index 1fb0e2b..25a7b4b 100644 --- a/src/mapMain/kotlin/externals/threejs/CircleGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CircleGeometry.module_three.kt @@ -10,7 +10,7 @@ external interface AnonymousStruct63 { var thetaLength: Number } -external open class CircleGeometry(radius: Number = definedExternally, segments: Number = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : BufferGeometry { +open external class CircleGeometry(radius: Number = definedExternally, segments: Number = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct63 diff --git a/src/mapMain/kotlin/externals/threejs/Clock.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Clock.module_three.kt similarity index 87% rename from src/mapMain/kotlin/externals/threejs/Clock.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Clock.module_three.kt index 8b0590e..0e12328 100644 --- a/src/mapMain/kotlin/externals/threejs/Clock.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Clock.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Clock(autoStart: Boolean = definedExternally) { +open external class Clock(autoStart: Boolean = definedExternally) { open var autoStart: Boolean open var startTime: Number open var oldTime: Number diff --git a/src/mapMain/kotlin/externals/threejs/Color.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Color.module_three.kt similarity index 99% rename from src/mapMain/kotlin/externals/threejs/Color.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Color.module_three.kt index 358b9c6..d34f6df 100644 --- a/src/mapMain/kotlin/externals/threejs/Color.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Color.module_three.kt @@ -9,7 +9,7 @@ external interface HSL { var l: Number } -external open class Color { +open external class Color { constructor(color: Color = definedExternally) constructor() constructor(color: String = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/ColorKeyframeTrack.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ColorKeyframeTrack.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/ColorKeyframeTrack.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ColorKeyframeTrack.module_three.kt index 5cfd86d..85ca7ce 100644 --- a/src/mapMain/kotlin/externals/threejs/ColorKeyframeTrack.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ColorKeyframeTrack.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class ColorKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { +open external class ColorKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { override var ValueTypeName: String } diff --git a/src/mapMain/kotlin/externals/threejs/CompressedTexture.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CompressedTexture.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/CompressedTexture.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CompressedTexture.module_three.kt index 252c832..e0bf5e4 100644 --- a/src/mapMain/kotlin/externals/threejs/CompressedTexture.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CompressedTexture.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.w3c.dom.ImageData -external open class CompressedTexture(mipmaps: Array, width: Number, height: Number, format: CompressedPixelFormat = definedExternally, type: TextureDataType = definedExternally, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, anisotropy: Number = definedExternally, encoding: TextureEncoding = definedExternally) : Texture { +open external class CompressedTexture(mipmaps: Array, width: Number, height: Number, format: CompressedPixelFormat = definedExternally, type: TextureDataType = definedExternally, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, anisotropy: Number = definedExternally, encoding: TextureEncoding = definedExternally) : Texture { override var image: Any override var mipmaps: Array override var flipY: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/CompressedTextureLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CompressedTextureLoader.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/CompressedTextureLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CompressedTextureLoader.module_three.kt index 4e875a4..9af6081 100644 --- a/src/mapMain/kotlin/externals/threejs/CompressedTextureLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CompressedTextureLoader.module_three.kt @@ -6,6 +6,6 @@ package externals.threejs import org.w3c.dom.ErrorEvent import org.w3c.xhr.ProgressEvent -external open class CompressedTextureLoader(manager: LoadingManager = definedExternally) : Loader { +open external class CompressedTextureLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(url: String, onLoad: (texture: CompressedTexture) -> Unit, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally): CompressedTexture } diff --git a/src/mapMain/kotlin/externals/threejs/ConeGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ConeGeometry.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/ConeGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ConeGeometry.module_three.kt index de9bf12..26a34fd 100644 --- a/src/mapMain/kotlin/externals/threejs/ConeGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ConeGeometry.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class ConeGeometry(radius: Number = definedExternally, height: Number = definedExternally, radialSegments: Number = definedExternally, heightSegments: Number = definedExternally, openEnded: Boolean = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : CylinderGeometry { +open external class ConeGeometry(radius: Number = definedExternally, height: Number = definedExternally, radialSegments: Number = definedExternally, heightSegments: Number = definedExternally, openEnded: Boolean = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : CylinderGeometry { override var type: String companion object { diff --git a/src/mapMain/kotlin/externals/threejs/CubeCamera.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CubeCamera.module_three.kt similarity index 85% rename from src/mapMain/kotlin/externals/threejs/CubeCamera.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CubeCamera.module_three.kt index 17b1367..5b28fc7 100644 --- a/src/mapMain/kotlin/externals/threejs/CubeCamera.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CubeCamera.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class CubeCamera(near: Number, far: Number, renderTarget: WebGLCubeRenderTarget) : Object3D { +open external class CubeCamera(near: Number, far: Number, renderTarget: WebGLCubeRenderTarget) : Object3D { override var type: String /* "CubeCamera" */ open var renderTarget: WebGLCubeRenderTarget open fun update(renderer: WebGLRenderer, scene: Scene) diff --git a/src/mapMain/kotlin/externals/threejs/CubeTexture.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CubeTexture.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/CubeTexture.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CubeTexture.module_three.kt index 79a2387..56d2d6b 100644 --- a/src/mapMain/kotlin/externals/threejs/CubeTexture.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CubeTexture.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class CubeTexture(images: Array = definedExternally, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, format: PixelFormat = definedExternally, type: TextureDataType = definedExternally, anisotropy: Number = definedExternally, encoding: TextureEncoding = definedExternally) : Texture { +open external class CubeTexture(images: Array = definedExternally, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, format: PixelFormat = definedExternally, type: TextureDataType = definedExternally, anisotropy: Number = definedExternally, encoding: TextureEncoding = definedExternally) : Texture { open var images: Any override var flipY: Boolean open var isCubeTexture: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/CubeTextureLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CubeTextureLoader.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/CubeTextureLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CubeTextureLoader.module_three.kt index 9a50ea2..830f17f 100644 --- a/src/mapMain/kotlin/externals/threejs/CubeTextureLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CubeTextureLoader.module_three.kt @@ -7,7 +7,7 @@ import org.w3c.dom.ErrorEvent import org.w3c.xhr.ProgressEvent import kotlin.js.Promise -external open class CubeTextureLoader(manager: LoadingManager = definedExternally) : Loader { +open external class CubeTextureLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(urls: Array, onLoad: (texture: CubeTexture) -> Unit = definedExternally, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally): CubeTexture open fun loadAsync(urls: Array, onProgress: (event: ProgressEvent) -> Unit = definedExternally): Promise } diff --git a/src/mapMain/kotlin/externals/threejs/CubicBezierCurve.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CubicBezierCurve.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/CubicBezierCurve.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CubicBezierCurve.module_three.kt index 9e8402c..9fd0a84 100644 --- a/src/mapMain/kotlin/externals/threejs/CubicBezierCurve.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CubicBezierCurve.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class CubicBezierCurve(v0: Vector2, v1: Vector2, v2: Vector2, v3: Vector2) : Curve { +open external class CubicBezierCurve(v0: Vector2, v1: Vector2, v2: Vector2, v3: Vector2) : Curve { override var type: String open var v0: Vector2 open var v1: Vector2 diff --git a/src/mapMain/kotlin/externals/threejs/CubicBezierCurve3.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CubicBezierCurve3.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/CubicBezierCurve3.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CubicBezierCurve3.module_three.kt index 96a72b5..f8843f9 100644 --- a/src/mapMain/kotlin/externals/threejs/CubicBezierCurve3.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CubicBezierCurve3.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class CubicBezierCurve3(v0: Vector3, v1: Vector3, v2: Vector3, v3: Vector3) : Curve { +open external class CubicBezierCurve3(v0: Vector3, v1: Vector3, v2: Vector3, v3: Vector3) : Curve { override var type: String open var v0: Vector3 open var v1: Vector3 diff --git a/src/mapMain/kotlin/externals/threejs/CubicInterpolant.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CubicInterpolant.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/CubicInterpolant.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CubicInterpolant.module_three.kt index 38d05ee..737c05f 100644 --- a/src/mapMain/kotlin/externals/threejs/CubicInterpolant.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CubicInterpolant.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class CubicInterpolant(parameterPositions: Any, samplesValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) : Interpolant { +open external class CubicInterpolant(parameterPositions: Any, samplesValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) : Interpolant { open fun interpolate_(i1: Number, t0: Number, t: Number, t1: Number): Any } diff --git a/src/mapMain/kotlin/externals/threejs/Curve.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Curve.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/Curve.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Curve.module_three.kt index 1cc84a2..6a05bf8 100644 --- a/src/mapMain/kotlin/externals/threejs/Curve.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Curve.module_three.kt @@ -9,7 +9,7 @@ external interface AnonymousStruct60 { var binormals: Array } -external open class Curve { +open external class Curve { open var type: String open var arcLengthDivisions: Number open fun getPoint(t: Number, optionalTarget: T = definedExternally): T diff --git a/src/mapMain/kotlin/externals/threejs/CurvePath.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CurvePath.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/CurvePath.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CurvePath.module_three.kt index 0513a80..0f08578 100644 --- a/src/mapMain/kotlin/externals/threejs/CurvePath.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CurvePath.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class CurvePath : Curve { +open external class CurvePath : Curve { override var type: String open var curves: Array> open var autoClose: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/CylinderGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/CylinderGeometry.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/CylinderGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/CylinderGeometry.module_three.kt index f2ba4ab..ff2d110 100644 --- a/src/mapMain/kotlin/externals/threejs/CylinderGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/CylinderGeometry.module_three.kt @@ -14,7 +14,7 @@ external interface AnonymousStruct64 { var thetaLength: Number } -external open class CylinderGeometry(radiusTop: Number = definedExternally, radiusBottom: Number = definedExternally, height: Number = definedExternally, radialSegments: Number = definedExternally, heightSegments: Number = definedExternally, openEnded: Boolean = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : BufferGeometry { +open external class CylinderGeometry(radiusTop: Number = definedExternally, radiusBottom: Number = definedExternally, height: Number = definedExternally, radialSegments: Number = definedExternally, heightSegments: Number = definedExternally, openEnded: Boolean = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct64 diff --git a/src/mapMain/kotlin/externals/threejs/Cylindrical.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Cylindrical.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/Cylindrical.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Cylindrical.module_three.kt index 3f6616a..ef8c1dd 100644 --- a/src/mapMain/kotlin/externals/threejs/Cylindrical.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Cylindrical.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Cylindrical(radius: Number = definedExternally, theta: Number = definedExternally, y: Number = definedExternally) { +open external class Cylindrical(radius: Number = definedExternally, theta: Number = definedExternally, y: Number = definedExternally) { open var radius: Number open var theta: Number open var y: Number diff --git a/src/mapMain/kotlin/externals/threejs/DataTexture.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DataTexture.module_three.kt similarity index 99% rename from src/mapMain/kotlin/externals/threejs/DataTexture.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DataTexture.module_three.kt index b2b2611..5f17224 100644 --- a/src/mapMain/kotlin/externals/threejs/DataTexture.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DataTexture.module_three.kt @@ -6,7 +6,7 @@ package externals.threejs import org.khronos.webgl.ArrayBuffer import org.khronos.webgl.ArrayBufferView -external open class DataTexture : Texture { +open external class DataTexture : Texture { constructor(data: ArrayBufferView, width: Number, height: Number, format: PixelFormat = definedExternally, type: TextureDataType = definedExternally, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, anisotropy: Number = definedExternally, encoding: TextureEncoding = definedExternally) constructor(data: ArrayBufferView, width: Number, height: Number) constructor(data: ArrayBufferView, width: Number, height: Number, format: PixelFormat = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/DataTexture2DArray.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DataTexture2DArray.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/DataTexture2DArray.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DataTexture2DArray.module_three.kt index d7946b1..ee59195 100644 --- a/src/mapMain/kotlin/externals/threejs/DataTexture2DArray.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DataTexture2DArray.module_three.kt @@ -6,7 +6,7 @@ package externals.threejs import org.khronos.webgl.ArrayBuffer import org.khronos.webgl.ArrayBufferView -external open class DataTexture2DArray : Texture { +open external class DataTexture2DArray : Texture { constructor(data: ArrayBufferView = definedExternally, width: Number = definedExternally, height: Number = definedExternally, depth: Number = definedExternally) constructor() constructor(data: ArrayBufferView = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/DataTexture3D.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DataTexture3D.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/DataTexture3D.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DataTexture3D.module_three.kt index 45eada1..713828d 100644 --- a/src/mapMain/kotlin/externals/threejs/DataTexture3D.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DataTexture3D.module_three.kt @@ -6,7 +6,7 @@ package externals.threejs import org.khronos.webgl.ArrayBuffer import org.khronos.webgl.ArrayBufferView -external open class DataTexture3D : Texture { +open external class DataTexture3D : Texture { constructor(data: ArrayBufferView, width: Number, height: Number, depth: Number) constructor(data: ArrayBuffer, width: Number, height: Number, depth: Number) diff --git a/src/mapMain/kotlin/externals/threejs/DataTextureLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DataTextureLoader.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/DataTextureLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DataTextureLoader.module_three.kt index d822596..407866f 100644 --- a/src/mapMain/kotlin/externals/threejs/DataTextureLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DataTextureLoader.module_three.kt @@ -6,6 +6,6 @@ package externals.threejs import org.w3c.dom.ErrorEvent import org.w3c.xhr.ProgressEvent -external open class DataTextureLoader(manager: LoadingManager = definedExternally) : Loader { +open external class DataTextureLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(url: String, onLoad: (dataTexture: DataTexture, texData: Any?) -> Unit, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally): DataTexture } diff --git a/src/mapMain/kotlin/externals/threejs/DataUtils.DataUtils.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DataUtils.DataUtils.module_three.kt similarity index 100% rename from src/mapMain/kotlin/externals/threejs/DataUtils.DataUtils.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DataUtils.DataUtils.module_three.kt diff --git a/src/mapMain/kotlin/externals/threejs/DepthTexture.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DepthTexture.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/DepthTexture.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DepthTexture.module_three.kt index 3a017d6..ab05cc4 100644 --- a/src/mapMain/kotlin/externals/threejs/DepthTexture.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DepthTexture.module_three.kt @@ -8,7 +8,7 @@ external interface AnonymousStruct50 { var height: Number } -external open class DepthTexture(width: Number, height: Number, type: TextureDataType = definedExternally, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, anisotropy: Number = definedExternally) : Texture { +open external class DepthTexture(width: Number, height: Number, type: TextureDataType = definedExternally, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, anisotropy: Number = definedExternally) : Texture { override var image: Any override var flipY: Boolean override var generateMipmaps: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/DirectionalLight.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DirectionalLight.module_three.kt similarity index 94% rename from src/mapMain/kotlin/externals/threejs/DirectionalLight.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DirectionalLight.module_three.kt index 527b7a8..add5c28 100644 --- a/src/mapMain/kotlin/externals/threejs/DirectionalLight.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DirectionalLight.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class DirectionalLight : Light { +open external class DirectionalLight : Light { constructor(color: Color = definedExternally, intensity: Number = definedExternally) constructor() constructor(color: Color = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/DirectionalLightHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DirectionalLightHelper.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/DirectionalLightHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DirectionalLightHelper.module_three.kt index fd4d1d2..1467084 100644 --- a/src/mapMain/kotlin/externals/threejs/DirectionalLightHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DirectionalLightHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class DirectionalLightHelper : Object3D { +open external class DirectionalLightHelper : Object3D { constructor(light: DirectionalLight, size: Number = definedExternally, color: Color = definedExternally) constructor(light: DirectionalLight) constructor(light: DirectionalLight, size: Number = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/DirectionalLightShadow.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DirectionalLightShadow.module_three.kt similarity index 81% rename from src/mapMain/kotlin/externals/threejs/DirectionalLightShadow.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DirectionalLightShadow.module_three.kt index 2dac275..897c082 100644 --- a/src/mapMain/kotlin/externals/threejs/DirectionalLightShadow.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DirectionalLightShadow.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class DirectionalLightShadow(camera: Camera) : LightShadow { +open external class DirectionalLightShadow(camera: Camera) : LightShadow { override var camera: Camera open var isDirectionalLightShadow: Boolean } diff --git a/src/mapMain/kotlin/externals/threejs/DiscreteInterpolant.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DiscreteInterpolant.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/DiscreteInterpolant.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DiscreteInterpolant.module_three.kt index f7e126b..27d8cff 100644 --- a/src/mapMain/kotlin/externals/threejs/DiscreteInterpolant.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DiscreteInterpolant.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class DiscreteInterpolant(parameterPositions: Any, samplesValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) : Interpolant { +open external class DiscreteInterpolant(parameterPositions: Any, samplesValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) : Interpolant { open fun interpolate_(i1: Number, t0: Number, t: Number, t1: Number): Any } diff --git a/src/mapMain/kotlin/externals/threejs/DodecahedronGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/DodecahedronGeometry.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/DodecahedronGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/DodecahedronGeometry.module_three.kt index c1da716..9d511d1 100644 --- a/src/mapMain/kotlin/externals/threejs/DodecahedronGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/DodecahedronGeometry.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class DodecahedronGeometry(radius: Number = definedExternally, detail: Number = definedExternally) : PolyhedronGeometry { +open external class DodecahedronGeometry(radius: Number = definedExternally, detail: Number = definedExternally) : PolyhedronGeometry { override var type: String companion object { diff --git a/src/mapMain/kotlin/externals/threejs/EdgesGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/EdgesGeometry.module_three.kt similarity index 85% rename from src/mapMain/kotlin/externals/threejs/EdgesGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/EdgesGeometry.module_three.kt index 7dd10b2..ffd4f4d 100644 --- a/src/mapMain/kotlin/externals/threejs/EdgesGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/EdgesGeometry.module_three.kt @@ -7,7 +7,7 @@ external interface AnonymousStruct66 { var thresholdAngle: Number } -external open class EdgesGeometry(geometry: BufferGeometry, thresholdAngle: Number = definedExternally) : BufferGeometry { +open external class EdgesGeometry(geometry: BufferGeometry, thresholdAngle: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct66 } diff --git a/src/mapMain/kotlin/externals/threejs/EllipseCurve.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/EllipseCurve.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/EllipseCurve.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/EllipseCurve.module_three.kt index 237ce21..5836d72 100644 --- a/src/mapMain/kotlin/externals/threejs/EllipseCurve.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/EllipseCurve.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class EllipseCurve(aX: Number, aY: Number, xRadius: Number, yRadius: Number, aStartAngle: Number, aEndAngle: Number, aClockwise: Boolean, aRotation: Number) : Curve { +open external class EllipseCurve(aX: Number, aY: Number, xRadius: Number, yRadius: Number, aStartAngle: Number, aEndAngle: Number, aClockwise: Boolean, aRotation: Number) : Curve { override var type: String open var aX: Number open var aY: Number diff --git a/src/mapMain/kotlin/externals/threejs/Euler.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Euler.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/Euler.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Euler.module_three.kt index 28c12bf..3d54feb 100644 --- a/src/mapMain/kotlin/externals/threejs/Euler.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Euler.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Euler(x: Number = definedExternally, y: Number = definedExternally, z: Number = definedExternally, order: String = definedExternally) { +open external class Euler(x: Number = definedExternally, y: Number = definedExternally, z: Number = definedExternally, order: String = definedExternally) { open var x: Number open var y: Number open var z: Number diff --git a/src/mapMain/kotlin/externals/threejs/ExtrudeGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ExtrudeGeometry.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/ExtrudeGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ExtrudeGeometry.module_three.kt index de1de73..479a31a 100644 --- a/src/mapMain/kotlin/externals/threejs/ExtrudeGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ExtrudeGeometry.module_three.kt @@ -41,7 +41,7 @@ external interface UVGenerator { fun generateSideWallUV(geometry: ExtrudeGeometry, vertices: Array, indexA: Number, indexB: Number, indexC: Number, indexD: Number): Array } -external open class ExtrudeGeometry : BufferGeometry { +open external class ExtrudeGeometry : BufferGeometry { constructor(shapes: Shape, options: ExtrudeGeometryOptions = definedExternally) constructor(shapes: Shape) constructor(shapes: Array, options: ExtrudeGeometryOptions = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/FileLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/FileLoader.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/FileLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/FileLoader.module_three.kt index 5f85353..a09c99a 100644 --- a/src/mapMain/kotlin/externals/threejs/FileLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/FileLoader.module_three.kt @@ -7,7 +7,7 @@ import org.w3c.dom.ErrorEvent import org.w3c.dom.MimeType import org.w3c.xhr.ProgressEvent -external open class FileLoader(manager: LoadingManager = definedExternally) : Loader { +open external class FileLoader(manager: LoadingManager = definedExternally) : Loader { open var mimeType: MimeType? open var responseType: String? open fun load(url: String, onLoad: (response: Any /* String | ArrayBuffer */) -> Unit = definedExternally, onProgress: (request: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally): Any diff --git a/src/mapMain/kotlin/externals/threejs/Fog.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Fog.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/Fog.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Fog.module_three.kt index 2105e7e..9313ee2 100644 --- a/src/mapMain/kotlin/externals/threejs/Fog.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Fog.module_three.kt @@ -10,7 +10,7 @@ external interface FogBase { fun toJSON(): Any } -external open class Fog : FogBase { +open external class Fog : FogBase { constructor(color: Color, near: Number = definedExternally, far: Number = definedExternally) constructor(color: Color) constructor(color: Color, near: Number = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/FogExp2.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/FogExp2.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/FogExp2.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/FogExp2.module_three.kt index 6203b44..5a8ad5e 100644 --- a/src/mapMain/kotlin/externals/threejs/FogExp2.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/FogExp2.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class FogExp2 : FogBase { +open external class FogExp2 : FogBase { constructor(hex: Number, density: Number = definedExternally) constructor(hex: Number) constructor(hex: String, density: Number = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/Font.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Font.module_three.kt similarity index 87% rename from src/mapMain/kotlin/externals/threejs/Font.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Font.module_three.kt index 63526d6..7f69404 100644 --- a/src/mapMain/kotlin/externals/threejs/Font.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Font.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Font(jsondata: Any) { +open external class Font(jsondata: Any) { open var type: String open var data: String open fun generateShapes(text: String, size: Number): Array diff --git a/src/mapMain/kotlin/externals/threejs/FontLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/FontLoader.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/FontLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/FontLoader.module_three.kt index c1763da..ce8f890 100644 --- a/src/mapMain/kotlin/externals/threejs/FontLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/FontLoader.module_three.kt @@ -6,7 +6,7 @@ package externals.threejs import org.w3c.dom.ErrorEvent import org.w3c.xhr.ProgressEvent -external open class FontLoader(manager: LoadingManager = definedExternally) : Loader { +open external class FontLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(url: String, onLoad: (responseFont: Font) -> Unit = definedExternally, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally) open fun parse(json: Any): Font } diff --git a/src/mapMain/kotlin/externals/threejs/Frustum.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Frustum.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/Frustum.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Frustum.module_three.kt index c269f10..02c608d 100644 --- a/src/mapMain/kotlin/externals/threejs/Frustum.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Frustum.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Frustum(p0: Plane = definedExternally, p1: Plane = definedExternally, p2: Plane = definedExternally, p3: Plane = definedExternally, p4: Plane = definedExternally, p5: Plane = definedExternally) { +open external class Frustum(p0: Plane = definedExternally, p1: Plane = definedExternally, p2: Plane = definedExternally, p3: Plane = definedExternally, p4: Plane = definedExternally, p5: Plane = definedExternally) { open var planes: Array open fun set(p0: Plane, p1: Plane, p2: Plane, p3: Plane, p4: Plane, p5: Plane): Frustum open fun clone(): Frustum /* this */ diff --git a/src/mapMain/kotlin/externals/threejs/GLBufferAttribute.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/GLBufferAttribute.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/GLBufferAttribute.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/GLBufferAttribute.module_three.kt index faa4358..b9ca317 100644 --- a/src/mapMain/kotlin/externals/threejs/GLBufferAttribute.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/GLBufferAttribute.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLBuffer -external open class GLBufferAttribute(buffer: WebGLBuffer, type: Number, itemSize: Number, elementSize: Number /* 1 | 2 | 4 */, count: Number) { +open external class GLBufferAttribute(buffer: WebGLBuffer, type: Number, itemSize: Number, elementSize: Number /* 1 | 2 | 4 */, count: Number) { open var buffer: WebGLBuffer open var type: Number open var itemSize: Number diff --git a/src/mapMain/kotlin/externals/threejs/GridHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/GridHelper.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/GridHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/GridHelper.module_three.kt index 518ee57..6837156 100644 --- a/src/mapMain/kotlin/externals/threejs/GridHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/GridHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class GridHelper : LineSegments { +open external class GridHelper : LineSegments { constructor(size: Number = definedExternally, divisions: Number = definedExternally, color1: Color = definedExternally, color2: Color = definedExternally) constructor() constructor(size: Number = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/Group.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Group.module_three.kt similarity index 86% rename from src/mapMain/kotlin/externals/threejs/Group.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Group.module_three.kt index 5238c41..a73ffae 100644 --- a/src/mapMain/kotlin/externals/threejs/Group.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Group.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Group : Object3D { +open external class Group : Object3D { override var type: String /* "Group" */ open var isGroup: Boolean } diff --git a/src/mapMain/kotlin/externals/threejs/HemisphereLight.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/HemisphereLight.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/HemisphereLight.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/HemisphereLight.module_three.kt index 1432b3f..9db30dd 100644 --- a/src/mapMain/kotlin/externals/threejs/HemisphereLight.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/HemisphereLight.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class HemisphereLight : Light { +open external class HemisphereLight : Light { constructor(skyColor: Color = definedExternally, groundColor: Color = definedExternally, intensity: Number = definedExternally) constructor() constructor(skyColor: Color = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/HemisphereLightHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/HemisphereLightHelper.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/HemisphereLightHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/HemisphereLightHelper.module_three.kt index 8c4501d..673912f 100644 --- a/src/mapMain/kotlin/externals/threejs/HemisphereLightHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/HemisphereLightHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class HemisphereLightHelper : Object3D { +open external class HemisphereLightHelper : Object3D { constructor(light: HemisphereLight, size: Number, color: Color = definedExternally) constructor(light: HemisphereLight, size: Number) constructor(light: HemisphereLight, size: Number, color: String = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/HemisphereLightProbe.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/HemisphereLightProbe.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/HemisphereLightProbe.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/HemisphereLightProbe.module_three.kt index c505532..135e7b3 100644 --- a/src/mapMain/kotlin/externals/threejs/HemisphereLightProbe.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/HemisphereLightProbe.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class HemisphereLightProbe : LightProbe { +open external class HemisphereLightProbe : LightProbe { constructor(skyColor: Color = definedExternally, groundColor: Color = definedExternally, intensity: Number = definedExternally) constructor() constructor(skyColor: Color = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/IcosahedronGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/IcosahedronGeometry.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/IcosahedronGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/IcosahedronGeometry.module_three.kt index 8777f01..f05f4ea 100644 --- a/src/mapMain/kotlin/externals/threejs/IcosahedronGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/IcosahedronGeometry.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class IcosahedronGeometry(radius: Number = definedExternally, detail: Number = definedExternally) : PolyhedronGeometry { +open external class IcosahedronGeometry(radius: Number = definedExternally, detail: Number = definedExternally) : PolyhedronGeometry { override var type: String companion object { diff --git a/src/mapMain/kotlin/externals/threejs/ImageBitmapLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ImageBitmapLoader.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/ImageBitmapLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ImageBitmapLoader.module_three.kt index ecfe23e..747b372 100644 --- a/src/mapMain/kotlin/externals/threejs/ImageBitmapLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ImageBitmapLoader.module_three.kt @@ -7,7 +7,7 @@ import org.w3c.dom.ErrorEvent import org.w3c.dom.ImageBitmap import org.w3c.xhr.ProgressEvent -external open class ImageBitmapLoader(manager: LoadingManager = definedExternally) : Loader { +open external class ImageBitmapLoader(manager: LoadingManager = definedExternally) : Loader { open var options: Any? open var isImageBitmapLoader: Boolean open fun setOptions(options: Any?): ImageBitmapLoader diff --git a/src/mapMain/kotlin/externals/threejs/ImageLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ImageLoader.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/ImageLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ImageLoader.module_three.kt index ff668cd..c5be282 100644 --- a/src/mapMain/kotlin/externals/threejs/ImageLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ImageLoader.module_three.kt @@ -7,6 +7,6 @@ import org.w3c.dom.ErrorEvent import org.w3c.dom.HTMLImageElement import org.w3c.xhr.ProgressEvent -external open class ImageLoader(manager: LoadingManager = definedExternally) : Loader { +open external class ImageLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(url: String, onLoad: (image: HTMLImageElement) -> Unit = definedExternally, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally): HTMLImageElement } diff --git a/src/mapMain/kotlin/externals/threejs/ImageUtils.ImageUtils.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ImageUtils.ImageUtils.module_three.kt similarity index 100% rename from src/mapMain/kotlin/externals/threejs/ImageUtils.ImageUtils.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ImageUtils.ImageUtils.module_three.kt diff --git a/src/mapMain/kotlin/externals/threejs/ImmediateRenderObject.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ImmediateRenderObject.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/ImmediateRenderObject.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ImmediateRenderObject.module_three.kt index 520472c..cdbf3a8 100644 --- a/src/mapMain/kotlin/externals/threejs/ImmediateRenderObject.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ImmediateRenderObject.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.Float32Array -external open class ImmediateRenderObject(material: Material) : Object3D { +open external class ImmediateRenderObject(material: Material) : Object3D { open var isImmediateRenderObject: Boolean open var material: Material open var hasPositions: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/InstancedBufferAttribute.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/InstancedBufferAttribute.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/InstancedBufferAttribute.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/InstancedBufferAttribute.module_three.kt index dc54969..4bebd4b 100644 --- a/src/mapMain/kotlin/externals/threejs/InstancedBufferAttribute.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/InstancedBufferAttribute.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class InstancedBufferAttribute(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally, meshPerAttribute: Number = definedExternally) : BufferAttribute { +open external class InstancedBufferAttribute(array: ArrayLike, itemSize: Number, normalized: Boolean = definedExternally, meshPerAttribute: Number = definedExternally) : BufferAttribute { open var meshPerAttribute: Number } diff --git a/src/mapMain/kotlin/externals/threejs/InstancedBufferGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/InstancedBufferGeometry.module_three.kt similarity index 85% rename from src/mapMain/kotlin/externals/threejs/InstancedBufferGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/InstancedBufferGeometry.module_three.kt index 60193f7..a9d438b 100644 --- a/src/mapMain/kotlin/externals/threejs/InstancedBufferGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/InstancedBufferGeometry.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class InstancedBufferGeometry : BufferGeometry { +open external class InstancedBufferGeometry : BufferGeometry { override var type: String open var isInstancedBufferGeometry: Boolean open var instanceCount: Number diff --git a/src/mapMain/kotlin/externals/threejs/InstancedInterleavedBuffer.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/InstancedInterleavedBuffer.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/InstancedInterleavedBuffer.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/InstancedInterleavedBuffer.module_three.kt index 7c70dc3..1e504c5 100644 --- a/src/mapMain/kotlin/externals/threejs/InstancedInterleavedBuffer.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/InstancedInterleavedBuffer.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class InstancedInterleavedBuffer(array: ArrayLike, stride: Number, meshPerAttribute: Number = definedExternally) : InterleavedBuffer { +open external class InstancedInterleavedBuffer(array: ArrayLike, stride: Number, meshPerAttribute: Number = definedExternally) : InterleavedBuffer { open var meshPerAttribute: Number } diff --git a/src/mapMain/kotlin/externals/threejs/InstancedMesh.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/InstancedMesh.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/InstancedMesh.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/InstancedMesh.module_three.kt index 4248ab5..3915291 100644 --- a/src/mapMain/kotlin/externals/threejs/InstancedMesh.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/InstancedMesh.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class InstancedMesh(geometry: BufferGeometry?, material: dynamic, count: Number) : Mesh { +open external class InstancedMesh(geometry: BufferGeometry?, material: dynamic, count: Number) : Mesh { open var count: Number open var instanceColor: BufferAttribute? open var instanceMatrix: BufferAttribute diff --git a/src/mapMain/kotlin/externals/threejs/InterleavedBuffer.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/InterleavedBuffer.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/InterleavedBuffer.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/InterleavedBuffer.module_three.kt index 2fc569b..64e22d9 100644 --- a/src/mapMain/kotlin/externals/threejs/InterleavedBuffer.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/InterleavedBuffer.module_three.kt @@ -10,7 +10,7 @@ external interface AnonymousStruct49 { var stride: Number } -external open class InterleavedBuffer(array: ArrayLike, stride: Number) { +open external class InterleavedBuffer(array: ArrayLike, stride: Number) { open var array: ArrayLike open var stride: Number open var usage: Usage diff --git a/src/mapMain/kotlin/externals/threejs/InterleavedBufferAttribute.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/InterleavedBufferAttribute.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/InterleavedBufferAttribute.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/InterleavedBufferAttribute.module_three.kt index 325ccca..314506a 100644 --- a/src/mapMain/kotlin/externals/threejs/InterleavedBufferAttribute.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/InterleavedBufferAttribute.module_three.kt @@ -11,7 +11,7 @@ external interface AnonymousStruct48 { var normalized: Boolean } -external open class InterleavedBufferAttribute(interleavedBuffer: InterleavedBuffer, itemSize: Number, offset: Number, normalized: Boolean = definedExternally) { +open external class InterleavedBufferAttribute(interleavedBuffer: InterleavedBuffer, itemSize: Number, offset: Number, normalized: Boolean = definedExternally) { open var name: String open var data: InterleavedBuffer open var itemSize: Number diff --git a/src/mapMain/kotlin/externals/threejs/Interpolant.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Interpolant.module_three.kt similarity index 86% rename from src/mapMain/kotlin/externals/threejs/Interpolant.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Interpolant.module_three.kt index 5ef823f..1b75d20 100644 --- a/src/mapMain/kotlin/externals/threejs/Interpolant.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Interpolant.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Interpolant(parameterPositions: Any, sampleValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) { +open external class Interpolant(parameterPositions: Any, sampleValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) { open var parameterPositions: Any open var sampleValues: Any open var valueSize: Number diff --git a/src/mapMain/kotlin/externals/threejs/KeyframeTrack.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/KeyframeTrack.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/KeyframeTrack.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/KeyframeTrack.module_three.kt index b633416..ac9b964 100644 --- a/src/mapMain/kotlin/externals/threejs/KeyframeTrack.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/KeyframeTrack.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.Float32Array -external open class KeyframeTrack(name: String, times: ArrayLike, values: ArrayLike, interpolation: InterpolationModes = definedExternally) { +open external class KeyframeTrack(name: String, times: ArrayLike, values: ArrayLike, interpolation: InterpolationModes = definedExternally) { open var name: String open var times: Float32Array open var values: Float32Array diff --git a/src/mapMain/kotlin/externals/threejs/LOD.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LOD.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/LOD.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LOD.module_three.kt index 61b597d..de2582a 100644 --- a/src/mapMain/kotlin/externals/threejs/LOD.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LOD.module_three.kt @@ -8,7 +8,7 @@ external interface AnonymousStruct83 { var `object`: Object3D } -external open class LOD : Object3D { +open external class LOD : Object3D { override var type: String /* "LOD" */ open var levels: Array open var autoUpdate: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/LatheGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LatheGeometry.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/LatheGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LatheGeometry.module_three.kt index d5232d0..0873533 100644 --- a/src/mapMain/kotlin/externals/threejs/LatheGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LatheGeometry.module_three.kt @@ -10,7 +10,7 @@ external interface AnonymousStruct67 { var phiLength: Number } -external open class LatheGeometry(points: Array, segments: Number = definedExternally, phiStart: Number = definedExternally, phiLength: Number = definedExternally) : BufferGeometry { +open external class LatheGeometry(points: Array, segments: Number = definedExternally, phiStart: Number = definedExternally, phiLength: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct67 diff --git a/src/mapMain/kotlin/externals/threejs/Layers.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Layers.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/Layers.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Layers.module_three.kt index b51ec8c..8356761 100644 --- a/src/mapMain/kotlin/externals/threejs/Layers.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Layers.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Layers { +open external class Layers { open var mask: Number open fun set(channel: Number) open fun enable(channel: Number) diff --git a/src/mapMain/kotlin/externals/threejs/Light.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Light.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/Light.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Light.module_three.kt index 75c5da2..e7024aa 100644 --- a/src/mapMain/kotlin/externals/threejs/Light.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Light.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Light : Object3D { +open external class Light : Object3D { constructor(hex: Number = definedExternally, intensity: Number = definedExternally) constructor() constructor(hex: Number = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/LightProbe.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LightProbe.module_three.kt similarity index 85% rename from src/mapMain/kotlin/externals/threejs/LightProbe.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LightProbe.module_three.kt index e03fff9..e32222b 100644 --- a/src/mapMain/kotlin/externals/threejs/LightProbe.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LightProbe.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class LightProbe(sh: SphericalHarmonics3 = definedExternally, intensity: Number = definedExternally) : Light { +open external class LightProbe(sh: SphericalHarmonics3 = definedExternally, intensity: Number = definedExternally) : Light { override var type: String open var isLightProbe: Boolean open var sh: SphericalHarmonics3 diff --git a/src/mapMain/kotlin/externals/threejs/LightShadow.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LightShadow.module_three.kt similarity index 94% rename from src/mapMain/kotlin/externals/threejs/LightShadow.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LightShadow.module_three.kt index e0ea41d..58ce615 100644 --- a/src/mapMain/kotlin/externals/threejs/LightShadow.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LightShadow.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class LightShadow(camera: Camera) { +open external class LightShadow(camera: Camera) { open var camera: Camera open var bias: Number open var normalBias: Number diff --git a/src/mapMain/kotlin/externals/threejs/Line.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Line.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/Line.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Line.module_three.kt index 5f40a2a..8e8d298 100644 --- a/src/mapMain/kotlin/externals/threejs/Line.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Line.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Line(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally) : Object3D { +open external class Line(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally) : Object3D { open var geometry: BufferGeometry open var material: dynamic override var type: String /* "Line" | "LineLoop" | "LineSegments" | String */ diff --git a/src/mapMain/kotlin/externals/threejs/Line3.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Line3.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/Line3.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Line3.module_three.kt index 8dfc38b..2effbf8 100644 --- a/src/mapMain/kotlin/externals/threejs/Line3.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Line3.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Line3(start: Vector3 = definedExternally, end: Vector3 = definedExternally) { +open external class Line3(start: Vector3 = definedExternally, end: Vector3 = definedExternally) { open var start: Vector3 open var end: Vector3 open fun set(start: Vector3 = definedExternally, end: Vector3 = definedExternally): Line3 diff --git a/src/mapMain/kotlin/externals/threejs/LineBasicMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LineBasicMaterial.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/LineBasicMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LineBasicMaterial.module_three.kt index b8a79b7..119a26a 100644 --- a/src/mapMain/kotlin/externals/threejs/LineBasicMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LineBasicMaterial.module_three.kt @@ -18,7 +18,7 @@ external interface LineBasicMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class LineBasicMaterial(parameters: LineBasicMaterialParameters = definedExternally) : Material { +open external class LineBasicMaterial(parameters: LineBasicMaterialParameters = definedExternally) : Material { override var type: String open var color: Color open var linewidth: Number diff --git a/src/mapMain/kotlin/externals/threejs/LineCurve.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LineCurve.module_three.kt similarity index 80% rename from src/mapMain/kotlin/externals/threejs/LineCurve.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LineCurve.module_three.kt index d100b5c..f7b12c2 100644 --- a/src/mapMain/kotlin/externals/threejs/LineCurve.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LineCurve.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class LineCurve(v1: Vector2, v2: Vector2) : Curve { +open external class LineCurve(v1: Vector2, v2: Vector2) : Curve { override var type: String open var v1: Vector2 open var v2: Vector2 diff --git a/src/mapMain/kotlin/externals/threejs/LineCurve3.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LineCurve3.module_three.kt similarity index 80% rename from src/mapMain/kotlin/externals/threejs/LineCurve3.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LineCurve3.module_three.kt index 147fc41..8974164 100644 --- a/src/mapMain/kotlin/externals/threejs/LineCurve3.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LineCurve3.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class LineCurve3(v1: Vector3, v2: Vector3) : Curve { +open external class LineCurve3(v1: Vector3, v2: Vector3) : Curve { override var type: String open var v1: Vector3 open var v2: Vector3 diff --git a/src/mapMain/kotlin/externals/threejs/LineDashedMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LineDashedMaterial.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/LineDashedMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LineDashedMaterial.module_three.kt index b5322f9..b4a64f5 100644 --- a/src/mapMain/kotlin/externals/threejs/LineDashedMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LineDashedMaterial.module_three.kt @@ -15,7 +15,7 @@ external interface LineDashedMaterialParameters : LineBasicMaterialParameters { set(value) = definedExternally } -external open class LineDashedMaterial(parameters: LineDashedMaterialParameters = definedExternally) : LineBasicMaterial { +open external class LineDashedMaterial(parameters: LineDashedMaterialParameters = definedExternally) : LineBasicMaterial { override var type: String open var scale: Number open var dashSize: Number diff --git a/src/mapMain/kotlin/externals/threejs/LineLoop.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LineLoop.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/LineLoop.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LineLoop.module_three.kt index 2209b4d..2622df5 100644 --- a/src/mapMain/kotlin/externals/threejs/LineLoop.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LineLoop.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class LineLoop(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally) : Line { +open external class LineLoop(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally) : Line { override var type: String /* "LineLoop" */ open var isLineLoop: Boolean } diff --git a/src/mapMain/kotlin/externals/threejs/LineSegments.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LineSegments.module_three.kt similarity index 86% rename from src/mapMain/kotlin/externals/threejs/LineSegments.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LineSegments.module_three.kt index 686c6aa..82306f1 100644 --- a/src/mapMain/kotlin/externals/threejs/LineSegments.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LineSegments.module_three.kt @@ -7,7 +7,7 @@ external var LineStrip: Number external var LinePieces: Number -external open class LineSegments(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally) : Line { +open external class LineSegments(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally) : Line { override var type: String /* "LineSegments" | String */ open var isLineSegments: Boolean } diff --git a/src/mapMain/kotlin/externals/threejs/LinearInterpolant.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LinearInterpolant.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/LinearInterpolant.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LinearInterpolant.module_three.kt index de55f02..4ff3222 100644 --- a/src/mapMain/kotlin/externals/threejs/LinearInterpolant.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LinearInterpolant.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class LinearInterpolant(parameterPositions: Any, samplesValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) : Interpolant { +open external class LinearInterpolant(parameterPositions: Any, samplesValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) : Interpolant { open fun interpolate_(i1: Number, t0: Number, t: Number, t1: Number): Any } diff --git a/externals/src/jsMain/kotlin/externals/threejs/Loader.kt b/externals/src/jsMain/kotlin/externals/threejs/Loader.kt new file mode 100644 index 0000000..d01f6ed --- /dev/null +++ b/externals/src/jsMain/kotlin/externals/threejs/Loader.kt @@ -0,0 +1,7 @@ +package externals.threejs + +inline operator fun AnonymousStruct77.get(header: String): String? = asDynamic()[header].unsafeCast() + +inline operator fun AnonymousStruct77.set(header: String, value: String) { + asDynamic()[header] = value +} diff --git a/src/mapMain/kotlin/externals/threejs/Loader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Loader.module_three.kt similarity index 79% rename from src/mapMain/kotlin/externals/threejs/Loader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Loader.module_three.kt index f414281..589959a 100644 --- a/src/mapMain/kotlin/externals/threejs/Loader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Loader.module_three.kt @@ -6,15 +6,9 @@ package externals.threejs import org.w3c.xhr.ProgressEvent import kotlin.js.Promise -external interface AnonymousStruct77 { - @nativeGetter - operator fun get(header: String): String? - - @nativeSetter - operator fun set(header: String, value: String) -} +external interface AnonymousStruct77 -external open class Loader(manager: LoadingManager = definedExternally) { +open external class Loader(manager: LoadingManager = definedExternally) { open var crossOrigin: String open var withCredentials: Boolean open var path: String diff --git a/src/mapMain/kotlin/externals/threejs/LoaderUtils.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LoaderUtils.module_three.kt similarity index 100% rename from src/mapMain/kotlin/externals/threejs/LoaderUtils.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LoaderUtils.module_three.kt diff --git a/src/mapMain/kotlin/externals/threejs/LoadingManager.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/LoadingManager.module_three.kt similarity index 94% rename from src/mapMain/kotlin/externals/threejs/LoadingManager.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/LoadingManager.module_three.kt index 3c0f128..3b30781 100644 --- a/src/mapMain/kotlin/externals/threejs/LoadingManager.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/LoadingManager.module_three.kt @@ -7,7 +7,7 @@ import kotlin.js.RegExp external var DefaultLoadingManager: LoadingManager -external open class LoadingManager(onLoad: () -> Unit = definedExternally, onProgress: (url: String, loaded: Number, total: Number) -> Unit = definedExternally, onError: (url: String) -> Unit = definedExternally) { +open external class LoadingManager(onLoad: () -> Unit = definedExternally, onProgress: (url: String, loaded: Number, total: Number) -> Unit = definedExternally, onError: (url: String) -> Unit = definedExternally) { open var onStart: ((url: String, loaded: Number, total: Number) -> Unit)? open var onLoad: () -> Unit open var onProgress: (url: String, loaded: Number, total: Number) -> Unit diff --git a/src/mapMain/kotlin/externals/threejs/MTLLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MTLLoader.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/MTLLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MTLLoader.module_three.kt index f782ef2..6a6edec 100644 --- a/src/mapMain/kotlin/externals/threejs/MTLLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MTLLoader.module_three.kt @@ -11,7 +11,7 @@ external class MaterialCreator { val materials: StringDict } -external open class MTLLoader(manager: LoadingManager = definedExternally) : Loader { +open external class MTLLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(url: String, onLoad: (mesh: MaterialCreator) -> Unit = definedExternally, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally) open fun parse(text: String, path: String): MaterialCreator } diff --git a/src/mapMain/kotlin/externals/threejs/Material.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Material.module_three.kt similarity index 99% rename from src/mapMain/kotlin/externals/threejs/Material.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Material.module_three.kt index bfb3575..69c4c95 100644 --- a/src/mapMain/kotlin/externals/threejs/Material.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Material.module_three.kt @@ -131,7 +131,7 @@ external interface MaterialParameters { set(value) = definedExternally } -external open class Material : EventTarget { +open external class Material : EventTarget { open var alphaTest: Number open var alphaToCoverage: Boolean open var blendDst: BlendingDstFactor diff --git a/externals/src/jsMain/kotlin/externals/threejs/MaterialLoader.kt b/externals/src/jsMain/kotlin/externals/threejs/MaterialLoader.kt new file mode 100644 index 0000000..5139df9 --- /dev/null +++ b/externals/src/jsMain/kotlin/externals/threejs/MaterialLoader.kt @@ -0,0 +1,7 @@ +package externals.threejs + +inline operator fun AnonymousStruct80.get(key: String): Texture? = asDynamic()[key].unsafeCast() + +inline operator fun AnonymousStruct80.set(key: String, value: Texture) { + asDynamic()[key] = value +} diff --git a/src/mapMain/kotlin/externals/threejs/MaterialLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MaterialLoader.module_three.kt similarity index 73% rename from src/mapMain/kotlin/externals/threejs/MaterialLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MaterialLoader.module_three.kt index 8d6e97d..49cede7 100644 --- a/src/mapMain/kotlin/externals/threejs/MaterialLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MaterialLoader.module_three.kt @@ -5,15 +5,9 @@ package externals.threejs import org.w3c.xhr.ProgressEvent -external interface AnonymousStruct80 { - @nativeGetter - operator fun get(key: String): Texture? - - @nativeSetter - operator fun set(key: String, value: Texture) -} +external interface AnonymousStruct80 -external open class MaterialLoader(manager: LoadingManager = definedExternally) : Loader { +open external class MaterialLoader(manager: LoadingManager = definedExternally) : Loader { open var textures: AnonymousStruct80 open fun load(url: String, onLoad: (material: Material) -> Unit, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: Any /* Error | ErrorEvent */) -> Unit = definedExternally) open fun setTextures(textures: AnonymousStruct80): MaterialLoader /* this */ diff --git a/src/mapMain/kotlin/externals/threejs/Matrix3.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Matrix3.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/Matrix3.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Matrix3.module_three.kt index 9c476ba..5cc4ce1 100644 --- a/src/mapMain/kotlin/externals/threejs/Matrix3.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Matrix3.module_three.kt @@ -14,7 +14,7 @@ external interface Matrix { fun clone(): Matrix } -external open class Matrix3 : Matrix { +open external class Matrix3 : Matrix { override var elements: Array open fun set(n11: Number, n12: Number, n13: Number, n21: Number, n22: Number, n23: Number, n31: Number, n32: Number, n33: Number): Matrix3 override fun identity(): Matrix3 diff --git a/src/mapMain/kotlin/externals/threejs/Matrix4.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Matrix4.module_three.kt similarity index 99% rename from src/mapMain/kotlin/externals/threejs/Matrix4.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Matrix4.module_three.kt index fc68c5c..e0c9ea7 100644 --- a/src/mapMain/kotlin/externals/threejs/Matrix4.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Matrix4.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Matrix4 : Matrix { +open external class Matrix4 : Matrix { override var elements: Array open fun set(n11: Number, n12: Number, n13: Number, n14: Number, n21: Number, n22: Number, n23: Number, n24: Number, n31: Number, n32: Number, n33: Number, n34: Number, n41: Number, n42: Number, n43: Number, n44: Number): Matrix4 override fun identity(): Matrix4 diff --git a/src/mapMain/kotlin/externals/threejs/Mesh.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Mesh.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/Mesh.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Mesh.module_three.kt index d0b76c2..e0197d9 100644 --- a/src/mapMain/kotlin/externals/threejs/Mesh.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Mesh.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Mesh(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally) : Object3D { +open external class Mesh(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally) : Object3D { open var geometry: BufferGeometry open var material: dynamic open var morphTargetInfluences: Array? diff --git a/src/mapMain/kotlin/externals/threejs/MeshBasicMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshBasicMaterial.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/MeshBasicMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshBasicMaterial.module_three.kt index 880065d..4d13779 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshBasicMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshBasicMaterial.module_three.kt @@ -57,7 +57,7 @@ external interface MeshBasicMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class MeshBasicMaterial(parameters: MeshBasicMaterialParameters = definedExternally) : Material { +open external class MeshBasicMaterial(parameters: MeshBasicMaterialParameters = definedExternally) : Material { override var type: String open var color: Color open var map: Texture? diff --git a/src/mapMain/kotlin/externals/threejs/MeshDepthMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshDepthMaterial.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/MeshDepthMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshDepthMaterial.module_three.kt index d14e05e..3bad6f0 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshDepthMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshDepthMaterial.module_three.kt @@ -30,7 +30,7 @@ external interface MeshDepthMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class MeshDepthMaterial(parameters: MeshDepthMaterialParameters = definedExternally) : Material { +open external class MeshDepthMaterial(parameters: MeshDepthMaterialParameters = definedExternally) : Material { override var type: String open var map: Texture? open var alphaMap: Texture? diff --git a/src/mapMain/kotlin/externals/threejs/MeshDistanceMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshDistanceMaterial.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/MeshDistanceMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshDistanceMaterial.module_three.kt index 2b17951..c39275f 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshDistanceMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshDistanceMaterial.module_three.kt @@ -30,7 +30,7 @@ external interface MeshDistanceMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class MeshDistanceMaterial(parameters: MeshDistanceMaterialParameters = definedExternally) : Material { +open external class MeshDistanceMaterial(parameters: MeshDistanceMaterialParameters = definedExternally) : Material { override var type: String open var map: Texture? open var alphaMap: Texture? diff --git a/src/mapMain/kotlin/externals/threejs/MeshLambertMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshLambertMaterial.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/MeshLambertMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshLambertMaterial.module_three.kt index 1913ab6..0c4ea03 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshLambertMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshLambertMaterial.module_three.kt @@ -63,7 +63,7 @@ external interface MeshLambertMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class MeshLambertMaterial(parameters: MeshLambertMaterialParameters = definedExternally) : Material { +open external class MeshLambertMaterial(parameters: MeshLambertMaterialParameters = definedExternally) : Material { override var type: String open var color: Color open var emissive: Color diff --git a/src/mapMain/kotlin/externals/threejs/MeshMatcapMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshMatcapMaterial.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/MeshMatcapMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshMatcapMaterial.module_three.kt index 19285dd..a1c9d54 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshMatcapMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshMatcapMaterial.module_three.kt @@ -45,7 +45,7 @@ external interface MeshMatcapMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class MeshMatcapMaterial(parameters: MeshMatcapMaterialParameters = definedExternally) : Material { +open external class MeshMatcapMaterial(parameters: MeshMatcapMaterialParameters = definedExternally) : Material { override var type: String open var color: Color open var matcap: Texture? diff --git a/src/mapMain/kotlin/externals/threejs/MeshNormalMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshNormalMaterial.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/MeshNormalMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshNormalMaterial.module_three.kt index a700398..1b7984f 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshNormalMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshNormalMaterial.module_three.kt @@ -39,7 +39,7 @@ external interface MeshNormalMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class MeshNormalMaterial(parameters: MeshNormalMaterialParameters = definedExternally) : Material { +open external class MeshNormalMaterial(parameters: MeshNormalMaterialParameters = definedExternally) : Material { override var type: String open var bumpMap: Texture? open var bumpScale: Number diff --git a/src/mapMain/kotlin/externals/threejs/MeshPhongMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshPhongMaterial.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/MeshPhongMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshPhongMaterial.module_three.kt index c8f2b2d..b4c582c 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshPhongMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshPhongMaterial.module_three.kt @@ -99,7 +99,7 @@ external interface MeshPhongMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class MeshPhongMaterial(parameters: MeshPhongMaterialParameters = definedExternally) : Material { +open external class MeshPhongMaterial(parameters: MeshPhongMaterialParameters = definedExternally) : Material { override var type: String open var color: Color open var specular: Color diff --git a/src/mapMain/kotlin/externals/threejs/MeshPhysicalMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshPhysicalMaterial.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/MeshPhysicalMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshPhysicalMaterial.module_three.kt index 7771aee..5c5ddb0 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshPhysicalMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshPhysicalMaterial.module_three.kt @@ -57,7 +57,7 @@ external interface MeshPhysicalMaterialParameters : MeshStandardMaterialParamete set(value) = definedExternally } -external open class MeshPhysicalMaterial(parameters: MeshPhysicalMaterialParameters = definedExternally) : MeshStandardMaterial { +open external class MeshPhysicalMaterial(parameters: MeshPhysicalMaterialParameters = definedExternally) : MeshStandardMaterial { override var type: String override var defines: dynamic open var clearcoat: Number diff --git a/src/mapMain/kotlin/externals/threejs/MeshStandardMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshStandardMaterial.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/MeshStandardMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshStandardMaterial.module_three.kt index 58826de..de1c115 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshStandardMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshStandardMaterial.module_three.kt @@ -90,7 +90,7 @@ external interface MeshStandardMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class MeshStandardMaterial(parameters: MeshStandardMaterialParameters = definedExternally) : Material { +open external class MeshStandardMaterial(parameters: MeshStandardMaterialParameters = definedExternally) : Material { override var type: String open var color: Color open var roughness: Number diff --git a/src/mapMain/kotlin/externals/threejs/MeshToonMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/MeshToonMaterial.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/MeshToonMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/MeshToonMaterial.module_three.kt index a5778e6..72de359 100644 --- a/src/mapMain/kotlin/externals/threejs/MeshToonMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/MeshToonMaterial.module_three.kt @@ -78,7 +78,7 @@ external interface MeshToonMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class MeshToonMaterial(parameters: MeshToonMaterialParameters = definedExternally) : Material { +open external class MeshToonMaterial(parameters: MeshToonMaterialParameters = definedExternally) : Material { override var type: String open var color: Color open var gradientMap: Texture? diff --git a/src/mapMain/kotlin/externals/threejs/NumberKeyframeTrack.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/NumberKeyframeTrack.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/NumberKeyframeTrack.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/NumberKeyframeTrack.module_three.kt index e501b9d..76ea51c 100644 --- a/src/mapMain/kotlin/externals/threejs/NumberKeyframeTrack.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/NumberKeyframeTrack.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class NumberKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { +open external class NumberKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { override var ValueTypeName: String } diff --git a/src/mapMain/kotlin/externals/threejs/OBJLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/OBJLoader.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/OBJLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/OBJLoader.module_three.kt index 7b53144..a0e5df2 100644 --- a/src/mapMain/kotlin/externals/threejs/OBJLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/OBJLoader.module_three.kt @@ -6,7 +6,7 @@ package externals.threejs import org.w3c.dom.ErrorEvent import org.w3c.xhr.ProgressEvent -external open class OBJLoader(manager: LoadingManager = definedExternally) : Loader { +open external class OBJLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(url: String, onLoad: (mesh: Object3D) -> Unit = definedExternally, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally) open fun parse(text: String): Object3D open fun setMaterials(materialCreator: MaterialCreator): OBJLoader diff --git a/src/mapMain/kotlin/externals/threejs/Object3D.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Object3D.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/Object3D.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Object3D.module_three.kt index 950cbe0..3e8101e 100644 --- a/src/mapMain/kotlin/externals/threejs/Object3D.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Object3D.module_three.kt @@ -12,7 +12,7 @@ external interface AnonymousStruct6 { var images: Any } -external open class Object3D : EventTarget { +open external class Object3D : EventTarget { open var id: Number open var uuid: String open var name: String diff --git a/externals/src/jsMain/kotlin/externals/threejs/ObjectLoader.kt b/externals/src/jsMain/kotlin/externals/threejs/ObjectLoader.kt new file mode 100644 index 0000000..65eae76 --- /dev/null +++ b/externals/src/jsMain/kotlin/externals/threejs/ObjectLoader.kt @@ -0,0 +1,19 @@ +package externals.threejs + +import org.w3c.dom.HTMLImageElement + +inline operator fun AnonymousStruct78.get(key: String): dynamic /* InstancedBufferGeometry? | BufferGeometry? */ = asDynamic()[key] + +inline operator fun AnonymousStruct78.set(key: String, value: InstancedBufferGeometry) { + asDynamic()[key] = value +} + +inline operator fun AnonymousStruct78.set(key: String, value: BufferGeometry) { + asDynamic()[key] = value +} + +inline operator fun AnonymousStruct79.get(key: String): HTMLImageElement? = asDynamic()[key].unsafeCast() + +inline operator fun AnonymousStruct79.set(key: String, value: HTMLImageElement) { + asDynamic()[key] = value +} diff --git a/src/mapMain/kotlin/externals/threejs/ObjectLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ObjectLoader.module_three.kt similarity index 72% rename from src/mapMain/kotlin/externals/threejs/ObjectLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ObjectLoader.module_three.kt index 328390e..41ab6c2 100644 --- a/src/mapMain/kotlin/externals/threejs/ObjectLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ObjectLoader.module_three.kt @@ -7,26 +7,11 @@ import org.w3c.dom.HTMLImageElement import org.w3c.xhr.ProgressEvent import kotlin.js.Promise -external interface AnonymousStruct78 { - @nativeGetter - operator fun get(key: String): dynamic /* InstancedBufferGeometry? | BufferGeometry? */ - - @nativeSetter - operator fun set(key: String, value: InstancedBufferGeometry) - - @nativeSetter - operator fun set(key: String, value: BufferGeometry) -} +external interface AnonymousStruct78 -external interface AnonymousStruct79 { - @nativeGetter - operator fun get(key: String): HTMLImageElement? - - @nativeSetter - operator fun set(key: String, value: HTMLImageElement) -} +external interface AnonymousStruct79 -external open class ObjectLoader(manager: LoadingManager = definedExternally) : Loader { +open external class ObjectLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(url: String, onLoad: (obj: ObjectType) -> Unit = definedExternally, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: Any /* Error | ErrorEvent */) -> Unit = definedExternally) open fun loadAsync(url: String, onProgress: (event: ProgressEvent) -> Unit = definedExternally): Promise open fun parse(json: Any, onLoad: (obj: Object3D) -> Unit = definedExternally): T diff --git a/src/mapMain/kotlin/externals/threejs/OctahedronGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/OctahedronGeometry.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/OctahedronGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/OctahedronGeometry.module_three.kt index 27bc36f..7e5f465 100644 --- a/src/mapMain/kotlin/externals/threejs/OctahedronGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/OctahedronGeometry.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class OctahedronGeometry(radius: Number = definedExternally, detail: Number = definedExternally) : PolyhedronGeometry { +open external class OctahedronGeometry(radius: Number = definedExternally, detail: Number = definedExternally) : PolyhedronGeometry { override var type: String companion object { diff --git a/src/mapMain/kotlin/externals/threejs/OrthographicCamera.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/OrthographicCamera.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/OrthographicCamera.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/OrthographicCamera.module_three.kt index 4b0b670..ffe515d 100644 --- a/src/mapMain/kotlin/externals/threejs/OrthographicCamera.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/OrthographicCamera.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class OrthographicCamera(left: Number, right: Number, top: Number, bottom: Number, near: Number = definedExternally, far: Number = definedExternally) : Camera { +open external class OrthographicCamera(left: Number, right: Number, top: Number, bottom: Number, near: Number = definedExternally, far: Number = definedExternally) : Camera { override var type: String /* "OrthographicCamera" */ open var isOrthographicCamera: Boolean open var zoom: Number diff --git a/src/mapMain/kotlin/externals/threejs/PMREMGenerator.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PMREMGenerator.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/PMREMGenerator.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PMREMGenerator.module_three.kt index 8bbacf8..d57bea8 100644 --- a/src/mapMain/kotlin/externals/threejs/PMREMGenerator.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PMREMGenerator.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class PMREMGenerator(renderer: WebGLRenderer) { +open external class PMREMGenerator(renderer: WebGLRenderer) { open fun fromScene(scene: Scene, sigma: Number = definedExternally, near: Number = definedExternally, far: Number = definedExternally): WebGLRenderTarget open fun fromEquirectangular(equirectangular: Texture): WebGLRenderTarget open fun fromCubemap(cubemap: CubeTexture): WebGLRenderTarget diff --git a/src/mapMain/kotlin/externals/threejs/ParametricGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ParametricGeometry.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/ParametricGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ParametricGeometry.module_three.kt index 76ed7c6..08584ba 100644 --- a/src/mapMain/kotlin/externals/threejs/ParametricGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ParametricGeometry.module_three.kt @@ -9,7 +9,7 @@ external interface AnonymousStruct68 { var stacks: Number } -external open class ParametricGeometry(func: (u: Number, v: Number, dest: Vector3) -> Unit, slices: Number, stacks: Number) : BufferGeometry { +open external class ParametricGeometry(func: (u: Number, v: Number, dest: Vector3) -> Unit, slices: Number, stacks: Number) : BufferGeometry { override var type: String open var parameters: AnonymousStruct68 } diff --git a/src/mapMain/kotlin/externals/threejs/Path.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Path.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/Path.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Path.module_three.kt index bf32ba2..c6a9a2b 100644 --- a/src/mapMain/kotlin/externals/threejs/Path.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Path.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Path(points: Array = definedExternally) : CurvePath { +open external class Path(points: Array = definedExternally) : CurvePath { override var type: String open var currentPoint: Vector2 open fun fromPoints(vectors: Array): Path /* this */ diff --git a/src/mapMain/kotlin/externals/threejs/PerspectiveCamera.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PerspectiveCamera.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/PerspectiveCamera.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PerspectiveCamera.module_three.kt index e85e2fa..fcae9e4 100644 --- a/src/mapMain/kotlin/externals/threejs/PerspectiveCamera.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PerspectiveCamera.module_three.kt @@ -13,7 +13,7 @@ external interface AnonymousStruct58 { var height: Number } -external open class PerspectiveCamera(fov: Number = definedExternally, aspect: Number = definedExternally, near: Number = definedExternally, far: Number = definedExternally) : Camera { +open external class PerspectiveCamera(fov: Number = definedExternally, aspect: Number = definedExternally, near: Number = definedExternally, far: Number = definedExternally) : Camera { override var type: String /* "PerspectiveCamera" */ open var isPerspectiveCamera: Boolean open var zoom: Number diff --git a/src/mapMain/kotlin/externals/threejs/Plane.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Plane.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/Plane.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Plane.module_three.kt index 9fa45a3..dd73e89 100644 --- a/src/mapMain/kotlin/externals/threejs/Plane.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Plane.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Plane(normal: Vector3 = definedExternally, constant: Number = definedExternally) { +open external class Plane(normal: Vector3 = definedExternally, constant: Number = definedExternally) { open var normal: Vector3 open var constant: Number open var isPlane: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/PlaneGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PlaneGeometry.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/PlaneGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PlaneGeometry.module_three.kt index 1d1f492..f008350 100644 --- a/src/mapMain/kotlin/externals/threejs/PlaneGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PlaneGeometry.module_three.kt @@ -10,7 +10,7 @@ external interface AnonymousStruct69 { var heightSegments: Number } -external open class PlaneGeometry(width: Number = definedExternally, height: Number = definedExternally, widthSegments: Number = definedExternally, heightSegments: Number = definedExternally) : BufferGeometry { +open external class PlaneGeometry(width: Number = definedExternally, height: Number = definedExternally, widthSegments: Number = definedExternally, heightSegments: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct69 diff --git a/src/mapMain/kotlin/externals/threejs/PlaneHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PlaneHelper.module_three.kt similarity index 85% rename from src/mapMain/kotlin/externals/threejs/PlaneHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PlaneHelper.module_three.kt index 0551250..a2dae41 100644 --- a/src/mapMain/kotlin/externals/threejs/PlaneHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PlaneHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class PlaneHelper(plane: Plane, size: Number = definedExternally, hex: Number = definedExternally) : LineSegments { +open external class PlaneHelper(plane: Plane, size: Number = definedExternally, hex: Number = definedExternally) : LineSegments { override var type: String open var plane: Plane open var size: Number diff --git a/src/mapMain/kotlin/externals/threejs/PointLight.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PointLight.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/PointLight.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PointLight.module_three.kt index c650e0e..bb900df 100644 --- a/src/mapMain/kotlin/externals/threejs/PointLight.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PointLight.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class PointLight : Light { +open external class PointLight : Light { constructor(color: Color = definedExternally, intensity: Number = definedExternally, distance: Number = definedExternally, decay: Number = definedExternally) constructor() constructor(color: Color = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/PointLightHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PointLightHelper.module_three.kt similarity index 94% rename from src/mapMain/kotlin/externals/threejs/PointLightHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PointLightHelper.module_three.kt index 68c3315..c734d07 100644 --- a/src/mapMain/kotlin/externals/threejs/PointLightHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PointLightHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class PointLightHelper : Object3D { +open external class PointLightHelper : Object3D { constructor(light: PointLight, sphereSize: Number = definedExternally, color: Color = definedExternally) constructor(light: PointLight) constructor(light: PointLight, sphereSize: Number = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/PointLightShadow.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PointLightShadow.module_three.kt similarity index 77% rename from src/mapMain/kotlin/externals/threejs/PointLightShadow.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PointLightShadow.module_three.kt index c6cf2c9..fc8598f 100644 --- a/src/mapMain/kotlin/externals/threejs/PointLightShadow.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PointLightShadow.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class PointLightShadow(camera: Camera) : LightShadow { +open external class PointLightShadow(camera: Camera) : LightShadow { override var camera: Camera } diff --git a/src/mapMain/kotlin/externals/threejs/Points.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Points.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/Points.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Points.module_three.kt index 0541e6b..9f0fbd0 100644 --- a/src/mapMain/kotlin/externals/threejs/Points.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Points.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Points(geometry: TGeometry = definedExternally, material: TMaterial = definedExternally) : Object3D { +open external class Points(geometry: TGeometry = definedExternally, material: TMaterial = definedExternally) : Object3D { override var type: String /* "Points" */ open var morphTargetInfluences: Array? open var morphTargetDictionary: AnonymousStruct55? diff --git a/src/mapMain/kotlin/externals/threejs/PointsMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PointsMaterial.module_three.kt similarity index 94% rename from src/mapMain/kotlin/externals/threejs/PointsMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PointsMaterial.module_three.kt index d6e8cdb..4102c84 100644 --- a/src/mapMain/kotlin/externals/threejs/PointsMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PointsMaterial.module_three.kt @@ -21,7 +21,7 @@ external interface PointsMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class PointsMaterial(parameters: PointsMaterialParameters = definedExternally) : Material { +open external class PointsMaterial(parameters: PointsMaterialParameters = definedExternally) : Material { override var type: String open var color: Color open var map: Texture? diff --git a/src/mapMain/kotlin/externals/threejs/PolarGridHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PolarGridHelper.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/PolarGridHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PolarGridHelper.module_three.kt index 197563f..5dfdbf6 100644 --- a/src/mapMain/kotlin/externals/threejs/PolarGridHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PolarGridHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class PolarGridHelper : LineSegments { +open external class PolarGridHelper : LineSegments { constructor(radius: Number = definedExternally, radials: Number = definedExternally, circles: Number = definedExternally, divisions: Number = definedExternally, color1: Color = definedExternally, color2: Color = definedExternally) constructor() constructor(radius: Number = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/PolyhedronGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PolyhedronGeometry.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/PolyhedronGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PolyhedronGeometry.module_three.kt index 44755e6..b2fcf88 100644 --- a/src/mapMain/kotlin/externals/threejs/PolyhedronGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PolyhedronGeometry.module_three.kt @@ -10,7 +10,7 @@ external interface AnonymousStruct65 { var detail: Number } -external open class PolyhedronGeometry(vertices: Array, indices: Array, radius: Number = definedExternally, detail: Number = definedExternally) : BufferGeometry { +open external class PolyhedronGeometry(vertices: Array, indices: Array, radius: Number = definedExternally, detail: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct65 diff --git a/externals/src/jsMain/kotlin/externals/threejs/PropertyBinding.kt b/externals/src/jsMain/kotlin/externals/threejs/PropertyBinding.kt new file mode 100644 index 0000000..581eedf --- /dev/null +++ b/externals/src/jsMain/kotlin/externals/threejs/PropertyBinding.kt @@ -0,0 +1,7 @@ +package externals.threejs + +inline operator fun AnonymousStruct55.get(bindingType: String): Number? = asDynamic()[bindingType].unsafeCast() + +inline operator fun AnonymousStruct55.set(bindingType: String, value: Number) { + asDynamic()[bindingType] = value +} diff --git a/src/mapMain/kotlin/externals/threejs/PropertyBinding.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PropertyBinding.module_three.kt similarity index 85% rename from src/mapMain/kotlin/externals/threejs/PropertyBinding.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PropertyBinding.module_three.kt index d6d701d..725e0b1 100644 --- a/src/mapMain/kotlin/externals/threejs/PropertyBinding.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PropertyBinding.module_three.kt @@ -11,15 +11,9 @@ external interface ParseTrackNameResults { var propertyIndex: String } -external interface AnonymousStruct55 { - @nativeGetter - operator fun get(bindingType: String): Number? - - @nativeSetter - operator fun set(bindingType: String, value: Number) -} +external interface AnonymousStruct55 -external open class PropertyBinding(rootNode: Any, path: String, parsedPath: Any = definedExternally) { +open external class PropertyBinding(rootNode: Any, path: String, parsedPath: Any = definedExternally) { open var path: String open var parsedPath: Any open var node: Any diff --git a/src/mapMain/kotlin/externals/threejs/PropertyMixer.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/PropertyMixer.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/PropertyMixer.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/PropertyMixer.module_three.kt index 7947107..eb0976b 100644 --- a/src/mapMain/kotlin/externals/threejs/PropertyMixer.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/PropertyMixer.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class PropertyMixer(binding: Any, typeName: String, valueSize: Number) { +open external class PropertyMixer(binding: Any, typeName: String, valueSize: Number) { open var binding: Any open var valueSize: Number open var buffer: Any diff --git a/src/mapMain/kotlin/externals/threejs/QuadraticBezierCurve.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/QuadraticBezierCurve.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/QuadraticBezierCurve.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/QuadraticBezierCurve.module_three.kt index 0c6c3dd..72cb22c 100644 --- a/src/mapMain/kotlin/externals/threejs/QuadraticBezierCurve.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/QuadraticBezierCurve.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class QuadraticBezierCurve(v0: Vector2, v1: Vector2, v2: Vector2) : Curve { +open external class QuadraticBezierCurve(v0: Vector2, v1: Vector2, v2: Vector2) : Curve { override var type: String open var v0: Vector2 open var v1: Vector2 diff --git a/src/mapMain/kotlin/externals/threejs/QuadraticBezierCurve3.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/QuadraticBezierCurve3.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/QuadraticBezierCurve3.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/QuadraticBezierCurve3.module_three.kt index 6412e0c..7c900ad 100644 --- a/src/mapMain/kotlin/externals/threejs/QuadraticBezierCurve3.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/QuadraticBezierCurve3.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class QuadraticBezierCurve3(v0: Vector3, v1: Vector3, v2: Vector3) : Curve { +open external class QuadraticBezierCurve3(v0: Vector3, v1: Vector3, v2: Vector3) : Curve { override var type: String open var v0: Vector3 open var v1: Vector3 diff --git a/src/mapMain/kotlin/externals/threejs/Quaternion.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Quaternion.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/Quaternion.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Quaternion.module_three.kt index 1d74133..72041be 100644 --- a/src/mapMain/kotlin/externals/threejs/Quaternion.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Quaternion.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Quaternion(x: Number = definedExternally, y: Number = definedExternally, z: Number = definedExternally, w: Number = definedExternally) { +open external class Quaternion(x: Number = definedExternally, y: Number = definedExternally, z: Number = definedExternally, w: Number = definedExternally) { open var x: Number open var y: Number open var z: Number diff --git a/src/mapMain/kotlin/externals/threejs/QuaternionKeyframeTrack.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/QuaternionKeyframeTrack.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/QuaternionKeyframeTrack.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/QuaternionKeyframeTrack.module_three.kt index d19de9e..b182737 100644 --- a/src/mapMain/kotlin/externals/threejs/QuaternionKeyframeTrack.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/QuaternionKeyframeTrack.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class QuaternionKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { +open external class QuaternionKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { override var ValueTypeName: String } diff --git a/src/mapMain/kotlin/externals/threejs/QuaternionLinearInterpolant.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/QuaternionLinearInterpolant.module_three.kt similarity index 85% rename from src/mapMain/kotlin/externals/threejs/QuaternionLinearInterpolant.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/QuaternionLinearInterpolant.module_three.kt index 452da6b..aa0c0f7 100644 --- a/src/mapMain/kotlin/externals/threejs/QuaternionLinearInterpolant.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/QuaternionLinearInterpolant.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class QuaternionLinearInterpolant(parameterPositions: Any, samplesValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) : Interpolant { +open external class QuaternionLinearInterpolant(parameterPositions: Any, samplesValues: Any, sampleSize: Number, resultBuffer: Any = definedExternally) : Interpolant { open fun interpolate_(i1: Number, t0: Number, t: Number, t1: Number): Any } diff --git a/src/mapMain/kotlin/externals/threejs/RawShaderMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/RawShaderMaterial.module_three.kt similarity index 78% rename from src/mapMain/kotlin/externals/threejs/RawShaderMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/RawShaderMaterial.module_three.kt index b8d68b1..664ba29 100644 --- a/src/mapMain/kotlin/externals/threejs/RawShaderMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/RawShaderMaterial.module_three.kt @@ -3,4 +3,4 @@ package externals.threejs -external open class RawShaderMaterial(parameters: ShaderMaterialParameters = definedExternally) : ShaderMaterial +open external class RawShaderMaterial(parameters: ShaderMaterialParameters = definedExternally) : ShaderMaterial diff --git a/src/mapMain/kotlin/externals/threejs/Ray.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Ray.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/Ray.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Ray.module_three.kt index c244381..8e9c007 100644 --- a/src/mapMain/kotlin/externals/threejs/Ray.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Ray.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Ray(origin: Vector3 = definedExternally, direction: Vector3 = definedExternally) { +open external class Ray(origin: Vector3 = definedExternally, direction: Vector3 = definedExternally) { open var origin: Vector3 open var direction: Vector3 open fun set(origin: Vector3, direction: Vector3): Ray diff --git a/src/mapMain/kotlin/externals/threejs/Raycaster.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Raycaster.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/Raycaster.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Raycaster.module_three.kt index b019da3..bc840f4 100644 --- a/src/mapMain/kotlin/externals/threejs/Raycaster.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Raycaster.module_three.kt @@ -57,7 +57,7 @@ external interface RaycasterParameters { set(value) = definedExternally } -external open class Raycaster(origin: Vector3 = definedExternally, direction: Vector3 = definedExternally, near: Number = definedExternally, far: Number = definedExternally) { +open external class Raycaster(origin: Vector3 = definedExternally, direction: Vector3 = definedExternally, near: Number = definedExternally, far: Number = definedExternally) { open var ray: Ray open var near: Number open var far: Number diff --git a/src/mapMain/kotlin/externals/threejs/RectAreaLight.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/RectAreaLight.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/RectAreaLight.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/RectAreaLight.module_three.kt index 6d9850e..bfac786 100644 --- a/src/mapMain/kotlin/externals/threejs/RectAreaLight.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/RectAreaLight.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class RectAreaLight : Light { +open external class RectAreaLight : Light { constructor(color: Color = definedExternally, intensity: Number = definedExternally, width: Number = definedExternally, height: Number = definedExternally) constructor() constructor(color: Color = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/RingGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/RingGeometry.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/RingGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/RingGeometry.module_three.kt index 8abc53e..fb8c261 100644 --- a/src/mapMain/kotlin/externals/threejs/RingGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/RingGeometry.module_three.kt @@ -12,7 +12,7 @@ external interface AnonymousStruct70 { var thetaLength: Number } -external open class RingGeometry(innerRadius: Number = definedExternally, outerRadius: Number = definedExternally, thetaSegments: Number = definedExternally, phiSegments: Number = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : BufferGeometry { +open external class RingGeometry(innerRadius: Number = definedExternally, outerRadius: Number = definedExternally, thetaSegments: Number = definedExternally, phiSegments: Number = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct70 diff --git a/src/mapMain/kotlin/externals/threejs/Scene.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Scene.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/Scene.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Scene.module_three.kt index 6ef568e..65f6d5e 100644 --- a/src/mapMain/kotlin/externals/threejs/Scene.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Scene.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Scene : Object3D { +open external class Scene : Object3D { override var type: String /* "Scene" */ open var fog: FogBase? open var overrideMaterial: Material? diff --git a/externals/src/jsMain/kotlin/externals/threejs/ShaderChunk.kt b/externals/src/jsMain/kotlin/externals/threejs/ShaderChunk.kt new file mode 100644 index 0000000..0fde7d4 --- /dev/null +++ b/externals/src/jsMain/kotlin/externals/threejs/ShaderChunk.kt @@ -0,0 +1,7 @@ +package externals.threejs + +inline operator fun ShaderChunk.get(name: String): String? = asDynamic()[name].unsafeCast() + +inline operator fun ShaderChunk.set(name: String, value: String) { + asDynamic()[name] = value +} diff --git a/src/mapMain/kotlin/externals/threejs/ShaderChunk.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ShaderChunk.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/ShaderChunk.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ShaderChunk.module_three.kt index bd9c6ce..16eac8b 100644 --- a/src/mapMain/kotlin/externals/threejs/ShaderChunk.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ShaderChunk.module_three.kt @@ -4,11 +4,6 @@ package externals.threejs external object ShaderChunk { - @nativeGetter - operator fun get(name: String): String? - - @nativeSetter - operator fun set(name: String, value: String) var alphamap_fragment: String var alphamap_pars_fragment: String var alphatest_fragment: String diff --git a/externals/src/jsMain/kotlin/externals/threejs/ShaderLib.kt b/externals/src/jsMain/kotlin/externals/threejs/ShaderLib.kt new file mode 100644 index 0000000..6167411 --- /dev/null +++ b/externals/src/jsMain/kotlin/externals/threejs/ShaderLib.kt @@ -0,0 +1,13 @@ +package externals.threejs + +inline operator fun AnonymousStruct8.get(uniform: String): IUniformAny? = asDynamic()[uniform].unsafeCast() + +inline operator fun AnonymousStruct8.set(uniform: String, value: IUniformAny) { + asDynamic()[uniform] = value +} + +inline operator fun ShaderLib.get(name: String): Shader? = asDynamic()[name].unsafeCast() + +inline operator fun ShaderLib.set(name: String, value: Shader) { + asDynamic()[name] = value +} diff --git a/src/mapMain/kotlin/externals/threejs/ShaderLib.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ShaderLib.module_three.kt similarity index 69% rename from src/mapMain/kotlin/externals/threejs/ShaderLib.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ShaderLib.module_three.kt index 3984084..1097966 100644 --- a/src/mapMain/kotlin/externals/threejs/ShaderLib.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ShaderLib.module_three.kt @@ -3,13 +3,7 @@ package externals.threejs -external interface AnonymousStruct8 { - @nativeGetter - operator fun get(uniform: String): IUniform__0? - - @nativeSetter - operator fun set(uniform: String, value: IUniform__0) -} +external interface AnonymousStruct8 external interface Shader { var uniforms: AnonymousStruct8 @@ -18,11 +12,6 @@ external interface Shader { } external object ShaderLib { - @nativeGetter - operator fun get(name: String): Shader? - - @nativeSetter - operator fun set(name: String, value: Shader) var basic: Shader var lambert: Shader var phong: Shader diff --git a/src/mapMain/kotlin/externals/threejs/ShaderMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ShaderMaterial.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/ShaderMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ShaderMaterial.module_three.kt index 6348878..843c47e 100644 --- a/src/mapMain/kotlin/externals/threejs/ShaderMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ShaderMaterial.module_three.kt @@ -58,7 +58,7 @@ external interface AnonymousStruct82 { var shaderTextureLOD: Boolean } -external open class ShaderMaterial(parameters: ShaderMaterialParameters = definedExternally) : Material { +open external class ShaderMaterial(parameters: ShaderMaterialParameters = definedExternally) : Material { override var type: String open var uniforms: AnonymousStruct8 open var vertexShader: String diff --git a/src/mapMain/kotlin/externals/threejs/ShadowMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ShadowMaterial.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/ShadowMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ShadowMaterial.module_three.kt index d131ce5..cc0dadd 100644 --- a/src/mapMain/kotlin/externals/threejs/ShadowMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ShadowMaterial.module_three.kt @@ -9,7 +9,7 @@ external interface ShadowMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class ShadowMaterial(parameters: ShadowMaterialParameters = definedExternally) : Material { +open external class ShadowMaterial(parameters: ShadowMaterialParameters = definedExternally) : Material { override var type: String open var color: Color override var transparent: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/Shape.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Shape.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/Shape.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Shape.module_three.kt index 6a1be02..187e579 100644 --- a/src/mapMain/kotlin/externals/threejs/Shape.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Shape.module_three.kt @@ -8,7 +8,7 @@ external interface AnonymousStruct61 { var holes: Array> } -external open class Shape(points: Array = definedExternally) : Path { +open external class Shape(points: Array = definedExternally) : Path { override var type: String open var uuid: String open var holes: Array diff --git a/src/mapMain/kotlin/externals/threejs/ShapeGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ShapeGeometry.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/ShapeGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ShapeGeometry.module_three.kt index 2ed5968..8a321f1 100644 --- a/src/mapMain/kotlin/externals/threejs/ShapeGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ShapeGeometry.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class ShapeGeometry : BufferGeometry { +open external class ShapeGeometry : BufferGeometry { constructor(shapes: Shape, curveSegments: Number = definedExternally) constructor(shapes: Shape) constructor(shapes: Array, curveSegments: Number = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/ShapePath.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ShapePath.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/ShapePath.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ShapePath.module_three.kt index c22806f..cb162de 100644 --- a/src/mapMain/kotlin/externals/threejs/ShapePath.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/ShapePath.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class ShapePath { +open external class ShapePath { open var type: String open var color: Color open var subPaths: Array diff --git a/src/mapMain/kotlin/externals/threejs/ShapeUtils.ShapeUtils.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ShapeUtils.ShapeUtils.module_three.kt similarity index 100% rename from src/mapMain/kotlin/externals/threejs/ShapeUtils.ShapeUtils.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ShapeUtils.ShapeUtils.module_three.kt diff --git a/src/mapMain/kotlin/externals/threejs/ShapeUtils.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/ShapeUtils.module_three.kt similarity index 100% rename from src/mapMain/kotlin/externals/threejs/ShapeUtils.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/ShapeUtils.module_three.kt diff --git a/src/mapMain/kotlin/externals/threejs/Skeleton.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Skeleton.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/Skeleton.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Skeleton.module_three.kt index a8da35a..e9e2a68 100644 --- a/src/mapMain/kotlin/externals/threejs/Skeleton.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Skeleton.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.Float32Array -external open class Skeleton(bones: Array, boneInverses: Array = definedExternally) { +open external class Skeleton(bones: Array, boneInverses: Array = definedExternally) { open var uuid: String open var bones: Array open var boneInverses: Array diff --git a/src/mapMain/kotlin/externals/threejs/SkeletonHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/SkeletonHelper.module_three.kt similarity index 87% rename from src/mapMain/kotlin/externals/threejs/SkeletonHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/SkeletonHelper.module_three.kt index 4a67b5f..a34097d 100644 --- a/src/mapMain/kotlin/externals/threejs/SkeletonHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/SkeletonHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class SkeletonHelper(obj: Object3D) : LineSegments { +open external class SkeletonHelper(obj: Object3D) : LineSegments { override var type: String open var bones: Array open var root: Object3D diff --git a/src/mapMain/kotlin/externals/threejs/SkinnedMesh.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/SkinnedMesh.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/SkinnedMesh.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/SkinnedMesh.module_three.kt index fb44259..be88212 100644 --- a/src/mapMain/kotlin/externals/threejs/SkinnedMesh.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/SkinnedMesh.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class SkinnedMesh(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally, useVertexTexture: Boolean = definedExternally) : Mesh { +open external class SkinnedMesh(geometry: BufferGeometry = definedExternally, material: dynamic = definedExternally, useVertexTexture: Boolean = definedExternally) : Mesh { open var bindMode: String open var bindMatrix: Matrix4 open var bindMatrixInverse: Matrix4 diff --git a/src/mapMain/kotlin/externals/threejs/Sphere.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Sphere.module_three.kt similarity index 94% rename from src/mapMain/kotlin/externals/threejs/Sphere.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Sphere.module_three.kt index cd5668b..e23fc3e 100644 --- a/src/mapMain/kotlin/externals/threejs/Sphere.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Sphere.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Sphere(center: Vector3 = definedExternally, radius: Number = definedExternally) { +open external class Sphere(center: Vector3 = definedExternally, radius: Number = definedExternally) { open var center: Vector3 open var radius: Number open fun set(center: Vector3, radius: Number): Sphere diff --git a/src/mapMain/kotlin/externals/threejs/SphereGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/SphereGeometry.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/SphereGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/SphereGeometry.module_three.kt index 227744d..33fdd64 100644 --- a/src/mapMain/kotlin/externals/threejs/SphereGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/SphereGeometry.module_three.kt @@ -13,7 +13,7 @@ external interface AnonymousStruct71 { var thetaLength: Number } -external open class SphereGeometry(radius: Number = definedExternally, widthSegments: Number = definedExternally, heightSegments: Number = definedExternally, phiStart: Number = definedExternally, phiLength: Number = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : BufferGeometry { +open external class SphereGeometry(radius: Number = definedExternally, widthSegments: Number = definedExternally, heightSegments: Number = definedExternally, phiStart: Number = definedExternally, phiLength: Number = definedExternally, thetaStart: Number = definedExternally, thetaLength: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct71 diff --git a/src/mapMain/kotlin/externals/threejs/Spherical.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Spherical.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/Spherical.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Spherical.module_three.kt index 4bb3768..1b11e89 100644 --- a/src/mapMain/kotlin/externals/threejs/Spherical.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Spherical.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Spherical(radius: Number = definedExternally, phi: Number = definedExternally, theta: Number = definedExternally) { +open external class Spherical(radius: Number = definedExternally, phi: Number = definedExternally, theta: Number = definedExternally) { open var radius: Number open var phi: Number open var theta: Number diff --git a/src/mapMain/kotlin/externals/threejs/SphericalHarmonics3.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/SphericalHarmonics3.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/SphericalHarmonics3.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/SphericalHarmonics3.module_three.kt index f68a214..2cd02b4 100644 --- a/src/mapMain/kotlin/externals/threejs/SphericalHarmonics3.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/SphericalHarmonics3.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class SphericalHarmonics3 { +open external class SphericalHarmonics3 { open var coefficients: Array open var isSphericalHarmonics3: Boolean open fun set(coefficients: Array): SphericalHarmonics3 diff --git a/src/mapMain/kotlin/externals/threejs/SplineCurve.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/SplineCurve.module_three.kt similarity index 81% rename from src/mapMain/kotlin/externals/threejs/SplineCurve.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/SplineCurve.module_three.kt index 8f6324a..d8fa077 100644 --- a/src/mapMain/kotlin/externals/threejs/SplineCurve.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/SplineCurve.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class SplineCurve(points: Array = definedExternally) : Curve { +open external class SplineCurve(points: Array = definedExternally) : Curve { override var type: String open var points: Array } diff --git a/src/mapMain/kotlin/externals/threejs/SpotLight.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/SpotLight.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/SpotLight.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/SpotLight.module_three.kt index 57f49dc..f09e6a0 100644 --- a/src/mapMain/kotlin/externals/threejs/SpotLight.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/SpotLight.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class SpotLight : Light { +open external class SpotLight : Light { constructor(color: Color = definedExternally, intensity: Number = definedExternally, distance: Number = definedExternally, angle: Number = definedExternally, penumbra: Number = definedExternally, decay: Number = definedExternally) constructor() constructor(color: Color = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/SpotLightHelper.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/SpotLightHelper.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/SpotLightHelper.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/SpotLightHelper.module_three.kt index fbd7085..ae37c03 100644 --- a/src/mapMain/kotlin/externals/threejs/SpotLightHelper.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/SpotLightHelper.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class SpotLightHelper : Object3D { +open external class SpotLightHelper : Object3D { constructor(light: Light, color: Color = definedExternally) constructor(light: Light) constructor(light: Light, color: String = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/SpotLightShadow.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/SpotLightShadow.module_three.kt similarity index 81% rename from src/mapMain/kotlin/externals/threejs/SpotLightShadow.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/SpotLightShadow.module_three.kt index ced555a..44aac16 100644 --- a/src/mapMain/kotlin/externals/threejs/SpotLightShadow.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/SpotLightShadow.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class SpotLightShadow(camera: Camera) : LightShadow { +open external class SpotLightShadow(camera: Camera) : LightShadow { override var camera: Camera open var isSpotLightShadow: Boolean open var focus: Number diff --git a/src/mapMain/kotlin/externals/threejs/Sprite.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Sprite.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/Sprite.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Sprite.module_three.kt index ad138b6..688e046 100644 --- a/src/mapMain/kotlin/externals/threejs/Sprite.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Sprite.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Sprite(material: SpriteMaterial = definedExternally) : Object3D { +open external class Sprite(material: SpriteMaterial = definedExternally) : Object3D { override var type: String /* "Sprite" */ open var isSprite: Boolean open var geometry: BufferGeometry diff --git a/src/mapMain/kotlin/externals/threejs/SpriteMaterial.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/SpriteMaterial.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/SpriteMaterial.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/SpriteMaterial.module_three.kt index 85aba9d..b75086a 100644 --- a/src/mapMain/kotlin/externals/threejs/SpriteMaterial.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/SpriteMaterial.module_three.kt @@ -21,7 +21,7 @@ external interface SpriteMaterialParameters : MaterialParameters { set(value) = definedExternally } -external open class SpriteMaterial(parameters: SpriteMaterialParameters = definedExternally) : Material { +open external class SpriteMaterial(parameters: SpriteMaterialParameters = definedExternally) : Material { override var type: String open var color: Color open var map: Texture? diff --git a/src/mapMain/kotlin/externals/threejs/StereoCamera.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/StereoCamera.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/StereoCamera.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/StereoCamera.module_three.kt index 04b7c55..119142f 100644 --- a/src/mapMain/kotlin/externals/threejs/StereoCamera.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/StereoCamera.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class StereoCamera : Camera { +open external class StereoCamera : Camera { override var type: String /* "StereoCamera" */ open var aspect: Number open var eyeSep: Number diff --git a/src/mapMain/kotlin/externals/threejs/StringKeyframeTrack.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/StringKeyframeTrack.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/StringKeyframeTrack.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/StringKeyframeTrack.module_three.kt index d0af785..55f4bba 100644 --- a/src/mapMain/kotlin/externals/threejs/StringKeyframeTrack.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/StringKeyframeTrack.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class StringKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { +open external class StringKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { override var ValueTypeName: String } diff --git a/src/mapMain/kotlin/externals/threejs/TetrahedronGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/TetrahedronGeometry.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/TetrahedronGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/TetrahedronGeometry.module_three.kt index 21706fd..a753617 100644 --- a/src/mapMain/kotlin/externals/threejs/TetrahedronGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/TetrahedronGeometry.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class TetrahedronGeometry(radius: Number = definedExternally, detail: Number = definedExternally) : PolyhedronGeometry { +open external class TetrahedronGeometry(radius: Number = definedExternally, detail: Number = definedExternally) : PolyhedronGeometry { override var type: String companion object { diff --git a/src/mapMain/kotlin/externals/threejs/TextGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/TextGeometry.module_three.kt similarity index 95% rename from src/mapMain/kotlin/externals/threejs/TextGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/TextGeometry.module_three.kt index a4dc7f1..635bee3 100644 --- a/src/mapMain/kotlin/externals/threejs/TextGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/TextGeometry.module_three.kt @@ -43,7 +43,7 @@ external interface AnonymousStruct72 { var bevelSegments: Number } -external open class TextGeometry(text: String, parameters: TextGeometryParameters) : ExtrudeGeometry { +open external class TextGeometry(text: String, parameters: TextGeometryParameters) : ExtrudeGeometry { override var type: String open var parameters: AnonymousStruct72 } diff --git a/src/mapMain/kotlin/externals/threejs/Texture.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Texture.module_three.kt similarity index 99% rename from src/mapMain/kotlin/externals/threejs/Texture.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Texture.module_three.kt index 8a4de7e..a35a449 100644 --- a/src/mapMain/kotlin/externals/threejs/Texture.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Texture.module_three.kt @@ -8,7 +8,7 @@ import org.w3c.dom.HTMLImageElement import org.w3c.dom.HTMLVideoElement import org.w3c.dom.events.EventTarget -external open class Texture : EventTarget { +open external class Texture : EventTarget { constructor(image: HTMLImageElement = definedExternally, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, format: PixelFormat = definedExternally, type: TextureDataType = definedExternally, anisotropy: Number = definedExternally, encoding: TextureEncoding = definedExternally) constructor() constructor(image: HTMLImageElement = definedExternally) diff --git a/src/mapMain/kotlin/externals/threejs/TextureLoader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/TextureLoader.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/TextureLoader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/TextureLoader.module_three.kt index 3c0b0d1..7e41162 100644 --- a/src/mapMain/kotlin/externals/threejs/TextureLoader.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/TextureLoader.module_three.kt @@ -6,6 +6,6 @@ package externals.threejs import org.w3c.dom.ErrorEvent import org.w3c.xhr.ProgressEvent -external open class TextureLoader(manager: LoadingManager = definedExternally) : Loader { +open external class TextureLoader(manager: LoadingManager = definedExternally) : Loader { open fun load(url: String, onLoad: (texture: Texture) -> Unit = definedExternally, onProgress: (event: ProgressEvent) -> Unit = definedExternally, onError: (event: ErrorEvent) -> Unit = definedExternally): Texture } diff --git a/src/mapMain/kotlin/externals/threejs/TorusGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/TorusGeometry.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/TorusGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/TorusGeometry.module_three.kt index f16f618..e7cf14d 100644 --- a/src/mapMain/kotlin/externals/threejs/TorusGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/TorusGeometry.module_three.kt @@ -11,7 +11,7 @@ external interface AnonymousStruct73 { var arc: Number } -external open class TorusGeometry(radius: Number = definedExternally, tube: Number = definedExternally, radialSegments: Number = definedExternally, tubularSegments: Number = definedExternally, arc: Number = definedExternally) : BufferGeometry { +open external class TorusGeometry(radius: Number = definedExternally, tube: Number = definedExternally, radialSegments: Number = definedExternally, tubularSegments: Number = definedExternally, arc: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct73 diff --git a/src/mapMain/kotlin/externals/threejs/TorusKnotGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/TorusKnotGeometry.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/TorusKnotGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/TorusKnotGeometry.module_three.kt index 18e5bb1..9da14d8 100644 --- a/src/mapMain/kotlin/externals/threejs/TorusKnotGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/TorusKnotGeometry.module_three.kt @@ -12,7 +12,7 @@ external interface AnonymousStruct74 { var q: Number } -external open class TorusKnotGeometry(radius: Number = definedExternally, tube: Number = definedExternally, tubularSegments: Number = definedExternally, radialSegments: Number = definedExternally, p: Number = definedExternally, q: Number = definedExternally) : BufferGeometry { +open external class TorusKnotGeometry(radius: Number = definedExternally, tube: Number = definedExternally, tubularSegments: Number = definedExternally, radialSegments: Number = definedExternally, p: Number = definedExternally, q: Number = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct74 diff --git a/src/mapMain/kotlin/externals/threejs/Triangle.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Triangle.module_three.kt similarity index 96% rename from src/mapMain/kotlin/externals/threejs/Triangle.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Triangle.module_three.kt index 0c418c7..1fc573a 100644 --- a/src/mapMain/kotlin/externals/threejs/Triangle.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Triangle.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Triangle(a: Vector3 = definedExternally, b: Vector3 = definedExternally, c: Vector3 = definedExternally) { +open external class Triangle(a: Vector3 = definedExternally, b: Vector3 = definedExternally, c: Vector3 = definedExternally) { open var a: Vector3 open var b: Vector3 open var c: Vector3 diff --git a/src/mapMain/kotlin/externals/threejs/TubeGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/TubeGeometry.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/TubeGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/TubeGeometry.module_three.kt index 22b7fa4..115e742 100644 --- a/src/mapMain/kotlin/externals/threejs/TubeGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/TubeGeometry.module_three.kt @@ -11,7 +11,7 @@ external interface AnonymousStruct75 { var closed: Boolean } -external open class TubeGeometry(path: Curve, tubularSegments: Number = definedExternally, radius: Number = definedExternally, radiusSegments: Number = definedExternally, closed: Boolean = definedExternally) : BufferGeometry { +open external class TubeGeometry(path: Curve, tubularSegments: Number = definedExternally, radius: Number = definedExternally, radiusSegments: Number = definedExternally, closed: Boolean = definedExternally) : BufferGeometry { override var type: String open var parameters: AnonymousStruct75 open var tangents: Array diff --git a/src/mapMain/kotlin/externals/threejs/Uniform.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Uniform.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/Uniform.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Uniform.module_three.kt index 68e0f9e..9aec840 100644 --- a/src/mapMain/kotlin/externals/threejs/Uniform.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Uniform.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Uniform { +open external class Uniform { constructor(value: Any) constructor(type: String, value: Any) diff --git a/src/mapMain/kotlin/externals/threejs/UniformsLib.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/UniformsLib.module_three.kt similarity index 70% rename from src/mapMain/kotlin/externals/threejs/UniformsLib.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/UniformsLib.module_three.kt index 572521c..6a0d7e6 100644 --- a/src/mapMain/kotlin/externals/threejs/UniformsLib.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/UniformsLib.module_three.kt @@ -7,76 +7,76 @@ external interface IUniform { var value: TValue } -external interface IUniform__0 : IUniform +external interface IUniformAny : IUniform external interface AnonymousStruct9 { - var diffuse: IUniform__0 - var opacity: IUniform__0 - var map: IUniform__0 - var uvTransform: IUniform__0 - var uv2Transform: IUniform__0 - var alphaMap: IUniform__0 + var diffuse: IUniformAny + var opacity: IUniformAny + var map: IUniformAny + var uvTransform: IUniformAny + var uv2Transform: IUniformAny + var alphaMap: IUniformAny } external interface AnonymousStruct10 { - var specularMap: IUniform__0 + var specularMap: IUniformAny } external interface AnonymousStruct11 { - var envMap: IUniform__0 - var flipEnvMap: IUniform__0 - var reflectivity: IUniform__0 - var refractionRatio: IUniform__0 - var maxMipLevel: IUniform__0 + var envMap: IUniformAny + var flipEnvMap: IUniformAny + var reflectivity: IUniformAny + var refractionRatio: IUniformAny + var maxMipLevel: IUniformAny } external interface AnonymousStruct12 { - var aoMap: IUniform__0 - var aoMapIntensity: IUniform__0 + var aoMap: IUniformAny + var aoMapIntensity: IUniformAny } external interface AnonymousStruct13 { - var lightMap: IUniform__0 - var lightMapIntensity: IUniform__0 + var lightMap: IUniformAny + var lightMapIntensity: IUniformAny } external interface AnonymousStruct14 { - var emissiveMap: IUniform__0 + var emissiveMap: IUniformAny } external interface AnonymousStruct15 { - var bumpMap: IUniform__0 - var bumpScale: IUniform__0 + var bumpMap: IUniformAny + var bumpScale: IUniformAny } external interface AnonymousStruct16 { - var normalMap: IUniform__0 - var normalScale: IUniform__0 + var normalMap: IUniformAny + var normalScale: IUniformAny } external interface AnonymousStruct17 { - var displacementMap: IUniform__0 - var displacementScale: IUniform__0 - var displacementBias: IUniform__0 + var displacementMap: IUniformAny + var displacementScale: IUniformAny + var displacementBias: IUniformAny } external interface AnonymousStruct18 { - var roughnessMap: IUniform__0 + var roughnessMap: IUniformAny } external interface AnonymousStruct19 { - var metalnessMap: IUniform__0 + var metalnessMap: IUniformAny } external interface AnonymousStruct20 { - var gradientMap: IUniform__0 + var gradientMap: IUniformAny } external interface AnonymousStruct21 { - var fogDensity: IUniform__0 - var fogNear: IUniform__0 - var fogFar: IUniform__0 - var fogColor: IUniform__0 + var fogDensity: IUniformAny + var fogNear: IUniformAny + var fogFar: IUniformAny + var fogColor: IUniformAny } external interface AnonymousStruct22 { @@ -162,30 +162,30 @@ external interface AnonymousStruct35 { } external interface AnonymousStruct36 { - var ambientLightColor: IUniform__0 + var ambientLightColor: IUniformAny var directionalLights: AnonymousStruct23 var directionalLightShadows: AnonymousStruct25 - var directionalShadowMap: IUniform__0 - var directionalShadowMatrix: IUniform__0 + var directionalShadowMap: IUniformAny + var directionalShadowMatrix: IUniformAny var spotLights: AnonymousStruct27 var spotLightShadows: AnonymousStruct28 - var spotShadowMap: IUniform__0 - var spotShadowMatrix: IUniform__0 + var spotShadowMap: IUniformAny + var spotShadowMatrix: IUniformAny var pointLights: AnonymousStruct30 var pointLightShadows: AnonymousStruct31 - var pointShadowMap: IUniform__0 - var pointShadowMatrix: IUniform__0 + var pointShadowMap: IUniformAny + var pointShadowMatrix: IUniformAny var hemisphereLights: AnonymousStruct33 var rectAreaLights: AnonymousStruct35 } external interface AnonymousStruct37 { - var diffuse: IUniform__0 - var opacity: IUniform__0 - var size: IUniform__0 - var scale: IUniform__0 - var map: IUniform__0 - var uvTransform: IUniform__0 + var diffuse: IUniformAny + var opacity: IUniformAny + var size: IUniformAny + var scale: IUniformAny + var map: IUniformAny + var uvTransform: IUniformAny } external object UniformsLib { diff --git a/src/mapMain/kotlin/externals/threejs/UniformsUtils.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/UniformsUtils.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/UniformsUtils.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/UniformsUtils.module_three.kt index 62aa3bd..e9a847c 100644 --- a/src/mapMain/kotlin/externals/threejs/UniformsUtils.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/UniformsUtils.module_three.kt @@ -4,6 +4,6 @@ package externals.threejs external object UniformsUtils { - fun clone(uniforms_src: Any): Any + fun clone(uniformsSrc: Any): Any fun merge(uniforms: Array): Any } diff --git a/src/mapMain/kotlin/externals/threejs/Vector2.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Vector2.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/Vector2.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Vector2.module_three.kt index 66cde88..d104897 100644 --- a/src/mapMain/kotlin/externals/threejs/Vector2.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Vector2.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs external interface Vector -external open class Vector2(x: Number = definedExternally, y: Number = definedExternally) : Vector { +open external class Vector2(x: Number = definedExternally, y: Number = definedExternally) : Vector { open var x: Number open var y: Number open var width: Number diff --git a/src/mapMain/kotlin/externals/threejs/Vector3.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Vector3.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/Vector3.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Vector3.module_three.kt index 4a9a358..7981987 100644 --- a/src/mapMain/kotlin/externals/threejs/Vector3.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Vector3.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Vector3(x: Number = definedExternally, y: Number = definedExternally, z: Number = definedExternally) : Vector { +open external class Vector3(x: Number = definedExternally, y: Number = definedExternally, z: Number = definedExternally) : Vector { open var x: Number open var y: Number open var z: Number diff --git a/src/mapMain/kotlin/externals/threejs/Vector4.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/Vector4.module_three.kt similarity index 98% rename from src/mapMain/kotlin/externals/threejs/Vector4.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/Vector4.module_three.kt index 6fed5a7..9399fee 100644 --- a/src/mapMain/kotlin/externals/threejs/Vector4.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/Vector4.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class Vector4(x: Number = definedExternally, y: Number = definedExternally, z: Number = definedExternally, w: Number = definedExternally) : Vector { +open external class Vector4(x: Number = definedExternally, y: Number = definedExternally, z: Number = definedExternally, w: Number = definedExternally) : Vector { open var x: Number open var y: Number open var z: Number diff --git a/src/mapMain/kotlin/externals/threejs/VectorKeyframeTrack.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/VectorKeyframeTrack.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/VectorKeyframeTrack.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/VectorKeyframeTrack.module_three.kt index b33f268..7e11e7f 100644 --- a/src/mapMain/kotlin/externals/threejs/VectorKeyframeTrack.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/VectorKeyframeTrack.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class VectorKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { +open external class VectorKeyframeTrack(name: String, times: Array, values: Array, interpolation: InterpolationModes = definedExternally) : KeyframeTrack { override var ValueTypeName: String } diff --git a/src/mapMain/kotlin/externals/threejs/VideoTexture.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/VideoTexture.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/VideoTexture.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/VideoTexture.module_three.kt index 753ccae..e1f3f55 100644 --- a/src/mapMain/kotlin/externals/threejs/VideoTexture.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/VideoTexture.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.w3c.dom.HTMLVideoElement -external open class VideoTexture(video: HTMLVideoElement, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, format: PixelFormat = definedExternally, type: TextureDataType = definedExternally, anisotropy: Number = definedExternally) : Texture { +open external class VideoTexture(video: HTMLVideoElement, mapping: Mapping = definedExternally, wrapS: Wrapping = definedExternally, wrapT: Wrapping = definedExternally, magFilter: TextureFilter = definedExternally, minFilter: TextureFilter = definedExternally, format: PixelFormat = definedExternally, type: TextureDataType = definedExternally, anisotropy: Number = definedExternally) : Texture { open var isVideoTexture: Boolean override var generateMipmaps: Boolean } diff --git a/src/mapMain/kotlin/externals/threejs/WebGL1Renderer.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGL1Renderer.module_three.kt similarity index 80% rename from src/mapMain/kotlin/externals/threejs/WebGL1Renderer.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGL1Renderer.module_three.kt index f4a78e5..5363013 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGL1Renderer.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGL1Renderer.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class WebGL1Renderer(parameters: WebGLRendererParameters = definedExternally) : WebGLRenderer { +open external class WebGL1Renderer(parameters: WebGLRendererParameters = definedExternally) : WebGLRenderer { open var isWebGL1Renderer: Boolean } diff --git a/src/mapMain/kotlin/externals/threejs/WebGLAttributes.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLAttributes.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/WebGLAttributes.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLAttributes.module_three.kt index d311cb3..2863302 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLAttributes.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLAttributes.module_three.kt @@ -13,7 +13,7 @@ external interface AnonymousStruct85 { var version: Number } -external open class WebGLAttributes(gl: WebGLRenderingContext, capabilities: WebGLCapabilities) { +open external class WebGLAttributes(gl: WebGLRenderingContext, capabilities: WebGLCapabilities) { open fun get(attribute: BufferAttribute): AnonymousStruct85 open fun get(attribute: InterleavedBufferAttribute): AnonymousStruct85 open fun remove(attribute: BufferAttribute) diff --git a/src/mapMain/kotlin/externals/threejs/WebGLBindingStates.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLBindingStates.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/WebGLBindingStates.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLBindingStates.module_three.kt index 3d63909..6ea6709 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLBindingStates.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLBindingStates.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLRenderingContext -external open class WebGLBindingStates(gl: WebGLRenderingContext, extensions: WebGLExtensions, attributes: WebGLAttributes, capabilities: WebGLCapabilities) { +open external class WebGLBindingStates(gl: WebGLRenderingContext, extensions: WebGLExtensions, attributes: WebGLAttributes, capabilities: WebGLCapabilities) { open fun setup(obj: Object3D, material: Material, program: WebGLProgram, geometry: BufferGeometry, index: BufferAttribute) open fun reset() open fun resetDefaultState() diff --git a/src/mapMain/kotlin/externals/threejs/WebGLBufferRenderer.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLBufferRenderer.module_three.kt similarity index 87% rename from src/mapMain/kotlin/externals/threejs/WebGLBufferRenderer.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLBufferRenderer.module_three.kt index f743b4f..dccda63 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLBufferRenderer.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLBufferRenderer.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLRenderingContext -external open class WebGLBufferRenderer(gl: WebGLRenderingContext, extensions: WebGLExtensions, info: WebGLInfo, capabilities: WebGLCapabilities) { +open external class WebGLBufferRenderer(gl: WebGLRenderingContext, extensions: WebGLExtensions, info: WebGLInfo, capabilities: WebGLCapabilities) { open fun setMode(value: Any) open fun render(start: Any, count: Number) open fun renderInstances(start: Any, count: Number, primcount: Number) diff --git a/src/mapMain/kotlin/externals/threejs/WebGLCapabilities.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLCapabilities.module_three.kt similarity index 94% rename from src/mapMain/kotlin/externals/threejs/WebGLCapabilities.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLCapabilities.module_three.kt index 068e7f5..6f5b0af 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLCapabilities.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLCapabilities.module_three.kt @@ -14,7 +14,7 @@ external interface WebGLCapabilitiesParameters { set(value) = definedExternally } -external open class WebGLCapabilities(gl: WebGLRenderingContext, extensions: Any, parameters: WebGLCapabilitiesParameters) { +open external class WebGLCapabilities(gl: WebGLRenderingContext, extensions: Any, parameters: WebGLCapabilitiesParameters) { open var isWebGL2: Boolean open var precision: String open var logarithmicDepthBuffer: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/WebGLClipping.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLClipping.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/WebGLClipping.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLClipping.module_three.kt index 5f73851..3cf97a4 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLClipping.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLClipping.module_three.kt @@ -8,7 +8,7 @@ external interface AnonymousStruct84 { var needsUpdate: Boolean } -external open class WebGLClipping(properties: WebGLProperties) { +open external class WebGLClipping(properties: WebGLProperties) { open var uniform: AnonymousStruct84 open var numPlanes: Number open var numIntersection: Number diff --git a/src/mapMain/kotlin/externals/threejs/WebGLCubeMaps.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLCubeMaps.module_three.kt similarity index 79% rename from src/mapMain/kotlin/externals/threejs/WebGLCubeMaps.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLCubeMaps.module_three.kt index 484d7e5..c3b801e 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLCubeMaps.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLCubeMaps.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class WebGLCubeMaps(renderer: WebGLRenderer) { +open external class WebGLCubeMaps(renderer: WebGLRenderer) { open fun get(texture: Any): Any open fun dispose() } diff --git a/src/mapMain/kotlin/externals/threejs/WebGLCubeRenderTarget.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLCubeRenderTarget.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/WebGLCubeRenderTarget.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLCubeRenderTarget.module_three.kt index f44583f..7d749b6 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLCubeRenderTarget.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLCubeRenderTarget.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class WebGLCubeRenderTarget(size: Number, options: WebGLRenderTargetOptions = definedExternally) : WebGLRenderTarget { +open external class WebGLCubeRenderTarget(size: Number, options: WebGLRenderTargetOptions = definedExternally) : WebGLRenderTarget { override var texture: Texture open fun fromEquirectangularTexture(renderer: WebGLRenderer, texture: Texture): WebGLCubeRenderTarget /* this */ open fun clear(renderer: WebGLRenderer, color: Boolean, depth: Boolean, stencil: Boolean) diff --git a/src/mapMain/kotlin/externals/threejs/WebGLCubeUVMaps.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLCubeUVMaps.module_three.kt similarity index 79% rename from src/mapMain/kotlin/externals/threejs/WebGLCubeUVMaps.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLCubeUVMaps.module_three.kt index 17b0563..fb81304 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLCubeUVMaps.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLCubeUVMaps.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class WebGLCubeUVMaps(renderer: WebGLRenderer) { +open external class WebGLCubeUVMaps(renderer: WebGLRenderer) { open fun get(texture: T): Any open fun dispose() } diff --git a/src/mapMain/kotlin/externals/threejs/WebGLExtensions.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLExtensions.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/WebGLExtensions.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLExtensions.module_three.kt index 1720fe5..b1fbe32 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLExtensions.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLExtensions.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLRenderingContext -external open class WebGLExtensions(gl: WebGLRenderingContext) { +open external class WebGLExtensions(gl: WebGLRenderingContext) { open fun has(name: String): Boolean open fun init(capabilities: WebGLCapabilities) open fun get(name: String): Any diff --git a/src/mapMain/kotlin/externals/threejs/WebGLGeometries.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLGeometries.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/WebGLGeometries.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLGeometries.module_three.kt index 7043140..588fcdc 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLGeometries.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLGeometries.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLRenderingContext -external open class WebGLGeometries(gl: WebGLRenderingContext, attributes: WebGLAttributes, info: WebGLInfo) { +open external class WebGLGeometries(gl: WebGLRenderingContext, attributes: WebGLAttributes, info: WebGLInfo) { open fun get(obj: Object3D, geometry: BufferGeometry): BufferGeometry open fun update(geometry: BufferGeometry) open fun getWireframeAttribute(geometry: BufferGeometry): BufferAttribute diff --git a/src/mapMain/kotlin/externals/threejs/WebGLIndexedBufferRenderer.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLIndexedBufferRenderer.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/WebGLIndexedBufferRenderer.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLIndexedBufferRenderer.module_three.kt index d13dc4c..72d1b1f 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLIndexedBufferRenderer.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLIndexedBufferRenderer.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLRenderingContext -external open class WebGLIndexedBufferRenderer(gl: WebGLRenderingContext, extensions: Any, info: Any, capabilities: Any) { +open external class WebGLIndexedBufferRenderer(gl: WebGLRenderingContext, extensions: Any, info: Any, capabilities: Any) { open fun setMode(value: Any) open fun setIndex(index: Any) open fun render(start: Any, count: Number) diff --git a/src/mapMain/kotlin/externals/threejs/WebGLInfo.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLInfo.module_three.kt similarity index 92% rename from src/mapMain/kotlin/externals/threejs/WebGLInfo.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLInfo.module_three.kt index 95361f7..cb55cae 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLInfo.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLInfo.module_three.kt @@ -18,7 +18,7 @@ external interface AnonymousStruct42 { var triangles: Number } -external open class WebGLInfo(gl: WebGLRenderingContext) { +open external class WebGLInfo(gl: WebGLRenderingContext) { open var autoReset: Boolean open var memory: AnonymousStruct41 open var programs: Array? diff --git a/src/mapMain/kotlin/externals/threejs/WebGLLights.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLLights.module_three.kt similarity index 94% rename from src/mapMain/kotlin/externals/threejs/WebGLLights.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLLights.module_three.kt index 42a8c15..76ce5ff 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLLights.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLLights.module_three.kt @@ -35,7 +35,7 @@ external interface AnonymousStruct87 { var hemi: Array } -external open class WebGLLights(extensions: WebGLExtensions, capabilities: WebGLCapabilities) { +open external class WebGLLights(extensions: WebGLExtensions, capabilities: WebGLCapabilities) { open var state: AnonymousStruct87 open fun get(light: Any): Any open fun setup(lights: Any) diff --git a/src/mapMain/kotlin/externals/threejs/WebGLMultipleRenderTargets.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLMultipleRenderTargets.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/WebGLMultipleRenderTargets.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLMultipleRenderTargets.module_three.kt index 87cdf08..83d21e3 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLMultipleRenderTargets.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLMultipleRenderTargets.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.w3c.dom.events.EventTarget -external open class WebGLMultipleRenderTargets(width: Number, height: Number, count: Number) : EventTarget { +open external class WebGLMultipleRenderTargets(width: Number, height: Number, count: Number) : EventTarget { open var texture: Array open var isWebGLMultipleRenderTargets: Any open fun setSize(width: Number, height: Number, depth: Number = definedExternally): WebGLMultipleRenderTargets /* this */ diff --git a/src/mapMain/kotlin/externals/threejs/WebGLMultisampleRenderTarget.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLMultisampleRenderTarget.module_three.kt similarity index 84% rename from src/mapMain/kotlin/externals/threejs/WebGLMultisampleRenderTarget.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLMultisampleRenderTarget.module_three.kt index 4d931fa..744a983 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLMultisampleRenderTarget.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLMultisampleRenderTarget.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class WebGLMultisampleRenderTarget(width: Number, height: Number, options: WebGLRenderTargetOptions = definedExternally) : WebGLRenderTarget { +open external class WebGLMultisampleRenderTarget(width: Number, height: Number, options: WebGLRenderTargetOptions = definedExternally) : WebGLRenderTarget { open var isWebGLMultisampleRenderTarget: Boolean open var samples: Number } diff --git a/src/mapMain/kotlin/externals/threejs/WebGLObjects.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLObjects.module_three.kt similarity index 83% rename from src/mapMain/kotlin/externals/threejs/WebGLObjects.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLObjects.module_three.kt index 1ef99a4..9de2cf2 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLObjects.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLObjects.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLRenderingContext -external open class WebGLObjects(gl: WebGLRenderingContext, geometries: Any, attributes: Any, info: Any) { +open external class WebGLObjects(gl: WebGLRenderingContext, geometries: Any, attributes: Any, info: Any) { open fun update(obj: Any): Any open fun dispose() } diff --git a/src/mapMain/kotlin/externals/threejs/WebGLProgram.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLProgram.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/WebGLProgram.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLProgram.module_three.kt index 4bd7617..c2e7c51 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLProgram.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLProgram.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLShader -external open class WebGLProgram(renderer: WebGLRenderer, cacheKey: String, parameters: Any?) { +open external class WebGLProgram(renderer: WebGLRenderer, cacheKey: String, parameters: Any?) { open var name: String open var id: Number open var cacheKey: String diff --git a/src/mapMain/kotlin/externals/threejs/WebGLPrograms.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLPrograms.module_three.kt similarity index 91% rename from src/mapMain/kotlin/externals/threejs/WebGLPrograms.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLPrograms.module_three.kt index b54894c..8535287 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLPrograms.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLPrograms.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class WebGLPrograms(renderer: WebGLRenderer, cubemaps: WebGLCubeMaps, extensions: WebGLExtensions, capabilities: WebGLCapabilities, bindingStates: WebGLBindingStates, clipping: WebGLClipping) { +open external class WebGLPrograms(renderer: WebGLRenderer, cubemaps: WebGLCubeMaps, extensions: WebGLExtensions, capabilities: WebGLCapabilities, bindingStates: WebGLBindingStates, clipping: WebGLClipping) { open var programs: Array open fun getParameters(material: Material, lights: Any, shadows: Array, scene: Scene, obj: Any): Any open fun getProgramCacheKey(parameters: Any): String diff --git a/src/mapMain/kotlin/externals/threejs/WebGLProperties.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLProperties.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/WebGLProperties.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLProperties.module_three.kt index 8a6f24a..ce0986a 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLProperties.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLProperties.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class WebGLProperties { +open external class WebGLProperties { open fun get(obj: Any): Any open fun remove(obj: Any) open fun update(obj: Any, key: Any, value: Any): Any diff --git a/src/mapMain/kotlin/externals/threejs/WebGLRenderLists.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLRenderLists.module_three.kt similarity index 88% rename from src/mapMain/kotlin/externals/threejs/WebGLRenderLists.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLRenderLists.module_three.kt index c035a9c..7c5c6ae 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLRenderLists.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLRenderLists.module_three.kt @@ -17,7 +17,7 @@ external interface RenderItem { var group: Group? } -external open class WebGLRenderList(properties: WebGLProperties) { +open external class WebGLRenderList(properties: WebGLProperties) { open var opaque: Array open var transparent: Array open fun init() @@ -27,7 +27,7 @@ external open class WebGLRenderList(properties: WebGLProperties) { open fun finish() } -external open class WebGLRenderLists(properties: WebGLProperties) { +open external class WebGLRenderLists(properties: WebGLProperties) { open fun dispose() open fun get(scene: Scene, camera: Camera): WebGLRenderList } diff --git a/src/mapMain/kotlin/externals/threejs/WebGLRenderTarget.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLRenderTarget.module_three.kt similarity index 97% rename from src/mapMain/kotlin/externals/threejs/WebGLRenderTarget.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLRenderTarget.module_three.kt index 065617a..0bace1d 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLRenderTarget.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLRenderTarget.module_three.kt @@ -44,7 +44,7 @@ external interface WebGLRenderTargetOptions { set(value) = definedExternally } -external open class WebGLRenderTarget(width: Number, height: Number, options: WebGLRenderTargetOptions = definedExternally) : EventTarget { +open external class WebGLRenderTarget(width: Number, height: Number, options: WebGLRenderTargetOptions = definedExternally) : EventTarget { open var uuid: String open var width: Number open var height: Number diff --git a/src/mapMain/kotlin/externals/threejs/WebGLRenderer.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLRenderer.module_three.kt similarity index 99% rename from src/mapMain/kotlin/externals/threejs/WebGLRenderer.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLRenderer.module_three.kt index 32ac73a..855f24b 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLRenderer.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLRenderer.module_three.kt @@ -58,7 +58,7 @@ external interface WebGLDebug { var checkShaderErrors: Boolean } -external open class WebGLRenderer(parameters: WebGLRendererParameters = definedExternally) : Renderer { +open external class WebGLRenderer(parameters: WebGLRendererParameters = definedExternally) : Renderer { override var domElement: HTMLElement open var context: WebGLRenderingContext open var autoClear: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/WebGLShader.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLShader.module_three.kt similarity index 100% rename from src/mapMain/kotlin/externals/threejs/WebGLShader.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLShader.module_three.kt diff --git a/src/mapMain/kotlin/externals/threejs/WebGLShadowMap.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLShadowMap.module_three.kt similarity index 87% rename from src/mapMain/kotlin/externals/threejs/WebGLShadowMap.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLShadowMap.module_three.kt index 963acbe..b45d1ba 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLShadowMap.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLShadowMap.module_three.kt @@ -3,7 +3,7 @@ package externals.threejs -external open class WebGLShadowMap(_renderer: WebGLRenderer, _objects: WebGLObjects, _capabilities: WebGLCapabilities) { +open external class WebGLShadowMap(_renderer: WebGLRenderer, _objects: WebGLObjects, _capabilities: WebGLCapabilities) { open var enabled: Boolean open var autoUpdate: Boolean open var needsUpdate: Boolean diff --git a/src/mapMain/kotlin/externals/threejs/WebGLState.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLState.module_three.kt similarity index 94% rename from src/mapMain/kotlin/externals/threejs/WebGLState.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLState.module_three.kt index 5419a9d..2eaa211 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLState.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLState.module_three.kt @@ -7,14 +7,14 @@ import org.khronos.webgl.ArrayBufferView import org.khronos.webgl.WebGLFramebuffer import org.khronos.webgl.WebGLRenderingContext -external open class WebGLColorBuffer { +open external class WebGLColorBuffer { open fun setMask(colorMask: Boolean) open fun setLocked(lock: Boolean) open fun setClear(r: Number, g: Number, b: Number, a: Number, premultipliedAlpha: Boolean) open fun reset() } -external open class WebGLDepthBuffer { +open external class WebGLDepthBuffer { open fun setTest(depthTest: Boolean) open fun setMask(depthMask: Boolean) open fun setFunc(depthFunc: DepthModes) @@ -23,7 +23,7 @@ external open class WebGLDepthBuffer { open fun reset() } -external open class WebGLStencilBuffer { +open external class WebGLStencilBuffer { open fun setTest(stencilTest: Boolean) open fun setMask(stencilMask: Number) open fun setFunc(stencilFunc: Number, stencilRef: Number, stencilMask: Number) @@ -39,7 +39,7 @@ external interface AnonymousStruct43 { var stencil: WebGLStencilBuffer } -external open class WebGLState(gl: WebGLRenderingContext, extensions: WebGLExtensions, capabilities: WebGLCapabilities) { +open external class WebGLState(gl: WebGLRenderingContext, extensions: WebGLExtensions, capabilities: WebGLCapabilities) { open var buffers: AnonymousStruct43 open fun initAttributes() open fun enableAttribute(attribute: Number) diff --git a/src/mapMain/kotlin/externals/threejs/WebGLTextures.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLTextures.module_three.kt similarity index 93% rename from src/mapMain/kotlin/externals/threejs/WebGLTextures.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLTextures.module_three.kt index 72ea3e0..d87af2d 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLTextures.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLTextures.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLRenderingContext -external open class WebGLTextures(gl: WebGLRenderingContext, extensions: WebGLExtensions, state: WebGLState, properties: WebGLProperties, capabilities: WebGLCapabilities, utils: WebGLUtils, info: WebGLInfo) { +open external class WebGLTextures(gl: WebGLRenderingContext, extensions: WebGLExtensions, state: WebGLState, properties: WebGLProperties, capabilities: WebGLCapabilities, utils: WebGLUtils, info: WebGLInfo) { open fun allocateTextureUnit() open fun resetTextureUnits() open fun setTexture2D(texture: Any, slot: Number) diff --git a/src/mapMain/kotlin/externals/threejs/WebGLUniforms.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLUniforms.module_three.kt similarity index 90% rename from src/mapMain/kotlin/externals/threejs/WebGLUniforms.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLUniforms.module_three.kt index 7d1de45..e758e5d 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLUniforms.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLUniforms.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs import org.khronos.webgl.WebGLRenderingContext -external open class WebGLUniforms(gl: WebGLRenderingContext, program: WebGLProgram) { +open external class WebGLUniforms(gl: WebGLRenderingContext, program: WebGLProgram) { open fun setValue(gl: WebGLRenderingContext, name: String, value: Any, textures: WebGLTextures) open fun setOptional(gl: WebGLRenderingContext, obj: Any, name: String) diff --git a/src/mapMain/kotlin/externals/threejs/WebGLUtils.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WebGLUtils.module_three.kt similarity index 82% rename from src/mapMain/kotlin/externals/threejs/WebGLUtils.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WebGLUtils.module_three.kt index 4c8a8d1..e5182f2 100644 --- a/src/mapMain/kotlin/externals/threejs/WebGLUtils.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WebGLUtils.module_three.kt @@ -5,6 +5,6 @@ package externals.threejs import org.khronos.webgl.WebGLRenderingContext -external open class WebGLUtils(gl: WebGLRenderingContext, extensions: Any, capabilities: Any) { +open external class WebGLUtils(gl: WebGLRenderingContext, extensions: Any, capabilities: Any) { open fun convert(p: Any) } diff --git a/src/mapMain/kotlin/externals/threejs/WireframeGeometry.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/WireframeGeometry.module_three.kt similarity index 78% rename from src/mapMain/kotlin/externals/threejs/WireframeGeometry.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/WireframeGeometry.module_three.kt index 7b4c9a2..a6520ed 100644 --- a/src/mapMain/kotlin/externals/threejs/WireframeGeometry.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/WireframeGeometry.module_three.kt @@ -3,6 +3,6 @@ package externals.threejs -external open class WireframeGeometry(geometry: BufferGeometry) : BufferGeometry { +open external class WireframeGeometry(geometry: BufferGeometry) : BufferGeometry { override var type: String } diff --git a/src/mapMain/kotlin/externals/threejs/constants.module_three.kt b/externals/src/jsMain/kotlin/externals/threejs/constants.module_three.kt similarity index 89% rename from src/mapMain/kotlin/externals/threejs/constants.module_three.kt rename to externals/src/jsMain/kotlin/externals/threejs/constants.module_three.kt index 521f43c..743e45d 100644 --- a/src/mapMain/kotlin/externals/threejs/constants.module_three.kt +++ b/externals/src/jsMain/kotlin/externals/threejs/constants.module_three.kt @@ -5,7 +5,7 @@ package externals.threejs external var REVISION: String -external sealed class MOUSE { +sealed external class MOUSE { object LEFT : MOUSE /* = 0 */ object MIDDLE : MOUSE /* = 1 */ object RIGHT : MOUSE /* = 2 */ @@ -14,14 +14,14 @@ external sealed class MOUSE { object PAN : MOUSE /* = 2 */ } -external sealed class TOUCH { +sealed external class TOUCH { object ROTATE : TOUCH object PAN : TOUCH object DOLLY_PAN : TOUCH object DOLLY_ROTATE : TOUCH } -external sealed class CullFace { +sealed external class CullFace { } @@ -33,7 +33,7 @@ external var CullFaceFront: CullFace external var CullFaceFrontBack: CullFace -external sealed class ShadowMapType { +sealed external class ShadowMapType { } @@ -45,7 +45,7 @@ external var PCFSoftShadowMap: ShadowMapType external var VSMShadowMap: ShadowMapType -external sealed class Side { +sealed external class Side { } @@ -55,7 +55,7 @@ external var BackSide: Side external var DoubleSide: Side -external sealed class Shading { +sealed external class Shading { } @@ -63,7 +63,7 @@ external var FlatShading: Shading external var SmoothShading: Shading -external sealed class Blending { +sealed external class Blending { } @@ -79,7 +79,7 @@ external var MultiplyBlending: Blending external var CustomBlending: Blending -external sealed class BlendingEquation { +sealed external class BlendingEquation { } @@ -93,7 +93,7 @@ external var MinEquation: BlendingEquation external var MaxEquation: BlendingEquation -external sealed class BlendingDstFactor { +sealed external class BlendingDstFactor { } @@ -117,13 +117,13 @@ external var DstColorFactor: BlendingDstFactor external var OneMinusDstColorFactor: BlendingDstFactor -external sealed class BlendingSrcFactor { +sealed external class BlendingSrcFactor { } external var SrcAlphaSaturateFactor: BlendingSrcFactor -external sealed class DepthModes { +sealed external class DepthModes { } @@ -143,7 +143,7 @@ external var GreaterDepth: DepthModes external var NotEqualDepth: DepthModes -external sealed class Combine { +sealed external class Combine { } @@ -153,7 +153,7 @@ external var MixOperation: Combine external var AddOperation: Combine -external sealed class ToneMapping { +sealed external class ToneMapping { } @@ -167,7 +167,7 @@ external var CineonToneMapping: ToneMapping external var ACESFilmicToneMapping: ToneMapping -external sealed class Mapping { +sealed external class Mapping { } @@ -185,7 +185,7 @@ external var CubeUVReflectionMapping: Mapping external var CubeUVRefractionMapping: Mapping -external sealed class Wrapping { +sealed external class Wrapping { } @@ -195,7 +195,7 @@ external var ClampToEdgeWrapping: Wrapping external var MirroredRepeatWrapping: Wrapping -external sealed class TextureFilter { +sealed external class TextureFilter { } @@ -219,7 +219,7 @@ external var LinearMipmapLinearFilter: TextureFilter external var LinearMipMapLinearFilter: TextureFilter -external sealed class TextureDataType { +sealed external class TextureDataType { } @@ -247,7 +247,7 @@ external var UnsignedShort565Type: TextureDataType external var UnsignedInt248Type: TextureDataType -external sealed class PixelFormat { +sealed external class PixelFormat { } @@ -279,7 +279,7 @@ external var RGBIntegerFormat: PixelFormat external var RGBAIntegerFormat: PixelFormat -external sealed class CompressedPixelFormat { +sealed external class CompressedPixelFormat { } @@ -363,7 +363,7 @@ external var SRGB8_ALPHA8_ASTC_12x12_Format: CompressedPixelFormat external var RGBA_BPTC_Format: CompressedPixelFormat -external sealed class AnimationActionLoopStyles { +sealed external class AnimationActionLoopStyles { } @@ -373,7 +373,7 @@ external var LoopRepeat: AnimationActionLoopStyles external var LoopPingPong: AnimationActionLoopStyles -external sealed class InterpolationModes { +sealed external class InterpolationModes { } @@ -383,7 +383,7 @@ external var InterpolateLinear: InterpolationModes external var InterpolateSmooth: InterpolationModes -external sealed class InterpolationEndingModes { +sealed external class InterpolationEndingModes { } @@ -393,7 +393,7 @@ external var ZeroSlopeEnding: InterpolationEndingModes external var WrapAroundEnding: InterpolationEndingModes -external sealed class AnimationBlendMode { +sealed external class AnimationBlendMode { } @@ -401,7 +401,7 @@ external var NormalAnimationBlendMode: AnimationBlendMode external var AdditiveAnimationBlendMode: AnimationBlendMode -external sealed class TrianglesDrawModes { +sealed external class TrianglesDrawModes { } @@ -411,7 +411,7 @@ external var TriangleStripDrawMode: TrianglesDrawModes external var TriangleFanDrawMode: TrianglesDrawModes -external sealed class TextureEncoding { +sealed external class TextureEncoding { } @@ -431,7 +431,7 @@ external var RGBM16Encoding: TextureEncoding external var RGBDEncoding: TextureEncoding -external sealed class DepthPackingStrategies { +sealed external class DepthPackingStrategies { } @@ -439,7 +439,7 @@ external var BasicDepthPacking: DepthPackingStrategies external var RGBADepthPacking: DepthPackingStrategies -external sealed class NormalMapTypes { +sealed external class NormalMapTypes { } @@ -447,7 +447,7 @@ external var TangentSpaceNormalMap: NormalMapTypes external var ObjectSpaceNormalMap: NormalMapTypes -external sealed class StencilOp { +sealed external class StencilOp { } @@ -467,7 +467,7 @@ external var DecrementWrapStencilOp: StencilOp external var InvertStencilOp: StencilOp -external sealed class StencilFunc { +sealed external class StencilFunc { } @@ -487,7 +487,7 @@ external var GreaterEqualStencilFunc: StencilFunc external var AlwaysStencilFunc: StencilFunc -external sealed class Usage { +sealed external class Usage { } @@ -509,7 +509,7 @@ external var DynamicCopyUsage: Usage external var StreamCopyUsage: Usage -external sealed class GLSLVersion { +sealed external class GLSLVersion { } diff --git a/settings.gradle.kts b/settings.gradle.kts index 7dab3e5..b7bc9a1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,2 +1,5 @@ rootProject.name = "factbooks" + +include("externals") +//include("fightgame") diff --git a/src/mapMain/kotlin/externals/threejs/0_extraDefs.module_three.kt b/src/mapMain/kotlin/externals/threejs/0_extraDefs.module_three.kt deleted file mode 100644 index 9421115..0000000 --- a/src/mapMain/kotlin/externals/threejs/0_extraDefs.module_three.kt +++ /dev/null @@ -1,19 +0,0 @@ -@file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS", "DEPRECATION") - -package externals.threejs - -external interface StringDict { - @nativeGetter - operator fun get(key: String): Type? - - @nativeSetter - operator fun set(key: String, value: Type) -} - -external interface ArrayLike { - @nativeGetter - operator fun get(key: Number): Type? - - @nativeSetter - operator fun set(key: Number, value: Type) -} diff --git a/stuff/map-index.html b/stuff/map-index.html index beedec9..01c7cb2 100644 --- a/stuff/map-index.html +++ b/stuff/map-index.html @@ -23,7 +23,6 @@ - @@ -35,8 +34,6 @@ - - -- 2.25.1