From 5ce671ff3f5fc413239e141f34fbe2aafb8c1cb1 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 14 Jul 2019 22:08:15 +0300 Subject: [PATCH] Geometry update --- LICENSE | 201 ++++++++++++++++++ build.gradle.kts | 13 +- .../vis/common/VisualObjectDelegates.kt | 24 +-- .../dataforge/vis/fx/demo/MetaEditorDemo.kt | 2 +- .../kotlin/hep/dataforge/vis/jsroot/HMR.kt | 2 +- .../kotlin/hep/dataforge/vis/jsroot/JSRoot.kt | 2 +- .../hep/dataforge/vis/jsroot/JSRootDemoApp.kt | 4 +- .../hep/dataforge/vis/jsroot/JSRootGEO.kt | 2 +- .../dataforge/vis/jsroot/JSRootGeometry.kt | 2 +- .../hep/dataforge/vis/jsroot/JSRootObject.kt | 2 +- .../hep/dataforge/vis/jsroot/JSRootPlugin.kt | 4 +- .../kotlin/hep/dataforge/vis/jsroot/main.kt | 3 +- .../dataforge/vis/spatial/gdml/Polyhedra.kt | 16 -- .../dataforge/vis/spatial/gdml/visualGDML.kt | 15 +- dataforge-vis-spatial-js/build.gradle.kts | 7 +- .../hep/dataforge/vis/spatial/Cylinder.kt | 28 +++ settings.gradle.kts | 3 +- 17 files changed, 275 insertions(+), 55 deletions(-) create mode 100644 LICENSE delete mode 100644 dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/Polyhedra.kt create mode 100644 dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Cylinder.kt diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/build.gradle.kts b/build.gradle.kts index fc4d14f0..4d53a86b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,8 @@ plugins{ id("kotlin2js") version "1.3.40" apply false id("kotlin-dce-js") version "1.3.40" apply false id("org.jetbrains.kotlin.frontend") version "0.0.45" apply false - id("scientifik.mpp") version "0.1.0" apply false + id("scientifik.mpp") version "0.1.3" apply false + id("scientifik.publish") version "0.1.3" apply false } allprojects { @@ -18,12 +19,12 @@ allprojects { } group = "hep.dataforge" - version = dataforgeVersion + version = "0.1.0" } +val githubProject by extra("dataforge-vis") +val bintrayRepo by extra("dataforge") + subprojects { -// apply(plugin = "dokka-publish") -// if (name.startsWith("dataforge")) { -// apply(plugin = "npm-publish") -// } + apply(plugin = "scientifik.publish") } \ No newline at end of file diff --git a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObjectDelegates.kt b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObjectDelegates.kt index 8879cbd1..7a35f3e8 100644 --- a/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObjectDelegates.kt +++ b/dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/VisualObjectDelegates.kt @@ -55,22 +55,22 @@ class DisplayObjectDelegateWrapper( } -fun VisualObject.value(default: Value? = null, key: String? = null, inherited: Boolean = true) = +fun VisualObject.value(default: Value? = null, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.value } -fun VisualObject.string(default: String? = null, key: String? = null, inherited: Boolean = true) = +fun VisualObject.string(default: String? = null, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.string } -fun VisualObject.boolean(default: Boolean? = null, key: String? = null, inherited: Boolean = true) = +fun VisualObject.boolean(default: Boolean? = null, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.boolean } -fun VisualObject.number(default: Number? = null, key: String? = null, inherited: Boolean = true) = +fun VisualObject.number(default: Number? = null, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.number } -fun VisualObject.double(default: Double? = null, key: String? = null, inherited: Boolean = true) = +fun VisualObject.double(default: Double? = null, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.double } -fun VisualObject.int(default: Int? = null, key: String? = null, inherited: Boolean = true) = +fun VisualObject.int(default: Int? = null, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.int } @@ -83,26 +83,26 @@ fun VisualObject.item(key: String? = null, inherited: Boolean = true) = //fun Configurable.spec(spec: Specification, key: String? = null) = ChildConfigDelegate(key) { spec.wrap(this) } @JvmName("safeString") -fun VisualObject.string(default: String, key: String? = null, inherited: Boolean = true) = +fun VisualObject.string(default: String, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.string } @JvmName("safeBoolean") -fun VisualObject.boolean(default: Boolean, key: String? = null, inherited: Boolean = true) = +fun VisualObject.boolean(default: Boolean, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.boolean } @JvmName("safeNumber") -fun VisualObject.number(default: Number, key: String? = null, inherited: Boolean = true) = +fun VisualObject.number(default: Number, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.number } @JvmName("safeDouble") -fun VisualObject.double(default: Double, key: String? = null, inherited: Boolean = true) = +fun VisualObject.double(default: Double, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.double } @JvmName("safeInt") -fun VisualObject.int(default: Int, key: String? = null, inherited: Boolean = true) = +fun VisualObject.int(default: Int, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { it.int } -inline fun > VisualObject.enum(default: E, key: String? = null, inherited: Boolean = true) = +inline fun > VisualObject.enum(default: E, key: String? = null, inherited: Boolean = false) = DisplayObjectDelegateWrapper(key?.toName(), default, inherited) { item -> item.string?.let { enumValueOf(it) } } //merge properties diff --git a/dataforge-vis-fx/src/main/kotlin/hep/dataforge/vis/fx/demo/MetaEditorDemo.kt b/dataforge-vis-fx/src/main/kotlin/hep/dataforge/vis/fx/demo/MetaEditorDemo.kt index 35dfbb67..6ced3e79 100644 --- a/dataforge-vis-fx/src/main/kotlin/hep/dataforge/vis/fx/demo/MetaEditorDemo.kt +++ b/dataforge-vis-fx/src/main/kotlin/hep/dataforge/vis/fx/demo/MetaEditorDemo.kt @@ -54,4 +54,4 @@ class MetaEditorDemo : View("Meta editor demo") { fun main() { launch() -} +} \ No newline at end of file diff --git a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/HMR.kt b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/HMR.kt index d5f5fffe..2834da53 100644 --- a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/HMR.kt +++ b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/HMR.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.demo +package hep.dataforge.vis.jsroot external val module: Module diff --git a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRoot.kt b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRoot.kt index 9a355a6a..76b9181f 100644 --- a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRoot.kt +++ b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRoot.kt @@ -1,6 +1,6 @@ @file:JsModule("JSRootUtils") @file:JsNonModule -package hep.dataforge.vis.spatial.jsroot +package hep.dataforge.vis.jsroot external fun parse(obj: String): dynamic diff --git a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootDemoApp.kt b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootDemoApp.kt index cf7d1629..aa6eb542 100644 --- a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootDemoApp.kt +++ b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootDemoApp.kt @@ -1,9 +1,7 @@ -package hep.dataforge.vis.spatial.jsroot +package hep.dataforge.vis.jsroot import hep.dataforge.context.Global import hep.dataforge.meta.EmptyMeta -import hep.dataforge.vis.spatial.three.ThreeOutput -import hep.dataforge.vis.spatial.demo.ApplicationBase import hep.dataforge.vis.spatial.render import hep.dataforge.vis.spatial.three.ThreePlugin import hep.dataforge.vis.spatial.three.output diff --git a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootGEO.kt b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootGEO.kt index 9d3fc17d..115ec701 100644 --- a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootGEO.kt +++ b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootGEO.kt @@ -1,7 +1,7 @@ @file:JsModule("JSRootGeoBase") @file:JsNonModule -package hep.dataforge.vis.spatial.jsroot +package hep.dataforge.vis.jsroot import info.laht.threekt.core.BufferGeometry import info.laht.threekt.core.Object3D diff --git a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootGeometry.kt b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootGeometry.kt index 46f44151..c23546a1 100644 --- a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootGeometry.kt +++ b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootGeometry.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.jsroot +package hep.dataforge.vis.jsroot import hep.dataforge.meta.EmptyMeta import hep.dataforge.meta.Meta diff --git a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootObject.kt b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootObject.kt index c8d827ce..0b5b5f30 100644 --- a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootObject.kt +++ b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootObject.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.jsroot +package hep.dataforge.vis.jsroot import hep.dataforge.meta.EmptyMeta import hep.dataforge.meta.Meta diff --git a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootPlugin.kt b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootPlugin.kt index f0a7cb73..0c386f58 100644 --- a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootPlugin.kt +++ b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/JSRootPlugin.kt @@ -1,4 +1,4 @@ -package hep.dataforge.vis.spatial.jsroot +package hep.dataforge.vis.jsroot import hep.dataforge.context.AbstractPlugin import hep.dataforge.context.PluginFactory @@ -10,7 +10,7 @@ import hep.dataforge.vis.spatial.three.ThreeFactory import hep.dataforge.vis.spatial.three.ThreePlugin class JSRootPlugin : AbstractPlugin() { - override val tag: PluginTag get() = JSRootPlugin.tag + override val tag: PluginTag get() = Companion.tag override fun dependsOn() = listOf(ThreePlugin) diff --git a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/main.kt b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/main.kt index 97eda399..3a62381b 100644 --- a/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/main.kt +++ b/dataforge-vis-jsroot/src/main/kotlin/hep/dataforge/vis/jsroot/main.kt @@ -1,6 +1,5 @@ -package hep.dataforge.vis.spatial.demo +package hep.dataforge.vis.jsroot -import hep.dataforge.vis.spatial.jsroot.JSRootDemoApp import kotlin.browser.document import kotlin.dom.hasClass diff --git a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/Polyhedra.kt b/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/Polyhedra.kt deleted file mode 100644 index 0bb9d661..00000000 --- a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/Polyhedra.kt +++ /dev/null @@ -1,16 +0,0 @@ -package hep.dataforge.vis.spatial.gdml - -import hep.dataforge.meta.Meta -import hep.dataforge.vis.common.DisplayLeaf -import hep.dataforge.vis.common.VisualObject -import hep.dataforge.vis.spatial.GeometryBuilder -import hep.dataforge.vis.spatial.Shape - -class Polyhedra(parent: VisualObject?, meta: Meta) : DisplayLeaf(parent, meta), Shape { - - - override fun toGeometry(geometryBuilder: GeometryBuilder) { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. - } - -} \ No newline at end of file diff --git a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt b/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt index 8f48d915..046ee11c 100644 --- a/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt +++ b/dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt @@ -28,7 +28,10 @@ private fun VisualObject.applyRotation(rotation: GDMLRotation): VisualObject = a private fun VisualGroup.addSolid(root: GDML, solid: GDMLSolid, block: VisualObject.() -> Unit = {}): VisualObject { return when (solid) { is GDMLBox -> box(solid.x, solid.y, solid.z) - is GDMLTube -> TODO() + is GDMLTube -> cylinder(solid.rmax, solid.z) { + startAngle = solid.startphi + angle = solid.deltaphi + } is GDMLXtru -> extrude { shape { solid.vertices.forEach { @@ -45,9 +48,9 @@ private fun VisualGroup.addSolid(root: GDML, solid: GDMLSolid, block: VisualObje ?: error("Solid with tag ${solid.solidref.ref} for scaled solid ${solid.name} not defined") addSolid(root, innerSolid) { block() - scaleX = scaleX.toDouble() * solid.scale.value.toDouble() - scaleY = scaleY.toDouble() * solid.scale.value.toDouble() - scaleZ = scaleZ.toDouble() * solid.scale.value.toDouble() + scaleX = scaleX.toDouble() * solid.scale.x.toDouble() + scaleY = scaleY.toDouble() * solid.scale.y.toDouble() + scaleZ = scaleZ.toDouble() * solid.scale.z.toDouble() } } is GDMLSphere -> sphere(solid.rmax, solid.deltaphi, solid.deltatheta) { @@ -94,7 +97,7 @@ private fun VisualGroup.addSolid(root: GDML, solid: GDMLSolid, block: VisualObje private fun VisualGroup.addVolume( root: GDML, gdmlVolume: GDMLVolume, - resolveColor: GDMLMaterialBase.() -> Meta + resolveColor: GDMLMaterial.() -> Meta ): VisualGroup { val solid = gdmlVolume.solidref.resolve(root) @@ -121,6 +124,6 @@ private fun VisualGroup.addVolume( fun GDML.toVisual(): VisualGroup { //TODO add materials cache - fun GDMLMaterialBase.color(): Meta = EmptyMeta + fun GDMLMaterial.color(): Meta = EmptyMeta return VisualGroup().also { it.addVolume(this, world) { color() } } } \ No newline at end of file diff --git a/dataforge-vis-spatial-js/build.gradle.kts b/dataforge-vis-spatial-js/build.gradle.kts index 6e008e34..72e3b5c1 100644 --- a/dataforge-vis-spatial-js/build.gradle.kts +++ b/dataforge-vis-spatial-js/build.gradle.kts @@ -9,10 +9,15 @@ plugins { id("org.jetbrains.kotlin.frontend") } -val kotlinVersion: String by rootProject.extra +repositories{ + maven("https://dl.bintray.com/pdvrieze/maven") +} + +//val kotlinVersion: String by rootProject.extra dependencies { api(project(":dataforge-vis-spatial")) + api(project(":dataforge-vis-spatial-gdml")) api("info.laht.threekt:threejs-wrapper:0.106-npm-2") testCompile(kotlin("test-js")) } diff --git a/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Cylinder.kt b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Cylinder.kt new file mode 100644 index 00000000..93a1bede --- /dev/null +++ b/dataforge-vis-spatial/src/commonMain/kotlin/hep/dataforge/vis/spatial/Cylinder.kt @@ -0,0 +1,28 @@ +package hep.dataforge.vis.spatial + +import hep.dataforge.meta.EmptyMeta +import hep.dataforge.meta.Meta +import hep.dataforge.vis.common.DisplayLeaf +import hep.dataforge.vis.common.VisualGroup +import hep.dataforge.vis.common.VisualObject +import hep.dataforge.vis.common.number +import kotlin.math.PI + +/** + * A cylinder or cut cone segment + */ +class Cylinder(parent: VisualObject?, meta: Meta) : DisplayLeaf(parent, meta) { + var radius by number() + var upperRadius by number(default = radius) + var height by number() + var startAngle by number(0.0) + var angle by number(2* PI) +} + +fun VisualGroup.cylinder(r: Number, height: Number, meta: Meta = EmptyMeta, block: Cylinder.()->Unit = {}):Cylinder{ + val cylinder = Cylinder(this,meta) + cylinder.radius = r + cylinder.height = height + cylinder.apply(block) + return cylinder +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index e13494eb..76012be5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,6 @@ pluginManagement { repositories { + mavenLocal() jcenter() gradlePluginPortal() maven("https://dl.bintray.com/kotlin/kotlin-eap") @@ -34,7 +35,7 @@ include( ":dataforge-vis-spatial", ":dataforge-vis-spatial-fx", ":dataforge-vis-spatial-js", - ":dataforge-vis-jsroot", +// ":dataforge-vis-jsroot", ":dataforge-vis-spatial-gdml" )