Skip to content

Commit

Permalink
Upgrade to OPENRNDR 0.3.45-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
edwinRNDR committed Nov 12, 2020
1 parent f60244f commit 206fb6e
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion orx-dnk3/src/main/kotlin/gltf/GltfScene.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orx-dnk3/src/main/kotlin/tools/Skybox.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions orx-midi/src/main/kotlin/MidiTransceiver.kt
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: Mi
})
}

val controlChanged = Event<MidiEvent>("midi-transceiver::controller-changed").signature(MidiEvent::class.java)
val programChanged = Event<MidiEvent>("midi-transceiver::program-changed").signature(MidiEvent::class.java)
val noteOn = Event<MidiEvent>("midi-transceiver::note-on").signature(MidiEvent::class.java)
val noteOff = Event<MidiEvent>("midi-transceiver::note-off").signature(MidiEvent::class.java)
val controlChanged = Event<MidiEvent>("midi-transceiver::controller-changed")
val programChanged = Event<MidiEvent>("midi-transceiver::program-changed")
val noteOn = Event<MidiEvent>("midi-transceiver::note-on")
val noteOff = Event<MidiEvent>("midi-transceiver::note-off")

fun controlChange(channel: Int, control: Int, value: Int) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 206fb6e

Please sign in to comment.