Load floor image in constructor instead of loadFloor method to avoid default image being displayed again and overwriting user selected one after bounding box change.

Author: Sharjith Naramparambath

include/GLWidget.h

@@ -447,7 +447,7 @@ private slots:
 	bool _viewPanning;
 	bool _viewRotating;
 	int _modelNum;
-	QImage _texImage, _texBuffer, _floorTexImage;
+	QImage _texImage, _texBuffer;
 	float _floorTexRepeatS, _floorTexRepeatT;
 	TextRenderer* _textRenderer;
 	TextRenderer* _axisTextRenderer;
@@ -600,6 +600,7 @@ private slots:
 	unsigned int			 _skyboxColorTexture = 0;
 	unsigned int			 _skyboxDepthBuffer = 0;
 
+	QImage					 _floorTexImage;
 	float                    _floorSize;
 	float 					 _floorSizeFactor;
 	float					 _floorOffsetPercent;

src/GLWidget.cpp

@@ -214,7 +214,21 @@ _assimpModelLoader(nullptr)
 	_floorDisplayed = false;
 	_floorTextureDisplayed = true;
 	_floorTexRepeatS = _floorTexRepeatT = 1;
-	_floorOffsetPercent = 0.05f;
+	_floorOffsetPercent = 0.0f;
+
+	// Floor texture
+	if (!_texBuffer.load(QString(MODELVIEWER_DATA_DIR) + "/" + "textures/envmap/floor/Grey-White-Checkered-Squares1800x1800.jpg"))
+	{ // Load first image from file
+		qWarning("GLWidget::loadFloor - Could not read image file, using single-color instead.");
+		QImage dummy(128, 128, QImage::Format_ARGB32);
+		dummy.fill(Qt::white);
+		_floorTexImage = dummy;
+	}
+	else
+	{
+		_floorTexImage = convertToGLFormat(_texBuffer);
+	}
+
 	_skyBoxEnabled = false;
 	_skyBoxFOV = 45.0f;
 	_skyBoxTextureHDRI = false;
@@ -3199,20 +3213,6 @@ void GLWidget::loadFloor()
 		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, defaultFramebufferObject());
 	}
 
-	// Floor texture
-    const QString path = QString(MODELVIEWER_DATA_DIR) + "/";
-    if (!_texBuffer.load(QString(path + "textures/envmap/floor/Grey-white-checkered-squares1800x1800.jpg")))
-	{ // Load first image from file
-		qWarning("GLWidget::loadFloor - Could not read image file, using single-color instead.");
-		QImage dummy(128, 128, QImage::Format_ARGB32);
-		dummy.fill(Qt::white);
-		_floorTexImage = dummy;
-	}
-	else
-	{
-		_floorTexImage = convertToGLFormat(_texBuffer);
-	}
-
 	_floorSize = _boundingSphere.getRadius();
 	_floorCenter = _boundingSphere.getCenter();
 	_lightPosition.setZ(_floorSize + _lightOffsetZ);

ui/ModelViewer.ui

@@ -272,8 +272,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>428</width>
-                   <height>738</height>
+                   <width>432</width>
+                   <height>737</height>
                   </rect>
                  </property>
                  <property name="sizePolicy">
@@ -1016,8 +1016,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>428</width>
-                   <height>738</height>
+                   <width>188</width>
+                   <height>174</height>
                   </rect>
                  </property>
                  <attribute name="label">
@@ -1182,8 +1182,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>428</width>
-                   <height>738</height>
+                   <width>96</width>
+                   <height>26</height>
                   </rect>
                  </property>
                  <attribute name="label">
@@ -1212,8 +1212,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>428</width>
-                   <height>738</height>
+                   <width>96</width>
+                   <height>26</height>
                   </rect>
                  </property>
                  <attribute name="label">
@@ -1249,8 +1249,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>428</width>
-                   <height>738</height>
+                   <width>212</width>
+                   <height>612</height>
                   </rect>
                  </property>
                  <property name="sizePolicy">
@@ -1625,9 +1625,9 @@
                  <property name="geometry">
                   <rect>
                    <x>0</x>
-                   <y>0</y>
-                   <width>428</width>
-                   <height>738</height>
+                   <y>-45</y>
+                   <width>432</width>
+                   <height>775</height>
                   </rect>
                  </property>
                  <attribute name="label">
@@ -2130,7 +2130,7 @@
                                  <double>100.000000000000000</double>
                                 </property>
                                 <property name="value">
-                                 <double>5.000000000000000</double>
+                                 <double>0.000000000000000</double>
                                 </property>
                                </widget>
                               </item>