From 536032be7cfa9e28d937342a4e578e77553bf24d Mon Sep 17 00:00:00 2001 From: Kazik Pogoda Date: Sun, 11 Aug 2019 00:00:24 +0200 Subject: [PATCH] build fix after changes in OPENRNDR APIs, fixes #19 --- custom-rendering-004/src/main/kotlin/Example.kt | 4 ++-- filters-002/src/main/kotlin/Example.kt | 1 - filters-003/src/main/kotlin/Example.kt | 1 - shader-shadertoy-001/src/main/kotlin/Example.kt | 1 - shader-shadertoy-002/src/main/kotlin/Example.kt | 1 - start-dialog-001/src/main/kotlin/Example.kt | 4 ++-- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/custom-rendering-004/src/main/kotlin/Example.kt b/custom-rendering-004/src/main/kotlin/Example.kt index 4462cb6..d1dccee 100644 --- a/custom-rendering-004/src/main/kotlin/Example.kt +++ b/custom-rendering-004/src/main/kotlin/Example.kt @@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa import org.openrndr.draw.* import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform -import org.openrndr.shape.Triangulator +import org.openrndr.shape.triangulate import org.openrndr.svg.loadSVG import java.io.File @@ -18,7 +18,7 @@ class Example : Program() { override fun setup() { val c = loadSVG(File("data/svg/shape.svg").readText()) val shape = c.findShapes()[0].shape - val points = Triangulator().triangulate(shape.outline) + val points = triangulate(shape) // -- create the vertex buffer geometry = vertexBuffer( diff --git a/filters-002/src/main/kotlin/Example.kt b/filters-002/src/main/kotlin/Example.kt index 44d410f..3072b0e 100644 --- a/filters-002/src/main/kotlin/Example.kt +++ b/filters-002/src/main/kotlin/Example.kt @@ -3,7 +3,6 @@ import org.openrndr.Configuration import org.openrndr.Program import org.openrndr.color.ColorRGBa import org.openrndr.draw.* -import org.openrndr.filter.filterShaderFromUrl /** * Example noise filter diff --git a/filters-003/src/main/kotlin/Example.kt b/filters-003/src/main/kotlin/Example.kt index 6f7444c..6e53f02 100644 --- a/filters-003/src/main/kotlin/Example.kt +++ b/filters-003/src/main/kotlin/Example.kt @@ -3,7 +3,6 @@ import org.openrndr.Configuration import org.openrndr.Program import org.openrndr.color.ColorRGBa import org.openrndr.draw.* -import org.openrndr.filter.filterWatcherFromUrl /** * Example noise filter diff --git a/shader-shadertoy-001/src/main/kotlin/Example.kt b/shader-shadertoy-001/src/main/kotlin/Example.kt index 18fab2b..92efb6e 100644 --- a/shader-shadertoy-001/src/main/kotlin/Example.kt +++ b/shader-shadertoy-001/src/main/kotlin/Example.kt @@ -2,7 +2,6 @@ import org.openrndr.Application import org.openrndr.Configuration import org.openrndr.Program import org.openrndr.draw.* -import org.openrndr.filter.filterShaderFromUrl import org.openrndr.math.Vector3 import org.openrndr.math.Vector4 diff --git a/shader-shadertoy-002/src/main/kotlin/Example.kt b/shader-shadertoy-002/src/main/kotlin/Example.kt index 1ad1076..cd221b9 100644 --- a/shader-shadertoy-002/src/main/kotlin/Example.kt +++ b/shader-shadertoy-002/src/main/kotlin/Example.kt @@ -2,7 +2,6 @@ import org.openrndr.Application import org.openrndr.Configuration import org.openrndr.Program import org.openrndr.draw.* -import org.openrndr.filter.filterShaderFromUrl import org.openrndr.math.Vector3 import org.openrndr.math.Vector4 diff --git a/start-dialog-001/src/main/kotlin/Example.kt b/start-dialog-001/src/main/kotlin/Example.kt index 677ffbd..0c5e26f 100644 --- a/start-dialog-001/src/main/kotlin/Example.kt +++ b/start-dialog-001/src/main/kotlin/Example.kt @@ -1,5 +1,5 @@ import org.openrndr.Application -import org.openrndr.Configuration +import org.openrndr.Fullscreen import org.openrndr.Program import org.openrndr.color.ColorRGBa import org.openrndr.configuration @@ -57,7 +57,7 @@ fun main(args: Array) { fullScreen?.let { Application.run(Example(), configuration { - fullscreen = it + fullscreen = if (it) Fullscreen.CURRENT_DISPLAY_MODE else Fullscreen.DISABLED width = if (it) -1 else 640 height = if (it) -1 else 480 })