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

cleanup

Browse Source
This commit is contained in:
Alexander Nozik 2021-07-11 15:16:04 +03:00
parent 7b30b62849
commit 42e2530f6f
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
View File

@ -17,7 +17,7 @@ import space.kscience.dataforge.names.*
@Serializable @Serializable
@SerialName("vision.group") @SerialName("vision.group")
public open class VisionGroupBase( public open class VisionGroupBase(
@SerialName("children") internal val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap(), @SerialName("children") protected val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap(),
) : VisionBase(), MutableVisionGroup { ) : VisionBase(), MutableVisionGroup {
/** /**

3
visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
View File

@ -29,9 +29,6 @@ public interface PrototypeHolder {
@SerialName("group.solid") @SerialName("group.solid")
public class SolidGroup( public class SolidGroup(
@Serializable(PrototypeSerializer::class) internal var prototypes: MutableVisionGroup? = null, @Serializable(PrototypeSerializer::class) internal var prototypes: MutableVisionGroup? = null,
// override var position: Point3D? = null,
// override var rotation: Point3D? = null,
// override var scale: Point3D? = null,
) : VisionGroupBase(), Solid, PrototypeHolder { ) : VisionGroupBase(), Solid, PrototypeHolder {
init { init {

17
visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
View File

@ -95,23 +95,6 @@ public class SolidReferenceGroup(
* (properties are stored in external cache) and created and destroyed on-demand). * (properties are stored in external cache) and created and destroyed on-demand).
*/ */
private inner class ReferenceChild(private val childName: Name) : SolidReference, VisionGroup { private inner class ReferenceChild(private val childName: Name) : SolidReference, VisionGroup {
// //TODO replace by properties
// override var position: Point3D?
// get() = prototype.position
// set(_) {
// error("Can't set position of reference")
// }
// override var rotation: Point3D?
// get() = prototype.rotation
// set(_) {
// error("Can't set position of reference")
// }
// override var scale: Point3D?
// get() = prototype.scale
// set(_) {
// error("Can't set position of reference")
// }
override val prototype: Solid get() = prototypeFor(childName) override val prototype: Solid get() = prototypeFor(childName)
override val children: Map<NameToken, Vision> override val children: Map<NameToken, Vision>