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

background() deprecated, replace with clear() (#101)

Browse Source
This commit is contained in:
Abe Pazos
2020-05-16 18:00:39 +02:00
committed by GitHub
parent 7c9c87ea3f
commit b6065b7198
28 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orx-camera/src/main/kotlin/AxisHelper.kt
View File

@@ -34,7 +34,7 @@ class AxisHelper(var size: Int = 80) : Extension {
drawer.defaults() drawer.defaults()
drawer.ortho(fbo) drawer.ortho(fbo)
drawer.background(ColorRGBa.TRANSPARENT) drawer.clear(ColorRGBa.TRANSPARENT)
drawer.stroke = null drawer.stroke = null
drawer.fill = ColorRGBa.PINK.opacify(0.7) drawer.fill = ColorRGBa.PINK.opacify(0.7)
drawer.circle(axisLength, axisLength, axisLength) drawer.circle(axisLength, axisLength, axisLength)

8
orx-compositor/src/main/kotlin/Compositor.kt
View File

@@ -77,7 +77,7 @@ open class Layer internal constructor() {
copyLayers.forEach { copyLayers.forEach {
drawer.isolatedWithTarget(target) { drawer.isolatedWithTarget(target) {
clearColor?.let { clearColor?.let {
drawer.background(it) drawer.clear(it)
} }
it.layerTarget?.let { copyTarget -> it.layerTarget?.let { copyTarget ->
@@ -96,7 +96,7 @@ open class Layer internal constructor() {
drawer.isolatedWithTarget(maskRt) { drawer.isolatedWithTarget(maskRt) {
if (copyLayers.isEmpty()) { if (copyLayers.isEmpty()) {
clearColor?.let { color -> clearColor?.let { color ->
drawer.background(color) drawer.clear(color)
} }
} }
drawer.fill = ColorRGBa.WHITE drawer.fill = ColorRGBa.WHITE
@@ -109,7 +109,7 @@ open class Layer internal constructor() {
drawer.isolatedWithTarget(target) { drawer.isolatedWithTarget(target) {
if (copyLayers.isEmpty()) { if (copyLayers.isEmpty()) {
clearColor?.let { clearColor?.let {
drawer.background(it) drawer.clear(it)
} }
} }
drawFunc() drawFunc()
@@ -182,7 +182,7 @@ open class Layer internal constructor() {
} }
layerTarget?.let { layerTarget?.let {
drawer.withTarget(it) { drawer.withTarget(it) {
drawer.background(ColorRGBa.TRANSPARENT) drawer.clear(ColorRGBa.TRANSPARENT)
} }
} }
} }

4
orx-filter-extension/src/main/kotlin/FilterExtension.kt
View File

@@ -36,13 +36,13 @@ fun <F : Filter> Program.extend(filter: F, configuration: F.() -> Unit = {}): Ex
renderTarget?.let { renderTarget?.let {
drawer.withTarget(it) { drawer.withTarget(it) {
background(program.backgroundColor ?: ColorRGBa.TRANSPARENT) clear(program.backgroundColor ?: ColorRGBa.TRANSPARENT)
} }
} }
} }
renderTarget?.bind() renderTarget?.bind()
program.backgroundColor?.let { program.backgroundColor?.let {
drawer.background(it) drawer.clear(it)
} }
} }

6
orx-gui/src/demo/kotlin/DemoOptions01.kt
View File

@@ -32,9 +32,9 @@ fun main() = application {
extend(gui) extend(gui)
extend { extend {
when(settings.option) { when(settings.option) {
BackgroundColors.Pink -> drawer.background(ColorRGBa.PINK) BackgroundColors.Pink -> drawer.clear(ColorRGBa.PINK)
BackgroundColors.Black -> drawer.background(ColorRGBa.BLACK) BackgroundColors.Black -> drawer.clear(ColorRGBa.BLACK)
BackgroundColors.Yellow -> drawer.background(ColorRGBa.YELLOW) BackgroundColors.Yellow -> drawer.clear(ColorRGBa.YELLOW)
} }
} }
} }

2
orx-jumpflood/src/demo/kotlin/DemoShapeSDF02.kt
View File

@@ -38,7 +38,7 @@ fun main() {
} }
} }
extend { extend {
drawer.background(ColorRGBa.PINK) drawer.clear(ColorRGBa.PINK)
sdf0.setShapes(shapes.mapIndexed { index, it -> sdf0.setShapes(shapes.mapIndexed { index, it ->
it.transform(transform { it.transform(transform {

2
orx-jumpflood/src/demo/kotlin/DemoShapeSDF03.kt
View File

@@ -39,7 +39,7 @@ fun main() {
} }
} }
extend { extend {
drawer.background(ColorRGBa.PINK) drawer.clear(ColorRGBa.PINK)
fd.apply(emptyArray(), uvmap) fd.apply(emptyArray(), uvmap)

2
orx-jumpflood/src/demo/kotlin/DemoShapeSDF04.kt
View File

@@ -45,7 +45,7 @@ fun main() {
} }
extend(gui) extend(gui)
extend { extend {
drawer.background(ColorRGBa.PINK) drawer.clear(ColorRGBa.PINK)
perturb.phase = seconds * 0.1 perturb.phase = seconds * 0.1
perturb.apply(uvmap, uvmap) perturb.apply(uvmap, uvmap)

2
orx-jumpflood/src/demo/kotlin/DemoShapeSDF05.kt
View File

@@ -56,7 +56,7 @@ fun main() {
extend(gui) extend(gui)
extend { extend {
drawer.background(ColorRGBa.PINK) drawer.clear(ColorRGBa.PINK)
perturb.offset = Vector2(cos(seconds*0.2), sin(seconds*0.2)) perturb.offset = Vector2(cos(seconds*0.2), sin(seconds*0.2))
perturb.outputUV = true perturb.outputUV = true

2
orx-jumpflood/src/demo/kotlin/DemoSkeleton01.kt
View File

@@ -31,7 +31,7 @@ fun main() {
drawer.isolatedWithTarget(input) { drawer.isolatedWithTarget(input) {
// -- draw something interesting // -- draw something interesting
drawer.stroke = null drawer.stroke = null
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.fill = ColorRGBa.WHITE drawer.fill = ColorRGBa.WHITE
drawer.circle(mouse.position, 300.0) drawer.circle(mouse.position, 300.0)
drawer.fill = ColorRGBa.BLACK drawer.fill = ColorRGBa.BLACK

2
orx-jumpflood/src/demo/kotlin/DemoStraightSkeleton01.kt
View File

@@ -31,7 +31,7 @@ fun main() {
drawer.isolatedWithTarget(input) { drawer.isolatedWithTarget(input) {
// -- draw something interesting // -- draw something interesting
drawer.stroke = null drawer.stroke = null
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.fill = ColorRGBa.WHITE drawer.fill = ColorRGBa.WHITE
drawer.circle(mouse.position, 300.0) drawer.circle(mouse.position, 300.0)
drawer.fill = ColorRGBa.BLACK drawer.fill = ColorRGBa.BLACK

2
orx-mesh-generators/src/demo/kotlin/DemoBox.kt
View File

@@ -29,7 +29,7 @@ fun main() {
eye = Vector3(1.0, 1.0, 1.0) eye = Vector3(1.0, 1.0, 1.0)
} }
extend { extend {
drawer.background(ColorRGBa.PINK) drawer.clear(ColorRGBa.PINK)
drawer.shadeStyle = shadeStyle { drawer.shadeStyle = shadeStyle {
fragmentTransform = """ fragmentTransform = """
x_fill = texture(p_texture, va_texCoord0.xy); x_fill = texture(p_texture, va_texCoord0.xy);

2
orx-no-clear/src/main/kotlin/NoClear.kt
View File

@@ -33,7 +33,7 @@ class NoClear : Extension {
renderTarget?.let { renderTarget?.let {
drawer.withTarget(it) { drawer.withTarget(it) {
background(program.backgroundColor ?: ColorRGBa.TRANSPARENT) clear(program.backgroundColor ?: ColorRGBa.TRANSPARENT)
backdrop?.invoke() // draw custom backdrop backdrop?.invoke() // draw custom backdrop
} }
} }

2
orx-noise/src/demo/kotlin/DemoPoissonDiskSampling.kt
View File

@@ -25,7 +25,7 @@ fun main() {
val circlePoints = points.map { Circle(Vector2(350.0, 100.0) + it, 3.0) } val circlePoints = points.map { Circle(Vector2(350.0, 100.0) + it, 3.0) }
extend { extend {
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.stroke = null drawer.stroke = null
drawer.fill = ColorRGBa.PINK drawer.fill = ColorRGBa.PINK

2
orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt
View File

@@ -73,7 +73,7 @@ fun main() = application {
} }
extend(cm) extend(cm)
extend { extend {
drawer.background(0.2, 0.18, 0.16, 1.0) drawer.clear(0.2, 0.18, 0.16, 1.0)
} }
} }
} }

8
orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt
View File

@@ -379,7 +379,7 @@ class ControlManager : Extension {
} }
renderTarget.bind() renderTarget.bind()
program.drawer.background(ColorRGBa.BLACK.opacify(0.0)) program.drawer.clear(ColorRGBa.BLACK.opacify(0.0))
renderTarget.unbind() renderTarget.unbind()
renderTargetCache.forEach { (_, u) -> u.destroy() } renderTargetCache.forEach { (_, u) -> u.destroy() }
@@ -422,7 +422,7 @@ class ControlManager : Extension {
} }
rt.bind() rt.bind()
drawer.background(ColorRGBa.BLACK.opacify(0.0)) drawer.clear(ColorRGBa.BLACK.opacify(0.0))
drawer.pushProjection() drawer.pushProjection()
drawer.ortho(rt) drawer.ortho(rt)
@@ -486,7 +486,7 @@ class ControlManager : Extension {
} }
renderTarget.bind() renderTarget.bind()
program.drawer.background(ColorRGBa.BLACK.opacify(0.0)) program.drawer.clear(ColorRGBa.BLACK.opacify(0.0))
renderTarget.unbind() renderTarget.unbind()
} }
} }
@@ -507,7 +507,7 @@ class ControlManager : Extension {
body?.style?.height = program.height.px body?.style?.height = program.height.px
body?.let { body?.let {
program.drawer.background(ColorRGBa.BLACK.opacify(0.0)) program.drawer.clear(ColorRGBa.BLACK.opacify(0.0))
layouter.computeStyles(it) layouter.computeStyles(it)
layouter.layout(it) layouter.layout(it)
drawElement(it, program.drawer, 0, 0) drawElement(it, program.drawer, 0, 0)

2
orx-panel/src/main/kotlin/org/openrndr/panel/elements/Canvas.kt
View File

@@ -32,7 +32,7 @@ class Canvas : Element(ElementType("canvas")) {
drawer.isolatedWithTarget(rt) { drawer.isolatedWithTarget(rt) {
model = Matrix44.IDENTITY model = Matrix44.IDENTITY
view = Matrix44.IDENTITY view = Matrix44.IDENTITY
background(ColorRGBa.TRANSPARENT) clear(ColorRGBa.TRANSPARENT)
size(screenArea.width.toInt(), screenArea.height.toInt()) size(screenArea.width.toInt(), screenArea.height.toInt())
ortho(rt) ortho(rt)
userDraw?.invoke(this) userDraw?.invoke(this)

2
orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt
View File

@@ -56,7 +56,7 @@ fun main() = application {
} }
extend(rabbit) extend(rabbit)
extend { extend {
drawer.background(if (settings.b) ColorRGBa.BLUE else ColorRGBa.BLACK) drawer.clear(if (settings.b) ColorRGBa.BLUE else ColorRGBa.BLACK)
drawer.fontMap = font drawer.fontMap = font
drawer.fill = settings.fill drawer.fill = settings.fill
drawer.stroke = settings.stroke drawer.stroke = settings.stroke

2
orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt
View File

@@ -43,7 +43,7 @@ fun main() = application {
} }
extend { extend {
drawer.background(if (settings.whiteOnBlack) ColorRGBa.BLACK else ColorRGBa.WHITE) drawer.clear(if (settings.whiteOnBlack) ColorRGBa.BLACK else ColorRGBa.WHITE)
drawer.fill = if (settings.whiteOnBlack) ColorRGBa.WHITE else ColorRGBa.BLACK drawer.fill = if (settings.whiteOnBlack) ColorRGBa.WHITE else ColorRGBa.BLACK
drawer.circle(drawer.bounds.center, 250.0) drawer.circle(drawer.bounds.center, 250.0)
} }

2
orx-runway/src/demo/kotlin/DemoBiGAN01.kt
View File

@@ -24,7 +24,7 @@ fun main() = application {
val alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" val alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
extend { extend {
drawer.isolatedWithTarget(rt) { drawer.isolatedWithTarget(rt) {
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.ortho(rt) drawer.ortho(rt)
val it = seconds.toInt() val it = seconds.toInt()
val t = seconds-it val t = seconds-it

2
orx-runway/src/demo/kotlin/DemoBiGAN02.kt
View File

@@ -24,7 +24,7 @@ fun main() = application {
drawer.isolatedWithTarget(rt) { drawer.isolatedWithTarget(rt) {
drawer.ortho(rt) drawer.ortho(rt)
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.image(startImage, (rt.width - startImage.width)/2.0, (rt.height - startImage.height) / 2.0) drawer.image(startImage, (rt.width - startImage.width)/2.0, (rt.height - startImage.height) / 2.0)
} }

4
orx-runway/src/demo/kotlin/DemoCaptionToImage01.kt
View File

@@ -20,8 +20,8 @@ fun main() = application {
program { program {
val runwayHost = "http://localhost:8000/query" val runwayHost = "http://localhost:8000/query"
val dictionary = URL(resourceUrl("/data/dictionary/words.txt")).readText().split("\n") val dictionary = URL("demo-data/dictionary/words.txt").readText().split("\n")
val font = loadFont(resourceUrl("/data/fonts/IBMPlexMono-Regular.ttf"), 72.0) val font = loadFont("demo-data/fonts/IBMPlexMono-Regular.ttf", 72.0)
extend { extend {
val text = dictionary.random() val text = dictionary.random()
val result: AttnGANResult = runwayQuery(runwayHost, AttnGANRequest(text)) val result: AttnGANResult = runwayQuery(runwayHost, AttnGANRequest(text))

2
orx-runway/src/demo/kotlin/DemoDensePose01.kt
View File

@@ -22,7 +22,7 @@ fun main() = application {
drawer.isolatedWithTarget(rt) { drawer.isolatedWithTarget(rt) {
drawer.ortho(rt) drawer.ortho(rt)
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.image(startImage, (rt.width - startImage.width)/2.0, (rt.height - startImage.height) / 2.0) drawer.image(startImage, (rt.width - startImage.width)/2.0, (rt.height - startImage.height) / 2.0)
} }

2
orx-syphon/src/test/kotlin/ClientExample.kt
View File

@@ -14,7 +14,7 @@ fun main() = application {
extend(syphonClient) extend(syphonClient)
extend { extend {
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.image(syphonClient.buffer) drawer.image(syphonClient.buffer)
} }
} }

2
orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt
View File

@@ -18,7 +18,7 @@ fun main() = application {
extend(syphonClient) extend(syphonClient)
extend { extend {
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.image(syphonClient.buffer) drawer.image(syphonClient.buffer)
} }
} }

2
orx-syphon/src/test/kotlin/ServerExample.kt
View File

@@ -14,7 +14,7 @@ fun main() = application {
extend(SyphonServer("Test")) extend(SyphonServer("Test"))
extend { extend {
drawer.background(ColorRGBa.PINK) drawer.clear(ColorRGBa.PINK)
drawer.fill = ColorRGBa.WHITE drawer.fill = ColorRGBa.WHITE
drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5) drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5)
} }

4
orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt
View File

@@ -25,10 +25,10 @@ fun main() = application {
* This is what will be sent to Syphon, and drawn in a small corner of the screen * This is what will be sent to Syphon, and drawn in a small corner of the screen
*/ */
drawer.isolatedWithTarget(rt) { drawer.isolatedWithTarget(rt) {
drawer.background(ColorRGBa(sin(seconds), cos(seconds / 2.0), 0.5, 1.0)) drawer.clear(ColorRGBa(sin(seconds), cos(seconds / 2.0), 0.5, 1.0))
} }
drawer.background(ColorRGBa.PINK) drawer.clear(ColorRGBa.PINK)
drawer.fill = ColorRGBa.WHITE drawer.fill = ColorRGBa.WHITE
drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5) drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5)
drawer.image(rt.colorBuffer(0)) drawer.image(rt.colorBuffer(0))

10
orx-temporal-blur/src/main/kotlin/TemporalBlur.kt
View File

@@ -124,7 +124,7 @@ class TemporalBlur : Extension {
accumulator?.let { accumulator?.let {
drawer.withTarget(it) { drawer.withTarget(it) {
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
} }
} }
val oldClock = program.clock val oldClock = program.clock
@@ -133,7 +133,7 @@ class TemporalBlur : Extension {
for (i in samples - 1 downTo 1) { for (i in samples - 1 downTo 1) {
image?.bind() image?.bind()
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
program.clock = { oldClockValue - (i * duration) / (fps * samples) } program.clock = { oldClockValue - (i * duration) / (fps * samples) }
// I guess we need something better here. // I guess we need something better here.
@@ -169,7 +169,7 @@ class TemporalBlur : Extension {
} }
image?.let { image?.let {
drawer.withTarget(it) { drawer.withTarget(it) {
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
} }
} }
image?.bind() image?.bind()
@@ -191,7 +191,7 @@ class TemporalBlur : Extension {
drawer.isolatedWithTarget(result!!) { drawer.isolatedWithTarget(result!!) {
drawer.drawStyle.blendMode = BlendMode.OVER drawer.drawStyle.blendMode = BlendMode.OVER
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.drawStyle.colorMatrix = tint(ColorRGBa.WHITE.shade(1.0 / samples)) drawer.drawStyle.colorMatrix = tint(ColorRGBa.WHITE.shade(1.0 / samples))
drawer.image(accumulator!!.colorBuffer(0)) drawer.image(accumulator!!.colorBuffer(0))
} }
@@ -202,7 +202,7 @@ class TemporalBlur : Extension {
drawer.drawStyle.colorMatrix = Matrix55.IDENTITY drawer.drawStyle.colorMatrix = Matrix55.IDENTITY
drawer.drawStyle.depthTestPass = DepthTestPass.ALWAYS drawer.drawStyle.depthTestPass = DepthTestPass.ALWAYS
drawer.background(ColorRGBa.BLACK) drawer.clear(ColorRGBa.BLACK)
drawer.image(result!!.colorBuffer(0)) drawer.image(result!!.colorBuffer(0))
} }
} }

2
orx-timer/src/demo/kotlin/DemoRepeat02.kt
View File

@@ -24,7 +24,7 @@ fun main() = application {
} }
} }
extend { extend {
drawer.background(ColorRGBa.PINK) drawer.clear(ColorRGBa.PINK)
// -- by explicitly calling deliver we know that the drawing code in the listener will be // -- by explicitly calling deliver we know that the drawing code in the listener will be
// -- executed exactly here // -- executed exactly here
event.deliver() event.deliver()