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

v0.2.0-dev-22 #47

Merged
altavir merged 158 commits from dev into master 2021-07-17 11:04:22 +03:00
Conversation 0 Commits 158 Files Changed 518 +13 -5
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5eb9925d35 - Show all commits

2
playground/src/jvmMain/kotlin/randomSpheres.kt
View File

@ -34,7 +34,7 @@ fun main() {
} }
} }
VisionForge.makeVisionFile( VisionForge.withSolids().makeVisionFile(
fragment, fragment,
Paths.get("randomSpheres.html"), Paths.get("randomSpheres.html"),
resourceLocation = ResourceLocation.EMBED resourceLocation = ResourceLocation.EMBED

3
playground/src/jvmMain/kotlin/simpleCube.kt
View File

@ -7,6 +7,7 @@ import hep.dataforge.vision.html.ResourceLocation
import hep.dataforge.vision.html.fragment import hep.dataforge.vision.html.fragment
import hep.dataforge.vision.solid.box import hep.dataforge.vision.solid.box
import hep.dataforge.vision.solid.solid import hep.dataforge.vision.solid.solid
import hep.dataforge.vision.solid.withSolids
@OptIn(DFExperimental::class) @OptIn(DFExperimental::class)
fun main() { fun main() {
@ -18,5 +19,5 @@ fun main() {
} }
} }
VisionForge.makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM) VisionForge.withSolids().makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
} }

1
visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
View File

@ -86,7 +86,6 @@ public abstract class VisionPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(met
VisionManager.VISION_SERIALIZER_MODULE_TARGET -> mapOf(tag.toString().toName() to visionSerializersModule) VisionManager.VISION_SERIALIZER_MODULE_TARGET -> mapOf(tag.toString().toName() to visionSerializersModule)
else -> super.content(target) else -> super.content(target)
} }
} }
/** /**

2
visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
View File

@ -18,7 +18,7 @@ public data class Page(
fragment(it) fragment(it)
} }
} }
title(title) title(this@Page.title)
} }
body { body {
embedVisionFragment(context.visionManager, fragment = content) embedVisionFragment(context.visionManager, fragment = content)

4
visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
View File

@ -69,3 +69,7 @@ public class SolidManager(meta: Meta) : VisionPlugin(meta) {
@VisionBuilder @VisionBuilder
@DFExperimental @DFExperimental
public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block) public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
public fun Context.withSolids(): Context = apply {
plugins.fetch(SolidManager)
}

4
visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
View File

@ -200,3 +200,7 @@ internal fun Object3D.findChild(name: Name): Object3D? {
else -> findChild(name.tokens.first().asName())?.findChild(name.cutFirst()) else -> findChild(name.tokens.first().asName())?.findChild(name.cutFirst())
} }
} }
public fun Context.withThreeJs(): Context = apply {
plugins.fetch(ThreePlugin)
}