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

Fix Three color change problem

Browse Source
This commit is contained in:
Alexander Nozik 2019-12-26 11:46:44 +03:00
parent c2e396328f
commit 8932c8dfd1
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dataforge-vis-common/src/commonMain/kotlin/hep/dataforge/vis/common/AbstractVisualObject.kt
View File

@ -48,10 +48,12 @@ abstract class AbstractVisualObject : VisualObject {
private val listeners = HashSet<PropertyListener>() private val listeners = HashSet<PropertyListener>()
override fun propertyChanged(name: Name, before: MetaItem<*>?, after: MetaItem<*>?) { override fun propertyChanged(name: Name, before: MetaItem<*>?, after: MetaItem<*>?) {
if (before != after) {
for (l in listeners) { for (l in listeners) {
l.action(name, before, after) l.action(name, before, after)
} }
} }
}
override fun onPropertyChange(owner: Any?, action: (Name, before: MetaItem<*>?, after: MetaItem<*>?) -> Unit) { override fun onPropertyChange(owner: Any?, action: (Name, before: MetaItem<*>?, after: MetaItem<*>?) -> Unit) {
listeners.add(PropertyListener(owner, action)) listeners.add(PropertyListener(owner, action))

2
dataforge-vis-spatial/src/jsMain/kotlin/hep/dataforge/vis/spatial/three/ThreeMaterials.kt
View File

@ -93,7 +93,7 @@ fun MetaItem<*>.color(): Color {
fun Mesh.updateMaterial(obj: VisualObject) { fun Mesh.updateMaterial(obj: VisualObject) {
val meta = obj.getProperty(Material3D.MATERIAL_KEY).node?:EmptyMeta val meta = obj.getProperty(Material3D.MATERIAL_KEY).node?:EmptyMeta
material = (material as? MeshBasicMaterial ?: MeshBasicMaterial()).apply { material = MeshBasicMaterial().apply {
color = meta[Material3D.COLOR_KEY]?.color() ?: ThreeMaterials.DEFAULT_COLOR color = meta[Material3D.COLOR_KEY]?.color() ?: ThreeMaterials.DEFAULT_COLOR
opacity = meta[Material3D.OPACITY_KEY]?.double ?: 1.0 opacity = meta[Material3D.OPACITY_KEY]?.double ?: 1.0
transparent = opacity < 1.0 transparent = opacity < 1.0

2
demo/gdml/build.gradle.kts
View File

@ -15,7 +15,7 @@ kotlin {
js { js {
browser { browser {
webpackTask { webpackTask {
sourceMaps = false //sourceMaps = false
} }
} }
} }