small frames renderer bugfixes

prime-slam · Mar 31, 2024 · 7c415ee · 7c415ee
1 parent 66b1232
commit 7c415ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/main/kotlin/solve/rendering/canvas/SceneCanvas.kt b/src/main/kotlin/solve/rendering/canvas/SceneCanvas.kt
@@ -41,14 +41,11 @@ class SceneCanvas : OpenGLCanvas() {
     }
 
     fun setNewScene(scene: Scene) {
-        canvasScene?.clearLandmarkRenderers()
-        needToReinitializeRenderers = true
         this.scene = scene
-    }
+        this.framesSize = Vector2i(scene.frameSize.width.toInt(), scene.frameSize.height.toInt())
+        canvasScene?.framesRenderer?.setNewSceneFrames(scene.frames)
 
-    fun setNewSceneFrames(frames: List<VisualizationFrame>, framesSize: Vector2i) {
-        canvasScene?.framesRenderer?.setNewSceneFrames(frames)
-        this.framesSize = framesSize
+        needToReinitializeRenderers = true
     }
 
     fun setFramesSelection(framesSelection: List<VisualizationFrame>) {
@@ -111,6 +108,7 @@ class SceneCanvas : OpenGLCanvas() {
     }
 
     private fun reinitializeRenderers() {
+        canvasScene?.clearLandmarkRenderers()
         val scene = this.scene ?: return
         scene.layers.forEach { layer ->
             if (layer is Layer.PointLayer || layer is Layer.LineLayer) {
@@ -123,7 +121,7 @@ class SceneCanvas : OpenGLCanvas() {
         needToReinitializeRenderers = false
     }
 
-    private fun addLandmarkRenderer(layer: Layer, scene: solve.scene.model.Scene) {
+    private fun addLandmarkRenderer(layer: Layer, scene: Scene) {
         val addingRenderer = when (layer) {
             is Layer.PointLayer -> PointsLayerRenderer(window)
             is Layer.LineLayer -> LinesLayerRenderer(window)

diff --git a/src/main/kotlin/solve/scene/view/SceneView.kt b/src/main/kotlin/solve/scene/view/SceneView.kt
@@ -33,9 +33,9 @@ class SceneView : View() {
         if (SceneFacade.lastVisualizationKeepSettings) {
             canvas.setFramesSelection(controller.scene.frames)
         } else {
-            val framesSize = controller.scene.frameSize
-            val framesSizeVector = Vector2i(framesSize.width.toInt(), framesSize.height.toInt())
-            canvas.setNewSceneFrames(controller.scene.frames, framesSizeVector)
+            //val framesSize = controller.scene.frameSize
+            //val framesSizeVector = Vector2i(framesSize.width.toInt(), framesSize.height.toInt())
+            // canvas.setNewSceneFrames(controller.scene.frames, framesSizeVector)
             canvas.setNewScene(controller.scene)
         }
     }