Merge branch 'main' of https://github.com/utahrobotics/lunadev-2024

utahrobotics · Sep 23, 2023 · a14d1ca · a14d1ca
2 parents c66d095 + 87fc210
commit a14d1ca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 118 deletions.
diff --git a/lunabase/ffmpeg.gd b/lunabase/ffmpeg.gd
diff --git a/lunabase/lunabot.gd b/lunabase/lunabot.gd
@@ -34,7 +34,6 @@ func _ready() -> void:
 	if err != OK:
 		push_error("Failed to start ENet Server: " + str(err))
 		return
-#	server.compress(ENetConnection.COMPRESS_ZLIB)
 	thread.start(_run_thr)
 
 
@@ -137,7 +136,11 @@ func _on_receive(channel: int) -> void:
 			pass
 
 		Channels.CAMERA:
-			Ffmpeg.process_data(data)
+			var img := Image.new()
+			var err := img.load_webp_from_buffer(data)
+			if err != OK:
+				push_error("Error parsing camera frame: %s" % err)
+			call_deferred("emit_signal", "camera_frame_received", img)
 
 		Channels.ODOMETRY:
 			var x := data.decode_float(0)

diff --git a/lunabase/project.godot b/lunabase/project.godot
@@ -18,7 +18,6 @@ config/icon="res://icon.png"
 [autoload]
 
 Lunabot="*res://lunabot.gd"
-Ffmpeg="*res://ffmpeg.gd"
 
 [display]