Upgrade to OPENRNDR 0.4 snapshot

This commit is contained in:
Edwin Jakobs
2021-06-22 11:08:07 +02:00
parent 579ddf9bb5
commit 9435907ef9
339 changed files with 460 additions and 497 deletions

38
.github/workflows/build.yml vendored Normal file
View File

@@ -0,0 +1,38 @@
name: Build
on:
push:
branches:
- master
jobs:
build:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
with:
repository: openrndr/openrndr
path: openrndr
ref: openrndr-0.4
- uses: actions/checkout@v2.3.4
with:
path: orx
- uses: actions/setup-java@v1
with:
java-version: 14
- uses: actions/cache@v2.3.4
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Build OPENRNDR snapshot
run: |
cd ~/openrndr
./gradlew publishToMavenLocal -Prelease.version=0.5.1-SNAPSHOT
- name: Build ORX
run: |
cd ~/orx
./gradlew build

View File

@@ -1,47 +0,0 @@
name: Generate screenshots
on:
push:
branches:
- master
jobs:
build:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 14
- uses: openrndr/setup-opengl@v1.1
- name: Test glxinfo
run: |
echo $LD_LIBRARY_PATH
export GALLIUM_DRIVER=swr
xvfb-run glxinfo
- uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Collect screenshots
run: xvfb-run ./gradlew collectScreenshots
- name: Build main readme
run: xvfb-run ./gradlew buildMainReadme
- name: Prepare media branch
run: |
git config --global user.email "actions@openrndr.org"
git config --global user.name "OPENRNDR Actions"
git reset HEAD -- .
(git add README.md && git commit -m "add auto-generated README" && git push origin master) || true
(git add [a-z-]*/README.md && git commit -m "add demos to README.md" && git push origin master) || true
git checkout --orphan media
git reset HEAD -- .
git add [a-z-]*/images/*.png
git commit -m "add auto-generated media"
git push -f origin media

View File

@@ -1,29 +0,0 @@
name: Release to Bintray
on:
push:
tags:
- v[0-9].[0-9]+.[0-9]+-rc.[0-9]+
jobs:
build:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
- uses: actions/setup-java@v1
with:
java-version: 8
- name: Build and publish to local maven
run: ./gradlew -Prelease.useLastTag=true candidate publishToMavenLocal --info
- name: Zip and publish to Bintray
run: |
cd ~/.m2/repository
zip release.zip org/openrndr/extra/*/${{ steps.get_version.outputs.VERSION }}/*
curl -u ${{ secrets.BINTRAY_USER }}:${{ secrets.BINTRAY_KEY }} -X PUT https://api.bintray.com/content/openrndr/openrndr/ \
-H "X-Bintray-Package:orx" \
-H "X-Bintray-Version:${{ steps.get_version.outputs.VERSION }}" \
-H "X-Bintray-Publish:1" \
-H "X-Bintray-Override:1" \
-H "X-Bintray-Explode:1" \
-T release.zip

View File

@@ -14,20 +14,20 @@ plugins {
id 'org.jetbrains.kotlin.jvm' version '1.5.0'
}
def openrndrUseSnapshot = false
def openrndrUseSnapshot = true
apply plugin: 'org.jetbrains.dokka'
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
project.ext {
openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.58"
openrndrVersion = openrndrUseSnapshot? "0.5.1-SNAPSHOT" : "0.4.0"
kotlinVersion = "1.5.0"
spekVersion = "2.0.15"
libfreenectVersion = "0.5.7-1.5.5"
librealsense2Version = "2.40.0-1.5.5"
gsonVersion = "2.8.6"
antlrVersion = "4.9.1"
antlrVersion = "4.9.2"
tensorflowVersion = "0.3.1"
mklDnnVersion = "0.21.5-1.5.5"
}
@@ -77,8 +77,7 @@ allprojects {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
implementation 'io.github.microutils:kotlin-logging-jvm:2.0.6'
implementation "org.openrndr:openrndr-core:$openrndrVersion"
implementation "org.openrndr:openrndr-filter:$openrndrVersion"
implementation "org.openrndr:openrndr-application:$openrndrVersion"
implementation "org.openrndr:openrndr-shape:$openrndrVersion"
implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.4.3'
testImplementation "org.spekframework.spek2:spek-dsl-jvm:$spekVersion"

View File

@@ -17,7 +17,7 @@ dependencies {
demoImplementation(project(":orx-shader-phrases"))
demoImplementation("org.slf4j:slf4j-simple:1.7.30")
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-ffmpeg:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-svg:$openrndrVersion")

View File

@@ -2,7 +2,7 @@
import org.openrndr.application
import org.openrndr.draw.loadImage
fun main() {
suspend fun main() {
application {
program {
val image16 = loadImage("demo-data/images/16-bit.png")

View File

@@ -4,7 +4,7 @@ import org.openrndr.application
import org.openrndr.math.Vector2
import org.openrndr.shape.contour
fun main() = application {
suspend fun main() = application {
program {
class A: Animatable() {
var x = 0.0

View File

@@ -4,7 +4,7 @@ import org.openrndr.application
import org.openrndr.math.Vector2
import org.openrndr.shape.contour
fun main() = application {
suspend fun main() = application {
program {
val a = object {
var x = 0.0

View File

@@ -1,7 +1,7 @@
import org.openrndr.application
import org.openrndr.internal.colorBufferLoader
fun main() {
suspend fun main() {
application {
program {
extend {

View File

@@ -10,7 +10,7 @@ import org.openrndr.math.Vector2
import org.openrndr.math.Vector3
fun main() = application {
suspend fun main() = application {
configure {
multisample = WindowMultisample.SampleCount(8)

View File

@@ -7,7 +7,7 @@ import org.openrndr.math.Polar
import org.openrndr.shape.ShapeContour
import org.openrndr.shape.toContour
fun main() = application {
suspend fun main() = application {
program {
val points = List(6) { Polar(it * 70.0, 100.0).cartesian + drawer.bounds.center }
val cmr = CatmullRomChain2(points, 1.0, loop = true)

View File

@@ -4,7 +4,7 @@ import org.openrndr.color.ColorRGBa
/*
This demo just verifies that drawing a single circle still works with revamped circle drawing code
*/
fun main() = application {
suspend fun main() = application {
program {
extend {
drawer.clear(ColorRGBa.GRAY)

View File

@@ -11,7 +11,7 @@ Batches are (currently) static but stored in GPU memory but can be
animated using a vertex shader. Batches are fast to draw.
*/
fun main() = application {
suspend fun main() = application {
program {
val batch = drawer.circleBatch {
for (i in 0 until 2000) {

View File

@@ -8,7 +8,7 @@ import kotlin.math.abs
This program demonstrates dynamic circle batches
*/
fun main() = application {
suspend fun main() = application {
program {
extend {

View File

@@ -3,7 +3,7 @@ import org.openrndr.draw.*
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
fun main() = application {
suspend fun main() = application {
program {
val cb0 = loadImage("demo-data/images/image-001.png")
val cb1 = cb0.createEquivalent()

View File

@@ -6,7 +6,7 @@ import org.openrndr.shape.drawComposition
import org.openrndr.svg.toSVG
import org.openrndr.svg.writeSVG
fun main() {
suspend fun main() {
application {
program {
extend {

View File

@@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa
import org.openrndr.shape.ClipMode
import org.openrndr.shape.drawComposition
fun main() {
suspend fun main() {
application {
program {
val cd = drawComposition {

View File

@@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa
import org.openrndr.shape.ClipMode
import org.openrndr.shape.drawComposition
fun main() {
suspend fun main() {
application {
program {
val cd = drawComposition {

View File

@@ -7,7 +7,7 @@ import org.openrndr.shape.Circle
*
* This was made to assist in resolving https://github.com/openrndr/openrndr/issues/164
*/
fun main() = application {
suspend fun main() = application {
program {
val c = Circle(200.0, 200.0, 10.0).contour
extend {

View File

@@ -18,7 +18,7 @@ fun arc(start: Vector2, end: Vector2, radius: Double): ShapeContour {
}
}
fun main() = application {
suspend fun main() = application {
configure {
width = 800
height = 800

View File

@@ -4,7 +4,7 @@ import org.openrndr.draw.isolated
import org.openrndr.shape.Circle
import org.openrndr.shape.Rectangle
fun main() {
suspend fun main() {
application {
configure {
width = 720

View File

@@ -1,37 +1,37 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.shape.Ellipse
import org.openrndr.shape.OrientedEllipse
import org.openrndr.shape.intersections
fun main() {
application {
program {
val c1 = Ellipse(width / 2.0, height / 2.0, 200.0, 100.0).contour
extend {
drawer.clear(ColorRGBa.PINK)
drawer.fill = null
val c2 = OrientedEllipse(mouse.position, 100.0, 200.0, seconds*45.0).contour
drawer.contour(c1)
//drawer.contour(c2)
val ints = intersections(c1, c2)
if (ints.isEmpty()) {
drawer.contour(c2)
} else {
(ints + ints.take(1)).map { it.b.contourT }.zipWithNext().forEach {
val end = if (it.second <= it.first) it.second + 1.0 else it.second
val sub = c2.sub(it.first, end)
val l = sub.length
val ta = sub.tForLength(15.0)
val tb = sub.tForLength(l - 15.0)
drawer.contour(sub.sub(ta, tb))
}
}
for (i in ints) {
drawer.circle(i.position, 10.0)
}
}
}
}
}
//import org.openrndr.application
//import org.openrndr.color.ColorRGBa
//import org.openrndr.shape.Ellipse
//import org.openrndr.shape.OrientedEllipse
//import org.openrndr.shape.intersections
//
//fun main() {
// application {
// program {
// val c1 = Ellipse(width / 2.0, height / 2.0, 200.0, 100.0).contour
// extend {
// drawer.clear(ColorRGBa.PINK)
// drawer.fill = null
// val c2 = OrientedEllipse(mouse.position, 100.0, 200.0, seconds*45.0).contour
// drawer.contour(c1)
// //drawer.contour(c2)
// val ints = intersections(c1, c2)
//
// if (ints.isEmpty()) {
// drawer.contour(c2)
// } else {
// (ints + ints.take(1)).map { it.b.contourT }.zipWithNext().forEach {
// val end = if (it.second <= it.first) it.second + 1.0 else it.second
// val sub = c2.sub(it.first, end)
// val l = sub.length
// val ta = sub.tForLength(15.0)
// val tb = sub.tForLength(l - 15.0)
// drawer.contour(sub.sub(ta, tb))
// }
// }
// for (i in ints) {
// drawer.circle(i.position, 10.0)
// }
// }
// }
// }
//}

View File

@@ -5,7 +5,7 @@ import org.openrndr.shape.Circle
import org.openrndr.shape.Rectangle
import org.openrndr.shape.intersections
fun main() {
suspend fun main() {
application {
program {
extend {

View File

@@ -8,7 +8,7 @@ import kotlin.math.PI
import kotlin.math.cos
import kotlin.math.sin
fun main() = application {
suspend fun main() = application {
program {
val points = 200
extend {

View File

@@ -1,54 +1,54 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.extra.noise.simplex
import org.openrndr.shape.OrientedEllipse
fun main() {
application {
program {
extend {
drawer.clear(ColorRGBa.BLACK)
drawer.fill = null
val offset = seconds * 0.1
val contours = listOf(
OrientedEllipse(
simplex(320, offset)*width/2.0 + width/2.0,
simplex(3120, offset)*height/2.0 + height/2.0,
simplex(3420, offset)*50.0 + 80.0,
simplex(7521, offset)*50.0+ 80.0,
simplex(3212, offset)*180.0+180.0
).contour,
OrientedEllipse(
simplex(5320, offset)*width/2.0 + width/2.0,
simplex(73120, offset)*height/2.0 + height/2.0,
simplex(23420, offset)*50.0 + 80.0,
simplex(47521, offset)*50.0+ 80.0,
simplex(33212, offset)*180.0+180.0
).contour
)
drawer.fill = null
drawer.stroke = ColorRGBa.PINK
for (contour in contours) {
drawer.contour(contour)
}
for (j in contours.indices) {
for (i in 0 until j) {
val eqj = contours[j].equidistantPositions(50)
val eqi = contours[i].equidistantPositions(50)
for (p in eqj) {
val q = contours[i].nearest(p).position
drawer.lineSegment(p, q)
}
for (p in eqi) {
val q = contours[j].nearest(p).position
drawer.lineSegment(p, q)
}
}
}
}
}
}
}
//import org.openrndr.application
//import org.openrndr.color.ColorRGBa
//import org.openrndr.extra.noise.simplex
//import org.openrndr.shape.OrientedEllipse
//
//fun main() {
// application {
// program {
// extend {
// drawer.clear(ColorRGBa.BLACK)
// drawer.fill = null
//
// val offset = seconds * 0.1
// val contours = listOf(
// OrientedEllipse(
// simplex(320, offset)*width/2.0 + width/2.0,
// simplex(3120, offset)*height/2.0 + height/2.0,
// simplex(3420, offset)*50.0 + 80.0,
// simplex(7521, offset)*50.0+ 80.0,
// simplex(3212, offset)*180.0+180.0
// ).contour,
// OrientedEllipse(
// simplex(5320, offset)*width/2.0 + width/2.0,
// simplex(73120, offset)*height/2.0 + height/2.0,
// simplex(23420, offset)*50.0 + 80.0,
// simplex(47521, offset)*50.0+ 80.0,
// simplex(33212, offset)*180.0+180.0
// ).contour
// )
// drawer.fill = null
// drawer.stroke = ColorRGBa.PINK
// for (contour in contours) {
// drawer.contour(contour)
// }
//
// for (j in contours.indices) {
// for (i in 0 until j) {
// val eqj = contours[j].equidistantPositions(50)
// val eqi = contours[i].equidistantPositions(50)
//
// for (p in eqj) {
// val q = contours[i].nearest(p).position
// drawer.lineSegment(p, q)
// }
// for (p in eqi) {
// val q = contours[j].nearest(p).position
// drawer.lineSegment(p, q)
// }
// }
// }
// }
// }
// }
//}

View File

@@ -6,7 +6,7 @@ import org.openrndr.draw.shadeStyle
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
fun main() = application {
suspend fun main() = application {
program {
val cubemap = Cubemap.fromUrl("file:demo-data/cubemaps/garage_iem.dds", null, session = Session.active)

View File

@@ -3,7 +3,7 @@ import org.openrndr.draw.*
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
fun main() = application {
suspend fun main() = application {
program {
val cubemap1 = Cubemap.fromUrl("file:demo-data/cubemaps/garage_iem.dds", null, session = Session.active)
val cube = boxMesh()

View File

@@ -3,7 +3,7 @@ import org.openrndr.draw.*
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
fun main() = application {
suspend fun main() = application {
program {
val cubemap1 = Cubemap.fromUrl("file:demo-data/cubemaps/garage_iem.dds", null, session = Session.active)
val cube = boxMesh()

View File

@@ -1,7 +1,7 @@
import org.openrndr.application
import org.openrndr.draw.loadImage
fun main() {
suspend fun main() {
application {
program {
val image = loadImage("demo-data/images/image-001.dds")

View File

@@ -4,16 +4,18 @@ import org.openrndr.draw.DrawPrimitive
import org.openrndr.draw.Shader
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.resourceText
import org.openrndr.resourceUrl
fun main() {
suspend fun main() {
application {
program {
val vb = boxMesh()
val shader = Shader.Companion.createFromUrls(
vsUrl = resourceUrl("/shaders/gs-01.vert"),
gsUrl = resourceUrl("/shaders/gs-01.geom"),
fsUrl = resourceUrl("/shaders/gs-01.frag")
val shader = Shader.createFromCode(
vsCode = resourceText("/shaders/gs-01.vert"),
gsCode = resourceText("/shaders/gs-01.geom"),
fsCode = resourceText("/shaders/gs-01.frag"),
name = "x"
)
extend(Orbital())
extend {

View File

@@ -6,7 +6,7 @@ import org.openrndr.internal.Driver
import org.openrndr.math.Vector3
fun main() = application {
suspend fun main() = application {
program {
val shader = Shader.createFromCode(vsCode =

View File

@@ -6,7 +6,7 @@ import org.openrndr.internal.Driver
import org.openrndr.math.Vector3
fun main() = application {
suspend fun main() = application {
program {
val cb = colorBuffer(128, 128)
extend {

View File

@@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
fun main() = application {
suspend fun main() = application {
program {
val cb = colorBuffer(128, 128)
val at = arrayTexture(128, 128, 32)

View File

@@ -13,7 +13,7 @@ import org.openrndr.shape.Triangle
* a 3x3 grid of triangles and lines.
*/
fun main() {
suspend fun main() {
application {
configure {
width = 720

View File

@@ -4,7 +4,7 @@ import org.openrndr.draw.shadeStyle
import org.openrndr.extensions.Screenshots
import org.openrndr.math.Polar
import org.openrndr.shape.contour
fun main() = application {
suspend fun main() = application {
program {
val style = shadeStyle {
//fragmentTransform = "x_stroke.a *= step(0.5, fract(c_contourPosition / p_dashLen));"

View File

@@ -1,7 +1,7 @@
import org.openrndr.CursorType
import org.openrndr.application
fun main() {
suspend fun main() {
application {
program {
keyboard.character.listen {

View File

@@ -4,7 +4,7 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.pointBatch
fun main() = application {
suspend fun main() = application {
program {
val storedBatch = drawer.pointBatch {
for (y in 10 until height step 20) {

View File

@@ -8,7 +8,7 @@ import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.ffmpeg.VideoPlayerFFMPEG
import org.openrndr.math.Vector3
fun main() {
suspend fun main() {
application {
program {
val cube = boxMesh()

View File

@@ -2,19 +2,21 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.math.Vector3
import org.openrndr.resourceText
import org.openrndr.resourceUrl
fun main() {
suspend fun main() {
application {
program {
val vb = vertexBuffer(vertexFormat {
position(3)
}, 12)
val shader = Shader.Companion.createFromUrls(
vsUrl = resourceUrl("/shaders/ts-01.vert"),
tcsUrl = resourceUrl("/shaders/ts-01.tesc"),
tesUrl = resourceUrl("/shaders/ts-01.tese"),
fsUrl = resourceUrl("/shaders/ts-01.frag")
val shader = Shader.Companion.createFromCode(
vsCode = resourceText("/shaders/ts-01.vert"),
tcsCode = resourceText("/shaders/ts-01.tesc"),
tesCode = resourceText("/shaders/ts-01.tese"),
fsCode = resourceText("/shaders/ts-01.frag"),
name = "x"
)
vb.put {

View File

@@ -4,25 +4,26 @@ import org.openrndr.draw.DrawPrimitive
import org.openrndr.draw.Shader
import org.openrndr.draw.vertexBuffer
import org.openrndr.draw.vertexFormat
import org.openrndr.resourceText
import org.openrndr.resourceUrl
import org.openrndr.shape.Ellipse
fun main() {
suspend fun main() {
application {
program {
val ellipse = Ellipse(width/2.0, height/2.0, 100.0, 300.0).contour
val vb = vertexBuffer(vertexFormat {
position(3)
}, ellipse.segments.size * 4)
val shader = Shader.createFromUrls(
vsUrl = resourceUrl("/shaders/ts-02.vert"),
tcsUrl = resourceUrl("/shaders/ts-02.tesc"),
tesUrl = resourceUrl("/shaders/ts-02.tese"),
gsUrl = resourceUrl("/shaders/ts-02.geom"),
fsUrl = resourceUrl("/shaders/ts-02.frag")
val shader = Shader.createFromCode(
vsCode = resourceText("/shaders/ts-02.vert"),
tcsCode = resourceText("/shaders/ts-02.tesc"),
tesCode = resourceText("/shaders/ts-02.tese"),
gsCode = resourceText("/shaders/ts-02.geom"),
fsCode = resourceText("/shaders/ts-02.frag"),
name = "x"
)
vb.put {

View File

@@ -4,10 +4,11 @@ import org.openrndr.draw.DrawPrimitive
import org.openrndr.draw.Shader
import org.openrndr.draw.vertexBuffer
import org.openrndr.draw.vertexFormat
import org.openrndr.resourceText
import org.openrndr.resourceUrl
import org.openrndr.shape.Ellipse
fun main() {
suspend fun main() {
application {
program {
@@ -17,12 +18,13 @@ fun main() {
position(3)
}, ellipse.segments.size * 4)
val shader = Shader.createFromUrls(
vsUrl = resourceUrl("/shaders/ts-03.vert"),
tcsUrl = resourceUrl("/shaders/ts-03.tesc"),
tesUrl = resourceUrl("/shaders/ts-03.tese"),
gsUrl = resourceUrl("/shaders/ts-03.geom"),
fsUrl = resourceUrl("/shaders/ts-03.frag")
val shader = Shader.createFromCode(
vsCode = resourceText("/shaders/ts-03.vert"),
tcsCode = resourceText("/shaders/ts-03.tesc"),
tesCode = resourceText("/shaders/ts-03.tese"),
gsCode = resourceText("/shaders/ts-03.geom"),
fsCode = resourceText("/shaders/ts-03.frag"),
name = "x"
)
vb.put {
@@ -37,7 +39,6 @@ fun main() {
extend {
drawer.clear(ColorRGBa.PINK)
drawer.translate(width/2.0, height/2.0, 0.0)
drawer.rotate(seconds*45.0)
drawer.translate(-width/2.0, -height/2.0, 0.0)

View File

@@ -14,7 +14,7 @@ import org.openrndr.shape.path3D
import org.openrndr.extra.shaderphrases.preprocessedFromUrls
import kotlin.math.cos
fun main() {
suspend fun main() {
application {
program {
extend(Orbital())

View File

@@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.extensions.Screenshots
fun main() = application {
suspend fun main() = application {
program {
val volumeTexture = VolumeTexture.create(128,128,32)
val rt = renderTarget(128, 128) {

View File

@@ -8,7 +8,7 @@ import org.openrndr.extra.noise.Random
import org.openrndr.math.Vector2
import org.openrndr.shape.Rectangle
fun main() = application {
suspend fun main() = application {
program {
val margin = 5.0
val squareSize = 100.0

View File

@@ -3,7 +3,7 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
fun main() = application {
suspend fun main() = application {
program {
extend {
drawer.clear(ColorRGBa.GRAY)

View File

@@ -3,7 +3,7 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.rectangleBatch
fun main() = application {
suspend fun main() = application {
program {
val batch = drawer.rectangleBatch {
fill = ColorRGBa.PINK

View File

@@ -3,7 +3,7 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
fun main() = application {
suspend fun main() = application {
program {
extend {
drawer.clear(ColorRGBa.GRAY)

View File

@@ -11,9 +11,8 @@ sourceSets {
def boofcvVersion = "0.37"
dependencies {
implementation("org.boofcv:boofcv-core:$boofcvVersion")
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
api("org.boofcv:boofcv-core:$boofcvVersion")
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion")

View File

@@ -13,7 +13,7 @@ import org.openrndr.extensions.SingleScreenshot
import kotlin.math.cos
import kotlin.math.sin
fun main() {
suspend fun main() {
application {
program {

View File

@@ -5,7 +5,7 @@ import org.openrndr.draw.loadImage
import org.openrndr.extensions.SingleScreenshot
fun main() {
suspend fun main() {
application {
program {
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -5,7 +5,7 @@ import org.openrndr.draw.loadImage
import org.openrndr.extensions.SingleScreenshot
fun main() {
suspend fun main() {
application {
program {
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -18,7 +18,7 @@ import org.openrndr.shape.ShapeContour
import org.openrndr.shape.simplify
import org.openrndr.shape.toContour
fun main() {
suspend fun main() {
application {
program {

View File

@@ -13,8 +13,7 @@ dependencies {
demoImplementation(project(":orx-camera"))
demoImplementation(project(":orx-mesh-generators"))
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion")

View File

@@ -8,7 +8,7 @@ import org.openrndr.extras.meshgenerators.sphereMesh
import org.openrndr.math.Vector3
import kotlin.math.cos
fun main() {
suspend fun main() {
application {
configure {
width = 800

View File

@@ -8,7 +8,7 @@ import org.openrndr.extras.meshgenerators.sphereMesh
import org.openrndr.math.Vector3
import kotlin.math.cos
fun main() {
suspend fun main() {
application {
configure {
width = 800

View File

@@ -10,7 +10,7 @@ import org.openrndr.math.Vector2
import org.openrndr.math.map
import org.openrndr.shape.Rectangle
fun main() = application {
suspend fun main() = application {
program {
// -- this block is for automation purposes only
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -9,7 +9,7 @@ import org.openrndr.extras.color.palettes.rangeTo
import org.openrndr.extras.color.presets.CORAL
import org.openrndr.extras.color.spaces.toHSLUVa
fun main() = application {
suspend fun main() = application {
program {
// -- this block is for automation purposes only
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -8,7 +8,7 @@ import org.openrndr.extras.color.spaces.toOKLABa
import org.openrndr.extras.color.spaces.toOKLCHa
import org.openrndr.extras.color.spaces.toXSLUVa
fun main() {
suspend fun main() {
application {
program {
// -- this block is for automation purposes only

View File

@@ -13,7 +13,7 @@ import org.openrndr.extras.color.spaces.toXSLUVa
import org.openrndr.extras.meshgenerators.sphereMesh
import org.openrndr.math.Vector3
fun main() {
suspend fun main() {
application {
configure {
width = 800

View File

@@ -11,7 +11,7 @@ import org.openrndr.extras.color.spaces.ColorHSLUVa
import org.openrndr.math.Vector2
import org.openrndr.shape.Rectangle
fun main() {
suspend fun main() {
application {
program {
// -- this block is for automation purposes only

View File

@@ -8,7 +8,7 @@ import org.openrndr.math.Polar
import org.openrndr.math.Vector2
import kotlin.math.sqrt
fun main() {
suspend fun main() {
application {
configure {
width = 720

View File

@@ -5,7 +5,7 @@ import org.openrndr.draw.loadImage
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.color.statistics.calculateHistogramRGB
fun main() = application {
suspend fun main() = application {
program {
// -- this block is for automation purposes only
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -6,7 +6,7 @@ import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.color.statistics.calculateHistogramRGB
import kotlin.math.pow
fun main() = application {
suspend fun main() = application {
program {
// -- this block is for automation purposes only
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -5,7 +5,7 @@ import org.openrndr.draw.loadImage
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.color.statistics.calculateHistogramRGB
fun main() = application {
suspend fun main() = application {
program {
// -- this block is for automation purposes only
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -8,7 +8,7 @@ import org.openrndr.extras.color.spaces.toHSLUVa
import org.openrndr.math.Polar
import org.openrndr.shape.contour
fun main() {
suspend fun main() {
class Arc(val start: Double, val radius: Double, val length: Double, val height: Double) {
fun split(offset: Double = 0.0): List<Arc> {
val hl = length / 2.0

View File

@@ -14,7 +14,7 @@ dependencies {
implementation project(":orx-fx")
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion")

View File

@@ -16,7 +16,7 @@ import kotlin.random.Random
* with a different amount of blur in each layer,
* simulating depth of field
*/
fun main() = application {
suspend fun main() = application {
configure {
width = 900
height = 900

View File

@@ -29,7 +29,7 @@ import kotlin.random.Random
// Toggle to see the difference between a simple blur and multilayer bloom
const val effectEnabled = true
fun main() = application {
suspend fun main() = application {
configure {
width = 900
height = 900

View File

@@ -20,10 +20,10 @@ dependencies {
demoImplementation(project(":orx-mesh-generators"))
demoImplementation(project(":orx-noise"))
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-ffmpeg:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-filter:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion")
demoImplementation(sourceSets.getByName("main").output)

View File

@@ -11,7 +11,7 @@ import org.openrndr.math.mod_
import org.openrndr.math.transforms.transform
import java.io.File
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -8,7 +8,7 @@ import org.openrndr.extra.dnk3.renderers.dryRenderer
import org.openrndr.math.*
import java.io.File
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -10,7 +10,7 @@ import org.openrndr.extras.meshgenerators.groundPlaneMesh
import org.openrndr.math.Vector3
import org.openrndr.math.transforms.transform
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -11,7 +11,7 @@ import org.openrndr.math.Vector3
import org.openrndr.math.transforms.transform
import org.openrndr.shape.path3D
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -29,7 +29,7 @@ import java.io.File
import kotlin.math.cos
import kotlin.math.sin
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -9,7 +9,7 @@ import org.openrndr.extras.camera.Orbital
import org.openrndr.math.*
import java.io.File
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -9,7 +9,7 @@ import org.openrndr.extras.camera.Orbital
import org.openrndr.math.*
import java.io.File
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -9,7 +9,7 @@ import org.openrndr.extras.camera.Orbital
import org.openrndr.math.*
import java.io.File
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -7,7 +7,7 @@ import org.openrndr.extras.camera.Orbital
import org.openrndr.math.Vector3
import java.io.File
fun main() = application {
suspend fun main() = application {
program {
if (System.getProperty("takeScreenshot") == "true") {
extend(SingleScreenshot()) {

View File

@@ -10,7 +10,7 @@ import org.openrndr.math.Vector3
import org.openrndr.math.transforms.transform
import java.io.File
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -11,7 +11,7 @@ import org.openrndr.math.Vector3
import org.openrndr.math.transforms.transform
import java.io.File
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -10,7 +10,7 @@ import org.openrndr.extras.meshgenerators.sphereMesh
import org.openrndr.math.Vector3
import org.openrndr.math.transforms.transform
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -11,7 +11,7 @@ import org.openrndr.math.Vector3
import org.openrndr.math.mod_
import java.io.File
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -10,7 +10,7 @@ import org.openrndr.math.Vector3
import org.openrndr.math.mod_
import java.io.File
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -18,7 +18,7 @@ import java.io.File
import kotlin.math.cos
import kotlin.math.sin
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -13,7 +13,7 @@ dependencies {
implementation project(":orx-parameters")
demoImplementation(project(":orx-camera"))
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion")

View File

@@ -4,7 +4,7 @@ import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.easing.*
import org.openrndr.math.Vector2
fun main() {
suspend fun main() {
application {
configure {
width = 1280

View File

@@ -11,8 +11,9 @@ sourceSets {
dependencies {
api project(":orx-parameters")
implementation project(":orx-noise")
implementation("org.openrndr:openrndr-filter:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-ffmpeg:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoImplementation(project(":orx-gui"))
demoImplementation(project(":orx-compositor"))

View File

@@ -6,7 +6,7 @@ import org.openrndr.extra.fx.blur.*
import org.openrndr.math.Polar
import kotlin.math.sin
fun main() {
suspend fun main() {
application {
program {

View File

@@ -4,7 +4,7 @@ import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extra.fx.distort.FluidDistort
import org.openrndr.extra.fx.patterns.Checkers
fun main() {
suspend fun main() {
application {
program {
val fd = FluidDistort()

View File

@@ -13,7 +13,7 @@ import org.openrndr.extra.noise.simplex
import org.openrndr.math.Vector2
import kotlin.math.absoluteValue
fun main() = application {
suspend fun main() = application {
configure {
width = 1280
height = 720

View File

@@ -8,7 +8,7 @@ internal class FilterTools
internal fun filterFragmentUrl(resourceId: String): String {
return resourceUrl("gl3/$resourceId", FilterTools::class.java)
return resourceUrl("gl3/$resourceId", FilterTools::class)
}
internal data class ColorBufferDescription(val width: Int, val height: Int, val contentScale: Double, val format: ColorFormat, val type: ColorType)

View File

@@ -10,9 +10,7 @@ import org.openrndr.extra.parameters.IntParameter
import org.openrndr.filter.color.delinearize
import org.openrndr.filter.color.linearize
class BloomDownscale : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-downscale.frag"))) {
}
class BloomDownscale : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-downscale.frag")))
class BloomUpscale : Filter(filterShaderFromUrl(filterFragmentUrl("blur/bloom-upscale.frag"))) {
var gain: Double by parameters

View File

@@ -14,7 +14,7 @@ dependencies {
implementation "org.openrndr:openrndr-dialogs:$openrndrVersion"
implementation "com.google.code.gson:gson:$gsonVersion"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion")

View File

@@ -9,7 +9,7 @@ import org.openrndr.shape.Circle
/**
* A simple demonstration of a GUI for drawing some circles
*/
fun main() = application {
suspend fun main() = application {
program {
// -- this block is for automation purposes only
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -14,7 +14,7 @@ enum class BackgroundColors {
Yellow
}
fun main() = application {
suspend fun main() = application {
program {
// -- this block is for automation purposes only
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -11,7 +11,7 @@ import org.openrndr.extra.parameters.*
* [Left Shift] + [0]..[9] => store current gui values to a preset
* [0]..[9] => recall a preset
*/
fun main() = application {
suspend fun main() = application {
program {
// -- this block is for automation purposes only
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -9,7 +9,7 @@ import org.openrndr.shape.Circle
/**
* A simple demonstration of a GUI for drawing some circles
*/
fun main() = application {
suspend fun main() = application {
program {
// -- this block is for automation purposes only
if (System.getProperty("takeScreenshot") == "true") {

View File

@@ -5,7 +5,7 @@ import org.openrndr.extra.parameters.Description
import org.openrndr.extra.parameters.XYParameter
import org.openrndr.math.Vector2
fun main() = application {
suspend fun main() = application {
configure {
width = 800
height = 800

View File

@@ -13,7 +13,7 @@ dependencies {
demoImplementation project(":orx-noise")
demoImplementation project(":orx-gui")
demoImplementation project(":orx-compositor")
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-svg:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-ffmpeg:$openrndrVersion")

View File

@@ -8,7 +8,7 @@ import org.openrndr.extra.compositor.post
import org.openrndr.extra.fx.patterns.Checkers
import org.openrndr.extra.jumpfill.fx.InnerGlow
fun main() = application {
suspend fun main() = application {
program {
if (System.getProperty("takeScreenshot") == "true") {
extend(SingleScreenshot()) {

Some files were not shown because too many files have changed in this diff Show More