kscience/visionforge
8
1
Fork 1
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Fixed rotation order in composites

Browse Source
This commit is contained in:
Alexander Nozik 2019-10-02 22:15:23 +03:00
parent 39ca362aa8
commit 255261e789
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/GDMLTransformer.kt
View File

@ -8,9 +8,11 @@ import hep.dataforge.names.toName
import hep.dataforge.vis.common.Colors import hep.dataforge.vis.common.Colors
import hep.dataforge.vis.common.VisualObject import hep.dataforge.vis.common.VisualObject
import hep.dataforge.vis.common.applyStyle import hep.dataforge.vis.common.applyStyle
import hep.dataforge.vis.spatial.RotationOrder
import hep.dataforge.vis.spatial.VisualGroup3D import hep.dataforge.vis.spatial.VisualGroup3D
import hep.dataforge.vis.spatial.VisualObject3D import hep.dataforge.vis.spatial.VisualObject3D
import hep.dataforge.vis.spatial.VisualObject3D.Companion.COLOR_KEY import hep.dataforge.vis.spatial.VisualObject3D.Companion.COLOR_KEY
import hep.dataforge.vis.spatial.rotationOrder
import scientifik.gdml.* import scientifik.gdml.*
import kotlin.collections.set import kotlin.collections.set
import kotlin.random.Random import kotlin.random.Random
@ -88,6 +90,7 @@ class GDMLTransformer(val root: GDML) {
styles.forEach { styles.forEach {
final.setStyle(it.key, it.value) final.setStyle(it.key, it.value)
} }
final.rotationOrder = RotationOrder.ZXY
onFinish(this@GDMLTransformer) onFinish(this@GDMLTransformer)
return final return final
} }

2
dataforge-vis-spatial-gdml/src/commonMain/kotlin/hep/dataforge/vis/spatial/gdml/visualGDML.kt
View File

@ -25,7 +25,7 @@ private fun VisualObject3D.withPosition(
this@withPosition.rotationX = rotation.x() this@withPosition.rotationX = rotation.x()
this@withPosition.rotationY = rotation.y() this@withPosition.rotationY = rotation.y()
this@withPosition.rotationZ = rotation.z() this@withPosition.rotationZ = rotation.z()
this@withPosition.rotationOrder = RotationOrder.ZXY //this@withPosition.rotationOrder = RotationOrder.ZXY
} }
scale?.let { scale?.let {
this@withPosition.scaleX = scale.x.toFloat() this@withPosition.scaleX = scale.x.toFloat()

4
dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeCompositeFactory.kt
View File

@ -11,9 +11,9 @@ import info.laht.threekt.objects.Mesh
class ThreeCompositeFactory(val three: ThreePlugin) : MeshThreeFactory<Composite>(Composite::class) { class ThreeCompositeFactory(val three: ThreePlugin) : MeshThreeFactory<Composite>(Composite::class) {
override fun buildGeometry(obj: Composite): BufferGeometry { override fun buildGeometry(obj: Composite): BufferGeometry {
val first = three.buildObject3D(obj.first) as? Mesh ?: error("First part of composite is not a mesh") val first = three.buildObject3D(obj.first.apply { parent = obj.parent }) as? Mesh ?: error("First part of composite is not a mesh")
first.updateMatrix() first.updateMatrix()
val second = three.buildObject3D(obj.second) as? Mesh ?: error("Second part of composite is not a mesh") val second = three.buildObject3D(obj.second.apply { parent = obj.parent }) as? Mesh ?: error("Second part of composite is not a mesh")
second.updateMatrix() second.updateMatrix()
val firstCSG = CSG.fromMesh(first) val firstCSG = CSG.fromMesh(first)
val secondCSG = CSG.fromMesh(second) val secondCSG = CSG.fromMesh(second)