kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vector control in GUI

Browse Source 
Also using snapshot of panel
This commit is contained in:
Rein van der Woerd
2020-03-14 16:17:45 +01:00
parent c8605f7f53
commit cba59e6a89
3 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
orx-gui/src/main/kotlin/Gui.kt
View File

@@ -13,6 +13,7 @@ import org.openrndr.dialogs.saveFileDialog
import org.openrndr.draw.Drawer
import org.openrndr.extra.parameters.*
import org.openrndr.internal.Driver
import org.openrndr.math.Vector2
import org.openrndr.panel.ControlManager
import org.openrndr.panel.controlManager
import org.openrndr.panel.elements.*
@@ -175,6 +176,11 @@ class GUI : Extension {
descendant(has type "toggle") {
this.width = 175.px
}
descendant(has type "vector2") {
this.width = 175.px
this.height = 175.px
}
}
styleSheet(has class_ "randomize-strong") {
@@ -406,6 +412,25 @@ class GUI : Extension {
}
}
}
ParameterType.Vector2 -> {
vector2 {
minX = parameter.vectorRange!!.first.x
minY = parameter.vectorRange!!.first.y
maxX = parameter.vectorRange!!.second.x
maxY = parameter.vectorRange!!.second.y
events.valueChanged.subscribe {
setAndPersist(
compartment.label,
parameter.property as KMutableProperty1<Any, Vector2>,
obj,
it.newValue
)
onChangeListener?.invoke(parameter.property!!.name, it.newValue)
}
}
}
}
}
@@ -423,6 +448,7 @@ class GUI : Extension {
var intValue: Int? = null,
var booleanValue: Boolean? = null,
var colorValue: ColorRGBa? = null,
var vectorValue: Vector2? = null,
var textValue: String? = null)
@@ -442,6 +468,7 @@ class GUI : Extension {
ParameterType.Color -> ParameterValue(colorValue = k.property.qget(lo.obj) as ColorRGBa)
ParameterType.Text -> ParameterValue(textValue = k.property.qget(lo.obj) as String)
ParameterType.Boolean -> ParameterValue(booleanValue = k.property.qget(lo.obj) as Boolean)
ParameterType.Vector2 -> ParameterValue(vectorValue = k.property.qget(lo.obj) as Vector2)
})
})
}
@@ -476,6 +503,9 @@ class GUI : Extension {
ParameterType.Color -> parameterValue.colorValue?.let {
parameter.property.qset(lo.obj, it)
}
ParameterType.Vector2 -> parameterValue.vectorValue?.let {
parameter.property.qset(lo.obj, it)
}
ParameterType.Boolean -> parameterValue.booleanValue?.let {
parameter.property.qset(lo.obj, it)
}
@@ -505,6 +535,11 @@ class GUI : Extension {
ParameterType.Color -> {
(control as ColorpickerButton).color = (parameter.property as KMutableProperty1<Any, ColorRGBa>).get(labeledObject.obj)
}
// ParameterType.Vector2 -> {
// (control as Vector2Control).value = (parameter.property as KMutableProperty1<Any, Vector2>).get(labeledObject.obj)
// }
ParameterType.Boolean -> {
(control as Toggle).value = (parameter.property as KMutableProperty1<Any, Boolean>).get(labeledObject.obj)
}
@@ -614,4 +649,4 @@ class GUI : Extension {
fun <T : Any> T.addTo(gui: GUI, label:String? = this.title()): T {
gui.add(this, label)
return this
}
}