Environment map is only loaded from file once. Further decreased copying of environment texture.

Author: SteveMaas1978

FEBioStudio/DlgEditMaterial.cpp

@@ -172,28 +172,6 @@ class CSceneWidget : public QFrame
 		GLContext rc;
 		rc.m_cam = &scene.GetCamera();
 
-		CMainWindow* wnd = CMainWindow::GetInstance();
-		bool useEnvMap = wnd->IsEnvironmentMapEnabled();
-		if (useEnvMap)
-		{
-			if (envMap.isNull())
-			{
-				QString file = wnd->GetEnvironmentMap();
-				if (!file.isEmpty())
-				{
-					QImage img(file);
-					if (!img.isNull())
-					{
-						QImage::Format format = img.format();
-						envMap = CRGBAImage(img.width(), img.height(), img.constBits());
-					}
-				}
-			}
-
-			if (!envMap.isNull())
-				scene.SetEnvironmentMap(envMap);
-		}
-
 		rt.start();
 		scene.Render(rt, rc);
 		rt.finish();
@@ -288,16 +266,9 @@ CDlgEditMaterial::CDlgEditMaterial(QWidget* parent) : QDialog(parent), ui(new UI
 	if (wnd)
 	{
 		bool useEnvMap = wnd->IsEnvironmentMapEnabled();
-		QString file = wnd->GetEnvironmentMap();
-		if (useEnvMap && !file.isEmpty())
+		if (useEnvMap)
 		{
-			QImage img(file);
-			if (!img.isNull())
-			{
-				QImage::Format format = img.format();
-				CRGBAImage rgba(img.width(), img.height(), img.constBits());
-				ui->view->scene.SetEnvironmentMap(rgba);
-			}
+			ui->view->scene.SetEnvironmentMap(wnd->GetEnvironmentMapImage());
 		}
 		else
 		{

FEBioStudio/MainWindow.cpp

@@ -3479,6 +3479,24 @@ bool CMainWindow::IsEnvironmentMapEnabled()
 	else return false;
 }
 
+CRGBAImage CMainWindow::GetEnvironmentMapImage()
+{
+	if (ui->m_settings.m_envImg.isNull())
+	{
+		QString file = GetEnvironmentMap();
+		if (!file.isEmpty())
+		{
+			QImage img(file);
+			if (!img.isNull())
+			{
+				QImage::Format format = img.format();
+				ui->m_settings.m_envImg = CRGBAImage(img.width(), img.height(), img.constBits());
+			}
+		}
+	}
+	return ui->m_settings.m_envImg;
+}
+
 QStringList CMainWindow::GetRecentProjectsList()
 {
 	return ui->m_settings.m_recentProjects;

FEBioStudio/MainWindow.h

@@ -32,6 +32,7 @@ SOFTWARE.*/
 #include <FEMLib/GMaterial.h>
 #include <FSCore/math3d.h>
 #include <FSCore/color.h>
+#include <ImageLib/RGBAImage.h>
 class FSObject;
 class CDocument;
 class CGLDocument;
@@ -397,6 +398,7 @@ class CMainWindow : public QMainWindow
 	QString GetEnvironmentMap() const;
 	void SetEnvironmentMap(const QString& filename);
 	bool IsEnvironmentMapEnabled();
+	CRGBAImage GetEnvironmentMapImage();
 
 	void AddRecentPlugin(const QString& fileName);
 

FEBioStudio/MatEditButton.cpp

@@ -83,12 +83,24 @@ class CMatEditButton::Imp
 	QImage img;
 	RayTracer rt;
 	MatEditButtonScene scene;
-	CRGBAImage envMap;
+	bool initEnvMap = false;
 
 	Imp() 
 	{
 		scene.addItem(new SphereItem(rt, vec3d(0, 0, 0), 1));
 	}
+
+	void InitEnvMap()
+	{
+		if (initEnvMap) return;
+		CMainWindow* wnd = CMainWindow::GetInstance();
+		bool useEnvMap = wnd->IsEnvironmentMapEnabled();
+		if (useEnvMap)
+		{
+			scene.SetEnvironmentMap(wnd->GetEnvironmentMapImage());
+		}
+		initEnvMap = true;
+	}
 };
 
 CMatEditButton::CMatEditButton(QWidget* parent) : QFrame(parent), m(*(new Imp))
@@ -140,31 +152,10 @@ void CMatEditButton::updateImage()
 
 	m.rt.setRenderShadows(false);
 
+	if (m.initEnvMap == false) m.InitEnvMap();
+
 	GLContext rc;
 	rc.m_cam = &m.scene.GetCamera();
-
-	CMainWindow* wnd = CMainWindow::GetInstance();
-	bool useEnvMap = wnd->IsEnvironmentMapEnabled();
-	if (useEnvMap)
-	{
-		if (m.envMap.isNull())
-		{
-			QString file = wnd->GetEnvironmentMap();
-			if (!file.isEmpty())
-			{
-				QImage img(file);
-				if (!img.isNull())
-				{
-					QImage::Format format = img.format();
-					m.envMap = CRGBAImage(img.width(), img.height(), img.constBits());
-				}
-			}
-		}
-
-		if (!m.envMap.isNull())
-			m.scene.SetEnvironmentMap(m.envMap);
-	}
-
 	m.rt.start();
 	m.scene.Render(m.rt, rc);
 	m.rt.finish();

FEBioStudio/ui_mainwindow.h

@@ -94,6 +94,7 @@ SOFTWARE.*/
 #include <PyLib/PythonRunner.h>
 #include "FEBioBatchView.h"
 #include "DocPropsPanel.h"
+#include <ImageLib/RGBAImage.h>
 
 class QProcess;
 
@@ -248,6 +249,7 @@ struct FBS_SETTINGS
 	QStringList m_recentImages;
 
 	QString m_envMapFile;
+	CRGBAImage m_envImg;
 
 	vector<CLaunchConfig*> m_launch_configs;
 };

RTLib/RTBTree.cpp

@@ -140,49 +140,51 @@ void rt::Btree::Build(Mesh& mesh, int levels)
 	if (output) FSLogger::Write("  Splitting levels : %d\n", levels);
 	int m = 0;
 	std::vector<rt::Btree::Block*> leaves;
-#pragma omp parallel shared(leaves)
+	if (ntriangles > 0)
 	{
-		// the the number of threads in this parallel region
-		int numThreads = omp_get_num_threads();
-
-		// only execute in parallel if it's worth it
-		if ((levels < 2) || (numThreads < 2))
-		{
-			// let's do it in serial
-#pragma omp master
-			for (int i = 0; i < ntriangles; ++i)
-			{
-				rt::Tri& tri = mesh.triangle(i);
-				root->add(&tri, levels);
-			}
-		}
-		else
+#pragma omp parallel shared(leaves)
 		{
-			// create initial split
-#pragma omp single
-			{
-				m = (int)log2(numThreads);
-				if (m > levels - 1) m = levels - 1;
-				int actualThreads = (int)pow(2, m);
-				if (output) FSLogger::Write("  Using %d threads.\n", actualThreads);
-				root->split(m);
-				leaves = rt::Btree::leaves();
-			}
+			// the the number of threads in this parallel region
+			int numThreads = omp_get_num_threads();
 
-			// loop over all the triangles and sort them in the blocks
-			int threadId = omp_get_thread_num();
-			if ((threadId >= 0) && (threadId < (int)leaves.size()))
+			// only execute in parallel if it's worth it
+			if ((levels < 2) || (numThreads < 2))
 			{
+				// let's do it in serial
+#pragma omp master
 				for (int i = 0; i < ntriangles; ++i)
 				{
 					rt::Tri& tri = mesh.triangle(i);
-					if (intersectBox(leaves[threadId]->box, tri))
-						leaves[threadId]->add(&tri, levels - m);
+					root->add(&tri, levels);
+				}
+			}
+			else
+			{
+				// create initial split
+#pragma omp single
+				{
+					m = (int)log2(numThreads);
+					if (m > levels - 1) m = levels - 1;
+					int actualThreads = (int)pow(2, m);
+					if (output) FSLogger::Write("  Using %d threads.\n", actualThreads);
+					root->split(m);
+					leaves = rt::Btree::leaves();
+				}
+
+				// loop over all the triangles and sort them in the blocks
+				int threadId = omp_get_thread_num();
+				if ((threadId >= 0) && (threadId < (int)leaves.size()))
+				{
+					for (int i = 0; i < ntriangles; ++i)
+					{
+						rt::Tri& tri = mesh.triangle(i);
+						if (intersectBox(leaves[threadId]->box, tri))
+							leaves[threadId]->add(&tri, levels - m);
+					}
 				}
 			}
 		}
 	}
-
 	int nrblocks = (int)blocks();
 	if (output) FSLogger::Write("  Nr. of blocks : %d\n", nrblocks);
 	if (output) FSLogger::Write("  Nr. of triangles in BTree : %d\n", (int)root->size());

RTLib/RayTracer.cpp

@@ -1072,7 +1072,8 @@ bool RayTracer::castRay(const Ray& ray, rt::Point& q)
 
 unsigned int RayTracer::SetEnvironmentMap(const CRGBAImage& img)
 {
-	envTex.setImageData(img);
+	if (envTex.isNull())
+		envTex.setImageData(img);
 	return 1;
 }