kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to OPENRNDR 0.3.45-rc.1

Browse Source
This commit is contained in:
Edwin Jakobs
2020-11-12 17:28:56 +01:00
parent f60244f37e
commit 206fb6e8fd
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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"

2
orx-dnk3/src/main/kotlin/gltf/GltfScene.kt
View File

@@ -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

2
orx-dnk3/src/main/kotlin/tools/Skybox.kt
View File

@@ -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)

8
orx-midi/src/main/kotlin/MidiTransceiver.kt
View File

@@ -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 {

2
orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt
View File

@@ -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)

2
settings.gradle
View File

@@ -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',