The render target image for the overlay is now handled by the rhiSceneView. Fixed problem where recording with opengl backend did not stop.

Author: SteveMaas1978

FEBioStudio/GLView.cpp

@@ -1625,47 +1625,51 @@ void CGLView::RenderScene(GLRenderEngine& re)
 
 	RenderDecorations(re);
 
-	RenderOverlay(re, rc);
-
-	if (m_recorder.IsRecording() && !m_stopRequested)
+	if (m_recorder.IsRecording())
 	{
-		rhiRenderer* rhiRender = dynamic_cast<rhiRenderer*>(&re);
-		if (rhiRender)
+		if (!m_stopRequested)
 		{
-			frameCapturesRequested++;
-			rhiRender->setCaptureNextFrame(true);
+			rhiRenderer* rhiRender = dynamic_cast<rhiRenderer*>(&re);
+			if (rhiRender)
+			{
+				frameCapturesRequested++;
+				rhiRender->setCaptureNextFrame(true);
+			}
+		}
+		else if (frameCapturesRequested <= 0)
+		{
+			m_recorder.Stop();
+			m_stopRequested = false;
+			UnlockSafeFrame();
+			m_pWnd->UpdateTitle();	
 		}
 	}
-}
 
-void CGLView::RenderOverlay(GLRenderEngine& re, GLContext& rc)
-{
 	rhiRenderer* rhiRender = dynamic_cast<rhiRenderer*>(&re);
 	if (rhiRender == nullptr) return;
 	rhiRender->useOverlayImage(renderOverlay);
-	if (!renderOverlay) return;
-
-	// Create the overlay image that we'll paint in
-	QImage img(rhiRender->pixelSize(), QImage::Format_RGBA8888);
-	img.fill(QColor(255, 255, 255, 0));
-	QPainter painter(&img);
-	painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
+}
 
+void CGLView::RenderOverlay(GLRenderEngine& re, QPainter& painter)
+{
 	// compose the overlay image
 	RenderOverlayComponents(painter);
 
-	// all done with drawing
-	painter.end();
-
 	// the triad requires a bit of special handling
-	QRhiViewport vp = { (float)m_ptriad->x(), (float)m_ptriad->y(), (float)m_ptriad->w(), (float)m_ptriad->h() };
-	quatd q = rc.m_cam->GetOrientation();
-	QMatrix4x4 Q; Q.rotate(QQuaternion(q.w, q.x, q.y, q.z));
-	m_ptriad->setOrientation(q);
-	rhiRender->setTriadInfo(Q, vp);
-
-	// all done, send it to the renderer
-	rhiRender->setOverlayImage(img);
+	rhiRenderer* rhiRender = dynamic_cast<rhiRenderer*>(&re);
+	if (rhiRender)
+	{
+		GLScene* scene = GetActiveScene();
+		if (scene == nullptr) return;
+
+		GLCamera& cam = scene->GetCamera();
+
+		QRhiViewport vp = { (float)m_ptriad->x(), (float)m_ptriad->y(), (float)m_ptriad->w(), (float)m_ptriad->h() };
+		quatd q = cam.GetOrientation();
+		QMatrix4x4 Q; Q.rotate(QQuaternion(q.w, q.x, q.y, q.z));
+		m_ptriad->setOrientation(q);
+		rhiRender->setTriadInfo(Q, vp);
+	}
 }
 
 void CGLView::RenderOverlayComponents(QPainter& painter)

FEBioStudio/GLView.h

@@ -205,7 +205,8 @@ class CGLView : public rhiSceneView
 	void onFrameFinished() override;
 
 private: // overlay rendering
-	void RenderOverlay(GLRenderEngine& re, GLContext& rc);
+	void RenderOverlay(GLRenderEngine& re, QPainter& painter) override;
+
 	void RenderOverlayComponents(QPainter& painter);
 	void RenderTags(QPainter& painter);
 	void RenderDecorations(GLRenderEngine& re);

RHILib/rhiRenderer.h

@@ -154,6 +154,7 @@ class rhiRenderer : public QObject, public GLRenderEngine
 public:
 	void setOverlayImage(const QImage& img);
 	void useOverlayImage(bool b);
+	bool useOverlayImage() const { return m_useOverlay; }
 
 	double getFPS() const { return timing.m_fps; }
 	void showFPS(bool b);

RHILib/rhiSceneView.cpp

@@ -62,6 +62,23 @@ void rhiSceneView::customRender()
 
 	RenderScene(*m_rhiRender);
 
+	if (m_rhiRender->useOverlayImage())
+	{
+		// Create the overlay image that we'll paint in
+		QImage img(m_rhiRender->pixelSize(), QImage::Format_RGBA8888);
+		img.fill(QColor(255, 255, 255, 0));
+		QPainter painter(&img);
+		painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
+
+		RenderOverlay(*m_rhiRender, painter);
+
+		// all done with drawing
+		painter.end();
+
+		// all done, send it to the renderer
+		m_rhiRender->setOverlayImage(img);
+	}
+
 	m_rhiRender->finish();
 }
 
@@ -89,6 +106,11 @@ void rhiSceneView::RenderScene(GLRenderEngine& re)
 	}
 }
 
+void rhiSceneView::RenderOverlay(GLRenderEngine& re, QPainter& painter)
+{
+
+}
+
 void rhiSceneView::ShowFPS(bool b)
 {
 	if (m_rhiRender) m_rhiRender->showFPS(b);

RHILib/rhiSceneView.h

@@ -30,6 +30,8 @@ SOFTWARE.*/
 #include <GLWLib/GLTriad.h>
 #include <GLLib/GLScene.h>
 
+class QPainter;
+
 class rhiSceneView : public RhiWindow
 {
 public:
@@ -41,6 +43,8 @@ class rhiSceneView : public RhiWindow
 
 	virtual void RenderScene(GLRenderEngine& re);
 
+	virtual void RenderOverlay(GLRenderEngine& re, QPainter& painter);
+
 	const GLRenderEngine* GetRenderEngine() { return m_rhiRender; }
 
 	void ShowFPS(bool b);