From 9435907ef900ed4468046ff51ee66877da6ee49d Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Tue, 22 Jun 2021 11:08:07 +0200 Subject: [PATCH] Upgrade to OPENRNDR 0.4 snapshot --- .github/workflows/build.yml | 38 ++++++ .github/workflows/generate-screenshots.yml | 47 -------- .../release-candidate-to-bintray.yml | 29 ----- build.gradle | 9 +- openrndr-demos/build.gradle | 2 +- .../src/demo/kotlin/Demo16BitPng.kt | 2 +- .../src/demo/kotlin/DemoAnimation01.kt | 2 +- .../src/demo/kotlin/DemoAnimation02.kt | 2 +- .../src/demo/kotlin/DemoAsyncImages01.kt | 2 +- .../src/demo/kotlin/DemoBillboardCircles01.kt | 2 +- .../src/demo/kotlin/DemoCatmullRom01.kt | 2 +- .../src/demo/kotlin/DemoCircleBatch01.kt | 2 +- .../src/demo/kotlin/DemoCircleBatch02.kt | 2 +- .../src/demo/kotlin/DemoCircleBatch03.kt | 2 +- .../src/demo/kotlin/DemoColorBufferCopy01.kt | 2 +- .../demo/kotlin/DemoCompositionDrawer01.kt | 2 +- .../demo/kotlin/DemoCompositionDrawer02.kt | 2 +- .../demo/kotlin/DemoCompositionDrawer03.kt | 2 +- .../src/demo/kotlin/DemoContour01.kt | 2 +- .../src/demo/kotlin/DemoContour02.kt | 2 +- .../src/demo/kotlin/DemoContour03.kt | 2 +- .../demo/kotlin/DemoContourIntersections01.kt | 74 ++++++------ .../demo/kotlin/DemoContourIntersections02.kt | 2 +- .../demo/kotlin/DemoContourIntersections03.kt | 2 +- .../src/demo/kotlin/DemoContourNearest01.kt | 108 +++++++++--------- .../src/demo/kotlin/DemoCubemap01.kt | 2 +- .../src/demo/kotlin/DemoCubemap02.kt | 2 +- .../src/demo/kotlin/DemoCubemap03.kt | 2 +- .../src/demo/kotlin/DemoDDSImage01.kt | 2 +- .../src/demo/kotlin/DemoGeometryShader01.kt | 12 +- .../src/demo/kotlin/DemoImageLoadStore01.kt | 2 +- .../src/demo/kotlin/DemoImageLoadStore02.kt | 2 +- .../src/demo/kotlin/DemoImageLoadStore03.kt | 2 +- .../src/demo/kotlin/DemoLineCapJoin.kt | 2 +- .../src/demo/kotlin/DemoLineDash01.kt | 2 +- .../src/demo/kotlin/DemoMouseCursor01.kt | 2 +- .../src/demo/kotlin/DemoPointBatch01.kt | 2 +- .../src/demo/kotlin/DemoScreenCapture01.kt | 2 +- .../src/demo/kotlin/DemoTessShader01.kt | 14 ++- .../src/demo/kotlin/DemoTessShader02.kt | 19 +-- .../src/demo/kotlin/DemoTessShader03.kt | 17 +-- .../src/demo/kotlin/DemoTessShader04.kt | 2 +- .../src/demo/kotlin/DemoVolumeTexture01.kt | 2 +- .../demo/kotlin/DrawerNegativeDimensions.kt | 2 +- .../src/demo/kotlin/DrawerRectangleBatch01.kt | 2 +- .../src/demo/kotlin/DrawerRectangleBatch02.kt | 2 +- .../src/demo/kotlin/DrawerRectangleBatch03.kt | 2 +- orx-boofcv/build.gradle | 5 +- orx-boofcv/src/demo/kotlin/DemoContours01.kt | 2 +- orx-boofcv/src/demo/kotlin/DemoResize01.kt | 2 +- orx-boofcv/src/demo/kotlin/DemoResize02.kt | 2 +- .../src/demo/kotlin/DemoSimplified01.kt | 2 +- orx-color/build.gradle | 3 +- orx-color/src/demo/kotlin/DemoColorPlane01.kt | 2 +- orx-color/src/demo/kotlin/DemoColorPlane02.kt | 2 +- orx-color/src/demo/kotlin/DemoColorRange01.kt | 2 +- orx-color/src/demo/kotlin/DemoColorRange02.kt | 2 +- orx-color/src/demo/kotlin/DemoColorRange03.kt | 2 +- orx-color/src/demo/kotlin/DemoColorRange04.kt | 2 +- orx-color/src/demo/kotlin/DemoHSLUV01.kt | 2 +- orx-color/src/demo/kotlin/DemoHSLUV02.kt | 2 +- orx-color/src/demo/kotlin/DemoHistogram01.kt | 2 +- orx-color/src/demo/kotlin/DemoHistogram02.kt | 2 +- orx-color/src/demo/kotlin/DemoHistogram03.kt | 2 +- orx-color/src/demo/kotlin/DemoXSLUV01.kt | 2 +- orx-compositor/build.gradle | 2 +- .../src/demo/kotlin/DemoCompositor01.kt | 2 +- orx-compositor/src/demo/kotlin/DemoUse01.kt | 2 +- orx-dnk3/build.gradle | 4 +- orx-dnk3/src/demo/kotlin/DemoAnimations01.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoCamera01.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoDSL01.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoDSL02.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoLights01.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoLights02.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoLights03.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoObject01.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoScene01.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoScene02.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoScene03.kt | 2 +- .../src/demo/kotlin/DemoSegmentContours01.kt | 2 +- orx-dnk3/src/demo/kotlin/DemoSkinning01.kt | 2 +- .../src/demo/kotlin/DemoVoxelConeTracing01.kt | 2 +- orx-easing/build.gradle | 2 +- orx-easing/src/demo/kotlin/DemoEasings01.kt | 2 +- orx-fx/build.gradle | 3 +- orx-fx/src/demo/kotlin/DemoBlur01.kt | 2 +- orx-fx/src/demo/kotlin/DemoFluidDistort01.kt | 2 +- orx-fx/src/demo/kotlin/DemoLaserBlur01.kt | 2 +- orx-fx/src/main/kotlin/FilterTools.kt | 2 +- orx-fx/src/main/kotlin/blur/MipBloom.kt | 4 +- orx-gui/build.gradle | 2 +- orx-gui/src/demo/kotlin/DemoHide01.kt | 2 +- orx-gui/src/demo/kotlin/DemoOptions01.kt | 2 +- orx-gui/src/demo/kotlin/DemoPresets01.kt | 2 +- orx-gui/src/demo/kotlin/DemoSimple01.kt | 2 +- orx-gui/src/demo/kotlin/DemoXYParameter.kt | 2 +- orx-jumpflood/build.gradle | 2 +- .../src/demo/kotlin/DemoInnerGlow01.kt | 2 +- .../src/demo/kotlin/DemoInnerGlow02.kt | 2 +- .../src/demo/kotlin/DemoShapeSDF01.kt | 2 +- .../src/demo/kotlin/DemoShapeSDF02.kt | 2 +- .../src/demo/kotlin/DemoShapeSDF03.kt | 2 +- .../src/demo/kotlin/DemoShapeSDF04.kt | 2 +- .../src/demo/kotlin/DemoShapeSDF05.kt | 2 +- .../src/demo/kotlin/DemoSkeleton01.kt | 2 +- .../src/demo/kotlin/DemoStraightSkeleton01.kt | 2 +- .../orx-chataigne}/README.md | 0 .../orx-chataigne}/build.gradle | 2 +- .../timeline_example_chataigne.noisette | 0 .../src/demo/kotlin/ChataigneOSCDemo.kt | 0 .../src/main/kotlin/ChataigneOSC.kt | 0 .../orx-file-watcher}/README.md | 0 .../src/main/kotlin/FileWatcher.kt | 0 .../src/main/kotlin/Kinect.kt | 6 +- .../openrndr/extra/kinect/impl/KinectImpl.kt | 4 +- .../extra/kinect/depth-to-colors-turbo.frag | 0 .../kinect/depth-to-colors-zucconi6.frag | 0 .../extra/kinect/depth-to-grayscale.frag | 0 .../kinect/impl/kinect-raw-to-depth.frag | 0 .../orx-kinect-v1-demo}/build.gradle | 4 +- .../src/main/kotlin/BasicUseCaseDemo.kt | 2 +- .../src/main/kotlin/DepthToColorMapsDemo.kt | 2 +- .../src/main/kotlin/MultipleKinectsDemo.kt | 2 +- .../main/kotlin/NativeFreenectCommandsDemo.kt | 2 +- .../src/main/resources/logback.xml | 0 .../build.gradle | 0 .../build.gradle | 0 .../orx-kinect-v1-natives-macos}/build.gradle | 0 .../build.gradle | 0 .../orx-kinect-v1}/README.md | 0 .../orx-kinect-v1}/build.gradle | 2 +- .../src/main/kotlin/KinectV1.kt | 2 +- .../orx-kotlin-parser}/build.gradle | 2 +- .../src/main/antlr/KotlinLexer.g4 | 0 .../src/main/antlr/KotlinLexer.tokens | 0 .../src/main/antlr/KotlinParser.g4 | 0 .../src/main/antlr/UnicodeClasses.g4 | 0 .../src/main/antlr/UnicodeClasses.tokens | 0 .../src/main/kotlin/ExtractProgram.kt | 0 .../src/main/kotlin/TreeUtils.kt | 0 {orx-midi => orx-jvm/orx-midi}/README.md | 0 .../orx-midi}/src/main/kotlin/MidiEvent.kt | 0 .../src/main/kotlin/MidiTransceiver.kt | 7 +- {orx-olive => orx-jvm/orx-olive}/README.md | 0 {orx-olive => orx-jvm/orx-olive}/build.gradle | 2 +- .../orx-olive}/images/DemoOlive01Kt.png | Bin .../orx-olive}/src/demo/kotlin/DemoOlive01.kt | 0 .../src/demo/kotlin/DemoOliveScriptless01.kt | 0 .../src/demo/kotlin/demo-olive-01.kts | 0 .../orx-olive}/src/main/kotlin/Olive.kt | 0 .../src/main/kotlin/OliveProgram.kt | 0 .../orx-olive}/src/main/kotlin/Reloadable.kt | 0 .../orx-olive}/src/main/kotlin/Resources.kt | 0 .../src/main/kotlin/ScriptGenerator.kt | 0 .../main/kotlin/ScriptObjectLoaderJSR233.kt | 0 .../src/main/kotlin/ScriptObjectLoaderKSH.kt | 0 .../src/test/kotlin/TestLoadScript.kt | 0 .../src/test/kotlin/TestLoadScriptKSH.kt | 0 {orx-osc => orx-jvm/orx-osc}/README.md | 0 {orx-osc => orx-jvm/orx-osc}/build.gradle | 0 .../orx-osc}/src/main/kotlin/OSC.kt | 0 .../orx-rabbit-control}/.gitignore | 0 .../orx-rabbit-control}/README.md | 0 .../orx-rabbit-control}/build.gradle | 0 .../src/demo/kotlin/DemoRabbitControl.kt | 2 +- .../kotlin/DemoRabbitControlManualOverlay.kt | 2 +- .../src/demo/kotlin/DemoRabbitHole.kt | 2 +- .../src/main/kotlin/RabbitControlServer.kt | 0 .../rabbit-client/asset-manifest.json | 0 .../main/resources/rabbit-client/favicon.ico | Bin .../main/resources/rabbit-client/index.html | 0 .../resources/rabbit-client/manifest.json | 0 ...nifest.8b50f7152eba97a8a3a748d36319a411.js | 0 .../resources/rabbit-client/service-worker.js | 0 .../static/css/1.a970d4a6.chunk.css | 0 .../static/css/1.a970d4a6.chunk.css.map | 0 .../static/css/main.6b57d6a6.chunk.css | 0 .../static/css/main.6b57d6a6.chunk.css.map | 0 .../static/js/1.ab137fd1.chunk.js | 0 .../static/js/1.ab137fd1.chunk.js.map | 0 .../static/js/main.3c08e7ef.chunk.js | 0 .../static/js/main.3c08e7ef.chunk.js.map | 0 .../static/js/runtime~main.4a686d48.js | 0 .../static/js/runtime~main.4a686d48.js.map | 0 .../static/media/icons-16.05f1cdad.eot | Bin .../static/media/icons-16.3c1c220e.woff | Bin .../static/media/icons-16.3cde8748.ttf | Bin .../static/media/icons-20.0a5c7651.eot | Bin .../static/media/icons-20.51ec31f3.ttf | Bin .../static/media/icons-20.cef8cdbb.woff | Bin .../build.gradle | 0 .../build.gradle | 0 .../build.gradle | 0 .../orx-realsense2}/build.gradle | 4 +- .../src/demo/kotlin/DemoRS201.kt | 2 +- .../src/demo/kotlin/DemoRS202.kt | 2 +- .../src/demo/kotlin/DemoUnproject01.kt | 2 +- .../src/main/kotlin/RS2Sensor.kt | 0 {orx-runway => orx-jvm/orx-runway}/README.md | 0 .../orx-runway}/build.gradle | 2 +- .../orx-runway}/src/demo/kotlin/DemoBASNet.kt | 2 +- .../src/demo/kotlin/DemoBiGAN01.kt | 2 +- .../src/demo/kotlin/DemoBiGAN02.kt | 2 +- .../src/demo/kotlin/DemoCaptionToImage01.kt | 2 +- .../src/demo/kotlin/DemoCaptionToImage02.kt | 2 +- .../src/demo/kotlin/DemoDensePose01.kt | 2 +- .../src/demo/kotlin/DemoDeoldify01.kt | 2 +- .../src/demo/kotlin/DemoDeoldify02.kt | 2 +- .../src/demo/kotlin/DemoFaceLandmarks01.kt | 2 +- .../src/demo/kotlin/DemoImageFeedback01.kt | 2 +- .../src/demo/kotlin/DemoImageToCaption01.kt | 2 +- .../src/demo/kotlin/DemoImageToCaption02.kt | 2 +- .../src/demo/kotlin/DemoObjectToCaption01.kt | 4 +- .../src/demo/kotlin/DemoPersonSegmentation.kt | 2 +- .../src/demo/kotlin/DemoStyleGAN01.kt | 2 +- .../src/demo/kotlin/DemoTextPrompt01.kt | 6 +- .../orx-runway}/src/demo/kotlin/DemoU2Net.kt | 2 +- .../orx-runway}/src/demo/kotlin/PoseNet01.kt | 2 +- .../orx-runway}/src/main/kotlin/Presets.kt | 0 .../orx-runway}/src/main/kotlin/RunwayHttp.kt | 0 {orx-syphon => orx-jvm/orx-syphon}/README.md | 0 .../orx-syphon}/build.gradle | 3 +- .../orx-syphon}/preview.gif | Bin .../src/main/kotlin/SyphonClient.kt | 7 +- .../src/main/kotlin/SyphonServer.kt | 3 +- .../src/main/kotlin/jsyphon/JSyphonClient.kt | 2 +- .../src/main/kotlin/jsyphon/JSyphonImage.kt | 2 +- .../src/main/kotlin/jsyphon/JSyphonNative.kt | 2 +- .../src/main/kotlin/jsyphon/JSyphonServer.kt | 2 +- .../main/kotlin/jsyphon/JSyphonServerList.kt | 2 +- .../src/main/kotlin/jsyphon/Util.kt | 2 +- .../src/main/resources/jsyphon-natives/Syphon | Bin .../jsyphon-natives/libJSyphon.jnilib | Bin .../src/test/kotlin/ClientExample.kt | 2 +- .../kotlin/ClientExampleSpecificServer.kt | 2 +- .../src/test/kotlin/ServerExample.kt | 2 +- .../ServerExampleAlternateRenderTarget.kt | 3 +- .../build.gradle | 0 .../build.gradle | 0 .../build.gradle | 0 .../build.gradle | 0 .../build.gradle | 0 .../build.gradle | 0 .../build.gradle | 0 .../build.gradle | 0 .../orx-tensorflow}/build.gradle | 6 +- .../orx-tensorflow}/src/main/kotlin/Tensor.kt | 1 + .../src/main/kotlin/arrays/Arrays.kt | 0 .../orx-video-profiles}/README.md | 0 .../orx-video-profiles}/build.gradle | 2 +- .../src/demo/kotlin/DemoGIF01.kt | 2 +- .../src/demo/kotlin/DemoProres01.kt | 2 +- .../src/demo/kotlin/DemoTIFF01.kt | 2 +- .../src/main/kotlin/GIFProfile.kt | 0 .../src/main/kotlin/PNGProfile.kt | 0 .../src/main/kotlin/ProresProfile.kt | 0 .../src/main/kotlin/TIFFProfile.kt | 0 .../src/main/kotlin/WebpProfile.kt | 0 .../src/main/kotlin/X265Profile.kt | 0 orx-kdtree/build.gradle | 2 +- .../src/demo/kotlin/DemoNearestNeighbour01.kt | 2 +- orx-keyframer/build.gradle | 2 +- .../src/demo/kotlin/DemoEvelope01.kt | 2 +- orx-keyframer/src/demo/kotlin/DemoFull01.kt | 2 +- orx-keyframer/src/demo/kotlin/DemoScrub01.kt | 2 +- orx-keyframer/src/demo/kotlin/DemoSimple01.kt | 2 +- orx-keyframer/src/demo/kotlin/DemoSimple02.kt | 2 +- .../demo/kotlin/DemoSimpleExpressions01.kt | 2 +- orx-mesh-generators/build.gradle | 2 +- .../src/demo/kotlin/DemoBox.kt | 2 +- .../src/demo/kotlin/DemoComplex01.kt | 2 +- .../src/demo/kotlin/DemoComplex02.kt | 2 +- .../src/demo/kotlin/DemoComplex03.kt | 2 +- .../src/demo/kotlin/DemoComplex04.kt | 2 +- .../src/demo/kotlin/DemoComplex05.kt | 2 +- orx-no-clear/build.gradle | 2 +- orx-no-clear/src/demo/kotlin/DemoNoClear.kt | 2 +- orx-noise/build.gradle | 2 +- .../src/demo/kotlin/DemoGradientPerturb2D.kt | 2 +- .../src/demo/kotlin/DemoGradientPerturb3D.kt | 2 +- .../demo/kotlin/DemoPoissonDiskSampling.kt | 2 +- orx-noise/src/demo/kotlin/DemoSimplex01.kt | 2 +- .../src/demo/kotlin/DemoHorizontalLayout01.kt | 2 +- .../src/demo/kotlin/DemoVerticalLayout01.kt | 2 +- orx-panel/src/demo/kotlin/DemoWatchDiv01.kt | 2 +- .../src/demo/kotlin/DemoWatchObjectDiv01.kt | 2 +- .../org/openrndr/panel/ControlManager.kt | 4 +- .../org/openrndr/panel/elements/Button.kt | 3 +- .../panel/elements/ColorpickerButton.kt | 3 +- .../openrndr/panel/elements/DropdownButton.kt | 3 +- .../org/openrndr/panel/elements/Element.kt | 7 +- .../openrndr/panel/elements/EnvelopeButton.kt | 4 +- .../openrndr/panel/elements/SequenceEditor.kt | 6 +- .../org/openrndr/panel/elements/Slider.kt | 4 +- .../openrndr/panel/elements/TextElements.kt | 4 +- .../org/openrndr/panel/elements/Textfield.kt | 4 +- .../org/openrndr/panel/elements/Toggle.kt | 2 +- .../org/openrndr/panel/elements/XYPad.kt | 2 +- .../org/openrndr/panel/tools/Tooltip.kt | 3 +- orx-poisson-fill/build.gradle | 4 +- .../src/demo/kotlin/DemoPoissonFill01.kt | 2 +- orx-quadtree/build.gradle | 2 +- .../src/demo/kotlin/DemoQuadTree01.kt | 2 +- .../src/demo/kotlin/DemoQuadTree02.kt | 2 +- orx-shade-styles/build.gradle | 2 +- .../src/demo/kotlin/DemoAllGradients01.kt | 2 +- .../src/demo/kotlin/DemoLinearGradient.kt | 2 +- .../src/demo/kotlin/DemoNPointGradient01.kt | 2 +- .../demo/kotlin/DemoNPointLinearGradient01.kt | 2 +- .../demo/kotlin/DemoNPointRadialGradient01.kt | 2 +- .../src/demo/kotlin/DemoRadialGradient01.kt | 2 +- orx-shapes/build.gradle | 2 +- .../src/demo/kotlin/DemoBezierPatch01.kt | 2 +- .../src/demo/kotlin/DemoBezierPatch02.kt | 2 +- .../src/demo/kotlin/DemoBezierPatch03.kt | 2 +- .../src/demo/kotlin/DemoBezierPatch04.kt | 2 +- .../demo/kotlin/DemoBezierPatchDrawer01.kt | 2 +- .../demo/kotlin/DemoBezierPatchDrawer02.kt | 2 +- .../demo/kotlin/DemoBezierPatchDrawer03.kt | 2 +- .../src/demo/kotlin/DemoRectangleGrid.kt | 2 +- .../src/demo/kotlin/DemoRegularPolygon.kt | 2 +- .../src/demo/kotlin/DemoRegularStar01.kt | 2 +- .../src/demo/kotlin/DemoRegularStar02.kt | 3 +- .../src/demo/kotlin/DemoRoundedRectangle.kt | 2 +- orx-temporal-blur/build.gradle | 1 + orx-time-operators/build.gradle | 2 +- .../src/demo/kotlin/DemoEnvelope.kt | 2 +- orx-time-operators/src/demo/kotlin/DemoLFO.kt | 2 +- orx-timer/build.gradle | 2 +- orx-timer/src/demo/kotlin/DemoRepeat01.kt | 2 +- orx-timer/src/demo/kotlin/DemoRepeat02.kt | 2 +- orx-timer/src/demo/kotlin/DemoTimeOut01.kt | 2 +- orx-triangulation/build.gradle | 4 +- .../src/demo/kotlin/DemoDelaunay01.kt | 2 +- .../src/demo/kotlin/DemoDelaunay02.kt | 2 +- .../src/demo/kotlin/DemoVoronoi01.kt | 2 +- settings.gradle | 56 ++++----- 339 files changed, 460 insertions(+), 497 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/generate-screenshots.yml delete mode 100644 .github/workflows/release-candidate-to-bintray.yml rename {orx-chataigne => orx-jvm/orx-chataigne}/README.md (100%) rename {orx-chataigne => orx-jvm/orx-chataigne}/build.gradle (91%) rename {orx-chataigne => orx-jvm/orx-chataigne}/resources/timeline_example_chataigne.noisette (100%) rename {orx-chataigne => orx-jvm/orx-chataigne}/src/demo/kotlin/ChataigneOSCDemo.kt (100%) rename {orx-chataigne => orx-jvm/orx-chataigne}/src/main/kotlin/ChataigneOSC.kt (100%) rename {orx-file-watcher => orx-jvm/orx-file-watcher}/README.md (100%) rename {orx-file-watcher => orx-jvm/orx-file-watcher}/src/main/kotlin/FileWatcher.kt (100%) rename {orx-kinect-common => orx-jvm/orx-kinect-common}/src/main/kotlin/Kinect.kt (97%) rename {orx-kinect-common => orx-jvm/orx-kinect-common}/src/main/kotlin/org/openrndr/extra/kinect/impl/KinectImpl.kt (97%) rename {orx-kinect-common => orx-jvm/orx-kinect-common}/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-turbo.frag (100%) rename {orx-kinect-common => orx-jvm/orx-kinect-common}/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-zucconi6.frag (100%) rename {orx-kinect-common => orx-jvm/orx-kinect-common}/src/main/resources/org/openrndr/extra/kinect/depth-to-grayscale.frag (100%) rename {orx-kinect-common => orx-jvm/orx-kinect-common}/src/main/resources/org/openrndr/extra/kinect/impl/kinect-raw-to-depth.frag (100%) rename {orx-kinect-v1-demo => orx-jvm/orx-kinect-v1-demo}/build.gradle (77%) rename {orx-kinect-v1-demo => orx-jvm/orx-kinect-v1-demo}/src/main/kotlin/BasicUseCaseDemo.kt (95%) rename {orx-kinect-v1-demo => orx-jvm/orx-kinect-v1-demo}/src/main/kotlin/DepthToColorMapsDemo.kt (98%) rename {orx-kinect-v1-demo => orx-jvm/orx-kinect-v1-demo}/src/main/kotlin/MultipleKinectsDemo.kt (97%) rename {orx-kinect-v1-demo => orx-jvm/orx-kinect-v1-demo}/src/main/kotlin/NativeFreenectCommandsDemo.kt (98%) rename {orx-kinect-v1-demo => orx-jvm/orx-kinect-v1-demo}/src/main/resources/logback.xml (100%) rename {orx-kinect-v1-natives-linux-arm64 => orx-jvm/orx-kinect-v1-natives-linux-arm64}/build.gradle (100%) rename {orx-kinect-v1-natives-linux-x64 => orx-jvm/orx-kinect-v1-natives-linux-x64}/build.gradle (100%) rename {orx-kinect-v1-natives-macos => orx-jvm/orx-kinect-v1-natives-macos}/build.gradle (100%) rename {orx-kinect-v1-natives-windows => orx-jvm/orx-kinect-v1-natives-windows}/build.gradle (100%) rename {orx-kinect-v1 => orx-jvm/orx-kinect-v1}/README.md (100%) rename {orx-kinect-v1 => orx-jvm/orx-kinect-v1}/build.gradle (61%) rename {orx-kinect-v1 => orx-jvm/orx-kinect-v1}/src/main/kotlin/KinectV1.kt (99%) rename {orx-kotlin-parser => orx-jvm/orx-kotlin-parser}/build.gradle (94%) rename {orx-kotlin-parser => orx-jvm/orx-kotlin-parser}/src/main/antlr/KotlinLexer.g4 (100%) rename {orx-kotlin-parser => orx-jvm/orx-kotlin-parser}/src/main/antlr/KotlinLexer.tokens (100%) rename {orx-kotlin-parser => orx-jvm/orx-kotlin-parser}/src/main/antlr/KotlinParser.g4 (100%) rename {orx-kotlin-parser => orx-jvm/orx-kotlin-parser}/src/main/antlr/UnicodeClasses.g4 (100%) rename {orx-kotlin-parser => orx-jvm/orx-kotlin-parser}/src/main/antlr/UnicodeClasses.tokens (100%) rename {orx-kotlin-parser => orx-jvm/orx-kotlin-parser}/src/main/kotlin/ExtractProgram.kt (100%) rename {orx-kotlin-parser => orx-jvm/orx-kotlin-parser}/src/main/kotlin/TreeUtils.kt (100%) rename {orx-midi => orx-jvm/orx-midi}/README.md (100%) rename {orx-midi => orx-jvm/orx-midi}/src/main/kotlin/MidiEvent.kt (100%) rename {orx-midi => orx-jvm/orx-midi}/src/main/kotlin/MidiTransceiver.kt (96%) rename {orx-olive => orx-jvm/orx-olive}/README.md (100%) rename {orx-olive => orx-jvm/orx-olive}/build.gradle (92%) rename {orx-olive => orx-jvm/orx-olive}/images/DemoOlive01Kt.png (100%) rename {orx-olive => orx-jvm/orx-olive}/src/demo/kotlin/DemoOlive01.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/demo/kotlin/DemoOliveScriptless01.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/demo/kotlin/demo-olive-01.kts (100%) rename {orx-olive => orx-jvm/orx-olive}/src/main/kotlin/Olive.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/main/kotlin/OliveProgram.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/main/kotlin/Reloadable.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/main/kotlin/Resources.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/main/kotlin/ScriptGenerator.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/main/kotlin/ScriptObjectLoaderJSR233.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/main/kotlin/ScriptObjectLoaderKSH.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/test/kotlin/TestLoadScript.kt (100%) rename {orx-olive => orx-jvm/orx-olive}/src/test/kotlin/TestLoadScriptKSH.kt (100%) rename {orx-osc => orx-jvm/orx-osc}/README.md (100%) rename {orx-osc => orx-jvm/orx-osc}/build.gradle (100%) rename {orx-osc => orx-jvm/orx-osc}/src/main/kotlin/OSC.kt (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/.gitignore (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/README.md (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/build.gradle (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/demo/kotlin/DemoRabbitControl.kt (98%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/demo/kotlin/DemoRabbitControlManualOverlay.kt (97%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/demo/kotlin/DemoRabbitHole.kt (98%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/kotlin/RabbitControlServer.kt (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/asset-manifest.json (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/favicon.ico (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/index.html (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/manifest.json (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/precache-manifest.8b50f7152eba97a8a3a748d36319a411.js (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/service-worker.js (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css.map (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css.map (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js.map (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js.map (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js.map (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/media/icons-16.05f1cdad.eot (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/media/icons-16.3c1c220e.woff (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/media/icons-16.3cde8748.ttf (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/media/icons-20.0a5c7651.eot (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/media/icons-20.51ec31f3.ttf (100%) rename {orx-rabbit-control => orx-jvm/orx-rabbit-control}/src/main/resources/rabbit-client/static/media/icons-20.cef8cdbb.woff (100%) rename {orx-realsense2-natives-linux-x64 => orx-jvm/orx-realsense2-natives-linux-x64}/build.gradle (100%) rename {orx-realsense2-natives-macos => orx-jvm/orx-realsense2-natives-macos}/build.gradle (100%) rename {orx-realsense2-natives-windows => orx-jvm/orx-realsense2-natives-windows}/build.gradle (100%) rename {orx-realsense2 => orx-jvm/orx-realsense2}/build.gradle (79%) rename {orx-realsense2 => orx-jvm/orx-realsense2}/src/demo/kotlin/DemoRS201.kt (97%) rename {orx-realsense2 => orx-jvm/orx-realsense2}/src/demo/kotlin/DemoRS202.kt (98%) rename {orx-realsense2 => orx-jvm/orx-realsense2}/src/demo/kotlin/DemoUnproject01.kt (80%) rename {orx-realsense2 => orx-jvm/orx-realsense2}/src/main/kotlin/RS2Sensor.kt (100%) rename {orx-runway => orx-jvm/orx-runway}/README.md (100%) rename {orx-runway => orx-jvm/orx-runway}/build.gradle (91%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoBASNet.kt (94%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoBiGAN01.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoBiGAN02.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoCaptionToImage01.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoCaptionToImage02.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoDensePose01.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoDeoldify01.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoDeoldify02.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoFaceLandmarks01.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoImageFeedback01.kt (98%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoImageToCaption01.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoImageToCaption02.kt (96%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoObjectToCaption01.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoPersonSegmentation.kt (94%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoStyleGAN01.kt (96%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoTextPrompt01.kt (95%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/DemoU2Net.kt (94%) rename {orx-runway => orx-jvm/orx-runway}/src/demo/kotlin/PoseNet01.kt (97%) rename {orx-runway => orx-jvm/orx-runway}/src/main/kotlin/Presets.kt (100%) rename {orx-runway => orx-jvm/orx-runway}/src/main/kotlin/RunwayHttp.kt (100%) rename {orx-syphon => orx-jvm/orx-syphon}/README.md (100%) rename {orx-syphon => orx-jvm/orx-syphon}/build.gradle (57%) rename {orx-syphon => orx-jvm/orx-syphon}/preview.gif (100%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/kotlin/SyphonClient.kt (94%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/kotlin/SyphonServer.kt (96%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/kotlin/jsyphon/JSyphonClient.kt (96%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/kotlin/jsyphon/JSyphonImage.kt (86%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/kotlin/jsyphon/JSyphonNative.kt (96%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/kotlin/jsyphon/JSyphonServer.kt (98%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/kotlin/jsyphon/JSyphonServerList.kt (87%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/kotlin/jsyphon/Util.kt (87%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/resources/jsyphon-natives/Syphon (100%) rename {orx-syphon => orx-jvm/orx-syphon}/src/main/resources/jsyphon-natives/libJSyphon.jnilib (100%) rename {orx-syphon => orx-jvm/orx-syphon}/src/test/kotlin/ClientExample.kt (91%) rename {orx-syphon => orx-jvm/orx-syphon}/src/test/kotlin/ClientExampleSpecificServer.kt (94%) rename {orx-syphon => orx-jvm/orx-syphon}/src/test/kotlin/ServerExample.kt (92%) rename {orx-syphon => orx-jvm/orx-syphon}/src/test/kotlin/ServerExampleAlternateRenderTarget.kt (96%) rename {orx-tensorflow-gpu-natives-linux-x64 => orx-jvm/orx-tensorflow-gpu-natives-linux-x64}/build.gradle (100%) rename {orx-tensorflow-gpu-natives-windows => orx-jvm/orx-tensorflow-gpu-natives-windows}/build.gradle (100%) rename {orx-tensorflow-mkl-natives-linux-x64 => orx-jvm/orx-tensorflow-mkl-natives-linux-x64}/build.gradle (100%) rename {orx-tensorflow-mkl-natives-macos => orx-jvm/orx-tensorflow-mkl-natives-macos}/build.gradle (100%) rename {orx-tensorflow-mkl-natives-windows => orx-jvm/orx-tensorflow-mkl-natives-windows}/build.gradle (100%) rename {orx-tensorflow-natives-linux-x64 => orx-jvm/orx-tensorflow-natives-linux-x64}/build.gradle (100%) rename {orx-tensorflow-natives-macos => orx-jvm/orx-tensorflow-natives-macos}/build.gradle (100%) rename {orx-tensorflow-natives-windows => orx-jvm/orx-tensorflow-natives-windows}/build.gradle (100%) rename {orx-tensorflow => orx-jvm/orx-tensorflow}/build.gradle (86%) rename {orx-tensorflow => orx-jvm/orx-tensorflow}/src/main/kotlin/Tensor.kt (99%) rename {orx-tensorflow => orx-jvm/orx-tensorflow}/src/main/kotlin/arrays/Arrays.kt (100%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/README.md (100%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/build.gradle (89%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/src/demo/kotlin/DemoGIF01.kt (91%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/src/demo/kotlin/DemoProres01.kt (90%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/src/demo/kotlin/DemoTIFF01.kt (93%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/src/main/kotlin/GIFProfile.kt (100%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/src/main/kotlin/PNGProfile.kt (100%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/src/main/kotlin/ProresProfile.kt (100%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/src/main/kotlin/TIFFProfile.kt (100%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/src/main/kotlin/WebpProfile.kt (100%) rename {orx-video-profiles => orx-jvm/orx-video-profiles}/src/main/kotlin/X265Profile.kt (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..e3d6444bb --- /dev/null +++ b/.github/workflows/build.yml @@ -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 \ No newline at end of file diff --git a/.github/workflows/generate-screenshots.yml b/.github/workflows/generate-screenshots.yml deleted file mode 100644 index 5366c529f..000000000 --- a/.github/workflows/generate-screenshots.yml +++ /dev/null @@ -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 - diff --git a/.github/workflows/release-candidate-to-bintray.yml b/.github/workflows/release-candidate-to-bintray.yml deleted file mode 100644 index d9d723b90..000000000 --- a/.github/workflows/release-candidate-to-bintray.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 83465e703..a30a458f8 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/openrndr-demos/build.gradle b/openrndr-demos/build.gradle index c6c17587f..1c66ccc03 100644 --- a/openrndr-demos/build.gradle +++ b/openrndr-demos/build.gradle @@ -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") diff --git a/openrndr-demos/src/demo/kotlin/Demo16BitPng.kt b/openrndr-demos/src/demo/kotlin/Demo16BitPng.kt index 640080f6a..daa45456a 100644 --- a/openrndr-demos/src/demo/kotlin/Demo16BitPng.kt +++ b/openrndr-demos/src/demo/kotlin/Demo16BitPng.kt @@ -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") diff --git a/openrndr-demos/src/demo/kotlin/DemoAnimation01.kt b/openrndr-demos/src/demo/kotlin/DemoAnimation01.kt index eb93afb4e..2e730dbb5 100644 --- a/openrndr-demos/src/demo/kotlin/DemoAnimation01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoAnimation01.kt @@ -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 diff --git a/openrndr-demos/src/demo/kotlin/DemoAnimation02.kt b/openrndr-demos/src/demo/kotlin/DemoAnimation02.kt index 55ae183b4..7a7fc2d37 100644 --- a/openrndr-demos/src/demo/kotlin/DemoAnimation02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoAnimation02.kt @@ -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 diff --git a/openrndr-demos/src/demo/kotlin/DemoAsyncImages01.kt b/openrndr-demos/src/demo/kotlin/DemoAsyncImages01.kt index 74b9e8e67..b9858253b 100644 --- a/openrndr-demos/src/demo/kotlin/DemoAsyncImages01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoAsyncImages01.kt @@ -1,7 +1,7 @@ import org.openrndr.application import org.openrndr.internal.colorBufferLoader -fun main() { +suspend fun main() { application { program { extend { diff --git a/openrndr-demos/src/demo/kotlin/DemoBillboardCircles01.kt b/openrndr-demos/src/demo/kotlin/DemoBillboardCircles01.kt index a45cca6d7..3e8842a61 100644 --- a/openrndr-demos/src/demo/kotlin/DemoBillboardCircles01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoBillboardCircles01.kt @@ -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) diff --git a/openrndr-demos/src/demo/kotlin/DemoCatmullRom01.kt b/openrndr-demos/src/demo/kotlin/DemoCatmullRom01.kt index f448aef7a..0a9b8fc32 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCatmullRom01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCatmullRom01.kt @@ -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) diff --git a/openrndr-demos/src/demo/kotlin/DemoCircleBatch01.kt b/openrndr-demos/src/demo/kotlin/DemoCircleBatch01.kt index e15fe5e7f..ce3cffa45 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCircleBatch01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCircleBatch01.kt @@ -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) diff --git a/openrndr-demos/src/demo/kotlin/DemoCircleBatch02.kt b/openrndr-demos/src/demo/kotlin/DemoCircleBatch02.kt index b07a947ec..56f80a30a 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCircleBatch02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCircleBatch02.kt @@ -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) { diff --git a/openrndr-demos/src/demo/kotlin/DemoCircleBatch03.kt b/openrndr-demos/src/demo/kotlin/DemoCircleBatch03.kt index c23e08ca9..275bb9b1d 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCircleBatch03.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCircleBatch03.kt @@ -8,7 +8,7 @@ import kotlin.math.abs This program demonstrates dynamic circle batches */ -fun main() = application { +suspend fun main() = application { program { extend { diff --git a/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt b/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt index fcce54622..963e98fa4 100644 --- a/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt @@ -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() diff --git a/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer01.kt b/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer01.kt index 50e67af7b..be6eeb0ca 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer01.kt @@ -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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer02.kt b/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer02.kt index 7f0f45448..97acccd89 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer02.kt @@ -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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer03.kt b/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer03.kt index dc482c4d2..9f5f78273 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer03.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCompositionDrawer03.kt @@ -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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoContour01.kt b/openrndr-demos/src/demo/kotlin/DemoContour01.kt index 45693f2a0..a8308aca3 100644 --- a/openrndr-demos/src/demo/kotlin/DemoContour01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoContour01.kt @@ -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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoContour02.kt b/openrndr-demos/src/demo/kotlin/DemoContour02.kt index 7ca4113b6..e955e2c03 100644 --- a/openrndr-demos/src/demo/kotlin/DemoContour02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoContour02.kt @@ -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 diff --git a/openrndr-demos/src/demo/kotlin/DemoContour03.kt b/openrndr-demos/src/demo/kotlin/DemoContour03.kt index cd9fb5100..cb50ae6d7 100644 --- a/openrndr-demos/src/demo/kotlin/DemoContour03.kt +++ b/openrndr-demos/src/demo/kotlin/DemoContour03.kt @@ -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 diff --git a/openrndr-demos/src/demo/kotlin/DemoContourIntersections01.kt b/openrndr-demos/src/demo/kotlin/DemoContourIntersections01.kt index 29cd936d3..ac98561f3 100644 --- a/openrndr-demos/src/demo/kotlin/DemoContourIntersections01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoContourIntersections01.kt @@ -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) - } - } - } - } -} \ No newline at end of file +//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) +// } +// } +// } +// } +//} \ No newline at end of file diff --git a/openrndr-demos/src/demo/kotlin/DemoContourIntersections02.kt b/openrndr-demos/src/demo/kotlin/DemoContourIntersections02.kt index 88a06acb3..6feaea536 100644 --- a/openrndr-demos/src/demo/kotlin/DemoContourIntersections02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoContourIntersections02.kt @@ -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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoContourIntersections03.kt b/openrndr-demos/src/demo/kotlin/DemoContourIntersections03.kt index 28df18fa2..a8d2018e0 100644 --- a/openrndr-demos/src/demo/kotlin/DemoContourIntersections03.kt +++ b/openrndr-demos/src/demo/kotlin/DemoContourIntersections03.kt @@ -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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoContourNearest01.kt b/openrndr-demos/src/demo/kotlin/DemoContourNearest01.kt index de4d26c9e..a18c3cbd1 100644 --- a/openrndr-demos/src/demo/kotlin/DemoContourNearest01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoContourNearest01.kt @@ -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) - } - } - } - } - } - } -} \ No newline at end of file +//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) +// } +// } +// } +// } +// } +// } +//} \ No newline at end of file diff --git a/openrndr-demos/src/demo/kotlin/DemoCubemap01.kt b/openrndr-demos/src/demo/kotlin/DemoCubemap01.kt index b741ca94a..0c20b83c2 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCubemap01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCubemap01.kt @@ -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) diff --git a/openrndr-demos/src/demo/kotlin/DemoCubemap02.kt b/openrndr-demos/src/demo/kotlin/DemoCubemap02.kt index b13875268..9e5ca27cf 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCubemap02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCubemap02.kt @@ -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() diff --git a/openrndr-demos/src/demo/kotlin/DemoCubemap03.kt b/openrndr-demos/src/demo/kotlin/DemoCubemap03.kt index 95b37f60c..cd212cd46 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCubemap03.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCubemap03.kt @@ -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() diff --git a/openrndr-demos/src/demo/kotlin/DemoDDSImage01.kt b/openrndr-demos/src/demo/kotlin/DemoDDSImage01.kt index d94608d80..2ab7f0c78 100644 --- a/openrndr-demos/src/demo/kotlin/DemoDDSImage01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoDDSImage01.kt @@ -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") diff --git a/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt b/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt index 9d6922c6a..00e17e61e 100644 --- a/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt @@ -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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore01.kt b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore01.kt index 1d94fd539..7533ad10c 100644 --- a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore01.kt @@ -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 = diff --git a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt index 8c9c3e09c..8fa484c88 100644 --- a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt @@ -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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore03.kt b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore03.kt index 106918e26..fa86f5848 100644 --- a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore03.kt +++ b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore03.kt @@ -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) diff --git a/openrndr-demos/src/demo/kotlin/DemoLineCapJoin.kt b/openrndr-demos/src/demo/kotlin/DemoLineCapJoin.kt index 8141a882a..70c0cc38a 100644 --- a/openrndr-demos/src/demo/kotlin/DemoLineCapJoin.kt +++ b/openrndr-demos/src/demo/kotlin/DemoLineCapJoin.kt @@ -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 diff --git a/openrndr-demos/src/demo/kotlin/DemoLineDash01.kt b/openrndr-demos/src/demo/kotlin/DemoLineDash01.kt index d3328157d..277bb9c0f 100644 --- a/openrndr-demos/src/demo/kotlin/DemoLineDash01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoLineDash01.kt @@ -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));" diff --git a/openrndr-demos/src/demo/kotlin/DemoMouseCursor01.kt b/openrndr-demos/src/demo/kotlin/DemoMouseCursor01.kt index 3e36347d4..d8ecbd093 100644 --- a/openrndr-demos/src/demo/kotlin/DemoMouseCursor01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoMouseCursor01.kt @@ -1,7 +1,7 @@ import org.openrndr.CursorType import org.openrndr.application -fun main() { +suspend fun main() { application { program { keyboard.character.listen { diff --git a/openrndr-demos/src/demo/kotlin/DemoPointBatch01.kt b/openrndr-demos/src/demo/kotlin/DemoPointBatch01.kt index 3ad0e9a6a..d7cb39790 100644 --- a/openrndr-demos/src/demo/kotlin/DemoPointBatch01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoPointBatch01.kt @@ -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) { diff --git a/openrndr-demos/src/demo/kotlin/DemoScreenCapture01.kt b/openrndr-demos/src/demo/kotlin/DemoScreenCapture01.kt index f0cb671e3..e1de4504f 100644 --- a/openrndr-demos/src/demo/kotlin/DemoScreenCapture01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoScreenCapture01.kt @@ -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() diff --git a/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt b/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt index 33ee1bbc5..b4a2d4e5b 100644 --- a/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoTessShader01.kt @@ -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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoTessShader02.kt b/openrndr-demos/src/demo/kotlin/DemoTessShader02.kt index 9b23b2a4b..551df5fa7 100644 --- a/openrndr-demos/src/demo/kotlin/DemoTessShader02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoTessShader02.kt @@ -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() { - application { +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 { diff --git a/openrndr-demos/src/demo/kotlin/DemoTessShader03.kt b/openrndr-demos/src/demo/kotlin/DemoTessShader03.kt index 90b649e9b..f7af0d235 100644 --- a/openrndr-demos/src/demo/kotlin/DemoTessShader03.kt +++ b/openrndr-demos/src/demo/kotlin/DemoTessShader03.kt @@ -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) diff --git a/openrndr-demos/src/demo/kotlin/DemoTessShader04.kt b/openrndr-demos/src/demo/kotlin/DemoTessShader04.kt index 817945faa..d6ed9f5e0 100644 --- a/openrndr-demos/src/demo/kotlin/DemoTessShader04.kt +++ b/openrndr-demos/src/demo/kotlin/DemoTessShader04.kt @@ -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()) diff --git a/openrndr-demos/src/demo/kotlin/DemoVolumeTexture01.kt b/openrndr-demos/src/demo/kotlin/DemoVolumeTexture01.kt index fbb5e3832..676bdce9d 100644 --- a/openrndr-demos/src/demo/kotlin/DemoVolumeTexture01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoVolumeTexture01.kt @@ -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) { diff --git a/openrndr-demos/src/demo/kotlin/DrawerNegativeDimensions.kt b/openrndr-demos/src/demo/kotlin/DrawerNegativeDimensions.kt index cbc20a9c1..127ecd959 100644 --- a/openrndr-demos/src/demo/kotlin/DrawerNegativeDimensions.kt +++ b/openrndr-demos/src/demo/kotlin/DrawerNegativeDimensions.kt @@ -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 diff --git a/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch01.kt b/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch01.kt index b9f69e09d..f1ba93e83 100644 --- a/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch01.kt +++ b/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch01.kt @@ -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) diff --git a/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch02.kt b/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch02.kt index 6bea140a5..dd54c2638 100644 --- a/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch02.kt +++ b/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch02.kt @@ -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 diff --git a/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch03.kt b/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch03.kt index e88db2c38..339915243 100644 --- a/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch03.kt +++ b/openrndr-demos/src/demo/kotlin/DrawerRectangleBatch03.kt @@ -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) diff --git a/orx-boofcv/build.gradle b/orx-boofcv/build.gradle index 76177901d..c1f8f49f2 100644 --- a/orx-boofcv/build.gradle +++ b/orx-boofcv/build.gradle @@ -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") diff --git a/orx-boofcv/src/demo/kotlin/DemoContours01.kt b/orx-boofcv/src/demo/kotlin/DemoContours01.kt index 65b13833f..bb40837e7 100644 --- a/orx-boofcv/src/demo/kotlin/DemoContours01.kt +++ b/orx-boofcv/src/demo/kotlin/DemoContours01.kt @@ -13,7 +13,7 @@ import org.openrndr.extensions.SingleScreenshot import kotlin.math.cos import kotlin.math.sin -fun main() { +suspend fun main() { application { program { diff --git a/orx-boofcv/src/demo/kotlin/DemoResize01.kt b/orx-boofcv/src/demo/kotlin/DemoResize01.kt index 27fb3a5f7..51d7df574 100644 --- a/orx-boofcv/src/demo/kotlin/DemoResize01.kt +++ b/orx-boofcv/src/demo/kotlin/DemoResize01.kt @@ -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") { diff --git a/orx-boofcv/src/demo/kotlin/DemoResize02.kt b/orx-boofcv/src/demo/kotlin/DemoResize02.kt index a1cebfbf9..516e62d01 100644 --- a/orx-boofcv/src/demo/kotlin/DemoResize02.kt +++ b/orx-boofcv/src/demo/kotlin/DemoResize02.kt @@ -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") { diff --git a/orx-boofcv/src/demo/kotlin/DemoSimplified01.kt b/orx-boofcv/src/demo/kotlin/DemoSimplified01.kt index 73761550b..b0ae6492f 100644 --- a/orx-boofcv/src/demo/kotlin/DemoSimplified01.kt +++ b/orx-boofcv/src/demo/kotlin/DemoSimplified01.kt @@ -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 { diff --git a/orx-color/build.gradle b/orx-color/build.gradle index eea96938d..920f1ede5 100644 --- a/orx-color/build.gradle +++ b/orx-color/build.gradle @@ -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") diff --git a/orx-color/src/demo/kotlin/DemoColorPlane01.kt b/orx-color/src/demo/kotlin/DemoColorPlane01.kt index a63f6b048..84eb79703 100644 --- a/orx-color/src/demo/kotlin/DemoColorPlane01.kt +++ b/orx-color/src/demo/kotlin/DemoColorPlane01.kt @@ -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 diff --git a/orx-color/src/demo/kotlin/DemoColorPlane02.kt b/orx-color/src/demo/kotlin/DemoColorPlane02.kt index 7a9d9e76c..b40e1791f 100644 --- a/orx-color/src/demo/kotlin/DemoColorPlane02.kt +++ b/orx-color/src/demo/kotlin/DemoColorPlane02.kt @@ -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 diff --git a/orx-color/src/demo/kotlin/DemoColorRange01.kt b/orx-color/src/demo/kotlin/DemoColorRange01.kt index 17d474016..3a74853b7 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange01.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange01.kt @@ -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") { diff --git a/orx-color/src/demo/kotlin/DemoColorRange02.kt b/orx-color/src/demo/kotlin/DemoColorRange02.kt index a39273187..a7d95b7bb 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange02.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange02.kt @@ -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") { diff --git a/orx-color/src/demo/kotlin/DemoColorRange03.kt b/orx-color/src/demo/kotlin/DemoColorRange03.kt index 24efb0afb..77b4755bf 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange03.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange03.kt @@ -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 diff --git a/orx-color/src/demo/kotlin/DemoColorRange04.kt b/orx-color/src/demo/kotlin/DemoColorRange04.kt index b3dc7af82..dd3e309bc 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange04.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange04.kt @@ -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 diff --git a/orx-color/src/demo/kotlin/DemoHSLUV01.kt b/orx-color/src/demo/kotlin/DemoHSLUV01.kt index 54fa0fedc..a2fa90ae2 100644 --- a/orx-color/src/demo/kotlin/DemoHSLUV01.kt +++ b/orx-color/src/demo/kotlin/DemoHSLUV01.kt @@ -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 diff --git a/orx-color/src/demo/kotlin/DemoHSLUV02.kt b/orx-color/src/demo/kotlin/DemoHSLUV02.kt index ffbe6caa4..28fc2c7bc 100644 --- a/orx-color/src/demo/kotlin/DemoHSLUV02.kt +++ b/orx-color/src/demo/kotlin/DemoHSLUV02.kt @@ -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 diff --git a/orx-color/src/demo/kotlin/DemoHistogram01.kt b/orx-color/src/demo/kotlin/DemoHistogram01.kt index 46b7bb009..13e7dcdfa 100644 --- a/orx-color/src/demo/kotlin/DemoHistogram01.kt +++ b/orx-color/src/demo/kotlin/DemoHistogram01.kt @@ -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") { diff --git a/orx-color/src/demo/kotlin/DemoHistogram02.kt b/orx-color/src/demo/kotlin/DemoHistogram02.kt index 251a65075..a518e672e 100644 --- a/orx-color/src/demo/kotlin/DemoHistogram02.kt +++ b/orx-color/src/demo/kotlin/DemoHistogram02.kt @@ -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") { diff --git a/orx-color/src/demo/kotlin/DemoHistogram03.kt b/orx-color/src/demo/kotlin/DemoHistogram03.kt index ad039251e..1859c9eaf 100644 --- a/orx-color/src/demo/kotlin/DemoHistogram03.kt +++ b/orx-color/src/demo/kotlin/DemoHistogram03.kt @@ -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") { diff --git a/orx-color/src/demo/kotlin/DemoXSLUV01.kt b/orx-color/src/demo/kotlin/DemoXSLUV01.kt index cdb6c21bf..c727a8f4f 100644 --- a/orx-color/src/demo/kotlin/DemoXSLUV01.kt +++ b/orx-color/src/demo/kotlin/DemoXSLUV01.kt @@ -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 { val hl = length / 2.0 diff --git a/orx-compositor/build.gradle b/orx-compositor/build.gradle index 42f5d819f..c8ac42e1d 100644 --- a/orx-compositor/build.gradle +++ b/orx-compositor/build.gradle @@ -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") diff --git a/orx-compositor/src/demo/kotlin/DemoCompositor01.kt b/orx-compositor/src/demo/kotlin/DemoCompositor01.kt index 43c924f4c..d102957f5 100644 --- a/orx-compositor/src/demo/kotlin/DemoCompositor01.kt +++ b/orx-compositor/src/demo/kotlin/DemoCompositor01.kt @@ -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 diff --git a/orx-compositor/src/demo/kotlin/DemoUse01.kt b/orx-compositor/src/demo/kotlin/DemoUse01.kt index f275b3f0c..82e060af1 100644 --- a/orx-compositor/src/demo/kotlin/DemoUse01.kt +++ b/orx-compositor/src/demo/kotlin/DemoUse01.kt @@ -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 diff --git a/orx-dnk3/build.gradle b/orx-dnk3/build.gradle index ede585d24..e5f960b06 100644 --- a/orx-dnk3/build.gradle +++ b/orx-dnk3/build.gradle @@ -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) diff --git a/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt b/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt index a5094f2c6..41381a00a 100644 --- a/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoCamera01.kt b/orx-dnk3/src/demo/kotlin/DemoCamera01.kt index cd467397b..4d61a6603 100644 --- a/orx-dnk3/src/demo/kotlin/DemoCamera01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoCamera01.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoDSL01.kt b/orx-dnk3/src/demo/kotlin/DemoDSL01.kt index 7830034dc..d5839c726 100644 --- a/orx-dnk3/src/demo/kotlin/DemoDSL01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoDSL01.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoDSL02.kt b/orx-dnk3/src/demo/kotlin/DemoDSL02.kt index 82fc9e55d..b766f66fc 100644 --- a/orx-dnk3/src/demo/kotlin/DemoDSL02.kt +++ b/orx-dnk3/src/demo/kotlin/DemoDSL02.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt b/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt index 497df3213..353d7d898 100644 --- a/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoLights01.kt b/orx-dnk3/src/demo/kotlin/DemoLights01.kt index 420b7ebec..a2be3a788 100644 --- a/orx-dnk3/src/demo/kotlin/DemoLights01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoLights01.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoLights02.kt b/orx-dnk3/src/demo/kotlin/DemoLights02.kt index c2e82d9fa..a3d28f224 100644 --- a/orx-dnk3/src/demo/kotlin/DemoLights02.kt +++ b/orx-dnk3/src/demo/kotlin/DemoLights02.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoLights03.kt b/orx-dnk3/src/demo/kotlin/DemoLights03.kt index b274a94e5..447d38c8a 100644 --- a/orx-dnk3/src/demo/kotlin/DemoLights03.kt +++ b/orx-dnk3/src/demo/kotlin/DemoLights03.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoObject01.kt b/orx-dnk3/src/demo/kotlin/DemoObject01.kt index a757e4fe1..3a41e31ca 100644 --- a/orx-dnk3/src/demo/kotlin/DemoObject01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoObject01.kt @@ -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()) { diff --git a/orx-dnk3/src/demo/kotlin/DemoScene01.kt b/orx-dnk3/src/demo/kotlin/DemoScene01.kt index e5ccaac14..16f93b075 100644 --- a/orx-dnk3/src/demo/kotlin/DemoScene01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoScene01.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoScene02.kt b/orx-dnk3/src/demo/kotlin/DemoScene02.kt index dc290ecef..bb83b68d1 100644 --- a/orx-dnk3/src/demo/kotlin/DemoScene02.kt +++ b/orx-dnk3/src/demo/kotlin/DemoScene02.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoScene03.kt b/orx-dnk3/src/demo/kotlin/DemoScene03.kt index b3fffdd15..60509c71a 100644 --- a/orx-dnk3/src/demo/kotlin/DemoScene03.kt +++ b/orx-dnk3/src/demo/kotlin/DemoScene03.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt b/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt index 00dcbc651..edb1e3d80 100644 --- a/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt b/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt index 6dbcaaaa7..79c35163d 100644 --- a/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt @@ -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 diff --git a/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt b/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt index 96f82092e..de7b41129 100644 --- a/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt +++ b/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt @@ -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 diff --git a/orx-easing/build.gradle b/orx-easing/build.gradle index 49d7c034c..306f00ea0 100644 --- a/orx-easing/build.gradle +++ b/orx-easing/build.gradle @@ -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") diff --git a/orx-easing/src/demo/kotlin/DemoEasings01.kt b/orx-easing/src/demo/kotlin/DemoEasings01.kt index 27a5aad35..78138f0aa 100644 --- a/orx-easing/src/demo/kotlin/DemoEasings01.kt +++ b/orx-easing/src/demo/kotlin/DemoEasings01.kt @@ -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 diff --git a/orx-fx/build.gradle b/orx-fx/build.gradle index 45f3e8e34..4fb7d1328 100644 --- a/orx-fx/build.gradle +++ b/orx-fx/build.gradle @@ -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")) diff --git a/orx-fx/src/demo/kotlin/DemoBlur01.kt b/orx-fx/src/demo/kotlin/DemoBlur01.kt index ec52850ba..38c00210c 100644 --- a/orx-fx/src/demo/kotlin/DemoBlur01.kt +++ b/orx-fx/src/demo/kotlin/DemoBlur01.kt @@ -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 { diff --git a/orx-fx/src/demo/kotlin/DemoFluidDistort01.kt b/orx-fx/src/demo/kotlin/DemoFluidDistort01.kt index bfb0b44d3..8c40c24a1 100644 --- a/orx-fx/src/demo/kotlin/DemoFluidDistort01.kt +++ b/orx-fx/src/demo/kotlin/DemoFluidDistort01.kt @@ -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() diff --git a/orx-fx/src/demo/kotlin/DemoLaserBlur01.kt b/orx-fx/src/demo/kotlin/DemoLaserBlur01.kt index 3aecefe72..325285d18 100644 --- a/orx-fx/src/demo/kotlin/DemoLaserBlur01.kt +++ b/orx-fx/src/demo/kotlin/DemoLaserBlur01.kt @@ -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 diff --git a/orx-fx/src/main/kotlin/FilterTools.kt b/orx-fx/src/main/kotlin/FilterTools.kt index da83fcc4a..d0c90a543 100644 --- a/orx-fx/src/main/kotlin/FilterTools.kt +++ b/orx-fx/src/main/kotlin/FilterTools.kt @@ -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) diff --git a/orx-fx/src/main/kotlin/blur/MipBloom.kt b/orx-fx/src/main/kotlin/blur/MipBloom.kt index 46f2bc1d4..b25231f7a 100644 --- a/orx-fx/src/main/kotlin/blur/MipBloom.kt +++ b/orx-fx/src/main/kotlin/blur/MipBloom.kt @@ -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 diff --git a/orx-gui/build.gradle b/orx-gui/build.gradle index 1c3064622..6ddce83be 100644 --- a/orx-gui/build.gradle +++ b/orx-gui/build.gradle @@ -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") diff --git a/orx-gui/src/demo/kotlin/DemoHide01.kt b/orx-gui/src/demo/kotlin/DemoHide01.kt index 85eedf0ff..246f4e8f8 100644 --- a/orx-gui/src/demo/kotlin/DemoHide01.kt +++ b/orx-gui/src/demo/kotlin/DemoHide01.kt @@ -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") { diff --git a/orx-gui/src/demo/kotlin/DemoOptions01.kt b/orx-gui/src/demo/kotlin/DemoOptions01.kt index 53ead58c3..0b663af52 100644 --- a/orx-gui/src/demo/kotlin/DemoOptions01.kt +++ b/orx-gui/src/demo/kotlin/DemoOptions01.kt @@ -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") { diff --git a/orx-gui/src/demo/kotlin/DemoPresets01.kt b/orx-gui/src/demo/kotlin/DemoPresets01.kt index 49566d4c5..b7a34d445 100644 --- a/orx-gui/src/demo/kotlin/DemoPresets01.kt +++ b/orx-gui/src/demo/kotlin/DemoPresets01.kt @@ -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") { diff --git a/orx-gui/src/demo/kotlin/DemoSimple01.kt b/orx-gui/src/demo/kotlin/DemoSimple01.kt index 4be8420d6..b7ed91f0f 100644 --- a/orx-gui/src/demo/kotlin/DemoSimple01.kt +++ b/orx-gui/src/demo/kotlin/DemoSimple01.kt @@ -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") { diff --git a/orx-gui/src/demo/kotlin/DemoXYParameter.kt b/orx-gui/src/demo/kotlin/DemoXYParameter.kt index 1300b7936..c0d27d8e2 100644 --- a/orx-gui/src/demo/kotlin/DemoXYParameter.kt +++ b/orx-gui/src/demo/kotlin/DemoXYParameter.kt @@ -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 diff --git a/orx-jumpflood/build.gradle b/orx-jumpflood/build.gradle index 36506b7e7..030c97fa2 100644 --- a/orx-jumpflood/build.gradle +++ b/orx-jumpflood/build.gradle @@ -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") diff --git a/orx-jumpflood/src/demo/kotlin/DemoInnerGlow01.kt b/orx-jumpflood/src/demo/kotlin/DemoInnerGlow01.kt index f8efa0ca2..8dc3b12ed 100644 --- a/orx-jumpflood/src/demo/kotlin/DemoInnerGlow01.kt +++ b/orx-jumpflood/src/demo/kotlin/DemoInnerGlow01.kt @@ -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()) { diff --git a/orx-jumpflood/src/demo/kotlin/DemoInnerGlow02.kt b/orx-jumpflood/src/demo/kotlin/DemoInnerGlow02.kt index dcdec0ab7..28343317b 100644 --- a/orx-jumpflood/src/demo/kotlin/DemoInnerGlow02.kt +++ b/orx-jumpflood/src/demo/kotlin/DemoInnerGlow02.kt @@ -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()) { diff --git a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF01.kt b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF01.kt index cb47435a7..20252b68f 100644 --- a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF01.kt +++ b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF01.kt @@ -9,7 +9,7 @@ import org.openrndr.math.transforms.transform import org.openrndr.shape.Circle import org.openrndr.svg.loadSVG -fun main() { +suspend fun main() { application { configure { width = 1280 diff --git a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF02.kt b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF02.kt index 94141646d..017f5d8d4 100644 --- a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF02.kt +++ b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF02.kt @@ -12,7 +12,7 @@ import org.openrndr.math.transforms.transform import org.openrndr.svg.loadSVG import kotlin.math.min -fun main() { +suspend fun main() { application { configure { width = 1280 diff --git a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF03.kt b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF03.kt index 0829bc903..1d2b198a0 100644 --- a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF03.kt +++ b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF03.kt @@ -11,7 +11,7 @@ import org.openrndr.extra.jumpfill.ops.* import org.openrndr.math.transforms.transform import org.openrndr.svg.loadSVG -fun main() { +suspend fun main() { application { configure { width = 1280 diff --git a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF04.kt b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF04.kt index bd05f43a1..4bf599b09 100644 --- a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF04.kt +++ b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF04.kt @@ -13,7 +13,7 @@ import org.openrndr.math.transforms.transform import org.openrndr.shape.Circle import org.openrndr.svg.loadSVG -fun main() { +suspend fun main() { application { configure { width = 1280 diff --git a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF05.kt b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF05.kt index 1cef4c099..0231aef82 100644 --- a/orx-jumpflood/src/demo/kotlin/DemoShapeSDF05.kt +++ b/orx-jumpflood/src/demo/kotlin/DemoShapeSDF05.kt @@ -17,7 +17,7 @@ import org.openrndr.svg.loadSVG import kotlin.math.cos import kotlin.math.sin -fun main() { +suspend fun main() { application { configure { width = 1280 diff --git a/orx-jumpflood/src/demo/kotlin/DemoSkeleton01.kt b/orx-jumpflood/src/demo/kotlin/DemoSkeleton01.kt index 8c4ed8196..4c4ceef45 100644 --- a/orx-jumpflood/src/demo/kotlin/DemoSkeleton01.kt +++ b/orx-jumpflood/src/demo/kotlin/DemoSkeleton01.kt @@ -9,7 +9,7 @@ import org.openrndr.extra.jumpfill.fx.Skeleton import org.openrndr.extra.jumpfill.fx.StraightSkeleton import org.openrndr.extra.noise.simplex -fun main() { +suspend fun main() { application { configure { width = 1280 diff --git a/orx-jumpflood/src/demo/kotlin/DemoStraightSkeleton01.kt b/orx-jumpflood/src/demo/kotlin/DemoStraightSkeleton01.kt index f813d6c4e..84d1fbb65 100644 --- a/orx-jumpflood/src/demo/kotlin/DemoStraightSkeleton01.kt +++ b/orx-jumpflood/src/demo/kotlin/DemoStraightSkeleton01.kt @@ -8,7 +8,7 @@ import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.jumpfill.fx.StraightSkeleton import org.openrndr.extra.noise.simplex -fun main() { +suspend fun main() { application { configure { width = 1280 diff --git a/orx-chataigne/README.md b/orx-jvm/orx-chataigne/README.md similarity index 100% rename from orx-chataigne/README.md rename to orx-jvm/orx-chataigne/README.md diff --git a/orx-chataigne/build.gradle b/orx-jvm/orx-chataigne/build.gradle similarity index 91% rename from orx-chataigne/build.gradle rename to orx-jvm/orx-chataigne/build.gradle index 1c4ec7c66..ba9ba9e2f 100644 --- a/orx-chataigne/build.gradle +++ b/orx-jvm/orx-chataigne/build.gradle @@ -11,7 +11,7 @@ dependencies { api project(":orx-osc") implementation "com.google.code.gson:gson:$gsonVersion" - demoImplementation("org.openrndr:openrndr-core:$openrndrVersion") + demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion") diff --git a/orx-chataigne/resources/timeline_example_chataigne.noisette b/orx-jvm/orx-chataigne/resources/timeline_example_chataigne.noisette similarity index 100% rename from orx-chataigne/resources/timeline_example_chataigne.noisette rename to orx-jvm/orx-chataigne/resources/timeline_example_chataigne.noisette diff --git a/orx-chataigne/src/demo/kotlin/ChataigneOSCDemo.kt b/orx-jvm/orx-chataigne/src/demo/kotlin/ChataigneOSCDemo.kt similarity index 100% rename from orx-chataigne/src/demo/kotlin/ChataigneOSCDemo.kt rename to orx-jvm/orx-chataigne/src/demo/kotlin/ChataigneOSCDemo.kt diff --git a/orx-chataigne/src/main/kotlin/ChataigneOSC.kt b/orx-jvm/orx-chataigne/src/main/kotlin/ChataigneOSC.kt similarity index 100% rename from orx-chataigne/src/main/kotlin/ChataigneOSC.kt rename to orx-jvm/orx-chataigne/src/main/kotlin/ChataigneOSC.kt diff --git a/orx-file-watcher/README.md b/orx-jvm/orx-file-watcher/README.md similarity index 100% rename from orx-file-watcher/README.md rename to orx-jvm/orx-file-watcher/README.md diff --git a/orx-file-watcher/src/main/kotlin/FileWatcher.kt b/orx-jvm/orx-file-watcher/src/main/kotlin/FileWatcher.kt similarity index 100% rename from orx-file-watcher/src/main/kotlin/FileWatcher.kt rename to orx-jvm/orx-file-watcher/src/main/kotlin/FileWatcher.kt diff --git a/orx-kinect-common/src/main/kotlin/Kinect.kt b/orx-jvm/orx-kinect-common/src/main/kotlin/Kinect.kt similarity index 97% rename from orx-kinect-common/src/main/kotlin/Kinect.kt rename to orx-jvm/orx-kinect-common/src/main/kotlin/Kinect.kt index ff634dd6f..a38d47dd1 100644 --- a/orx-kinect-common/src/main/kotlin/Kinect.kt +++ b/orx-jvm/orx-kinect-common/src/main/kotlin/Kinect.kt @@ -80,7 +80,7 @@ class KinectException(msg: String) : RuntimeException(msg) * Maps depth values to grayscale. */ class DepthToGrayscaleMapper : Filter( - filterShaderFromUrl(resourceUrl("depth-to-grayscale.frag", Kinects::class.java)) + filterShaderFromUrl(resourceUrl("depth-to-grayscale.frag", Kinects::class)) ) /** @@ -90,7 +90,7 @@ class DepthToGrayscaleMapper : Filter( * article. */ class DepthToColorsZucconi6Mapper : Filter( - filterShaderFromUrl(resourceUrl("depth-to-colors-zucconi6.frag", Kinects::class.java)) + filterShaderFromUrl(resourceUrl("depth-to-colors-zucconi6.frag", Kinects::class)) ) /** @@ -101,5 +101,5 @@ class DepthToColorsZucconi6Mapper : Filter( * by Google. */ class DepthToColorsTurboMapper : Filter( - filterShaderFromUrl(resourceUrl("depth-to-colors-turbo.frag", Kinects::class.java)) + filterShaderFromUrl(resourceUrl("depth-to-colors-turbo.frag", Kinects::class)) ) diff --git a/orx-kinect-common/src/main/kotlin/org/openrndr/extra/kinect/impl/KinectImpl.kt b/orx-jvm/orx-kinect-common/src/main/kotlin/org/openrndr/extra/kinect/impl/KinectImpl.kt similarity index 97% rename from orx-kinect-common/src/main/kotlin/org/openrndr/extra/kinect/impl/KinectImpl.kt rename to orx-jvm/orx-kinect-common/src/main/kotlin/org/openrndr/extra/kinect/impl/KinectImpl.kt index da2e5dbb1..cc3855186 100644 --- a/orx-kinect-common/src/main/kotlin/org/openrndr/extra/kinect/impl/KinectImpl.kt +++ b/orx-jvm/orx-kinect-common/src/main/kotlin/org/openrndr/extra/kinect/impl/KinectImpl.kt @@ -1,4 +1,4 @@ -package org.openrndr.extra.kinect.impl +package org.openrndr.extra.kinect.org.openrndr.extra.kinect.impl import org.openrndr.Program import org.openrndr.draw.* @@ -141,7 +141,7 @@ private class KinectRawDataToDepthMapper : filterShaderFromUrl( resourceUrl( "kinect-raw-to-depth.frag", - DefaultKinects::class.java + DefaultKinects::class ) ) ) { diff --git a/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-turbo.frag b/orx-jvm/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-turbo.frag similarity index 100% rename from orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-turbo.frag rename to orx-jvm/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-turbo.frag diff --git a/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-zucconi6.frag b/orx-jvm/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-zucconi6.frag similarity index 100% rename from orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-zucconi6.frag rename to orx-jvm/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-colors-zucconi6.frag diff --git a/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-grayscale.frag b/orx-jvm/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-grayscale.frag similarity index 100% rename from orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-grayscale.frag rename to orx-jvm/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/depth-to-grayscale.frag diff --git a/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/impl/kinect-raw-to-depth.frag b/orx-jvm/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/impl/kinect-raw-to-depth.frag similarity index 100% rename from orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/impl/kinect-raw-to-depth.frag rename to orx-jvm/orx-kinect-common/src/main/resources/org/openrndr/extra/kinect/impl/kinect-raw-to-depth.frag diff --git a/orx-kinect-v1-demo/build.gradle b/orx-jvm/orx-kinect-v1-demo/build.gradle similarity index 77% rename from orx-kinect-v1-demo/build.gradle rename to orx-jvm/orx-kinect-v1-demo/build.gradle index b1964fdec..e159b1847 100644 --- a/orx-kinect-v1-demo/build.gradle +++ b/orx-jvm/orx-kinect-v1-demo/build.gradle @@ -5,8 +5,8 @@ else if (os.macOsX) { openrndrOs = "macos" } else if (os.linux) { openrndrOs = "linux-x64" } dependencies { - implementation project(":orx-kinect-v1") - runtimeOnly project(":orx-kinect-v1-natives-$openrndrOs") + implementation project(":orx-jvm:orx-kinect-v1") + runtimeOnly project(":orx-jvm:orx-kinect-v1-natives-$openrndrOs") runtimeOnly "org.openrndr:openrndr-gl3:$openrndrVersion" runtimeOnly "org.openrndr:openrndr-gl3-natives-$openrndrOs:$openrndrVersion" runtimeOnly "ch.qos.logback:logback-classic:1.2.3" diff --git a/orx-kinect-v1-demo/src/main/kotlin/BasicUseCaseDemo.kt b/orx-jvm/orx-kinect-v1-demo/src/main/kotlin/BasicUseCaseDemo.kt similarity index 95% rename from orx-kinect-v1-demo/src/main/kotlin/BasicUseCaseDemo.kt rename to orx-jvm/orx-kinect-v1-demo/src/main/kotlin/BasicUseCaseDemo.kt index 8cca5febb..a3c28abd9 100644 --- a/orx-kinect-v1-demo/src/main/kotlin/BasicUseCaseDemo.kt +++ b/orx-jvm/orx-kinect-v1-demo/src/main/kotlin/BasicUseCaseDemo.kt @@ -9,7 +9,7 @@ import org.openrndr.extra.kinect.v1.getKinectsV1 * Note: kinect depth map is stored only on the RED color channel to save * space. Therefore depth map is displayed only in the red tones. */ -fun main() = application { +suspend fun main() = application { configure { // default resolution of the Kinect v1 depth camera width = 640 height = 480 diff --git a/orx-kinect-v1-demo/src/main/kotlin/DepthToColorMapsDemo.kt b/orx-jvm/orx-kinect-v1-demo/src/main/kotlin/DepthToColorMapsDemo.kt similarity index 98% rename from orx-kinect-v1-demo/src/main/kotlin/DepthToColorMapsDemo.kt rename to orx-jvm/orx-kinect-v1-demo/src/main/kotlin/DepthToColorMapsDemo.kt index 150491e56..f31c0a28c 100644 --- a/orx-kinect-v1-demo/src/main/kotlin/DepthToColorMapsDemo.kt +++ b/orx-jvm/orx-kinect-v1-demo/src/main/kotlin/DepthToColorMapsDemo.kt @@ -31,7 +31,7 @@ import org.openrndr.extra.kinect.v1.getKinectsV1 * @see DepthToColorsZucconi6Mapper * @see DepthToColorsTurboMapper */ -fun main() = application { +suspend fun main() = application { configure { width = 2 * 640 height = 2 * 480 diff --git a/orx-kinect-v1-demo/src/main/kotlin/MultipleKinectsDemo.kt b/orx-jvm/orx-kinect-v1-demo/src/main/kotlin/MultipleKinectsDemo.kt similarity index 97% rename from orx-kinect-v1-demo/src/main/kotlin/MultipleKinectsDemo.kt rename to orx-jvm/orx-kinect-v1-demo/src/main/kotlin/MultipleKinectsDemo.kt index 3239327dc..ecb5073be 100644 --- a/orx-kinect-v1-demo/src/main/kotlin/MultipleKinectsDemo.kt +++ b/orx-jvm/orx-kinect-v1-demo/src/main/kotlin/MultipleKinectsDemo.kt @@ -6,7 +6,7 @@ import org.openrndr.extra.kinect.v1.getKinectsV1 /** * Stream from 2 kinects side by side. */ -fun main() = application { +suspend fun main() = application { configure { width = 640 * 2 height = 480 diff --git a/orx-kinect-v1-demo/src/main/kotlin/NativeFreenectCommandsDemo.kt b/orx-jvm/orx-kinect-v1-demo/src/main/kotlin/NativeFreenectCommandsDemo.kt similarity index 98% rename from orx-kinect-v1-demo/src/main/kotlin/NativeFreenectCommandsDemo.kt rename to orx-jvm/orx-kinect-v1-demo/src/main/kotlin/NativeFreenectCommandsDemo.kt index e185bb6d4..d4ccfed8a 100644 --- a/orx-kinect-v1-demo/src/main/kotlin/NativeFreenectCommandsDemo.kt +++ b/orx-jvm/orx-kinect-v1-demo/src/main/kotlin/NativeFreenectCommandsDemo.kt @@ -12,7 +12,7 @@ import java.lang.RuntimeException * The calls are executed in separate kinect runner thread but they will * block the calling thread until the result is returned. */ -fun main() = application { +suspend fun main() = application { program { val kinects = getKinectsV1(this) // the same as calling kinects.countDevices(), here to show that any value might be returned from execute diff --git a/orx-kinect-v1-demo/src/main/resources/logback.xml b/orx-jvm/orx-kinect-v1-demo/src/main/resources/logback.xml similarity index 100% rename from orx-kinect-v1-demo/src/main/resources/logback.xml rename to orx-jvm/orx-kinect-v1-demo/src/main/resources/logback.xml diff --git a/orx-kinect-v1-natives-linux-arm64/build.gradle b/orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle similarity index 100% rename from orx-kinect-v1-natives-linux-arm64/build.gradle rename to orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle diff --git a/orx-kinect-v1-natives-linux-x64/build.gradle b/orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle similarity index 100% rename from orx-kinect-v1-natives-linux-x64/build.gradle rename to orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle diff --git a/orx-kinect-v1-natives-macos/build.gradle b/orx-jvm/orx-kinect-v1-natives-macos/build.gradle similarity index 100% rename from orx-kinect-v1-natives-macos/build.gradle rename to orx-jvm/orx-kinect-v1-natives-macos/build.gradle diff --git a/orx-kinect-v1-natives-windows/build.gradle b/orx-jvm/orx-kinect-v1-natives-windows/build.gradle similarity index 100% rename from orx-kinect-v1-natives-windows/build.gradle rename to orx-jvm/orx-kinect-v1-natives-windows/build.gradle diff --git a/orx-kinect-v1/README.md b/orx-jvm/orx-kinect-v1/README.md similarity index 100% rename from orx-kinect-v1/README.md rename to orx-jvm/orx-kinect-v1/README.md diff --git a/orx-kinect-v1/build.gradle b/orx-jvm/orx-kinect-v1/build.gradle similarity index 61% rename from orx-kinect-v1/build.gradle rename to orx-jvm/orx-kinect-v1/build.gradle index 38e109b10..1a6de0825 100644 --- a/orx-kinect-v1/build.gradle +++ b/orx-jvm/orx-kinect-v1/build.gradle @@ -1,4 +1,4 @@ dependencies { - api project(":orx-kinect-common") + api project(":orx-jvm:orx-kinect-common") api "org.bytedeco:libfreenect:$libfreenectVersion" } diff --git a/orx-kinect-v1/src/main/kotlin/KinectV1.kt b/orx-jvm/orx-kinect-v1/src/main/kotlin/KinectV1.kt similarity index 99% rename from orx-kinect-v1/src/main/kotlin/KinectV1.kt rename to orx-jvm/orx-kinect-v1/src/main/kotlin/KinectV1.kt index 41798ece5..400e9e1ea 100644 --- a/orx-kinect-v1/src/main/kotlin/KinectV1.kt +++ b/orx-jvm/orx-kinect-v1/src/main/kotlin/KinectV1.kt @@ -8,6 +8,7 @@ import org.bytedeco.libfreenect.presets.freenect import org.openrndr.Program import org.openrndr.extra.kinect.* import org.openrndr.extra.kinect.impl.* +import org.openrndr.extra.kinect.org.openrndr.extra.kinect.impl.* import java.nio.ByteBuffer import java.nio.ByteOrder import java.util.* @@ -40,7 +41,6 @@ class Freenect( ) private class KinectsV1Manager(val depthCameraInitializationDelay: Long) : KinectsManager { - private val logger = KotlinLogging.logger {} private val fnCtx = freenect_context() diff --git a/orx-kotlin-parser/build.gradle b/orx-jvm/orx-kotlin-parser/build.gradle similarity index 94% rename from orx-kotlin-parser/build.gradle rename to orx-jvm/orx-kotlin-parser/build.gradle index b7094abfe..fb9dc66a9 100644 --- a/orx-kotlin-parser/build.gradle +++ b/orx-jvm/orx-kotlin-parser/build.gradle @@ -36,7 +36,7 @@ dependencies { demoImplementation(project(":orx-camera")) demoImplementation(project(":orx-panel")) - 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") diff --git a/orx-kotlin-parser/src/main/antlr/KotlinLexer.g4 b/orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinLexer.g4 similarity index 100% rename from orx-kotlin-parser/src/main/antlr/KotlinLexer.g4 rename to orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinLexer.g4 diff --git a/orx-kotlin-parser/src/main/antlr/KotlinLexer.tokens b/orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinLexer.tokens similarity index 100% rename from orx-kotlin-parser/src/main/antlr/KotlinLexer.tokens rename to orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinLexer.tokens diff --git a/orx-kotlin-parser/src/main/antlr/KotlinParser.g4 b/orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinParser.g4 similarity index 100% rename from orx-kotlin-parser/src/main/antlr/KotlinParser.g4 rename to orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinParser.g4 diff --git a/orx-kotlin-parser/src/main/antlr/UnicodeClasses.g4 b/orx-jvm/orx-kotlin-parser/src/main/antlr/UnicodeClasses.g4 similarity index 100% rename from orx-kotlin-parser/src/main/antlr/UnicodeClasses.g4 rename to orx-jvm/orx-kotlin-parser/src/main/antlr/UnicodeClasses.g4 diff --git a/orx-kotlin-parser/src/main/antlr/UnicodeClasses.tokens b/orx-jvm/orx-kotlin-parser/src/main/antlr/UnicodeClasses.tokens similarity index 100% rename from orx-kotlin-parser/src/main/antlr/UnicodeClasses.tokens rename to orx-jvm/orx-kotlin-parser/src/main/antlr/UnicodeClasses.tokens diff --git a/orx-kotlin-parser/src/main/kotlin/ExtractProgram.kt b/orx-jvm/orx-kotlin-parser/src/main/kotlin/ExtractProgram.kt similarity index 100% rename from orx-kotlin-parser/src/main/kotlin/ExtractProgram.kt rename to orx-jvm/orx-kotlin-parser/src/main/kotlin/ExtractProgram.kt diff --git a/orx-kotlin-parser/src/main/kotlin/TreeUtils.kt b/orx-jvm/orx-kotlin-parser/src/main/kotlin/TreeUtils.kt similarity index 100% rename from orx-kotlin-parser/src/main/kotlin/TreeUtils.kt rename to orx-jvm/orx-kotlin-parser/src/main/kotlin/TreeUtils.kt diff --git a/orx-midi/README.md b/orx-jvm/orx-midi/README.md similarity index 100% rename from orx-midi/README.md rename to orx-jvm/orx-midi/README.md diff --git a/orx-midi/src/main/kotlin/MidiEvent.kt b/orx-jvm/orx-midi/src/main/kotlin/MidiEvent.kt similarity index 100% rename from orx-midi/src/main/kotlin/MidiEvent.kt rename to orx-jvm/orx-midi/src/main/kotlin/MidiEvent.kt diff --git a/orx-midi/src/main/kotlin/MidiTransceiver.kt b/orx-jvm/orx-midi/src/main/kotlin/MidiTransceiver.kt similarity index 96% rename from orx-midi/src/main/kotlin/MidiTransceiver.kt rename to orx-jvm/orx-midi/src/main/kotlin/MidiTransceiver.kt index 94faf7ce6..8b047828a 100644 --- a/orx-midi/src/main/kotlin/MidiTransceiver.kt +++ b/orx-jvm/orx-midi/src/main/kotlin/MidiTransceiver.kt @@ -126,7 +126,7 @@ class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: Mi try { val msg = ShortMessage(ShortMessage.CONTROL_CHANGE, channel, control, value) if (receiverDevice != null) { - val tc = receiverDevice!!.microsecondPosition + val tc = receiverDevice.microsecondPosition receiver.send(msg, tc) } } catch (e: InvalidMidiDataException) { @@ -138,7 +138,7 @@ class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: Mi try { val msg = ShortMessage(ShortMessage.PROGRAM_CHANGE, channel, program) if (receiverDevice != null) { - val tc = receiverDevice!!.microsecondPosition + val tc = receiverDevice.microsecondPosition receiver.send(msg, tc) } } catch (e: InvalidMidiDataException) { @@ -150,7 +150,7 @@ class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: Mi try { val msg = ShortMessage(ShortMessage.NOTE_ON, channel, key, velocity) if (receiverDevice != null) { - val tc = receiverDevice!!.microsecondPosition + val tc = receiverDevice.microsecondPosition receiver.send(msg, tc) } } catch (e: InvalidMidiDataException) { @@ -172,5 +172,4 @@ fun main() { dev.controlChanged.listen { println("${it.channel} ${it.control} ${it.value}") } -// dev.destroy() } \ No newline at end of file diff --git a/orx-olive/README.md b/orx-jvm/orx-olive/README.md similarity index 100% rename from orx-olive/README.md rename to orx-jvm/orx-olive/README.md diff --git a/orx-olive/build.gradle b/orx-jvm/orx-olive/build.gradle similarity index 92% rename from orx-olive/build.gradle rename to orx-jvm/orx-olive/build.gradle index b0453e8f1..5d02495c8 100644 --- a/orx-olive/build.gradle +++ b/orx-jvm/orx-olive/build.gradle @@ -19,7 +19,7 @@ dependencies { 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") diff --git a/orx-olive/images/DemoOlive01Kt.png b/orx-jvm/orx-olive/images/DemoOlive01Kt.png similarity index 100% rename from orx-olive/images/DemoOlive01Kt.png rename to orx-jvm/orx-olive/images/DemoOlive01Kt.png diff --git a/orx-olive/src/demo/kotlin/DemoOlive01.kt b/orx-jvm/orx-olive/src/demo/kotlin/DemoOlive01.kt similarity index 100% rename from orx-olive/src/demo/kotlin/DemoOlive01.kt rename to orx-jvm/orx-olive/src/demo/kotlin/DemoOlive01.kt diff --git a/orx-olive/src/demo/kotlin/DemoOliveScriptless01.kt b/orx-jvm/orx-olive/src/demo/kotlin/DemoOliveScriptless01.kt similarity index 100% rename from orx-olive/src/demo/kotlin/DemoOliveScriptless01.kt rename to orx-jvm/orx-olive/src/demo/kotlin/DemoOliveScriptless01.kt diff --git a/orx-olive/src/demo/kotlin/demo-olive-01.kts b/orx-jvm/orx-olive/src/demo/kotlin/demo-olive-01.kts similarity index 100% rename from orx-olive/src/demo/kotlin/demo-olive-01.kts rename to orx-jvm/orx-olive/src/demo/kotlin/demo-olive-01.kts diff --git a/orx-olive/src/main/kotlin/Olive.kt b/orx-jvm/orx-olive/src/main/kotlin/Olive.kt similarity index 100% rename from orx-olive/src/main/kotlin/Olive.kt rename to orx-jvm/orx-olive/src/main/kotlin/Olive.kt diff --git a/orx-olive/src/main/kotlin/OliveProgram.kt b/orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt similarity index 100% rename from orx-olive/src/main/kotlin/OliveProgram.kt rename to orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt diff --git a/orx-olive/src/main/kotlin/Reloadable.kt b/orx-jvm/orx-olive/src/main/kotlin/Reloadable.kt similarity index 100% rename from orx-olive/src/main/kotlin/Reloadable.kt rename to orx-jvm/orx-olive/src/main/kotlin/Reloadable.kt diff --git a/orx-olive/src/main/kotlin/Resources.kt b/orx-jvm/orx-olive/src/main/kotlin/Resources.kt similarity index 100% rename from orx-olive/src/main/kotlin/Resources.kt rename to orx-jvm/orx-olive/src/main/kotlin/Resources.kt diff --git a/orx-olive/src/main/kotlin/ScriptGenerator.kt b/orx-jvm/orx-olive/src/main/kotlin/ScriptGenerator.kt similarity index 100% rename from orx-olive/src/main/kotlin/ScriptGenerator.kt rename to orx-jvm/orx-olive/src/main/kotlin/ScriptGenerator.kt diff --git a/orx-olive/src/main/kotlin/ScriptObjectLoaderJSR233.kt b/orx-jvm/orx-olive/src/main/kotlin/ScriptObjectLoaderJSR233.kt similarity index 100% rename from orx-olive/src/main/kotlin/ScriptObjectLoaderJSR233.kt rename to orx-jvm/orx-olive/src/main/kotlin/ScriptObjectLoaderJSR233.kt diff --git a/orx-olive/src/main/kotlin/ScriptObjectLoaderKSH.kt b/orx-jvm/orx-olive/src/main/kotlin/ScriptObjectLoaderKSH.kt similarity index 100% rename from orx-olive/src/main/kotlin/ScriptObjectLoaderKSH.kt rename to orx-jvm/orx-olive/src/main/kotlin/ScriptObjectLoaderKSH.kt diff --git a/orx-olive/src/test/kotlin/TestLoadScript.kt b/orx-jvm/orx-olive/src/test/kotlin/TestLoadScript.kt similarity index 100% rename from orx-olive/src/test/kotlin/TestLoadScript.kt rename to orx-jvm/orx-olive/src/test/kotlin/TestLoadScript.kt diff --git a/orx-olive/src/test/kotlin/TestLoadScriptKSH.kt b/orx-jvm/orx-olive/src/test/kotlin/TestLoadScriptKSH.kt similarity index 100% rename from orx-olive/src/test/kotlin/TestLoadScriptKSH.kt rename to orx-jvm/orx-olive/src/test/kotlin/TestLoadScriptKSH.kt diff --git a/orx-osc/README.md b/orx-jvm/orx-osc/README.md similarity index 100% rename from orx-osc/README.md rename to orx-jvm/orx-osc/README.md diff --git a/orx-osc/build.gradle b/orx-jvm/orx-osc/build.gradle similarity index 100% rename from orx-osc/build.gradle rename to orx-jvm/orx-osc/build.gradle diff --git a/orx-osc/src/main/kotlin/OSC.kt b/orx-jvm/orx-osc/src/main/kotlin/OSC.kt similarity index 100% rename from orx-osc/src/main/kotlin/OSC.kt rename to orx-jvm/orx-osc/src/main/kotlin/OSC.kt diff --git a/orx-rabbit-control/.gitignore b/orx-jvm/orx-rabbit-control/.gitignore similarity index 100% rename from orx-rabbit-control/.gitignore rename to orx-jvm/orx-rabbit-control/.gitignore diff --git a/orx-rabbit-control/README.md b/orx-jvm/orx-rabbit-control/README.md similarity index 100% rename from orx-rabbit-control/README.md rename to orx-jvm/orx-rabbit-control/README.md diff --git a/orx-rabbit-control/build.gradle b/orx-jvm/orx-rabbit-control/build.gradle similarity index 100% rename from orx-rabbit-control/build.gradle rename to orx-jvm/orx-rabbit-control/build.gradle diff --git a/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt similarity index 98% rename from orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt rename to orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt index e593a928c..115e07541 100644 --- a/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt +++ b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt @@ -8,7 +8,7 @@ import org.openrndr.math.Vector3 import org.openrndr.math.Vector4 -fun main() = application { +suspend fun main() = application { configure { width = 800 height = 800 diff --git a/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt similarity index 97% rename from orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt rename to orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt index 6bc65447b..9c48c44fc 100644 --- a/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt +++ b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt @@ -5,7 +5,7 @@ import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.parameters.* -fun main() = application { +suspend fun main() = application { configure { width = 800 height = 800 diff --git a/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt similarity index 98% rename from orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt rename to orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt index e95a39cb7..644764bac 100644 --- a/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt +++ b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt @@ -8,7 +8,7 @@ import org.openrndr.math.Vector3 import org.openrndr.math.Vector4 -fun main() = application { +suspend fun main() = application { configure { width = 800 height = 800 diff --git a/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt b/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt similarity index 100% rename from orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt rename to orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/asset-manifest.json b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/asset-manifest.json similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/asset-manifest.json rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/asset-manifest.json diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/favicon.ico b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/favicon.ico similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/favicon.ico rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/favicon.ico diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/index.html b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/index.html similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/index.html rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/index.html diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/manifest.json b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/manifest.json similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/manifest.json rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/manifest.json diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/precache-manifest.8b50f7152eba97a8a3a748d36319a411.js b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/precache-manifest.8b50f7152eba97a8a3a748d36319a411.js similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/precache-manifest.8b50f7152eba97a8a3a748d36319a411.js rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/precache-manifest.8b50f7152eba97a8a3a748d36319a411.js diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/service-worker.js b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/service-worker.js similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/service-worker.js rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/service-worker.js diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css.map b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css.map similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css.map rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/css/1.a970d4a6.chunk.css.map diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css.map b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css.map similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css.map rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/css/main.6b57d6a6.chunk.css.map diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js.map b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js.map similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js.map rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/1.ab137fd1.chunk.js.map diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js.map b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js.map similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js.map rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/main.3c08e7ef.chunk.js.map diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js.map b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js.map similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js.map rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/js/runtime~main.4a686d48.js.map diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.05f1cdad.eot b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.05f1cdad.eot similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.05f1cdad.eot rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.05f1cdad.eot diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.3c1c220e.woff b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.3c1c220e.woff similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.3c1c220e.woff rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.3c1c220e.woff diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.3cde8748.ttf b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.3cde8748.ttf similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.3cde8748.ttf rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-16.3cde8748.ttf diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.0a5c7651.eot b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.0a5c7651.eot similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.0a5c7651.eot rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.0a5c7651.eot diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.51ec31f3.ttf b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.51ec31f3.ttf similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.51ec31f3.ttf rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.51ec31f3.ttf diff --git a/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.cef8cdbb.woff b/orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.cef8cdbb.woff similarity index 100% rename from orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.cef8cdbb.woff rename to orx-jvm/orx-rabbit-control/src/main/resources/rabbit-client/static/media/icons-20.cef8cdbb.woff diff --git a/orx-realsense2-natives-linux-x64/build.gradle b/orx-jvm/orx-realsense2-natives-linux-x64/build.gradle similarity index 100% rename from orx-realsense2-natives-linux-x64/build.gradle rename to orx-jvm/orx-realsense2-natives-linux-x64/build.gradle diff --git a/orx-realsense2-natives-macos/build.gradle b/orx-jvm/orx-realsense2-natives-macos/build.gradle similarity index 100% rename from orx-realsense2-natives-macos/build.gradle rename to orx-jvm/orx-realsense2-natives-macos/build.gradle diff --git a/orx-realsense2-natives-windows/build.gradle b/orx-jvm/orx-realsense2-natives-windows/build.gradle similarity index 100% rename from orx-realsense2-natives-windows/build.gradle rename to orx-jvm/orx-realsense2-natives-windows/build.gradle diff --git a/orx-realsense2/build.gradle b/orx-jvm/orx-realsense2/build.gradle similarity index 79% rename from orx-realsense2/build.gradle rename to orx-jvm/orx-realsense2/build.gradle index 153450a2c..39a3dfd4c 100644 --- a/orx-realsense2/build.gradle +++ b/orx-jvm/orx-realsense2/build.gradle @@ -13,9 +13,9 @@ sourceSets { dependencies { api "org.bytedeco:librealsense2:$librealsense2Version" - demoImplementation("org.openrndr:openrndr-core:$openrndrVersion") + demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion") - demoRuntimeOnly(project(":orx-realsense2-natives-$openrndrOS")) + demoRuntimeOnly(project(":orx-jvm:orx-realsense2-natives-$openrndrOS")) demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion") demoImplementation(sourceSets.getByName("main").output) diff --git a/orx-realsense2/src/demo/kotlin/DemoRS201.kt b/orx-jvm/orx-realsense2/src/demo/kotlin/DemoRS201.kt similarity index 97% rename from orx-realsense2/src/demo/kotlin/DemoRS201.kt rename to orx-jvm/orx-realsense2/src/demo/kotlin/DemoRS201.kt index b46020c69..c609356fa 100644 --- a/orx-realsense2/src/demo/kotlin/DemoRS201.kt +++ b/orx-jvm/orx-realsense2/src/demo/kotlin/DemoRS201.kt @@ -6,7 +6,7 @@ import org.openrndr.draw.colorBuffer import org.openrndr.draw.tint import org.openrndr.extra.realsense2.RS2Sensor -fun main() { +suspend fun main() { application { program { val sensors = RS2Sensor.listSensors() diff --git a/orx-realsense2/src/demo/kotlin/DemoRS202.kt b/orx-jvm/orx-realsense2/src/demo/kotlin/DemoRS202.kt similarity index 98% rename from orx-realsense2/src/demo/kotlin/DemoRS202.kt rename to orx-jvm/orx-realsense2/src/demo/kotlin/DemoRS202.kt index 9f991a5f9..13f939fbb 100644 --- a/orx-realsense2/src/demo/kotlin/DemoRS202.kt +++ b/orx-jvm/orx-realsense2/src/demo/kotlin/DemoRS202.kt @@ -11,7 +11,7 @@ import org.openrndr.extra.realsense2.RS2Sensor * * Tested with two sensors, only uses depth stream now */ -fun main() { +suspend fun main() { application { configure { width = 1280 diff --git a/orx-realsense2/src/demo/kotlin/DemoUnproject01.kt b/orx-jvm/orx-realsense2/src/demo/kotlin/DemoUnproject01.kt similarity index 80% rename from orx-realsense2/src/demo/kotlin/DemoUnproject01.kt rename to orx-jvm/orx-realsense2/src/demo/kotlin/DemoUnproject01.kt index c723fb304..c38f925db 100644 --- a/orx-realsense2/src/demo/kotlin/DemoUnproject01.kt +++ b/orx-jvm/orx-realsense2/src/demo/kotlin/DemoUnproject01.kt @@ -1,6 +1,6 @@ import org.openrndr.application -fun main() { +suspend fun main() { application { program { diff --git a/orx-realsense2/src/main/kotlin/RS2Sensor.kt b/orx-jvm/orx-realsense2/src/main/kotlin/RS2Sensor.kt similarity index 100% rename from orx-realsense2/src/main/kotlin/RS2Sensor.kt rename to orx-jvm/orx-realsense2/src/main/kotlin/RS2Sensor.kt diff --git a/orx-runway/README.md b/orx-jvm/orx-runway/README.md similarity index 100% rename from orx-runway/README.md rename to orx-jvm/orx-runway/README.md diff --git a/orx-runway/build.gradle b/orx-jvm/orx-runway/build.gradle similarity index 91% rename from orx-runway/build.gradle rename to orx-jvm/orx-runway/build.gradle index a039d7a16..0bd256a0b 100644 --- a/orx-runway/build.gradle +++ b/orx-jvm/orx-runway/build.gradle @@ -9,7 +9,7 @@ sourceSets { } dependencies { implementation "com.google.code.gson:gson:$gsonVersion" - demoImplementation("org.openrndr:openrndr-core:$openrndrVersion") + demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion") diff --git a/orx-runway/src/demo/kotlin/DemoBASNet.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoBASNet.kt similarity index 94% rename from orx-runway/src/demo/kotlin/DemoBASNet.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoBASNet.kt index 7ef4c70fa..143c32561 100644 --- a/orx-runway/src/demo/kotlin/DemoBASNet.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoBASNet.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.runway.* /** * This example requires a `runway/BASNet` model to be active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 331 height = 400 diff --git a/orx-runway/src/demo/kotlin/DemoBiGAN01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoBiGAN01.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoBiGAN01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoBiGAN01.kt index 9ecab7af7..7ad0e588b 100644 --- a/orx-runway/src/demo/kotlin/DemoBiGAN01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoBiGAN01.kt @@ -12,7 +12,7 @@ import org.openrndr.math.smoothstep * This example requires a `runway/BigBiGAN` model to be active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 512 height = 256 diff --git a/orx-runway/src/demo/kotlin/DemoBiGAN02.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoBiGAN02.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoBiGAN02.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoBiGAN02.kt index 2404cd8a4..7e1d9ee0c 100644 --- a/orx-runway/src/demo/kotlin/DemoBiGAN02.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoBiGAN02.kt @@ -9,7 +9,7 @@ import org.openrndr.extra.runway.* * generated image back into the model (with an additional distortion). * This example requires a `runway/BigBiGAN` model to be active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 512 height = 512 diff --git a/orx-runway/src/demo/kotlin/DemoCaptionToImage01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoCaptionToImage01.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoCaptionToImage01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoCaptionToImage01.kt index 77ac33cce..01940d00c 100644 --- a/orx-runway/src/demo/kotlin/DemoCaptionToImage01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoCaptionToImage01.kt @@ -12,7 +12,7 @@ import java.io.File * This example requires a `runway/AttnGAN` model to be active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 768 height = 576 diff --git a/orx-runway/src/demo/kotlin/DemoCaptionToImage02.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoCaptionToImage02.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoCaptionToImage02.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoCaptionToImage02.kt index 8de7fc978..72ad31ac1 100644 --- a/orx-runway/src/demo/kotlin/DemoCaptionToImage02.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoCaptionToImage02.kt @@ -12,7 +12,7 @@ import java.io.File * This example requires a `runway/AttnGAN` model to be active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 768 height = 576 diff --git a/orx-runway/src/demo/kotlin/DemoDensePose01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoDensePose01.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoDensePose01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoDensePose01.kt index c6c073e3b..e85c01a70 100644 --- a/orx-runway/src/demo/kotlin/DemoDensePose01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoDensePose01.kt @@ -10,7 +10,7 @@ import org.openrndr.extra.runway.* * This demonstrates the body estimation model of DensePose * This example requires a `runway/DensePose` model active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 512 height = 512 diff --git a/orx-runway/src/demo/kotlin/DemoDeoldify01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoDeoldify01.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoDeoldify01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoDeoldify01.kt index 1ca94fcb4..584942f57 100644 --- a/orx-runway/src/demo/kotlin/DemoDeoldify01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoDeoldify01.kt @@ -12,7 +12,7 @@ import org.openrndr.ffmpeg.VideoPlayerFFMPEG * This example requires a `reiinakano/DeOldify` model active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 1280 height = 360 diff --git a/orx-runway/src/demo/kotlin/DemoDeoldify02.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoDeoldify02.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoDeoldify02.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoDeoldify02.kt index 48ae45349..fa0b71c98 100644 --- a/orx-runway/src/demo/kotlin/DemoDeoldify02.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoDeoldify02.kt @@ -14,7 +14,7 @@ import org.openrndr.ffmpeg.VideoPlayerFFMPEG * This example requires a `reiinakano/DeOldify` model active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 1280 height = 480 diff --git a/orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt index e51df80ed..9dfc023c7 100644 --- a/orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoFaceLandmarks01.kt @@ -10,7 +10,7 @@ import org.openrndr.ffmpeg.VideoPlayerFFMPEG import org.openrndr.math.Vector2 import org.openrndr.resourceUrl -fun main() = application { +suspend fun main() = application { configure { width = 768 height = 576 diff --git a/orx-runway/src/demo/kotlin/DemoImageFeedback01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageFeedback01.kt similarity index 98% rename from orx-runway/src/demo/kotlin/DemoImageFeedback01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoImageFeedback01.kt index 68ca88643..4289b4954 100644 --- a/orx-runway/src/demo/kotlin/DemoImageFeedback01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageFeedback01.kt @@ -15,7 +15,7 @@ import java.net.URL * a `runway/AttnGAN` model active in Runway on port 8001 */ -fun main() = application { +suspend fun main() = application { configure { width = 768 height = 576 diff --git a/orx-runway/src/demo/kotlin/DemoImageToCaption01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption01.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoImageToCaption01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption01.kt index c0cc4e7ed..2b66ecce8 100644 --- a/orx-runway/src/demo/kotlin/DemoImageToCaption01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption01.kt @@ -15,7 +15,7 @@ import org.openrndr.math.Vector2 */ -fun main() = application { +suspend fun main() = application { configure { width = 768 height = 576 diff --git a/orx-runway/src/demo/kotlin/DemoImageToCaption02.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption02.kt similarity index 96% rename from orx-runway/src/demo/kotlin/DemoImageToCaption02.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption02.kt index a03f6f391..0bf7b9536 100644 --- a/orx-runway/src/demo/kotlin/DemoImageToCaption02.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoImageToCaption02.kt @@ -13,7 +13,7 @@ import org.openrndr.extra.runway.runwayQuery */ -fun main() = application { +suspend fun main() = application { configure { width = 768 height = 576 diff --git a/orx-runway/src/demo/kotlin/DemoObjectToCaption01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoObjectToCaption01.kt similarity index 97% rename from orx-runway/src/demo/kotlin/DemoObjectToCaption01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoObjectToCaption01.kt index 3bdc475f3..545513a2f 100644 --- a/orx-runway/src/demo/kotlin/DemoObjectToCaption01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoObjectToCaption01.kt @@ -1,5 +1,6 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa +import org.openrndr.draw.Writer import org.openrndr.draw.colorBuffer import org.openrndr.draw.loadFont import org.openrndr.extra.fx.transform.FlipVertically @@ -9,7 +10,6 @@ import org.openrndr.extra.runway.runwayQuery import org.openrndr.ffmpeg.ScreenRecorder import org.openrndr.ffmpeg.VideoPlayerFFMPEG import org.openrndr.shape.Rectangle -import org.openrndr.text.Writer /** @@ -18,7 +18,7 @@ import org.openrndr.text.Writer * This example requires a `runway/DenseCap` model to be active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 768 height = 576 diff --git a/orx-runway/src/demo/kotlin/DemoPersonSegmentation.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoPersonSegmentation.kt similarity index 94% rename from orx-runway/src/demo/kotlin/DemoPersonSegmentation.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoPersonSegmentation.kt index dce7c79d9..56ce6d6ae 100644 --- a/orx-runway/src/demo/kotlin/DemoPersonSegmentation.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoPersonSegmentation.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.runway.* /** * This example requires a `runway/Person-Segmentation` model to be active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 331 height = 400 diff --git a/orx-runway/src/demo/kotlin/DemoStyleGAN01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoStyleGAN01.kt similarity index 96% rename from orx-runway/src/demo/kotlin/DemoStyleGAN01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoStyleGAN01.kt index b36fc0afc..34394b252 100644 --- a/orx-runway/src/demo/kotlin/DemoStyleGAN01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoStyleGAN01.kt @@ -9,7 +9,7 @@ import org.openrndr.extra.runway.runwayQuery * This example requires a `runway/StyleGAN` model to be active in Runway. * This also works with `eryksalvaggio/Ascinte_Seated` */ -fun main() = application { +suspend fun main() = application { configure { width = 512 height = 512 diff --git a/orx-runway/src/demo/kotlin/DemoTextPrompt01.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoTextPrompt01.kt similarity index 95% rename from orx-runway/src/demo/kotlin/DemoTextPrompt01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoTextPrompt01.kt index a7f17c061..f21fd6e50 100644 --- a/orx-runway/src/demo/kotlin/DemoTextPrompt01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoTextPrompt01.kt @@ -1,20 +1,20 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa +import org.openrndr.draw.Writer import org.openrndr.draw.loadFont import org.openrndr.extra.runway.Gpt2Request import org.openrndr.extra.runway.Gpt2Result import org.openrndr.extra.runway.runwayQuery import org.openrndr.shape.Rectangle -import org.openrndr.text.Writer + import java.io.File -import java.net.URL /** * This demonstrates a prompt to text model. It generates a longer text sequence from a prompt. * This example requires a `runway/GPT-2` model to be active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 768 height = 768 diff --git a/orx-runway/src/demo/kotlin/DemoU2Net.kt b/orx-jvm/orx-runway/src/demo/kotlin/DemoU2Net.kt similarity index 94% rename from orx-runway/src/demo/kotlin/DemoU2Net.kt rename to orx-jvm/orx-runway/src/demo/kotlin/DemoU2Net.kt index f79202e78..8a08f44d9 100644 --- a/orx-runway/src/demo/kotlin/DemoU2Net.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/DemoU2Net.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.runway.* /** * This example requires a `runway/U-2-Net` model to be active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 305 height = 400 diff --git a/orx-runway/src/demo/kotlin/PoseNet01.kt b/orx-jvm/orx-runway/src/demo/kotlin/PoseNet01.kt similarity index 97% rename from orx-runway/src/demo/kotlin/PoseNet01.kt rename to orx-jvm/orx-runway/src/demo/kotlin/PoseNet01.kt index 6eca0f644..71c5ce054 100644 --- a/orx-runway/src/demo/kotlin/PoseNet01.kt +++ b/orx-jvm/orx-runway/src/demo/kotlin/PoseNet01.kt @@ -9,7 +9,7 @@ import org.openrndr.extra.runway.* * This demonstrates the body estimation model of PoseNet * This example requires a `runway/PoseNet` model active in Runway. */ -fun main() = application { +suspend fun main() = application { configure { width = 512 height = 512 diff --git a/orx-runway/src/main/kotlin/Presets.kt b/orx-jvm/orx-runway/src/main/kotlin/Presets.kt similarity index 100% rename from orx-runway/src/main/kotlin/Presets.kt rename to orx-jvm/orx-runway/src/main/kotlin/Presets.kt diff --git a/orx-runway/src/main/kotlin/RunwayHttp.kt b/orx-jvm/orx-runway/src/main/kotlin/RunwayHttp.kt similarity index 100% rename from orx-runway/src/main/kotlin/RunwayHttp.kt rename to orx-jvm/orx-runway/src/main/kotlin/RunwayHttp.kt diff --git a/orx-syphon/README.md b/orx-jvm/orx-syphon/README.md similarity index 100% rename from orx-syphon/README.md rename to orx-jvm/orx-syphon/README.md diff --git a/orx-syphon/build.gradle b/orx-jvm/orx-syphon/build.gradle similarity index 57% rename from orx-syphon/build.gradle rename to orx-jvm/orx-syphon/build.gradle index ab4046831..d6ad37635 100644 --- a/orx-syphon/build.gradle +++ b/orx-jvm/orx-syphon/build.gradle @@ -1,6 +1,5 @@ dependencies { - implementation "org.openrndr:openrndr-core:$openrndrVersion" + implementation "org.openrndr:openrndr-application:$openrndrVersion" implementation "org.openrndr:openrndr-gl3:$openrndrVersion" - implementation "org.lwjgl:lwjgl-opengl:3.2.3" implementation "org.openrndr:openrndr-gl3-natives-macos:$openrndrVersion" } \ No newline at end of file diff --git a/orx-syphon/preview.gif b/orx-jvm/orx-syphon/preview.gif similarity index 100% rename from orx-syphon/preview.gif rename to orx-jvm/orx-syphon/preview.gif diff --git a/orx-syphon/src/main/kotlin/SyphonClient.kt b/orx-jvm/orx-syphon/src/main/kotlin/SyphonClient.kt similarity index 94% rename from orx-syphon/src/main/kotlin/SyphonClient.kt rename to orx-jvm/orx-syphon/src/main/kotlin/SyphonClient.kt index 56109af02..5bb237292 100644 --- a/orx-syphon/src/main/kotlin/SyphonClient.kt +++ b/orx-jvm/orx-syphon/src/main/kotlin/SyphonClient.kt @@ -1,11 +1,11 @@ package org.openrndr.extra.syphon -import jsyphon.JSyphonClient -import org.lwjgl.opengl.GL33C.GL_TEXTURE_RECTANGLE + import org.openrndr.Extension import org.openrndr.Program import org.openrndr.draw.* +import org.openrndr.extra.syphon.jsyphon.JSyphonClient import org.openrndr.internal.gl3.ColorBufferGL3 import org.openrndr.internal.gl3.TextureStorageModeGL @@ -34,9 +34,12 @@ class SyphonClient(private val appName: String? = null, private val serverName: val w = img.textureWidth() val h = img.textureHeight() + + /** * GL_TEXTURE_RECTANGLE is necessary */ + val GL_TEXTURE_RECTANGLE = 0x84F5 val rectBuffer = ColorBufferGL3(GL_TEXTURE_RECTANGLE, name, TextureStorageModeGL.IMAGE, w, h, 1.0, ColorFormat.RGBa, ColorType.UINT8, 0, BufferMultisample.Disabled, Session.root) /** diff --git a/orx-syphon/src/main/kotlin/SyphonServer.kt b/orx-jvm/orx-syphon/src/main/kotlin/SyphonServer.kt similarity index 96% rename from orx-syphon/src/main/kotlin/SyphonServer.kt rename to orx-jvm/orx-syphon/src/main/kotlin/SyphonServer.kt index 251c709e7..dc41df83d 100644 --- a/orx-syphon/src/main/kotlin/SyphonServer.kt +++ b/orx-jvm/orx-syphon/src/main/kotlin/SyphonServer.kt @@ -1,12 +1,13 @@ package org.openrndr.extra.syphon -import jsyphon.JSyphonServer + import org.openrndr.Extension import org.openrndr.Program import org.openrndr.draw.Drawer import org.openrndr.draw.RenderTarget import org.openrndr.draw.renderTarget +import org.openrndr.extra.syphon.jsyphon.JSyphonServer import org.openrndr.internal.gl3.ColorBufferGL3 diff --git a/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt similarity index 96% rename from orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt rename to orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt index 6ab7630b3..5cca11aac 100644 --- a/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt +++ b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt @@ -1,4 +1,4 @@ -package jsyphon +package org.openrndr.extra.syphon.jsyphon import java.io.File import java.util.* diff --git a/orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt similarity index 86% rename from orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt rename to orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt index d994a30fc..feddc76d6 100644 --- a/orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt +++ b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt @@ -1,4 +1,4 @@ -package jsyphon +package org.openrndr.extra.syphon.jsyphon class JSyphonImage(private val name: Int, private val width: Int, private val height: Int) { fun textureName(): Int { diff --git a/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt similarity index 96% rename from orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt rename to orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt index 7902db609..e61344079 100644 --- a/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt +++ b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt @@ -1,4 +1,4 @@ -package jsyphon +package org.openrndr.extra.syphon.jsyphon import org.openrndr.platform.Platform import org.openrndr.platform.PlatformType diff --git a/orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt similarity index 98% rename from orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt rename to orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt index 65a2f7e67..3f967e293 100644 --- a/orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt +++ b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt @@ -1,4 +1,4 @@ -package jsyphon +package org.openrndr.extra.syphon.jsyphon /* JSyphonServer.java - Copyright 2011 -Skye Book (sbook) & Anton Marini (vade) diff --git a/orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt similarity index 87% rename from orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt rename to orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt index 0ef8d24c1..bef9df316 100644 --- a/orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt +++ b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt @@ -1,4 +1,4 @@ -package jsyphon +package org.openrndr.extra.syphon.jsyphon import java.io.File import java.util.ArrayList import java.util.HashMap diff --git a/orx-syphon/src/main/kotlin/jsyphon/Util.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/Util.kt similarity index 87% rename from orx-syphon/src/main/kotlin/jsyphon/Util.kt rename to orx-jvm/orx-syphon/src/main/kotlin/jsyphon/Util.kt index 69b33d48a..f59061bb9 100644 --- a/orx-syphon/src/main/kotlin/jsyphon/Util.kt +++ b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/Util.kt @@ -1,4 +1,4 @@ -package jsyphon +package org.openrndr.extra.syphon.jsyphon class NSSize (var x: Int, var y: Int) class NSPoint(var x: Int, var y: Int) diff --git a/orx-syphon/src/main/resources/jsyphon-natives/Syphon b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon similarity index 100% rename from orx-syphon/src/main/resources/jsyphon-natives/Syphon rename to orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon diff --git a/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib similarity index 100% rename from orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib rename to orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib diff --git a/orx-syphon/src/test/kotlin/ClientExample.kt b/orx-jvm/orx-syphon/src/test/kotlin/ClientExample.kt similarity index 91% rename from orx-syphon/src/test/kotlin/ClientExample.kt rename to orx-jvm/orx-syphon/src/test/kotlin/ClientExample.kt index 3e3193199..eabea23a7 100644 --- a/orx-syphon/src/test/kotlin/ClientExample.kt +++ b/orx-jvm/orx-syphon/src/test/kotlin/ClientExample.kt @@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa import org.openrndr.extra.syphon.SyphonClient -fun main() = application { +suspend fun main() = application { configure { width = 1000 height = 800 diff --git a/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt b/orx-jvm/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt similarity index 94% rename from orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt rename to orx-jvm/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt index 3d886a165..67b76cdef 100644 --- a/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt +++ b/orx-jvm/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.syphon.SyphonClient /** * This example uses After Effects and OPENRNDR connected via Syphon */ -fun main() = application { +suspend fun main() = application { configure { // The maximum resolution supported by the free // version of AESyphon diff --git a/orx-syphon/src/test/kotlin/ServerExample.kt b/orx-jvm/orx-syphon/src/test/kotlin/ServerExample.kt similarity index 92% rename from orx-syphon/src/test/kotlin/ServerExample.kt rename to orx-jvm/orx-syphon/src/test/kotlin/ServerExample.kt index e0b14bfd7..2864a84c9 100644 --- a/orx-syphon/src/test/kotlin/ServerExample.kt +++ b/orx-jvm/orx-syphon/src/test/kotlin/ServerExample.kt @@ -4,7 +4,7 @@ import org.openrndr.extra.syphon.SyphonServer import kotlin.math.* -fun main() = application { +suspend fun main() = application { configure { width = 1000 height = 1000 diff --git a/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt b/orx-jvm/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt similarity index 96% rename from orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt rename to orx-jvm/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt index 78a285322..929240319 100644 --- a/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt +++ b/orx-jvm/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt @@ -5,8 +5,7 @@ import org.openrndr.draw.renderTarget import org.openrndr.extra.syphon.SyphonServer import kotlin.math.* - -fun main() = application { +suspend fun main() = application { configure { width = 1000 height = 1000 diff --git a/orx-tensorflow-gpu-natives-linux-x64/build.gradle b/orx-jvm/orx-tensorflow-gpu-natives-linux-x64/build.gradle similarity index 100% rename from orx-tensorflow-gpu-natives-linux-x64/build.gradle rename to orx-jvm/orx-tensorflow-gpu-natives-linux-x64/build.gradle diff --git a/orx-tensorflow-gpu-natives-windows/build.gradle b/orx-jvm/orx-tensorflow-gpu-natives-windows/build.gradle similarity index 100% rename from orx-tensorflow-gpu-natives-windows/build.gradle rename to orx-jvm/orx-tensorflow-gpu-natives-windows/build.gradle diff --git a/orx-tensorflow-mkl-natives-linux-x64/build.gradle b/orx-jvm/orx-tensorflow-mkl-natives-linux-x64/build.gradle similarity index 100% rename from orx-tensorflow-mkl-natives-linux-x64/build.gradle rename to orx-jvm/orx-tensorflow-mkl-natives-linux-x64/build.gradle diff --git a/orx-tensorflow-mkl-natives-macos/build.gradle b/orx-jvm/orx-tensorflow-mkl-natives-macos/build.gradle similarity index 100% rename from orx-tensorflow-mkl-natives-macos/build.gradle rename to orx-jvm/orx-tensorflow-mkl-natives-macos/build.gradle diff --git a/orx-tensorflow-mkl-natives-windows/build.gradle b/orx-jvm/orx-tensorflow-mkl-natives-windows/build.gradle similarity index 100% rename from orx-tensorflow-mkl-natives-windows/build.gradle rename to orx-jvm/orx-tensorflow-mkl-natives-windows/build.gradle diff --git a/orx-tensorflow-natives-linux-x64/build.gradle b/orx-jvm/orx-tensorflow-natives-linux-x64/build.gradle similarity index 100% rename from orx-tensorflow-natives-linux-x64/build.gradle rename to orx-jvm/orx-tensorflow-natives-linux-x64/build.gradle diff --git a/orx-tensorflow-natives-macos/build.gradle b/orx-jvm/orx-tensorflow-natives-macos/build.gradle similarity index 100% rename from orx-tensorflow-natives-macos/build.gradle rename to orx-jvm/orx-tensorflow-natives-macos/build.gradle diff --git a/orx-tensorflow-natives-windows/build.gradle b/orx-jvm/orx-tensorflow-natives-windows/build.gradle similarity index 100% rename from orx-tensorflow-natives-windows/build.gradle rename to orx-jvm/orx-tensorflow-natives-windows/build.gradle diff --git a/orx-tensorflow/build.gradle b/orx-jvm/orx-tensorflow/build.gradle similarity index 86% rename from orx-tensorflow/build.gradle rename to orx-jvm/orx-tensorflow/build.gradle index 4ee40d726..1fac1026e 100644 --- a/orx-tensorflow/build.gradle +++ b/orx-jvm/orx-tensorflow/build.gradle @@ -33,10 +33,10 @@ compileWrapgenKotlin { dependencies { implementation "com.google.code.gson:gson:$gsonVersion" - demoImplementation("org.openrndr:openrndr-core:$openrndrVersion") + demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") - demoRuntimeOnly(project(":orx-tensorflow-natives-$openrndrOS")) + demoRuntimeOnly(project(":orx-jvm:orx-tensorflow-natives-$openrndrOS")) demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-extensions:$openrndrVersion") @@ -44,7 +44,7 @@ dependencies { demoRuntimeOnly("org.openrndr:openrndr-ffmpeg-natives-$openrndrOS:$openrndrVersion") demoImplementation(project(":orx-fx")) demoImplementation(sourceSets.getByName("main").output) - implementation "org.tensorflow:tensorflow-core-api:$tensorflowVersion" + api("org.tensorflow:tensorflow-core-api:$tensorflowVersion") // -- wrapgen wrapgenImplementation 'com.github.javaparser:javaparser-core:3.15.21' diff --git a/orx-tensorflow/src/main/kotlin/Tensor.kt b/orx-jvm/orx-tensorflow/src/main/kotlin/Tensor.kt similarity index 99% rename from orx-tensorflow/src/main/kotlin/Tensor.kt rename to orx-jvm/orx-tensorflow/src/main/kotlin/Tensor.kt index 4e27fa767..eebce184c 100644 --- a/orx-tensorflow/src/main/kotlin/Tensor.kt +++ b/orx-jvm/orx-tensorflow/src/main/kotlin/Tensor.kt @@ -56,6 +56,7 @@ fun TFloat32.copyTo(colorBuffer: ColorBuffer) { } val buffer = ByteBuffer.allocateDirect(this.numBytes().toInt()) buffer.order(ByteOrder.nativeOrder()) + val dataBuffer = DataBuffers.of(buffer.asFloatBuffer()) this.read(dataBuffer) diff --git a/orx-tensorflow/src/main/kotlin/arrays/Arrays.kt b/orx-jvm/orx-tensorflow/src/main/kotlin/arrays/Arrays.kt similarity index 100% rename from orx-tensorflow/src/main/kotlin/arrays/Arrays.kt rename to orx-jvm/orx-tensorflow/src/main/kotlin/arrays/Arrays.kt diff --git a/orx-video-profiles/README.md b/orx-jvm/orx-video-profiles/README.md similarity index 100% rename from orx-video-profiles/README.md rename to orx-jvm/orx-video-profiles/README.md diff --git a/orx-video-profiles/build.gradle b/orx-jvm/orx-video-profiles/build.gradle similarity index 89% rename from orx-video-profiles/build.gradle rename to orx-jvm/orx-video-profiles/build.gradle index a0d7205cf..cbaaa07c3 100644 --- a/orx-video-profiles/build.gradle +++ b/orx-jvm/orx-video-profiles/build.gradle @@ -9,7 +9,7 @@ sourceSets { } dependencies { - demoImplementation("org.openrndr:openrndr-core:$openrndrVersion") + demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion") demoImplementation("org.openrndr:openrndr-ffmpeg:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion") diff --git a/orx-video-profiles/src/demo/kotlin/DemoGIF01.kt b/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoGIF01.kt similarity index 91% rename from orx-video-profiles/src/demo/kotlin/DemoGIF01.kt rename to orx-jvm/orx-video-profiles/src/demo/kotlin/DemoGIF01.kt index 38728cd29..b630e64d5 100644 --- a/orx-video-profiles/src/demo/kotlin/DemoGIF01.kt +++ b/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoGIF01.kt @@ -4,7 +4,7 @@ import org.openrndr.extra.videoprofiles.GIFProfile import org.openrndr.extra.videoprofiles.ProresProfile import org.openrndr.ffmpeg.ScreenRecorder -fun main() = application { +suspend fun main() = application { program { extend(ScreenRecorder()) { profile = GIFProfile() diff --git a/orx-video-profiles/src/demo/kotlin/DemoProres01.kt b/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoProres01.kt similarity index 90% rename from orx-video-profiles/src/demo/kotlin/DemoProres01.kt rename to orx-jvm/orx-video-profiles/src/demo/kotlin/DemoProres01.kt index 388ab5965..c4cd97307 100644 --- a/orx-video-profiles/src/demo/kotlin/DemoProres01.kt +++ b/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoProres01.kt @@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa import org.openrndr.extra.videoprofiles.ProresProfile import org.openrndr.ffmpeg.ScreenRecorder -fun main() = application { +suspend fun main() = application { program { extend(ScreenRecorder()) { profile = ProresProfile() diff --git a/orx-video-profiles/src/demo/kotlin/DemoTIFF01.kt b/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoTIFF01.kt similarity index 93% rename from orx-video-profiles/src/demo/kotlin/DemoTIFF01.kt rename to orx-jvm/orx-video-profiles/src/demo/kotlin/DemoTIFF01.kt index 920133f89..1b5bad3bc 100644 --- a/orx-video-profiles/src/demo/kotlin/DemoTIFF01.kt +++ b/orx-jvm/orx-video-profiles/src/demo/kotlin/DemoTIFF01.kt @@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa import org.openrndr.extra.videoprofiles.TIFFProfile import org.openrndr.ffmpeg.ScreenRecorder -fun main() = application { +suspend fun main() = application { program { extend(ScreenRecorder()) { profile = TIFFProfile() diff --git a/orx-video-profiles/src/main/kotlin/GIFProfile.kt b/orx-jvm/orx-video-profiles/src/main/kotlin/GIFProfile.kt similarity index 100% rename from orx-video-profiles/src/main/kotlin/GIFProfile.kt rename to orx-jvm/orx-video-profiles/src/main/kotlin/GIFProfile.kt diff --git a/orx-video-profiles/src/main/kotlin/PNGProfile.kt b/orx-jvm/orx-video-profiles/src/main/kotlin/PNGProfile.kt similarity index 100% rename from orx-video-profiles/src/main/kotlin/PNGProfile.kt rename to orx-jvm/orx-video-profiles/src/main/kotlin/PNGProfile.kt diff --git a/orx-video-profiles/src/main/kotlin/ProresProfile.kt b/orx-jvm/orx-video-profiles/src/main/kotlin/ProresProfile.kt similarity index 100% rename from orx-video-profiles/src/main/kotlin/ProresProfile.kt rename to orx-jvm/orx-video-profiles/src/main/kotlin/ProresProfile.kt diff --git a/orx-video-profiles/src/main/kotlin/TIFFProfile.kt b/orx-jvm/orx-video-profiles/src/main/kotlin/TIFFProfile.kt similarity index 100% rename from orx-video-profiles/src/main/kotlin/TIFFProfile.kt rename to orx-jvm/orx-video-profiles/src/main/kotlin/TIFFProfile.kt diff --git a/orx-video-profiles/src/main/kotlin/WebpProfile.kt b/orx-jvm/orx-video-profiles/src/main/kotlin/WebpProfile.kt similarity index 100% rename from orx-video-profiles/src/main/kotlin/WebpProfile.kt rename to orx-jvm/orx-video-profiles/src/main/kotlin/WebpProfile.kt diff --git a/orx-video-profiles/src/main/kotlin/X265Profile.kt b/orx-jvm/orx-video-profiles/src/main/kotlin/X265Profile.kt similarity index 100% rename from orx-video-profiles/src/main/kotlin/X265Profile.kt rename to orx-jvm/orx-video-profiles/src/main/kotlin/X265Profile.kt diff --git a/orx-kdtree/build.gradle b/orx-kdtree/build.gradle index dec3965b2..fc659a2ae 100644 --- a/orx-kdtree/build.gradle +++ b/orx-kdtree/build.gradle @@ -9,7 +9,7 @@ sourceSets { } dependencies { - 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") diff --git a/orx-kdtree/src/demo/kotlin/DemoNearestNeighbour01.kt b/orx-kdtree/src/demo/kotlin/DemoNearestNeighbour01.kt index 7d5118712..2b987446f 100644 --- a/orx-kdtree/src/demo/kotlin/DemoNearestNeighbour01.kt +++ b/orx-kdtree/src/demo/kotlin/DemoNearestNeighbour01.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.kdtree.findNearest import org.openrndr.extra.kdtree.vector2Mapper import org.openrndr.math.Vector2 -fun main() { +suspend fun main() { application { configure { width = 1280 diff --git a/orx-keyframer/build.gradle b/orx-keyframer/build.gradle index 8559e0145..067c40a65 100644 --- a/orx-keyframer/build.gradle +++ b/orx-keyframer/build.gradle @@ -41,7 +41,7 @@ dependencies { demoImplementation(project(":orx-camera")) demoImplementation(project(":orx-panel")) - 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") diff --git a/orx-keyframer/src/demo/kotlin/DemoEvelope01.kt b/orx-keyframer/src/demo/kotlin/DemoEvelope01.kt index e245555d8..4f18644e7 100644 --- a/orx-keyframer/src/demo/kotlin/DemoEvelope01.kt +++ b/orx-keyframer/src/demo/kotlin/DemoEvelope01.kt @@ -4,7 +4,7 @@ import org.openrndr.extra.keyframer.Keyframer import org.openrndr.resourceUrl import java.net.URL -fun main() = application { +suspend fun main() = application { program { class Animation: Keyframer() { val position by Vector2Channel(arrayOf("x", "y")) diff --git a/orx-keyframer/src/demo/kotlin/DemoFull01.kt b/orx-keyframer/src/demo/kotlin/DemoFull01.kt index e7a1b1b19..9aaf7615b 100644 --- a/orx-keyframer/src/demo/kotlin/DemoFull01.kt +++ b/orx-keyframer/src/demo/kotlin/DemoFull01.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.keyframer.KeyframerFormat import org.openrndr.resourceUrl import java.net.URL -fun main() = application { +suspend fun main() = application { program { class Animation: Keyframer() { val position by Vector2Channel(arrayOf("x", "y")) diff --git a/orx-keyframer/src/demo/kotlin/DemoScrub01.kt b/orx-keyframer/src/demo/kotlin/DemoScrub01.kt index 6c96a0888..84c51ffe9 100644 --- a/orx-keyframer/src/demo/kotlin/DemoScrub01.kt +++ b/orx-keyframer/src/demo/kotlin/DemoScrub01.kt @@ -8,7 +8,7 @@ import org.openrndr.panel.elements.slider import org.openrndr.resourceUrl import java.net.URL -fun main() = application { +suspend fun main() = application { program { // -- replace the default clock with an offset clock diff --git a/orx-keyframer/src/demo/kotlin/DemoSimple01.kt b/orx-keyframer/src/demo/kotlin/DemoSimple01.kt index 79a782059..22ee00f33 100644 --- a/orx-keyframer/src/demo/kotlin/DemoSimple01.kt +++ b/orx-keyframer/src/demo/kotlin/DemoSimple01.kt @@ -4,7 +4,7 @@ import org.openrndr.extra.keyframer.Keyframer import org.openrndr.resourceUrl import java.net.URL -fun main() = application { +suspend fun main() = application { program { class Animation: Keyframer() { val position by Vector2Channel(arrayOf("x", "y")) diff --git a/orx-keyframer/src/demo/kotlin/DemoSimple02.kt b/orx-keyframer/src/demo/kotlin/DemoSimple02.kt index 6032fd613..9127ab085 100644 --- a/orx-keyframer/src/demo/kotlin/DemoSimple02.kt +++ b/orx-keyframer/src/demo/kotlin/DemoSimple02.kt @@ -4,7 +4,7 @@ import org.openrndr.extra.keyframer.Keyframer import org.openrndr.resourceUrl import java.net.URL -fun main() = application { +suspend fun main() = application { program { class Animation: Keyframer() { val position by Vector2Channel(arrayOf("x", "y")) diff --git a/orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt b/orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt index 605b2dd98..7c9173fd2 100644 --- a/orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt +++ b/orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt @@ -4,7 +4,7 @@ import org.openrndr.extra.keyframer.Keyframer import org.openrndr.resourceUrl import java.net.URL -fun main() = application { +suspend fun main() = application { program { class Animation : Keyframer() { val position by Vector2Channel(arrayOf("x", "y")) diff --git a/orx-mesh-generators/build.gradle b/orx-mesh-generators/build.gradle index 91e634832..f150cb22f 100644 --- a/orx-mesh-generators/build.gradle +++ b/orx-mesh-generators/build.gradle @@ -10,7 +10,7 @@ sourceSets { dependencies { 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") diff --git a/orx-mesh-generators/src/demo/kotlin/DemoBox.kt b/orx-mesh-generators/src/demo/kotlin/DemoBox.kt index 5e14934bd..def02f7e0 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoBox.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoBox.kt @@ -8,7 +8,7 @@ import org.openrndr.extras.camera.Orbital import org.openrndr.extras.meshgenerators.boxMesh import org.openrndr.math.Vector3 -fun main() { +suspend fun main() { application { program { val box = boxMesh(1.0, 1.0, 1.0) diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex01.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex01.kt index 522dd2aca..aa28ff6c5 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex01.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex01.kt @@ -10,7 +10,7 @@ import org.openrndr.extras.meshgenerators.sphere import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform -fun main() { +suspend fun main() { application { program { val m = meshGenerator { diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex02.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex02.kt index 286a3aed5..7a986865a 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex02.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex02.kt @@ -7,7 +7,7 @@ import org.openrndr.extras.meshgenerators.* import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex03.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex03.kt index 3cb5190a0..55cfe1871 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex03.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex03.kt @@ -7,7 +7,7 @@ import org.openrndr.extras.meshgenerators.* import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex04.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex04.kt index 1fd58968a..49042c468 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex04.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex04.kt @@ -8,7 +8,7 @@ import org.openrndr.math.Vector2 import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex05.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex05.kt index 12ac93365..41ba1994c 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex05.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex05.kt @@ -9,7 +9,7 @@ import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform import org.openrndr.shape.Circle -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-no-clear/build.gradle b/orx-no-clear/build.gradle index 631145f7d..3785da3bf 100644 --- a/orx-no-clear/build.gradle +++ b/orx-no-clear/build.gradle @@ -11,7 +11,7 @@ sourceSets { dependencies { //implementation project(":orx-?") - 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") diff --git a/orx-no-clear/src/demo/kotlin/DemoNoClear.kt b/orx-no-clear/src/demo/kotlin/DemoNoClear.kt index ff9212bc8..8c0e1be16 100644 --- a/orx-no-clear/src/demo/kotlin/DemoNoClear.kt +++ b/orx-no-clear/src/demo/kotlin/DemoNoClear.kt @@ -8,7 +8,7 @@ import org.openrndr.math.Polar import org.openrndr.shape.contour import kotlin.math.sin -fun main() { +suspend fun main() { application { program { var time = 0.0 diff --git a/orx-noise/build.gradle b/orx-noise/build.gradle index 49d7c034c..306f00ea0 100644 --- a/orx-noise/build.gradle +++ b/orx-noise/build.gradle @@ -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") diff --git a/orx-noise/src/demo/kotlin/DemoGradientPerturb2D.kt b/orx-noise/src/demo/kotlin/DemoGradientPerturb2D.kt index 6a2e88481..232c2d5b5 100644 --- a/orx-noise/src/demo/kotlin/DemoGradientPerturb2D.kt +++ b/orx-noise/src/demo/kotlin/DemoGradientPerturb2D.kt @@ -7,7 +7,7 @@ import org.openrndr.extra.noise.simplex import org.openrndr.math.Vector2 import kotlin.math.absoluteValue -fun main() { +suspend fun main() { application { program { val cb = colorBuffer(width, height) diff --git a/orx-noise/src/demo/kotlin/DemoGradientPerturb3D.kt b/orx-noise/src/demo/kotlin/DemoGradientPerturb3D.kt index a1acc55db..5c9025f79 100644 --- a/orx-noise/src/demo/kotlin/DemoGradientPerturb3D.kt +++ b/orx-noise/src/demo/kotlin/DemoGradientPerturb3D.kt @@ -7,7 +7,7 @@ import org.openrndr.extra.noise.simplex import org.openrndr.math.Vector3 import kotlin.math.absoluteValue -fun main() { +suspend fun main() { application { program { val cb = colorBuffer(width, height) diff --git a/orx-noise/src/demo/kotlin/DemoPoissonDiskSampling.kt b/orx-noise/src/demo/kotlin/DemoPoissonDiskSampling.kt index 2e3b16577..2c14b7d65 100644 --- a/orx-noise/src/demo/kotlin/DemoPoissonDiskSampling.kt +++ b/orx-noise/src/demo/kotlin/DemoPoissonDiskSampling.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.noise.poissonDiskSampling import org.openrndr.math.Vector2 import org.openrndr.shape.Circle -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-noise/src/demo/kotlin/DemoSimplex01.kt b/orx-noise/src/demo/kotlin/DemoSimplex01.kt index e45b8ed0a..f1ef50f46 100644 --- a/orx-noise/src/demo/kotlin/DemoSimplex01.kt +++ b/orx-noise/src/demo/kotlin/DemoSimplex01.kt @@ -5,7 +5,7 @@ import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.noise.simplex import org.openrndr.shape.contour -fun main() = application { +suspend fun main() = application { configure { width = 720 height = 720 diff --git a/orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt b/orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt index 9de6945d6..76f14a156 100644 --- a/orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt +++ b/orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt @@ -9,7 +9,7 @@ import org.openrndr.panel.elements.div import org.openrndr.panel.elements.h1 import org.openrndr.panel.style.* -fun main() = application { +suspend fun main() = application { program { // -- this block is for automation purposes only if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt b/orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt index febc56d45..f2bd1ef58 100644 --- a/orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt +++ b/orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt @@ -6,7 +6,7 @@ import org.openrndr.panel.elements.div import org.openrndr.panel.elements.slider import org.openrndr.panel.style.* -fun main() = application { +suspend fun main() = application { program { // -- this block is for automation purposes only if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-panel/src/demo/kotlin/DemoWatchDiv01.kt b/orx-panel/src/demo/kotlin/DemoWatchDiv01.kt index a4a3700bb..f627ba33e 100644 --- a/orx-panel/src/demo/kotlin/DemoWatchDiv01.kt +++ b/orx-panel/src/demo/kotlin/DemoWatchDiv01.kt @@ -34,7 +34,7 @@ private class ProgramState { } } -fun main() = application { +suspend fun main() = application { configure { width = 900 height = 720 diff --git a/orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt b/orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt index 07409b39e..a01618518 100644 --- a/orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt +++ b/orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt @@ -5,7 +5,7 @@ import org.openrndr.panel.elements.* import org.openrndr.panel.style.* -fun main() = application { +suspend fun main() = application { configure { width = 900 height = 720 diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt index 4314345f2..5081179f9 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt @@ -162,7 +162,7 @@ class ControlManager : Extension { } } - fun character(event: Program.CharacterEvent) { + fun character(event: CharacterEvent) { target?.keyboard?.character?.trigger(event) if (target != null) { checkForManualRedraw() @@ -325,7 +325,7 @@ class ControlManager : Extension { override fun setup(program: Program) { this.program = program - contentScale = program.window.scale.x + contentScale = program.window.contentScale window = program.window //surfaceCache = SurfaceCache(4096, 4096, contentScale) diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Button.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Button.kt index 6f28c99d3..fcfbd92be 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Button.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Button.kt @@ -3,11 +3,12 @@ package org.openrndr.panel.elements import org.openrndr.color.ColorRGBa import org.openrndr.draw.Drawer import org.openrndr.draw.FontImageMap +import org.openrndr.draw.Writer import org.openrndr.draw.isolated import org.openrndr.events.Event import org.openrndr.panel.style.* import org.openrndr.shape.Rectangle -import org.openrndr.text.Writer + import kotlin.math.round diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/ColorpickerButton.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/ColorpickerButton.kt index a2cf82850..e6ad55fbc 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/ColorpickerButton.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/ColorpickerButton.kt @@ -4,10 +4,11 @@ import kotlinx.coroutines.yield import org.openrndr.color.ColorRGBa import org.openrndr.draw.Drawer import org.openrndr.draw.LineCap +import org.openrndr.draw.Writer import org.openrndr.events.Event import org.openrndr.launch import org.openrndr.panel.style.* -import org.openrndr.text.Writer + import kotlin.reflect.KMutableProperty0 class ColorpickerButton : Element(ElementType("colorpicker-button")), DisposableElement { diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/DropdownButton.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/DropdownButton.kt index b1dd05cda..63cdfdc36 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/DropdownButton.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/DropdownButton.kt @@ -5,11 +5,12 @@ import org.openrndr.draw.Drawer import org.openrndr.draw.FontImageMap import org.openrndr.panel.style.* import org.openrndr.shape.Rectangle -import org.openrndr.text.Writer + import kotlinx.coroutines.yield import org.openrndr.KEY_ARROW_DOWN import org.openrndr.KEY_ARROW_UP import org.openrndr.KEY_ENTER +import org.openrndr.draw.Writer import org.openrndr.events.Event import org.openrndr.launch import kotlin.math.max diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Element.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Element.kt index 6a90b2fe4..9557ab4ea 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Element.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Element.kt @@ -1,9 +1,6 @@ package org.openrndr.panel.elements -import org.openrndr.DropEvent -import org.openrndr.KeyEvent -import org.openrndr.MouseEvent -import org.openrndr.Program +import org.openrndr.* import org.openrndr.draw.Drawer import org.openrndr.events.Event import org.openrndr.math.Vector2 @@ -72,7 +69,7 @@ open class Element(val type: ElementType) { val pressed = Event("element-keyboard-pressed") val released = Event("element-keyboard-released") val repeated = Event("element-keyboard-repeated") - val character = Event("element-keyboard-character") + val character = Event("element-keyboard-character") val focusGained = Event("element-keyboard-focus-gained") val focusLost = Event("element-keyboard-focus-lost") } diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeButton.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeButton.kt index 3a6637b44..75231c90b 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeButton.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeButton.kt @@ -1,11 +1,11 @@ package org.openrndr.panel.elements import org.openrndr.color.ColorRGBa +import org.openrndr.draw.Cursor import org.openrndr.draw.Drawer +import org.openrndr.draw.Writer import org.openrndr.math.Vector2 import org.openrndr.panel.style.* -import org.openrndr.text.Cursor -import org.openrndr.text.Writer class EnvelopeButton : Element(ElementType("envelope-button")) { diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SequenceEditor.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SequenceEditor.kt index a236dd422..54b2421a1 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SequenceEditor.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SequenceEditor.kt @@ -3,17 +3,13 @@ package org.openrndr.panel.elements import kotlinx.coroutines.* import org.openrndr.KeyModifier import org.openrndr.color.ColorRGBa -import org.openrndr.draw.Drawer -import org.openrndr.draw.LineCap -import org.openrndr.draw.isolated +import org.openrndr.draw.* import org.openrndr.events.Event import org.openrndr.math.Vector2 import org.openrndr.math.map import org.openrndr.panel.style.effectiveColor import org.openrndr.panel.tools.Tooltip import org.openrndr.shape.Rectangle -import org.openrndr.text.Cursor -import org.openrndr.text.Writer import kotlin.math.abs import kotlin.math.round import kotlin.math.roundToInt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt index 0e8c56a54..ccc83d200 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt @@ -5,16 +5,16 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.yield import mu.KotlinLogging import org.openrndr.* +import org.openrndr.draw.Cursor import org.openrndr.draw.Drawer import org.openrndr.draw.LineCap +import org.openrndr.draw.Writer import org.openrndr.events.Event import org.openrndr.math.Vector2 import org.openrndr.panel.style.Color import org.openrndr.panel.style.color import org.openrndr.panel.style.effectiveColor import org.openrndr.shape.Rectangle -import org.openrndr.text.Cursor -import org.openrndr.text.Writer import java.text.NumberFormat import java.text.ParseException import kotlin.reflect.KMutableProperty0 diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/TextElements.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/TextElements.kt index 7ef382fe2..89d408f86 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/TextElements.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/TextElements.kt @@ -4,11 +4,11 @@ import kotlinx.coroutines.yield import org.openrndr.color.ColorRGBa import org.openrndr.draw.Drawer import org.openrndr.draw.FontImageMap +import org.openrndr.draw.Writer import org.openrndr.launch import org.openrndr.math.Vector2 import org.openrndr.panel.style.* import org.openrndr.shape.Rectangle -import org.openrndr.text.Writer import kotlin.reflect.KMutableProperty0 class TextNode(var text: String) : Element(ElementType("text")) { @@ -23,7 +23,7 @@ class TextNode(var text: String) : Element(ElementType("text")) { val writer = Writer(drawer) drawer.fontMap = (fontMap) - writer.box= Rectangle(Vector2(layout.screenX * 0.0, layout.screenY * 0.0), layout.screenWidth, layout.screenHeight) + writer.box = Rectangle(Vector2(layout.screenX * 0.0, layout.screenY * 0.0), layout.screenWidth, layout.screenHeight) writer.newLine() writer.text(text) } diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Textfield.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Textfield.kt index 33eea4275..a0230c62d 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Textfield.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Textfield.kt @@ -9,11 +9,11 @@ import org.openrndr.draw.LineCap import org.openrndr.panel.style.* import kotlinx.coroutines.yield import org.openrndr.KeyModifier +import org.openrndr.draw.Cursor +import org.openrndr.draw.writer import org.openrndr.events.Event import org.openrndr.launch import org.openrndr.shape.Rectangle -import org.openrndr.text.Cursor -import org.openrndr.text.writer import kotlin.reflect.KMutableProperty0 class Textfield : Element(ElementType("textfield")), DisposableElement { diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Toggle.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Toggle.kt index 569bc4bfd..5c50c332b 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Toggle.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Toggle.kt @@ -7,9 +7,9 @@ import org.openrndr.draw.FontImageMap import org.openrndr.draw.LineCap import org.openrndr.panel.style.* import org.openrndr.shape.Rectangle -import org.openrndr.text.Writer import kotlinx.coroutines.yield +import org.openrndr.draw.Writer import org.openrndr.events.Event import org.openrndr.launch import kotlin.reflect.KMutableProperty0 diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/XYPad.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/XYPad.kt index 5883ea10a..99666f67c 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/XYPad.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/elements/XYPad.kt @@ -4,13 +4,13 @@ import kotlinx.coroutines.yield import org.openrndr.* import org.openrndr.color.ColorRGBa import org.openrndr.draw.Drawer +import org.openrndr.draw.Writer import org.openrndr.events.Event import org.openrndr.math.Vector2 import org.openrndr.math.clamp import org.openrndr.math.map import org.openrndr.panel.style.Color import org.openrndr.panel.style.color -import org.openrndr.text.Writer import kotlin.math.pow import kotlin.math.round import kotlin.reflect.KMutableProperty0 diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/tools/Tooltip.kt b/orx-panel/src/main/kotlin/org/openrndr/panel/tools/Tooltip.kt index d33b6b3ca..2ced4fc2a 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/tools/Tooltip.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/tools/Tooltip.kt @@ -4,11 +4,10 @@ import org.openrndr.color.ColorRGBa import org.openrndr.draw.Drawer import org.openrndr.draw.FontImageMap import org.openrndr.draw.isolated +import org.openrndr.draw.writer import org.openrndr.math.Vector2 -import org.openrndr.panel.ControlManager import org.openrndr.panel.elements.Body import org.openrndr.panel.elements.Element -import org.openrndr.text.writer import kotlin.math.max class Tooltip(val parent: Element, val position: Vector2, val message: String) { diff --git a/orx-poisson-fill/build.gradle b/orx-poisson-fill/build.gradle index 1b1f068de..c1e56bd33 100644 --- a/orx-poisson-fill/build.gradle +++ b/orx-poisson-fill/build.gradle @@ -10,8 +10,8 @@ sourceSets { dependencies { implementation project(":orx-fx") implementation project(":orx-noise") - - demoImplementation("org.openrndr:openrndr-core:$openrndrVersion") + implementation("org.openrndr:openrndr-filter:$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") diff --git a/orx-poisson-fill/src/demo/kotlin/DemoPoissonFill01.kt b/orx-poisson-fill/src/demo/kotlin/DemoPoissonFill01.kt index 2768b8218..fc5bba106 100644 --- a/orx-poisson-fill/src/demo/kotlin/DemoPoissonFill01.kt +++ b/orx-poisson-fill/src/demo/kotlin/DemoPoissonFill01.kt @@ -18,7 +18,7 @@ import kotlin.math.sin data class Thing(val color: ColorRGBa, var pos: Polar, val speed: Polar) -fun main() { +suspend fun main() { application { program { diff --git a/orx-quadtree/build.gradle b/orx-quadtree/build.gradle index 98a1f0158..900344d0d 100644 --- a/orx-quadtree/build.gradle +++ b/orx-quadtree/build.gradle @@ -9,7 +9,7 @@ sourceSets { } dependencies { - demoImplementation("org.openrndr:openrndr-core:$openrndrVersion") + demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion") demoImplementation(project(":orx-noise")) demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion") diff --git a/orx-quadtree/src/demo/kotlin/DemoQuadTree01.kt b/orx-quadtree/src/demo/kotlin/DemoQuadTree01.kt index bad546b75..e3189d44c 100644 --- a/orx-quadtree/src/demo/kotlin/DemoQuadTree01.kt +++ b/orx-quadtree/src/demo/kotlin/DemoQuadTree01.kt @@ -8,7 +8,7 @@ import org.openrndr.math.Vector2 import org.openrndr.shape.Rectangle import quadtree.Quadtree -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/orx-quadtree/src/demo/kotlin/DemoQuadTree02.kt b/orx-quadtree/src/demo/kotlin/DemoQuadTree02.kt index f6d847057..c52390883 100644 --- a/orx-quadtree/src/demo/kotlin/DemoQuadTree02.kt +++ b/orx-quadtree/src/demo/kotlin/DemoQuadTree02.kt @@ -8,7 +8,7 @@ import org.openrndr.math.Vector2 import org.openrndr.shape.Rectangle import quadtree.Quadtree -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/orx-shade-styles/build.gradle b/orx-shade-styles/build.gradle index c3918ba4f..b550d111a 100644 --- a/orx-shade-styles/build.gradle +++ b/orx-shade-styles/build.gradle @@ -11,7 +11,7 @@ dependencies { api project(":orx-parameters") implementation project(":orx-color") implementation project(":orx-shader-phrases") - 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") diff --git a/orx-shade-styles/src/demo/kotlin/DemoAllGradients01.kt b/orx-shade-styles/src/demo/kotlin/DemoAllGradients01.kt index 1065a1a54..5635b0758 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoAllGradients01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoAllGradients01.kt @@ -10,7 +10,7 @@ import org.openrndr.shape.Rectangle * Example of 5 gradient styles. * NPointLinear and NPoingGradient have separate demos. */ -fun main() { +suspend fun main() { application { configure { width = 1000 diff --git a/orx-shade-styles/src/demo/kotlin/DemoLinearGradient.kt b/orx-shade-styles/src/demo/kotlin/DemoLinearGradient.kt index 1d50a48be..1d05a63a0 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoLinearGradient.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoLinearGradient.kt @@ -7,7 +7,7 @@ import org.openrndr.extra.shadestyles.radialGradient import org.openrndr.extras.color.spaces.toOKLABa import kotlin.math.cos -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-shade-styles/src/demo/kotlin/DemoNPointGradient01.kt b/orx-shade-styles/src/demo/kotlin/DemoNPointGradient01.kt index a5a5fe17d..6002a7a16 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoNPointGradient01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoNPointGradient01.kt @@ -17,7 +17,7 @@ import kotlin.math.cos * on a static shape (a circle for example) or you can animate a shape * with a static gradient. */ -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-shade-styles/src/demo/kotlin/DemoNPointLinearGradient01.kt b/orx-shade-styles/src/demo/kotlin/DemoNPointLinearGradient01.kt index bdaaec595..100402e85 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoNPointLinearGradient01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoNPointLinearGradient01.kt @@ -15,7 +15,7 @@ import kotlin.math.sin * uniformly between 0.0 and 1.0 and then animated towards one of * the ends over time using pow() and sin(seconds). */ -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-shade-styles/src/demo/kotlin/DemoNPointRadialGradient01.kt b/orx-shade-styles/src/demo/kotlin/DemoNPointRadialGradient01.kt index 61a4dd628..f848ecd26 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoNPointRadialGradient01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoNPointRadialGradient01.kt @@ -12,7 +12,7 @@ import kotlin.random.Random * Any of the properties can be animated, including colors and points. * See DemoNPointLinearGradient01.kt for an example of animated properties. */ -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-shade-styles/src/demo/kotlin/DemoRadialGradient01.kt b/orx-shade-styles/src/demo/kotlin/DemoRadialGradient01.kt index 7aafcfa85..91a841272 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoRadialGradient01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoRadialGradient01.kt @@ -5,7 +5,7 @@ import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.shadestyles.radialGradient import kotlin.math.cos -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-shapes/build.gradle b/orx-shapes/build.gradle index c9088ade7..c82346a88 100644 --- a/orx-shapes/build.gradle +++ b/orx-shapes/build.gradle @@ -11,7 +11,7 @@ sourceSets { dependencies { implementation(project(":orx-color")) implementation(project(":orx-shader-phrases")) - 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") diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch01.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch01.kt index cac3cb07d..aabc3ac87 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch01.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch01.kt @@ -14,7 +14,7 @@ import org.openrndr.shape.ShapeContour * The created contours are horizontal and vertical in "bezier-patch space" but * are rendered deformed following the shape of the bezier patch. */ -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch02.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch02.kt index 44b836eb9..46877db43 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch02.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch02.kt @@ -14,7 +14,7 @@ import org.openrndr.shape.ShapeContour * but one can manually create any other 4-segment closed contour * to use in bezier patches. */ -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch03.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch03.kt index d686e6828..68f3abbda 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch03.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch03.kt @@ -14,7 +14,7 @@ import org.openrndr.shape.ShapeContour * In this case the contours are regular stars and the bezier patch * is created using a circular contour with the required 4 segments. */ -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch04.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch04.kt index 2b9e54bd1..92d19f3e0 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch04.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch04.kt @@ -11,7 +11,7 @@ import org.openrndr.shape.Circle * You can think of bezierPatch.position() as requesting points * in a wavy flag (the bezier patch) using normalized uv coordinates. */ -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer01.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer01.kt index 96a7ad3ef..36de556d2 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer01.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer01.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.shapes.bezierPatch import org.openrndr.extra.shapes.drawers.bezierPatch import org.openrndr.shape.Circle -fun main() { +suspend fun main() { application { program { if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer02.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer02.kt index 56ef2fa37..c2f7f94b3 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer02.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer02.kt @@ -7,7 +7,7 @@ import org.openrndr.extra.shapes.drawers.bezierPatch import org.openrndr.extras.color.spaces.toOKLABa import org.openrndr.shape.Circle -fun main() { +suspend fun main() { application { configure { width = 720 diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer03.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer03.kt index abb2c752a..624a3a165 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer03.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer03.kt @@ -15,7 +15,7 @@ import org.openrndr.shape.Circle import org.openrndr.shape.Rectangle import kotlin.math.min -fun main() { +suspend fun main() { application { configure { width = 720 diff --git a/orx-shapes/src/demo/kotlin/DemoRectangleGrid.kt b/orx-shapes/src/demo/kotlin/DemoRectangleGrid.kt index 46d4b617c..d99bd772c 100644 --- a/orx-shapes/src/demo/kotlin/DemoRectangleGrid.kt +++ b/orx-shapes/src/demo/kotlin/DemoRectangleGrid.kt @@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.shapes.grid -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/orx-shapes/src/demo/kotlin/DemoRegularPolygon.kt b/orx-shapes/src/demo/kotlin/DemoRegularPolygon.kt index 828c1676b..06da175ef 100644 --- a/orx-shapes/src/demo/kotlin/DemoRegularPolygon.kt +++ b/orx-shapes/src/demo/kotlin/DemoRegularPolygon.kt @@ -6,7 +6,7 @@ import org.openrndr.extra.shapes.regularPolygon import org.openrndr.math.map import kotlin.math.cos -fun main() = application { +suspend fun main() = application { program { // -- this block is for automation purposes only if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-shapes/src/demo/kotlin/DemoRegularStar01.kt b/orx-shapes/src/demo/kotlin/DemoRegularStar01.kt index 138164b86..079c58a8b 100644 --- a/orx-shapes/src/demo/kotlin/DemoRegularStar01.kt +++ b/orx-shapes/src/demo/kotlin/DemoRegularStar01.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.shapes.regularStar import kotlin.math.cos import kotlin.math.sin -fun main() = application { +suspend fun main() = application { program { // -- this block is for automation purposes only if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-shapes/src/demo/kotlin/DemoRegularStar02.kt b/orx-shapes/src/demo/kotlin/DemoRegularStar02.kt index acd60890b..7335bc247 100644 --- a/orx-shapes/src/demo/kotlin/DemoRegularStar02.kt +++ b/orx-shapes/src/demo/kotlin/DemoRegularStar02.kt @@ -3,10 +3,11 @@ import org.openrndr.color.ColorRGBa import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.shapes.regularStar import org.openrndr.math.Vector2 +import org.openrndr.shape.contains import kotlin.math.cos import kotlin.math.sin -fun main() = application { +suspend fun main() = application { program { // -- this block is for automation purposes only if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-shapes/src/demo/kotlin/DemoRoundedRectangle.kt b/orx-shapes/src/demo/kotlin/DemoRoundedRectangle.kt index 56419b6ac..3a3a18ba9 100644 --- a/orx-shapes/src/demo/kotlin/DemoRoundedRectangle.kt +++ b/orx-shapes/src/demo/kotlin/DemoRoundedRectangle.kt @@ -4,7 +4,7 @@ import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.shapes.RoundedRectangle import kotlin.math.cos -fun main() = application { +suspend fun main() = application { program { // -- this block is for automation purposes only if (System.getProperty("takeScreenshot") == "true") { diff --git a/orx-temporal-blur/build.gradle b/orx-temporal-blur/build.gradle index 6f2ad6023..52b6d1385 100644 --- a/orx-temporal-blur/build.gradle +++ b/orx-temporal-blur/build.gradle @@ -1,4 +1,5 @@ dependencies { implementation project(":orx-noise") implementation project(":orx-fx") + implementation("org.openrndr:openrndr-filter:$openrndrVersion") } \ No newline at end of file diff --git a/orx-time-operators/build.gradle b/orx-time-operators/build.gradle index bfdfb2615..388630d13 100644 --- a/orx-time-operators/build.gradle +++ b/orx-time-operators/build.gradle @@ -12,7 +12,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") diff --git a/orx-time-operators/src/demo/kotlin/DemoEnvelope.kt b/orx-time-operators/src/demo/kotlin/DemoEnvelope.kt index 37b161879..d5579f6e2 100644 --- a/orx-time-operators/src/demo/kotlin/DemoEnvelope.kt +++ b/orx-time-operators/src/demo/kotlin/DemoEnvelope.kt @@ -5,7 +5,7 @@ import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.timeoperators.Envelope import org.openrndr.extra.timeoperators.TimeOperators -fun main() { +suspend fun main() { application { program { val size = Envelope(50.0, 400.0, 0.5, 0.5) diff --git a/orx-time-operators/src/demo/kotlin/DemoLFO.kt b/orx-time-operators/src/demo/kotlin/DemoLFO.kt index 79e22b849..b9c31c33b 100644 --- a/orx-time-operators/src/demo/kotlin/DemoLFO.kt +++ b/orx-time-operators/src/demo/kotlin/DemoLFO.kt @@ -6,7 +6,7 @@ import org.openrndr.extra.timeoperators.LFO import org.openrndr.extra.timeoperators.LFOWave import org.openrndr.extra.timeoperators.TimeOperators -fun main() { +suspend fun main() { application { program { val size = LFO() diff --git a/orx-timer/build.gradle b/orx-timer/build.gradle index dec3965b2..fc659a2ae 100644 --- a/orx-timer/build.gradle +++ b/orx-timer/build.gradle @@ -9,7 +9,7 @@ sourceSets { } dependencies { - 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") diff --git a/orx-timer/src/demo/kotlin/DemoRepeat01.kt b/orx-timer/src/demo/kotlin/DemoRepeat01.kt index 286a4d4d9..78243b5f3 100644 --- a/orx-timer/src/demo/kotlin/DemoRepeat01.kt +++ b/orx-timer/src/demo/kotlin/DemoRepeat01.kt @@ -2,7 +2,7 @@ import org.openrndr.application import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.timer.repeat -fun main() = application { +suspend fun main() = application { program { repeat(2.0) { println("hello there $seconds" ) diff --git a/orx-timer/src/demo/kotlin/DemoRepeat02.kt b/orx-timer/src/demo/kotlin/DemoRepeat02.kt index f4a1f9947..c335d548c 100644 --- a/orx-timer/src/demo/kotlin/DemoRepeat02.kt +++ b/orx-timer/src/demo/kotlin/DemoRepeat02.kt @@ -8,7 +8,7 @@ import org.openrndr.extra.timer.repeat * This demonstrates how to combine `repeat {}` with a postponed event to trigger drawing */ -fun main() = application { +suspend fun main() = application { program { val event = Event().postpone(true) event.listen { diff --git a/orx-timer/src/demo/kotlin/DemoTimeOut01.kt b/orx-timer/src/demo/kotlin/DemoTimeOut01.kt index cb641a7c7..35af71d36 100644 --- a/orx-timer/src/demo/kotlin/DemoTimeOut01.kt +++ b/orx-timer/src/demo/kotlin/DemoTimeOut01.kt @@ -2,7 +2,7 @@ import org.openrndr.application import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.timer.timeOut -fun main() = application { +suspend fun main() = application { program { if (System.getProperty("takeScreenshot") == "true") { extend(SingleScreenshot()) { diff --git a/orx-triangulation/build.gradle b/orx-triangulation/build.gradle index 9bd99705a..5cef62b2f 100644 --- a/orx-triangulation/build.gradle +++ b/orx-triangulation/build.gradle @@ -12,11 +12,11 @@ def useSnapshot = false def delaunatorVersion = (useSnapshot) ? "0.4.0-SNAPSHOT" : "1.0.2" dependencies { - implementation project(":orx-noise") + api project(":orx-noise") implementation("com.github.ricardomatias:delaunator:$delaunatorVersion") - 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") diff --git a/orx-triangulation/src/demo/kotlin/DemoDelaunay01.kt b/orx-triangulation/src/demo/kotlin/DemoDelaunay01.kt index ba49fdaed..5255f7083 100644 --- a/orx-triangulation/src/demo/kotlin/DemoDelaunay01.kt +++ b/orx-triangulation/src/demo/kotlin/DemoDelaunay01.kt @@ -7,7 +7,7 @@ import org.openrndr.math.Vector2 import org.openrndr.shape.Circle import org.openrndr.shape.Rectangle -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/orx-triangulation/src/demo/kotlin/DemoDelaunay02.kt b/orx-triangulation/src/demo/kotlin/DemoDelaunay02.kt index f6daef84c..34b8012d8 100644 --- a/orx-triangulation/src/demo/kotlin/DemoDelaunay02.kt +++ b/orx-triangulation/src/demo/kotlin/DemoDelaunay02.kt @@ -6,7 +6,7 @@ import org.openrndr.extra.triangulation.Delaunay import org.openrndr.math.Vector2 import org.openrndr.shape.Rectangle -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/orx-triangulation/src/demo/kotlin/DemoVoronoi01.kt b/orx-triangulation/src/demo/kotlin/DemoVoronoi01.kt index e53a5a9eb..cab6c51cd 100644 --- a/orx-triangulation/src/demo/kotlin/DemoVoronoi01.kt +++ b/orx-triangulation/src/demo/kotlin/DemoVoronoi01.kt @@ -7,7 +7,7 @@ import org.openrndr.math.Vector2 import org.openrndr.shape.Circle import org.openrndr.shape.Rectangle -fun main() { +suspend fun main() { application { configure { width = 800 diff --git a/settings.gradle b/settings.gradle index 98007d911..d30f07a8c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ include 'openrndr-demos', 'orx-compositor', 'orx-dnk3', 'orx-easing', - 'orx-file-watcher', + 'orx-jvm:orx-file-watcher', 'orx-parameters', 'orx-filter-extension', 'orx-fx', @@ -22,46 +22,46 @@ include 'openrndr-demos', 'orx-kdtree', 'orx-keyframer', 'orx-mesh-generators', - 'orx-kotlin-parser', - 'orx-midi', + 'orx-jvm:orx-kotlin-parser', + 'orx-jvm:orx-midi', 'orx-no-clear', 'orx-noise', 'orx-obj-loader', 'orx-olive', - 'orx-osc', + 'orx-jvm:orx-osc', 'orx-palette', 'orx-panel', 'orx-poisson-fill', 'orx-quadtree', - 'orx-rabbit-control', - 'orx-realsense2', - 'orx-realsense2-natives-linux-x64', - 'orx-realsense2-natives-macos', - 'orx-realsense2-natives-windows', - 'orx-runway', + 'orx-jvm:orx-rabbit-control', + 'orx-jvm:orx-realsense2', + 'orx-jvm:orx-realsense2-natives-linux-x64', + 'orx-jvm:orx-realsense2-natives-macos', + 'orx-jvm:orx-realsense2-natives-windows', + 'orx-jvm:orx-runway', 'orx-shader-phrases', 'orx-shade-styles', 'orx-shapes', - 'orx-syphon', + 'orx-jvm:orx-syphon', 'orx-temporal-blur', - 'orx-tensorflow', - 'orx-tensorflow-gpu-natives-linux-x64', - 'orx-tensorflow-gpu-natives-windows', - 'orx-tensorflow-mkl-natives-linux-x64', - 'orx-tensorflow-mkl-natives-macos', - 'orx-tensorflow-mkl-natives-windows', - 'orx-tensorflow-natives-linux-x64', - 'orx-tensorflow-natives-macos', - 'orx-tensorflow-natives-windows', + 'orx-jvm:orx-tensorflow', + 'orx-jvm:orx-tensorflow-gpu-natives-linux-x64', + 'orx-jvm:orx-tensorflow-gpu-natives-windows', + 'orx-jvm:orx-tensorflow-mkl-natives-linux-x64', + 'orx-jvm:orx-tensorflow-mkl-natives-macos', + 'orx-jvm:orx-tensorflow-mkl-natives-windows', + 'orx-jvm:orx-tensorflow-natives-linux-x64', + 'orx-jvm:orx-tensorflow-natives-macos', + 'orx-jvm:orx-tensorflow-natives-windows', 'orx-timer', 'orx-time-operators', 'orx-triangulation', - 'orx-kinect-common', - 'orx-kinect-v1', - 'orx-kinect-v1-natives-linux-arm64', - 'orx-kinect-v1-natives-linux-x64', - 'orx-kinect-v1-natives-macos', - 'orx-kinect-v1-natives-windows', - 'orx-kinect-v1-demo', - 'orx-video-profiles' + 'orx-jvm:orx-kinect-common', + 'orx-jvm:orx-kinect-v1', + 'orx-jvm:orx-kinect-v1-natives-linux-arm64', + 'orx-jvm:orx-kinect-v1-natives-linux-x64', + 'orx-jvm:orx-kinect-v1-natives-macos', + 'orx-jvm:orx-kinect-v1-natives-windows', + 'orx-jvm:orx-kinect-v1-demo', + 'orx-jvm:orx-video-profiles'