Create camera reference so we don't need to search for it

ultraq · Jun 28, 2024 · 889ae4a · 889ae4a
1 parent 144c209
commit 889ae4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...zon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/pipeline/RenderPipeline.groovy b/...zon-engine/source/nz/net/ultraq/redhorizon/engine/graphics/pipeline/RenderPipeline.groovy
@@ -31,7 +31,6 @@ import nz.net.ultraq.redhorizon.engine.input.InputEventStream
 import nz.net.ultraq.redhorizon.engine.scenegraph.GraphicsElement
 import nz.net.ultraq.redhorizon.engine.scenegraph.Node
 import nz.net.ultraq.redhorizon.engine.scenegraph.Scene
-import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.Camera
 
 import org.joml.FrustumIntersection
 import org.joml.Matrix4f
@@ -195,7 +194,7 @@ class RenderPipeline implements AutoCloseable {
 		void render(GraphicsRenderer renderer, Void unused) {
 
 			if (scene) {
-				var camera = (Camera)scene.findNode { node -> node instanceof Camera }
+				var camera = scene.camera
 				if (camera) {
 					camera.update()
 

diff --git a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/scenegraph/Scene.groovy b/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/scenegraph/Scene.groovy
@@ -23,6 +23,7 @@ import nz.net.ultraq.redhorizon.engine.graphics.MainMenu
 import nz.net.ultraq.redhorizon.engine.graphics.Window
 import nz.net.ultraq.redhorizon.engine.graphics.imgui.ImGuiLayer.GameWindow
 import nz.net.ultraq.redhorizon.engine.input.InputEventStream
+import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.Camera
 import nz.net.ultraq.redhorizon.engine.scenegraph.partioning.QuadTree
 import nz.net.ultraq.redhorizon.engine.time.TimeSystem
 import nz.net.ultraq.redhorizon.events.EventTarget
@@ -54,6 +55,7 @@ class Scene implements EventTarget {
 	InputEventStream inputEventStream
 
 	Window window
+	Camera camera
 	Listener listener
 	MainMenu gameMenu
 	GameWindow gameWindow
@@ -67,7 +69,11 @@ class Scene implements EventTarget {
 	Scene() {
 
 		on(NodeAddedEvent) { event ->
-			if (event.node instanceof GraphicsElement) {
+			var node = event.node
+			if (node instanceof Camera) {
+				camera = node
+			}
+			else if (event.node instanceof GraphicsElement) {
 				quadTree.add(event.node)
 			}
 		}