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

Add XYParameter annotation

Browse Source
This commit is contained in:
Edwin Jakobs
2020-03-19 23:39:57 +01:00
parent 96ad0f6e68
commit 963038d74e
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,7 @@ class GUI : Extension {
this.width = 175.px
}
descendant(has type "vector2") {
descendant(has type "xy-pad") {
this.width = 175.px
this.height = 175.px
}
@@ -413,12 +413,15 @@ class GUI : Extension {
}
}
ParameterType.Vector2 -> {
planarPad {
ParameterType.XY -> {
xyPad {
minX = parameter.vectorRange!!.first.x
minY = parameter.vectorRange!!.first.y
maxX = parameter.vectorRange!!.second.x
maxY = parameter.vectorRange!!.second.y
keyboardIncrement = parameter.keyboardIncrement!!
precision = parameter.precision!!
showAngle = parameter.showAngle!!
events.valueChanged.subscribe {
setAndPersist(
@@ -468,7 +471,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)
ParameterType.XY -> ParameterValue(vectorValue = k.property.qget(lo.obj) as Vector2)
})
})
}
@@ -503,7 +506,7 @@ class GUI : Extension {
ParameterType.Color -> parameterValue.colorValue?.let {
parameter.property.qset(lo.obj, it)
}
ParameterType.Vector2 -> parameterValue.vectorValue?.let {
ParameterType.XY -> parameterValue.vectorValue?.let {
parameter.property.qset(lo.obj, it)
}
ParameterType.Boolean -> parameterValue.booleanValue?.let {