Skip to content

Commit

Permalink
Rename org.openrndr.extras -> org.openrndr.extra (#250)
Browse files Browse the repository at this point in the history 
Co-authored-by: Edwin Jakobs <edwin@rndr.studio>
  • Loading branch information
@Vechro @edwinRNDR
Vechro and edwinRNDR authored Jul 28, 2022
1 parent 5fa4e72 commit bad9070
Show file tree
Hide file tree
Showing 81 changed files with 129 additions and 129 deletions.
2 changes: 1 addition & 1 deletion openrndr-demos/src/demo/kotlin/DemoBillboardCircles01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.extra.noise.uniformRing
import org.openrndr.extras.camera.Orbital
import org.openrndr.extra.camera.Orbital
import org.openrndr.math.Vector2
import org.openrndr.math.Vector3

Expand Down
4 changes: 2 additions & 2 deletions openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.openrndr.application
import org.openrndr.draw.*
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.meshgenerators.boxMesh

fun main() = application {
program {
Expand Down
4 changes: 2 additions & 2 deletions openrndr-demos/src/demo/kotlin/DemoCubemap01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import org.openrndr.draw.Cubemap
import org.openrndr.draw.DrawPrimitive
import org.openrndr.draw.Session
import org.openrndr.draw.shadeStyle
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.meshgenerators.boxMesh

fun main() = application {
program {
Expand Down
4 changes: 2 additions & 2 deletions openrndr-demos/src/demo/kotlin/DemoCubemap02.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.openrndr.application
import org.openrndr.draw.*
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.meshgenerators.boxMesh

fun main() = application {
program {
Expand Down
4 changes: 2 additions & 2 deletions openrndr-demos/src/demo/kotlin/DemoCubemap03.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.openrndr.application
import org.openrndr.draw.*
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.meshgenerators.boxMesh

fun main() = application {
program {
Expand Down
4 changes: 2 additions & 2 deletions openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa
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.extra.camera.Orbital
import org.openrndr.extra.meshgenerators.boxMesh
import org.openrndr.resourceText
import org.openrndr.resourceUrl

Expand Down
2 changes: 1 addition & 1 deletion openrndr-demos/src/demo/kotlin/DemoImageLoadStore01.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.extras.meshgenerators.planeMesh
import org.openrndr.extra.meshgenerators.planeMesh
import org.openrndr.internal.Driver
import org.openrndr.math.Vector3

Expand Down
2 changes: 1 addition & 1 deletion openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.extras.meshgenerators.planeMesh
import org.openrndr.extra.meshgenerators.planeMesh
import org.openrndr.internal.Driver
import org.openrndr.math.Vector3

Expand Down
2 changes: 1 addition & 1 deletion openrndr-demos/src/demo/kotlin/DemoScreenCapture01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.openrndr.draw.DepthTestPass
import org.openrndr.draw.DrawPrimitive
import org.openrndr.draw.isolated
import org.openrndr.draw.shadeStyle
import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.extra.meshgenerators.boxMesh
import org.openrndr.ffmpeg.VideoPlayerFFMPEG
import org.openrndr.math.Vector3

Expand Down
6 changes: 3 additions & 3 deletions openrndr-demos/src/demo/kotlin/DemoTessShader04.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.extra.noise.uniform
import org.openrndr.extra.noise.uniformRing
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.camera.OrbitalCamera
import org.openrndr.extras.meshgenerators.sphereMesh
import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.camera.OrbitalCamera
import org.openrndr.extra.meshgenerators.sphereMesh
import org.openrndr.math.Vector3
import org.openrndr.resourceUrl
import org.openrndr.shape.Ellipse
Expand Down
12 changes: 6 additions & 6 deletions orx-camera/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.DrawPrimitive
import org.openrndr.extras.camera.AxisHelper
import org.openrndr.extras.camera.GridHelper
import org.openrndr.extras.camera.OrbitalCamera
import org.openrndr.extras.camera.OrbitalControls
import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.extras.meshgenerators.sphereMesh
import org.openrndr.extra.camera.AxisHelper
import org.openrndr.extra.camera.GridHelper
import org.openrndr.extra.camera.OrbitalCamera
import org.openrndr.extra.camera.OrbitalControls
import org.openrndr.extra.meshgenerators.boxMesh
import org.openrndr.extra.meshgenerators.sphereMesh
import org.openrndr.math.Vector3

fun main() = application {
Expand Down
2 changes: 1 addition & 1 deletion orx-camera/src/commonMain/kotlin/AxisHelper.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.camera
package org.openrndr.extra.camera

import org.openrndr.Extension
import org.openrndr.Program
Expand Down
2 changes: 1 addition & 1 deletion orx-camera/src/commonMain/kotlin/GridHelper.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.camera
package org.openrndr.extra.camera

import org.openrndr.Extension
import org.openrndr.Program
Expand Down
2 changes: 1 addition & 1 deletion orx-camera/src/commonMain/kotlin/Orbital.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.camera
package org.openrndr.extra.camera

import org.openrndr.Extension
import org.openrndr.Program
Expand Down
2 changes: 1 addition & 1 deletion orx-camera/src/commonMain/kotlin/OrbitalCamera.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.camera
package org.openrndr.extra.camera

import org.openrndr.Extension
import org.openrndr.Program
Expand Down
2 changes: 1 addition & 1 deletion orx-camera/src/commonMain/kotlin/OrbitalControls.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.camera
package org.openrndr.extra.camera

import org.openrndr.*
import org.openrndr.math.Vector2
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/commonMain/kotlin/palettes/Palettes.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.color.palettes
package org.openrndr.extra.color.palettes

import org.openrndr.color.*
import org.openrndr.extra.color.spaces.*
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/commonMain/kotlin/phrases/Phrases.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.color.phrases
package org.openrndr.extra.color.phrases

import org.openrndr.extra.shaderphrases.ShaderPhrase
import org.openrndr.extra.shaderphrases.ShaderPhraseBook
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/commonMain/kotlin/presets/Colors.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@file:Suppress("unused")

package org.openrndr.extras.color.presets
package org.openrndr.extra.color.presets

import org.openrndr.color.ColorRGBa
import org.openrndr.color.rgb
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/commonMain/kotlin/statistics/Histogram.kt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@file:JvmName("HistogramJvm")
package org.openrndr.extras.color.statistics
package org.openrndr.extra.color.statistics

import org.openrndr.color.ColorRGBa
import org.openrndr.draw.ColorBuffer
Expand Down
4 changes: 2 additions & 2 deletions orx-color/src/demo/kotlin/DemoColorPlane01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.camera.Orbital
import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.color.spaces.ColorOKLCHa
import org.openrndr.extras.meshgenerators.sphereMesh
import org.openrndr.extra.meshgenerators.sphereMesh
import org.openrndr.math.Vector3
import kotlin.math.cos

Expand Down
4 changes: 2 additions & 2 deletions orx-color/src/demo/kotlin/DemoColorPlane02.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.camera.Orbital
import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.color.spaces.ColorOKLCHa
import org.openrndr.extras.meshgenerators.sphereMesh
import org.openrndr.extra.meshgenerators.sphereMesh
import org.openrndr.math.Vector3
import kotlin.math.cos

Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/demo/kotlin/DemoColorRange01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.color.palettes.rangeTo
import org.openrndr.extra.color.palettes.rangeTo
import org.openrndr.extra.color.spaces.toHSLUVa
import org.openrndr.math.Vector2
import org.openrndr.math.map
Expand Down
6 changes: 3 additions & 3 deletions orx-color/src/demo/kotlin/DemoColorRange02.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.isolated
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.color.palettes.colorSequence
import org.openrndr.extras.color.palettes.rangeTo
import org.openrndr.extras.color.presets.CORAL
import org.openrndr.extra.color.palettes.colorSequence
import org.openrndr.extra.color.palettes.rangeTo
import org.openrndr.extra.color.presets.CORAL
import org.openrndr.extra.color.spaces.toHSLUVa

fun main() = application {
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/demo/kotlin/DemoColorRange03.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa
import org.openrndr.draw.loadFont
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extra.color.spaces.*
import org.openrndr.extras.color.palettes.rangeTo
import org.openrndr.extra.color.palettes.rangeTo

fun main() {
application {
Expand Down
6 changes: 3 additions & 3 deletions orx-color/src/demo/kotlin/DemoColorRange04.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import org.openrndr.draw.DrawPrimitive
import org.openrndr.draw.isolated
import org.openrndr.draw.loadFont
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.color.palettes.rangeTo
import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.color.palettes.rangeTo
import org.openrndr.extra.color.spaces.toHSLUVa
import org.openrndr.extra.color.spaces.toOKLABa
import org.openrndr.extra.color.spaces.toOKLCHa
import org.openrndr.extra.color.spaces.toXSLUVa
import org.openrndr.extras.meshgenerators.sphereMesh
import org.openrndr.extra.meshgenerators.sphereMesh
import org.openrndr.math.Vector3

fun main() {
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/demo/kotlin/DemoHistogram01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.openrndr.application
import org.openrndr.draw.loadImage
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.color.statistics.calculateHistogramRGB
import org.openrndr.extra.color.statistics.calculateHistogramRGB

fun main() = application {
program {
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/demo/kotlin/DemoHistogram02.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.openrndr.application
import org.openrndr.draw.loadImage
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.color.statistics.calculateHistogramRGB
import org.openrndr.extra.color.statistics.calculateHistogramRGB
import kotlin.math.pow

fun main() = application {
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/demo/kotlin/DemoHistogram03.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.openrndr.application
import org.openrndr.draw.loadImage
import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extras.color.statistics.calculateHistogramRGB
import org.openrndr.extra.color.statistics.calculateHistogramRGB

fun main() = application {
program {
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/jvmMain/kotlin/src/statistics/Histogram.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.color.statistics
package org.openrndr.extra.color.statistics

import org.openrndr.color.ColorRGBa
import org.openrndr.draw.ColorBuffer
Expand Down
2 changes: 1 addition & 1 deletion orx-color/src/jvmTest/kotlin/TestMix.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.amshove.kluent.`should be equal to`
import org.openrndr.color.ColorRGBa
import org.openrndr.color.Linearity
import org.openrndr.extras.color.palettes.rangeTo
import org.openrndr.extra.color.palettes.rangeTo
import org.spekframework.spek2.Spek
import org.spekframework.spek2.style.specification.describe

Expand Down
2 changes: 1 addition & 1 deletion orx-compute-graph-nodes/src/commonMain/kotlin/FitImageNode.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import org.openrndr.draw.renderTarget
import org.openrndr.extra.computegraph.ComputeGraph
import org.openrndr.extra.computegraph.ComputeNode
import org.openrndr.extra.computegraph.withKey
import org.openrndr.extras.imageFit.imageFit
import org.openrndr.extra.imageFit.imageFit

fun ComputeGraph.fitImageNode(program: Program, input: ComputeNode) : ComputeNode {
return node {
Expand Down
2 changes: 1 addition & 1 deletion orx-easing/src/commonMain/kotlin/Easing.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.easing
package org.openrndr.extra.easing

import kotlin.math.*

Expand Down
2 changes: 1 addition & 1 deletion orx-easing/src/demo/kotlin/DemoEasings01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.loadFont
import org.openrndr.extra.shapes.grid
import org.openrndr.extras.easing.Easing
import org.openrndr.extra.easing.Easing
import org.openrndr.math.Vector2
import org.openrndr.math.map

Expand Down
2 changes: 1 addition & 1 deletion orx-fx/src/commonMain/kotlin/color/Colorspaces.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.openrndr.extra.fx.fx_rgb_to_oklab
import org.openrndr.extra.fx.fx_rgb_to_ycbcr
import org.openrndr.extra.fx.fx_ycbcr_to_rgb
import org.openrndr.extra.shaderphrases.preprocess
import org.openrndr.extras.color.phrases.ColorPhraseBook
import org.openrndr.extra.color.phrases.ColorPhraseBook

class RgbToYCbcr : Filter(mppFilterShader(fx_rgb_to_ycbcr, "rgb-to-ycbcr"))
class YcbcrToRgb : Filter(mppFilterShader(fx_ycbcr_to_rgb, "ycbcr_to_rgb"))
Expand Down
8 changes: 4 additions & 4 deletions orx-fx/src/commonMain/kotlin/color/Duotone.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import org.openrndr.extra.parameters.BooleanParameter
import org.openrndr.extra.parameters.ColorParameter
import org.openrndr.extra.parameters.Description
import org.openrndr.extra.shaderphrases.preprocess
import org.openrndr.extras.color.phrases.ColorPhraseBook
import org.openrndr.extras.color.presets.CORAL
import org.openrndr.extras.color.presets.DARK_GRAY
import org.openrndr.extras.color.presets.NAVY
import org.openrndr.extra.color.phrases.ColorPhraseBook
import org.openrndr.extra.color.presets.CORAL
import org.openrndr.extra.color.presets.DARK_GRAY
import org.openrndr.extra.color.presets.NAVY

@Description("Duotone")
class Duotone : Filter(filterShaderFromCode(run {
Expand Down
6 changes: 3 additions & 3 deletions orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import org.openrndr.extra.parameters.ColorParameter
import org.openrndr.extra.parameters.Description
import org.openrndr.extra.parameters.DoubleParameter
import org.openrndr.extra.shaderphrases.preprocess
import org.openrndr.extras.color.phrases.ColorPhraseBook
import org.openrndr.extras.color.presets.CORAL
import org.openrndr.extras.color.presets.NAVY
import org.openrndr.extra.color.phrases.ColorPhraseBook
import org.openrndr.extra.color.presets.CORAL
import org.openrndr.extra.color.presets.NAVY

@Description("Duotone Gradient")
class DuotoneGradient : Filter(filterShaderFromCode(run {
Expand Down
8 changes: 4 additions & 4 deletions orx-fx/src/commonMain/kotlin/color/Posterize.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import org.openrndr.extra.parameters.ColorParameter
import org.openrndr.extra.parameters.Description
import org.openrndr.extra.parameters.IntParameter
import org.openrndr.extra.shaderphrases.preprocess
import org.openrndr.extras.color.phrases.ColorPhraseBook
import org.openrndr.extras.color.presets.CORAL
import org.openrndr.extras.color.presets.DARK_GRAY
import org.openrndr.extras.color.presets.NAVY
import org.openrndr.extra.color.phrases.ColorPhraseBook
import org.openrndr.extra.color.presets.CORAL
import org.openrndr.extra.color.presets.DARK_GRAY
import org.openrndr.extra.color.presets.NAVY

@Description("Posterize")
class Posterize : Filter(filterShaderFromCode(fx_posterize, "posterize")) {
Expand Down
2 changes: 1 addition & 1 deletion orx-image-fit/src/commonMain/kotlin/ImageFit.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.openrndr.extras.imageFit
package org.openrndr.extra.imageFit

import org.openrndr.draw.ColorBuffer
import org.openrndr.draw.Drawer
Expand Down
2 changes: 1 addition & 1 deletion orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import org.openrndr.extra.dnk3.*
import org.openrndr.extra.dnk3.gltf.buildSceneNodes
import org.openrndr.extra.dnk3.gltf.loadGltfFromFile
import org.openrndr.extra.dnk3.renderers.dryRenderer
import org.openrndr.extras.camera.Orbital
import org.openrndr.extra.camera.Orbital
import org.openrndr.math.Vector3
import org.openrndr.math.mod_
import org.openrndr.math.transforms.transform
Expand Down
6 changes: 3 additions & 3 deletions orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL01.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import org.openrndr.extensions.SingleScreenshot
import org.openrndr.extra.dnk3.dsl.*
import org.openrndr.extra.dnk3.renderers.dryRenderer
import org.openrndr.extra.dnk3.tools.addSkybox
import org.openrndr.extras.camera.Orbital
import org.openrndr.extras.meshgenerators.boxMesh
import org.openrndr.extras.meshgenerators.groundPlaneMesh
import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.meshgenerators.boxMesh
import org.openrndr.extra.meshgenerators.groundPlaneMesh
import org.openrndr.math.Vector3
import org.openrndr.math.transforms.transform

Expand Down
Loading

0 comments on commit bad9070

Please sign in to comment.