Allow users to modify the size of the axis grid.

Author: kovacsv

Sources/VisualScriptCAD/Application/ExportDialog.cpp

@@ -225,7 +225,7 @@ void ExportDialog::OnButtonClick (wxCommandEvent& evt)
 		} else if (exportSettings.format == ExportSettings::FormatId::Png) {
 			if (exportSettings.image.IsValid ()) {
 				RenderPixels pixels (exportSettings.image.width * exportSettings.image.multisampling, exportSettings.image.height * exportSettings.image.multisampling);
-				RenderSettings renderSettings (ViewMode::Polygons, AxisMode::Off, 10);
+				RenderSettings renderSettings (ViewMode::Polygons, AxisMode::Off, 0.0, 0);
 				scene.DrawOffscreen (renderSettings, pixels);
 
 				wxImage image (pixels.GetWidth (), pixels.GetHeight ());

Sources/VisualScriptCAD/Application/SettingsDialog.cpp

@@ -1,7 +1,9 @@
 #include "SettingsDialog.hpp"
 
+#include <wx/spinctrl.h>
+
+static const wxSize TextControlSize (250, 25);
 static const wxSize ChoiceControlSize (250, 25);
-static const wxSize SliderControlSize (250, 35);
 
 SettingsDialogPanel::SettingsDialogPanel (const std::wstring& name, wxDialog* parent) :
 	name (name),
@@ -28,16 +30,18 @@ class ModelViewPanel : public SettingsDialogPanel
 	{
 		ViewModeChoiceId = 1001,
 		AxisModeChoiceId = 1002,
-		AxisSizeSliderId = 1002
+		GridSizeSpinId = 1002,
+		GridCountSliderId = 1003
 	};
 
 	ModelViewPanel (wxDialog* parent) :
 		SettingsDialogPanel (L"Model View", parent),
-		gridSizer (new wxFlexGridSizer (3, 2, 5, 20)),
+		gridSizer (new wxFlexGridSizer (4, 2, 5, 20)),
 		boxSizer (new wxBoxSizer (wxVERTICAL)),
 		viewModeChoice (new wxChoice (panel, DialogIds::ViewModeChoiceId, wxDefaultPosition, ChoiceControlSize)),
 		axisModeChoice (new wxChoice (panel, DialogIds::AxisModeChoiceId, wxDefaultPosition, ChoiceControlSize)),
-		axisSizeSlider (new wxSlider (panel, DialogIds::AxisSizeSliderId, 10, 5, 50, wxDefaultPosition, SliderControlSize, wxSL_LABELS))
+		gridSizeSpin (new wxSpinCtrlDouble (panel, DialogIds::GridSizeSpinId, L"", wxDefaultPosition, TextControlSize, wxSP_ARROW_KEYS, 0.1, 100.0, 0.1, 0.1)),
+		gridCountSpin (new wxSpinCtrl (panel, DialogIds::GridSizeSpinId, L"", wxDefaultPosition, TextControlSize, wxSP_ARROW_KEYS, 1, 100, 1))
 	{
 		viewModeChoice->Append (L"Lines");
 		viewModeChoice->Append (L"Polygons");
@@ -49,8 +53,10 @@ class ModelViewPanel : public SettingsDialogPanel
 		gridSizer->Add (viewModeChoice, 1, wxEXPAND);
 		gridSizer->Add (new wxStaticText (panel, wxID_ANY, L"Axis Mode"), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
 		gridSizer->Add (axisModeChoice, 1, wxEXPAND);
-		gridSizer->Add (new wxStaticText (panel, wxID_ANY, L"Axis Size"), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
-		gridSizer->Add (axisSizeSlider, 1, wxEXPAND);
+		gridSizer->Add (new wxStaticText (panel, wxID_ANY, L"Grid Size"), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
+		gridSizer->Add (gridSizeSpin, 1, wxEXPAND);
+		gridSizer->Add (new wxStaticText (panel, wxID_ANY, L"Grid Count"), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
+		gridSizer->Add (gridCountSpin, 1, wxEXPAND);
 
 		boxSizer->Add (gridSizer, 1, wxEXPAND | wxALL, 5);
 		panel->SetSizer (boxSizer);
@@ -70,7 +76,8 @@ class ModelViewPanel : public SettingsDialogPanel
 			axisModeChoice->Select (1);
 		}
 
-		axisSizeSlider->SetValue (userSettings.renderSettings.axisSize);
+		gridSizeSpin->SetValue (userSettings.renderSettings.gridSize);
+		gridCountSpin->SetValue (userSettings.renderSettings.gridCount);
 	}
 
 	virtual void SaveToUserSettings (UserSettings& userSettings) const override
@@ -87,15 +94,17 @@ class ModelViewPanel : public SettingsDialogPanel
 			userSettings.renderSettings.axisMode = AxisMode::Off;
 		}
 
-		userSettings.renderSettings.axisSize = axisSizeSlider->GetValue ();
+		userSettings.renderSettings.gridSize = gridSizeSpin->GetValue ();
+		userSettings.renderSettings.gridCount = gridCountSpin->GetValue ();
 	}
 
 private:
 	wxFlexGridSizer*	gridSizer;
 	wxBoxSizer*			boxSizer;
 	wxChoice*			viewModeChoice;
 	wxChoice*			axisModeChoice;
-	wxSlider*			axisSizeSlider;
+	wxSpinCtrlDouble*	gridSizeSpin;
+	wxSpinCtrl*			gridCountSpin;
 };
 
 wxPanel* SettingsDialogPanel::GetPanel ()

Sources/VisualScriptCAD/Application/UserSettings.cpp

@@ -21,7 +21,8 @@ static std::string GetXmlFilePath ()
 
 static const char SettingsNodeName[] = "VisualScriptCADSettings";
 static const char RenderSettingsNodeName[] = "RenderSettings";
-static const char RenderAxisSizeNodeName[] = "AxisSize";
+static const char RenderGridSizeNodeName[] = "GridSize";
+static const char RenderGridCountNodeName[] = "GridCount";
 static const char ExportSettingsNodeName[] = "ExportSettings";
 static const char ImageSettingsNodeName[] = "ImageSettings";
 static const char ImageWidthNodeName[] = "ImageWidth";
@@ -51,15 +52,16 @@ static const XmlEnum<ExportSettings::FormatId> ExportFormatEnum ("ExportFormat",
 });
 
 RenderSettings::RenderSettings () :
-	RenderSettings (ViewMode::Polygons, AxisMode::On, 20)
+	RenderSettings (ViewMode::Polygons, AxisMode::On, 1.0, 20)
 {
 
 }
 
-RenderSettings::RenderSettings (ViewMode viewMode, AxisMode axisMode, int axisSize) :
+RenderSettings::RenderSettings (ViewMode viewMode, AxisMode axisMode, double gridSize, int gridCount) :
 	viewMode (viewMode),
 	axisMode (axisMode),
-	axisSize (axisSize)
+	gridSize (gridSize),
+	gridCount (gridCount)
 {
 
 }
@@ -123,7 +125,8 @@ void UserSettings::Load ()
 	if (renderSettingsNode != nullptr) {
 		ViewModeEnum.Read (renderSettingsNode, renderSettings.viewMode);
 		AxisModeEnum.Read (renderSettingsNode, renderSettings.axisMode);
-		ReadIntegerNode (renderSettingsNode, RenderAxisSizeNodeName, renderSettings.axisSize);
+		ReadDoubleNode (renderSettingsNode, RenderGridSizeNodeName, renderSettings.gridSize);
+		ReadIntegerNode (renderSettingsNode, RenderGridCountNodeName, renderSettings.gridCount);
 	}
 
 	const tinyxml2::XMLNode* exportSettingsNode = settingsNode->FirstChildElement (ExportSettingsNodeName);
@@ -163,7 +166,8 @@ void UserSettings::Save ()
 	tinyxml2::XMLNode* renderSettingsNode = doc.NewElement (RenderSettingsNodeName);
 	ViewModeEnum.Write (doc, renderSettingsNode, renderSettings.viewMode);
 	AxisModeEnum.Write (doc, renderSettingsNode, renderSettings.axisMode);
-	WriteIntegerNode (doc, renderSettingsNode, RenderAxisSizeNodeName, renderSettings.axisSize);
+	WriteDoubleNode (doc, renderSettingsNode, RenderGridSizeNodeName, renderSettings.gridSize);
+	WriteIntegerNode (doc, renderSettingsNode, RenderGridCountNodeName, renderSettings.gridCount);
 	settingsNode->InsertEndChild (renderSettingsNode);
 
 	tinyxml2::XMLNode* exportSettingsNode = doc.NewElement (ExportSettingsNodeName);

Sources/VisualScriptCAD/Application/UserSettings.hpp

@@ -22,11 +22,12 @@ class RenderSettings
 {
 public:
 	RenderSettings ();
-	RenderSettings (ViewMode viewMode, AxisMode axisMode, int axisSize);
+	RenderSettings (ViewMode viewMode, AxisMode axisMode, double gridSize, int gridCount);
 
 	ViewMode	viewMode;
 	AxisMode	axisMode;
-	int			axisSize;
+	double		gridSize;
+	int			gridCount;
 };
 
 class ImageSettings

Sources/VisualScriptCAD/Application/XMLUtilities.cpp

@@ -64,6 +64,21 @@ void WriteIntegerNode (tinyxml2::XMLDocument& doc, tinyxml2::XMLNode* parent, co
 	WriteStringNode (doc, parent, nodeName, std::to_wstring (value));
 }
 
+bool ReadDoubleNode (const tinyxml2::XMLNode* parent, const char* nodeName, double& value)
+{
+	std::wstring nodeValue;
+	if (!ReadStringNode (parent, nodeName, nodeValue)) {
+		return false;
+	}
+	value = std::stod (nodeValue);
+	return true;
+}
+
+void WriteDoubleNode (tinyxml2::XMLDocument& doc, tinyxml2::XMLNode* parent, const char* nodeName, double value)
+{
+	WriteStringNode (doc, parent, nodeName, std::to_wstring (value));
+}
+
 bool ReadBooleanNode (const tinyxml2::XMLNode* parent, const char* nodeName, bool& value)
 {
 	std::wstring nodeValue;

Sources/VisualScriptCAD/Application/XMLUtilities.hpp

@@ -19,6 +19,9 @@ void			WriteStringNode (tinyxml2::XMLDocument& doc, tinyxml2::XMLNode* parent, c
 bool			ReadIntegerNode (const tinyxml2::XMLNode* parent, const char* nodeName, int& value);
 void			WriteIntegerNode (tinyxml2::XMLDocument& doc, tinyxml2::XMLNode* parent, const char* nodeName, int value);
 
+bool			ReadDoubleNode (const tinyxml2::XMLNode* parent, const char* nodeName, double& value);
+void			WriteDoubleNode (tinyxml2::XMLDocument& doc, tinyxml2::XMLNode* parent, const char* nodeName, double value);
+
 bool			ReadBooleanNode (const tinyxml2::XMLNode* parent, const char* nodeName, bool& value);
 void			WriteBooleanNode (tinyxml2::XMLDocument& doc, tinyxml2::XMLNode* parent, const char* nodeName, bool value);
 

Sources/VisualScriptCAD/Renderer/ModelControl.cpp

@@ -133,7 +133,7 @@ const RenderSettings& ModelControl::GetRenderSettings () const
 void ModelControl::SetRenderSettings (const RenderSettings& newSettings)
 {
 	renderSceneSettings = newSettings;
-	renderScene.InitAxisLines (renderSceneSettings.axisSize);
+	renderScene.InitAxisLines (renderSceneSettings.gridSize, renderSceneSettings.gridCount);
 	Refresh ();
 }
 

Sources/VisualScriptCAD/Renderer/RenderScene.cpp

@@ -1,6 +1,7 @@
 #include "RenderScene.hpp"
 #include "ShaderProgram.hpp"
 #include "IncludeGLM.hpp"
+#include "Geometry.hpp"
 
 static const char* lineVertexShaderSource = R"(
 #version 330 core
@@ -485,7 +486,7 @@ RenderScene::RenderScene () :
 	lineShader (-1),
 	triangleShader (-1),
 	model (),
-	lineModel (),
+	axisModel (),
 	light (),
 	camera (DefaultCamera)
 {
@@ -508,36 +509,38 @@ bool RenderScene::Init ()
 		return false;
 	}
 
-	InitAxisLines (0);
+	InitAxisLines (0.0, 0);
 
 	glEnable (GL_DEPTH_TEST);
 	glEnable (GL_BLEND);
 	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	return true;
 }
 
-void RenderScene::InitAxisLines (int size)
+void RenderScene::InitAxisLines (double gridSize, int gridCount)
 {
-	lineModel.Clear ();
-	if (size == 0) {
+	axisModel.Clear ();
+	if (gridCount == 0 || !Geometry::IsGreater (gridSize, 0.0)) {
 		return;
 	}
 
+	double axisSize = gridSize * gridCount;
+
 	RenderLineGeometry mainAxisLines (RenderLineMaterial (glm::vec3 (0.5f, 0.5f, 0.5f)));
-	mainAxisLines.AddLine (glm::vec3 (-size, 0.0f, 0.0f), glm::vec3 (size, 0.0f, 0.0f));
-	mainAxisLines.AddLine (glm::vec3 (0.0f, -size, 0.0f), glm::vec3 (0.0f, size, 0.0f));
-	mainAxisLines.AddLine (glm::vec3 (0.0f, 0.0f, -size), glm::vec3 (0.0f, 0.0f, size));
-	lineModel.AddRenderLineGeometry (mainAxisLines);
+	mainAxisLines.AddLine (glm::vec3 (-axisSize, 0.0f, 0.0f), glm::vec3 (axisSize, 0.0f, 0.0f));
+	mainAxisLines.AddLine (glm::vec3 (0.0f, -axisSize, 0.0f), glm::vec3 (0.0f, axisSize, 0.0f));
+	mainAxisLines.AddLine (glm::vec3 (0.0f, 0.0f, -axisSize), glm::vec3 (0.0f, 0.0f, axisSize));
+	axisModel.AddRenderLineGeometry (mainAxisLines);
 
 	RenderLineGeometry secondaryAxisLines (RenderLineMaterial (glm::vec3 (0.8f, 0.8f, 0.8f)));
-	for (int i = -size; i <= size; i++) {
+	for (int i = -gridCount; i <= gridCount; i++) {
 		if (i == 0) {
 			continue;
 		}
-		secondaryAxisLines.AddLine (glm::vec3 (-size, i, 0.0f), glm::vec3 (size, i, 0.0f));
-		secondaryAxisLines.AddLine (glm::vec3 (i, -size, 0.0f), glm::vec3 (i, size, 0.0f));
+		secondaryAxisLines.AddLine (glm::vec3 (-axisSize, i * gridSize, 0.0f), glm::vec3 (axisSize, i * gridSize, 0.0f));
+		secondaryAxisLines.AddLine (glm::vec3 (i * gridSize, -axisSize, 0.0f), glm::vec3 (i * gridSize, axisSize, 0.0f));
 	}
-	lineModel.AddRenderLineGeometry (secondaryAxisLines);
+	axisModel.AddRenderLineGeometry (secondaryAxisLines);
 }
 
 void RenderScene::Draw (int width, int height, const RenderSettings& settings) const
@@ -685,23 +688,21 @@ void RenderScene::DrawModel (int width, int height, ViewMode drawMode) const
 
 void RenderScene::DrawLines (int width, int height, AxisMode axisMode) const
 {
-	if (axisMode == AxisMode::Off) {
-		return;
-	}
+	if (axisMode == AxisMode::On) {
+		glUseProgram (lineShader);
 
-	glUseProgram (lineShader);
+		glm::mat4 viewMatrix = camera.GetViewMatrix ();
+		glm::mat4 projectionMatrix = camera.GetProjectionMatrix (width, height);
 
-	glm::mat4 viewMatrix = camera.GetViewMatrix ();
-	glm::mat4 projectionMatrix = camera.GetProjectionMatrix (width, height);
+		glUniformMatrix4fv (glGetUniformLocation (lineShader, "viewMatrix"), 1, GL_FALSE, glm::value_ptr (viewMatrix));
+		glUniformMatrix4fv (glGetUniformLocation (lineShader, "projectionMatrix"), 1, GL_FALSE, glm::value_ptr (projectionMatrix));
+		glUniformMatrix4fv (glGetUniformLocation (lineShader, "modelMatrix"), 1, GL_FALSE, glm::value_ptr (glm::mat4 (1.0f)));
 
-	glUniformMatrix4fv (glGetUniformLocation (lineShader, "viewMatrix"), 1, GL_FALSE, glm::value_ptr (viewMatrix));
-	glUniformMatrix4fv (glGetUniformLocation (lineShader, "projectionMatrix"), 1, GL_FALSE, glm::value_ptr (projectionMatrix));
-	glUniformMatrix4fv (glGetUniformLocation (lineShader, "modelMatrix"), 1, GL_FALSE, glm::value_ptr (glm::mat4 (1.0f)));
-
-	lineModel.EnumerateRenderLineGeometries ([&] (const RenderLineGeometry& lineGeometry) {
-		const RenderLineMaterial& material = lineGeometry.GetMaterial ();
-		glUniform3fv (glGetUniformLocation (lineShader, "materialColor"), 1, &material.color[0]);
-		lineGeometry.SetupBuffers ();
-		lineGeometry.DrawBuffers ();
-	});
+		axisModel.EnumerateRenderLineGeometries ([&] (const RenderLineGeometry& lineGeometry) {
+			const RenderLineMaterial& material = lineGeometry.GetMaterial ();
+			glUniform3fv (glGetUniformLocation (lineShader, "materialColor"), 1, &material.color[0]);
+			lineGeometry.SetupBuffers ();
+			lineGeometry.DrawBuffers ();
+		});
+	}
 }

Sources/VisualScriptCAD/Renderer/RenderScene.hpp

@@ -192,7 +192,7 @@ class RenderScene
 	RenderScene ();
 
 	bool				Init ();
-	void				InitAxisLines (int size);
+	void				InitAxisLines (double gridSize, int gridCount);
 
 	void				Draw (int width, int height, const RenderSettings& settings) const;
 	void				DrawOffscreen (const RenderSettings& settings, RenderPixels& pixels) const;
@@ -212,7 +212,7 @@ class RenderScene
 	int					lineShader;
 	int					triangleShader;
 	RenderModel			model;
-	RenderLineModel		lineModel;
+	RenderLineModel		axisModel;
 	RenderLight			light;
 	Modeler::Camera		camera;
 };