diff --git a/build.gradle b/build.gradle index 78490a6b4..848521787 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ def openrndrUseSnapshot = false apply plugin: 'org.jetbrains.dokka' project.ext { - openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.45.rc-1" + openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.45-rc.1" kotlinVersion = "1.4.0" spekVersion = "2.0.12" libfreenectVersion = "0.5.7-1.5.4" diff --git a/orx-dnk3/src/main/kotlin/gltf/GltfScene.kt b/orx-dnk3/src/main/kotlin/gltf/GltfScene.kt index cc4a89f6e..b6f04a18b 100644 --- a/orx-dnk3/src/main/kotlin/gltf/GltfScene.kt +++ b/orx-dnk3/src/main/kotlin/gltf/GltfScene.kt @@ -87,7 +87,7 @@ fun GltfFile.buildSceneNodes(): GltfSceneData { require(localBufferView.byteLength != null) localBuffer.position(localBufferView.byteOffset) localBuffer.limit(localBufferView.byteOffset + localBufferView.byteLength) - val cb = ColorBuffer.fromBuffer(localBuffer) + val cb = ColorBuffer.fromBuffer(localBuffer, null) cb.generateMipmaps() cb.filter(MinifyingFilter.LINEAR_MIPMAP_LINEAR, MagnifyingFilter.LINEAR) cb.anisotropy = 100.0 diff --git a/orx-dnk3/src/main/kotlin/tools/Skybox.kt b/orx-dnk3/src/main/kotlin/tools/Skybox.kt index 565275df2..ef5875634 100644 --- a/orx-dnk3/src/main/kotlin/tools/Skybox.kt +++ b/orx-dnk3/src/main/kotlin/tools/Skybox.kt @@ -72,7 +72,7 @@ data class SkyboxMaterial(val cubemap: Cubemap, val intensity: Double = 0.0) : M } fun Scene.addSkybox(cubemapUrl: String, size: Double = 100.0, intensity: Double = 1.0) { - val cubemap = Cubemap.fromUrl(cubemapUrl, Session.active).apply { generateMipmaps() } + val cubemap = Cubemap.fromUrl(cubemapUrl, null, Session.active).apply { generateMipmaps() } val box = boxMesh(size, size, size, 1, 1, 1, true) val node = SceneNode() val material = SkyboxMaterial(cubemap, intensity) diff --git a/orx-midi/src/main/kotlin/MidiTransceiver.kt b/orx-midi/src/main/kotlin/MidiTransceiver.kt index bcac7a809..0c9b088e3 100644 --- a/orx-midi/src/main/kotlin/MidiTransceiver.kt +++ b/orx-midi/src/main/kotlin/MidiTransceiver.kt @@ -116,10 +116,10 @@ class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: Mi }) } - val controlChanged = Event("midi-transceiver::controller-changed").signature(MidiEvent::class.java) - val programChanged = Event("midi-transceiver::program-changed").signature(MidiEvent::class.java) - val noteOn = Event("midi-transceiver::note-on").signature(MidiEvent::class.java) - val noteOff = Event("midi-transceiver::note-off").signature(MidiEvent::class.java) + val controlChanged = Event("midi-transceiver::controller-changed") + val programChanged = Event("midi-transceiver::program-changed") + val noteOn = Event("midi-transceiver::note-on") + val noteOff = Event("midi-transceiver::note-off") fun controlChange(channel: Int, control: Int, value: Int) { try { 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 3d5d3b811..270e2c626 100644 --- a/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt +++ b/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt @@ -283,7 +283,7 @@ class ControlManager : Extension { val toRemove = insideElements.filter { (event.position !in it.screenArea) } toRemove.forEach { - it.mouse.exited.trigger(MouseEvent(event.position, Vector2.ZERO, Vector2.ZERO, MouseEventType.MOVED, MouseButton.NONE, event.modifiers, false)) + it.mouse.exited.trigger(MouseEvent(event.position, Vector2.ZERO, Vector2.ZERO, MouseEventType.MOVED, MouseButton.NONE, event.modifiers)) } insideElements.removeAll(toRemove) diff --git a/settings.gradle b/settings.gradle index e9b82bb48..650174b80 100644 --- a/settings.gradle +++ b/settings.gradle @@ -34,6 +34,8 @@ include 'openrndr-demos', 'orx-poisson-fill', 'orx-rabbit-control', 'orx-realsense2', + 'orx-realsense2-natives-linux-x64', + 'orx-realsense2-natives-macos', 'orx-realsense2-natives-windows', 'orx-runway', 'orx-shader-phrases',