Upgrade to OPENRNDR 0.4 snapshot

This commit is contained in:
Edwin Jakobs
2021-06-22 11:08:07 +02:00
parent 579ddf9bb5
commit 9435907ef9
339 changed files with 460 additions and 497 deletions

View File

@@ -0,0 +1,23 @@
sourceSets {
demo {
java {
srcDirs = ["src/demo/kotlin"]
compileClasspath += main.getCompileClasspath()
runtimeClasspath += main.getRuntimeClasspath()
}
}
}
dependencies {
api "org.bytedeco:librealsense2:$librealsense2Version"
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
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)
}

View File

@@ -0,0 +1,34 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.ColorFormat
import org.openrndr.draw.ColorType
import org.openrndr.draw.colorBuffer
import org.openrndr.draw.tint
import org.openrndr.extra.realsense2.RS2Sensor
suspend fun main() {
application {
program {
val sensors = RS2Sensor.listSensors()
val depthFrame = colorBuffer(640, 480, format = ColorFormat.R, type = ColorType.UINT16)
for (sensor in sensors) {
println(sensor)
}
val sensor = RS2Sensor.openFirstOrDummy()
println(sensor)
for (stream in sensor.streams) {
println(stream.intrinsics)
}
sensor.depthFrameReceived.listen {
it.copyTo(depthFrame)
}
extend {
sensor.waitForFrames()
drawer.drawStyle.colorMatrix = tint(ColorRGBa.WHITE.shade(20.0))
drawer.image(depthFrame)
}
}
}
}

View File

@@ -0,0 +1,45 @@
import org.openrndr.application
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.ColorFormat
import org.openrndr.draw.ColorType
import org.openrndr.draw.colorBuffer
import org.openrndr.draw.tint
import org.openrndr.extra.realsense2.RS2Sensor
/**
* show how to use multiple RealSense sensors
*
* Tested with two sensors, only uses depth stream now
*/
suspend fun main() {
application {
configure {
width = 1280
height = 720
}
program {
val sensorDescriptions = RS2Sensor.listSensors()
val sensors = sensorDescriptions.map {
it.open()
}
val depthFrames = sensors.map {
colorBuffer(640, 480, format = ColorFormat.R, type = ColorType.UINT16)
}
sensors.forEachIndexed { index, it ->
it.depthFrameReceived.listen {
it.copyTo(depthFrames[index])
}
}
extend {
drawer.drawStyle.colorMatrix = tint(ColorRGBa.WHITE.shade(20.0))
for ((index, sensor) in sensors.withIndex()) {
sensor.waitForFrames()
drawer.image(depthFrames[index])
drawer.translate(640.0, 0.0)
}
}
}
}
}

View File

@@ -0,0 +1,9 @@
import org.openrndr.application
suspend fun main() {
application {
program {
}
}
}

View File

@@ -0,0 +1,275 @@
package org.openrndr.extra.realsense2
import org.bytedeco.javacpp.BytePointer
import org.bytedeco.librealsense2.*
import org.bytedeco.librealsense2.global.realsense2.*
import org.openrndr.draw.ColorBuffer
import org.openrndr.events.Event
import org.openrndr.math.Vector3
import java.nio.ByteBuffer
private val rs2Context by lazy {
val error = rs2_error()
val ctx = rs2_create_context(RS2_API_VERSION, error)
ctx
}
private fun rs2_error.check() {
if (!this.isNull) {
val function = rs2_get_failed_function(this)
val args = rs2_get_failed_args(this)
val errorMessage = rs2_get_error_message(this)
error("$errorMessage in $function with $args")
}
}
enum class RS2DepthFormat {
UINT16
}
data class RS2SensorDescription(private val deviceList: rs2_device_list, private val deviceIndex: Int) {
/**
* open realsense sensor from description entry
*/
fun open(
depthWidth: Int = 640,
depthHeight: Int = 480,
depthFps: Int = 30,
depthFormat: RS2DepthFormat = RS2DepthFormat.UINT16
): RS2Sensor {
val error = rs2_error()
val device = rs2_create_device(deviceList, deviceIndex, error);
error.check()
val pipeline = rs2_create_pipeline(rs2Context, error)
error.check()
val config = rs2_create_config(error)
error.check()
val info = rs2_get_device_info(device, RS2_CAMERA_INFO_SERIAL_NUMBER, error)
rs2_config_enable_device(config, info, error)
rs2_config_enable_stream(config, RS2_STREAM_DEPTH, 0, depthWidth, depthHeight, RS2_FORMAT_Z16, depthFps, error)
error.check()
val pipelineProfile = rs2_pipeline_start_with_config(pipeline, config, error)
error.check()
return RS2Sensor(device, pipeline, pipelineProfile)
}
}
class RS2FrameEvent(private val frame: rs2_frame, val frameWidth: Int, val frameHeight: Int) {
val frameData: ByteBuffer
get() {
val error = rs2_error()
val pointer = rs2_get_frame_data(frame, error)
val buffer = BytePointer(pointer).capacity(frameWidth * frameHeight * 2L).asByteBuffer()
error.check()
error.close()
pointer.close()
return buffer
}
fun copyTo(target : ColorBuffer) {
target.write(frameData)
}
}
/**
* Distortion model
*/
enum class DistortionModel {
NONE,
FTHETA,
BROWN_CONRADY,
INVERSE_BROWN_CONRADY,
KANNALA_BRANDT4,
MODIFIED_BROWN_CONRADY
}
/**
* Stream intrinsics
*/
data class Intrinsics(
/** width of the stream image in pixels */
val width: Int,
/** height of the stream image in pixels */
val height: Int,
/** horizontal coordinate of the principal point of the image, as a pixel offset from the left edge */
val ppx: Double,
/** vertical coordinate of the principal point of the image, as a pixel offset from the left edge */
val ppy: Double,
/** focal length of the image plane, as a multiple of pixel width */
val fx: Double,
/** focal length of the image plane, as a multiple of pixel height */
val fy: Double,
/** distortion model of the image */
val model: DistortionModel
) {
fun unproject(x: Double, y: Double, depth: Double) : Vector3 {
if (model == DistortionModel.BROWN_CONRADY) {
return Vector3(((x - ppx) / fx) * depth , ((y - ppy) / fy) * depth, depth)
} else {
error("unsupported distortion model $model")
}
}
}
/**
* Stream descriptor
*/
data class Stream(val intrinsics: Intrinsics) {
}
abstract class Sensor {
/**
* depth frame received event, triggered from [waitForFrames]
*/
val depthFrameReceived = Event<RS2FrameEvent>()
abstract val serial: String
/**
* a list of [Stream]s for the [Sensor]
*/
abstract val streams: List<Stream>
/**
* wait for frames to arrives
*/
abstract fun waitForFrames()
/**
* destroy the sensor
*/
abstract fun destroy()
}
class DummySensor : Sensor() {
override val serial: String = "DummySensor-${System.identityHashCode(this)}"
override fun waitForFrames() {
}
override fun destroy() {
}
override val streams: List<Stream>
get() = emptyList()
}
class RS2Sensor(
private val device: rs2_device,
private val pipeline: rs2_pipeline,
private val pipelineProfile: rs2_pipeline_profile
) : Sensor() {
override val serial: String by lazy {
val error = rs2_error()
val info = rs2_get_device_info(device, RS2_CAMERA_INFO_SERIAL_NUMBER, error)
val serial = info.string
error.close()
info.close()
serial
}
override fun waitForFrames() {
val error = rs2_error()
val frames = rs2_pipeline_wait_for_frames(pipeline, RS2_DEFAULT_TIMEOUT, error)
error.check()
val frameCount = rs2_embedded_frames_count(frames, error)
error.check()
for (i in 0 until frameCount) {
val frame = rs2_extract_frame(frames, i, error)
error.check()
val cmp = rs2_is_frame_extendable_to(frame, RS2_EXTENSION_DEPTH_FRAME, error)
if (cmp != 0) {
val width = rs2_get_frame_width(frame, error)
error.check()
val height = rs2_get_frame_height(frame, error)
error.check()
val eventMessage = RS2FrameEvent(frame, width, height)
depthFrameReceived.trigger(eventMessage)
rs2_release_frame(frame)
}
}
rs2_release_frame(frames)
}
override fun destroy() {
val error = rs2_error()
rs2_pipeline_stop(pipeline, error)
error.check()
}
override val streams: List<Stream> by lazy {
val error = rs2_error()
val streamProfileList = rs2_pipeline_profile_get_streams(pipelineProfile, error)
error.check()
val streamProfileCount = rs2_get_stream_profiles_count(streamProfileList, error)
error.check()
val result = (0 until streamProfileCount).map {
val streamProfile = rs2_get_stream_profile(streamProfileList, it, error)
error.check()
val intrinsics = rs2_intrinsics()
rs2_get_video_stream_intrinsics(streamProfile, intrinsics, error)
val result = Stream(
Intrinsics(
width = intrinsics.width(),
height = intrinsics.height(),
ppx = intrinsics.ppx().toDouble(),
ppy = intrinsics.ppy().toDouble(),
fx = intrinsics.fx().toDouble(),
fy = intrinsics.fy().toDouble(),
model = when (intrinsics.model()) {
RS2_DISTORTION_NONE -> DistortionModel.NONE
RS2_DISTORTION_FTHETA -> DistortionModel.FTHETA
RS2_DISTORTION_BROWN_CONRADY -> DistortionModel.BROWN_CONRADY
RS2_DISTORTION_INVERSE_BROWN_CONRADY -> DistortionModel.INVERSE_BROWN_CONRADY
RS2_DISTORTION_KANNALA_BRANDT4 -> DistortionModel.KANNALA_BRANDT4
RS2_DISTORTION_MODIFIED_BROWN_CONRADY -> DistortionModel.MODIFIED_BROWN_CONRADY
else -> error("unsupported distortion model for stream")
}
)
)
result
}
rs2_delete_stream_profiles_list(streamProfileList)
result
}
companion object {
/**
* list all connected Realsense devices
*/
fun listSensors(): List<RS2SensorDescription> {
val error = rs2_error()
val deviceList = rs2_query_devices(rs2Context, error)
error.check()
val deviceCount = rs2_get_device_count(deviceList, error)
error.check()
return if (deviceCount == 0) {
emptyList()
} else {
(0 until deviceCount).map {
RS2SensorDescription(deviceList, it)
}
}
}
/**
* open the first available sensor or a dummy sensor if no real sensors are available
*/
fun openFirstOrDummy() : Sensor {
return listSensors().firstOrNull()?.open() ?: DummySensor()
}
}
}