fixed sine build when 2 points are at the same location.

pryvyd9 · May 9, 2021 · cecef1d · cecef1d
1 parent 01c02fb
commit cecef1d
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 23 deletions.
diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md
@@ -51,4 +51,5 @@ Added Publish configuration that cleans output before build and copies only nece
 - property/event overhaul;
 # 0.14
 - introduced independent cross movement and rotation;
-- isolated main math in separate static classes;
+- isolated main math in separate static classes;
+- fixed sine building when 2 points are at the same location;
diff --git a/StereoPlus2/Math.hpp b/StereoPlus2/Math.hpp
@@ -304,6 +304,16 @@ class Build {
 		auto ab = vertices[1] - vertices[0];
 		auto bc = vertices[2] - vertices[1];
 
+		auto acLength = glm::length(ac);
+		auto abLength = glm::length(ab);
+		auto bcLength = glm::length(bc);
+
+		static const auto E = glm::epsilon<float>();
+
+		// Draw straight line if 2 vertices are at the same location.
+		if (bcLength < E || abLength < E || acLength < E)
+			return { vertices[0], vertices[1], vertices[2] };
+
 		auto acUnit = glm::normalize(ac);
 		auto abadScalarProjection = glm::dot(ab, acUnit);
 		auto dbUnit = glm::normalize(ab - acUnit * abadScalarProjection);
@@ -317,16 +327,12 @@ class Build {
 		if (isnan(r.x) || isnan(r.y) || isnan(r.z) || isnan(r.w))
 			return { vertices[0], vertices[1], vertices[2] };
 
-		auto acLength = glm::length(ac);
-		auto abLength = glm::length(ab);
 		auto bdLength = abdbScalarProjection;
 		auto adLength = abadScalarProjection;
 		auto dcLength = acLength - adLength;
 
 		static const auto hpi = glm::half_pi<float>();
 
-		auto bcLength = glm::length(bc);
-
 		int abNumber = abLength / 5 + 1;
 		int bcNumber = bcLength / 5 + 1;
 

diff --git a/StereoPlus2/Settings.hpp b/StereoPlus2/Settings.hpp
@@ -53,6 +53,8 @@ class Settings {
 	StaticProperty(::MoveCoordinateAction, MoveCoordinateAction)
 	StaticProperty(bool, ShouldDetectPosition)
 
+	StaticProperty(bool, ShouldRestrictTargetModeToPivot)
+
 	// Settings
 	StaticProperty(std::string, Language)
 	StaticProperty(int, StateBufferLength)

diff --git a/StereoPlus2/Tools.hpp b/StereoPlus2/Tools.hpp
@@ -420,6 +420,7 @@ class PenTool : public EditingTool {
 			StateBuffer::Commit();
 			wasCommitDone = true;
 		};
+		Settings::ShouldRestrictTargetModeToPivot() = true;
 
 	}
 
@@ -470,12 +471,15 @@ class PenTool : public EditingTool {
 			StateBuffer::Commit();
 			wasCommitDone = true;
 		};
+		Settings::ShouldRestrictTargetModeToPivot() = true;
 
 		return true;
 	}
 	virtual bool UnbindSceneObjects() {
 		if (!lockCreateNewObjectHandlerId)
 			Input::RemoveHandler(createNewObjectHandlerId);
+
+		Settings::ShouldRestrictTargetModeToPivot() = false;
 
 		if (!target.HasValue())
 			return true;
@@ -866,9 +870,13 @@ class ExtrusionEditingTool : public EditingToolConfigured<ExtrusionEditingToolMo
 
 			cross->SetWorldPosition(pos);
 			};
+		Settings::ShouldRestrictTargetModeToPivot() = true;
+
 		return true;
 	}
 	virtual bool UnbindSceneObjects() {
+		Settings::ShouldRestrictTargetModeToPivot() = true;
+
 		switch (mode)
 		{
 		case  Mode::Immediate:
@@ -1372,7 +1380,7 @@ class SinePenTool : public EditingTool {
 			if (Settings::ShouldMoveCrossOnSinePenModeChange().Get())
 				moveCrossToVertice(currentVertice);
 		};
-
+		Settings::ShouldRestrictTargetModeToPivot() = true;
 	}
 
 public:
@@ -1422,13 +1430,19 @@ class SinePenTool : public EditingTool {
 			StateBuffer::Commit();
 			wasCommitDone = true;
 		};
+		Settings::ShouldRestrictTargetModeToPivot() = true;
 
 		return true;
 	}
 	virtual bool UnbindSceneObjects() {
+		// On unbinding objects the tool goes to 
+		// creating new object awaiting state.
+		// But if the tool is unbind then it should be cancelled.
 		if (!lockCreateNewObjectHandlerId)
 			Input::RemoveHandler(createNewObjectHandlerId);
 
+		Settings::ShouldRestrictTargetModeToPivot() = false;
+
 		if (!target.HasValue())
 			return true;
 
@@ -1449,12 +1463,6 @@ class SinePenTool : public EditingTool {
 	}
 	virtual void UnbindTool() override {
 		UnbindSceneObjects();
-
-		// On unbinding objects the tool goes to 
-		// creating new object awaiting state.
-		// But if the tool is unbind then it should be cancelled.
-		if (!lockCreateNewObjectHandlerId)
-			Input::RemoveHandler(createNewObjectHandlerId);
 	}
 
 	SceneObject* GetTarget() {

diff --git a/StereoPlus2/Windows.hpp b/StereoPlus2/Windows.hpp
@@ -1301,12 +1301,6 @@ class ToolWindow : Window {
 		};
 	}
 
-	/*void Unbind() {
-		attributesWindow->UnbindTarget();
-		attributesWindow->UnbindTool();
-	}*/
-
-
 	virtual bool Init() {
 		if (!AttributesWindow().IsAssigned())
 		{
@@ -1360,11 +1354,22 @@ class ToolWindow : Window {
 		}
 		{
 			ImGui::Separator();
-			auto v = (int)Settings::TargetMode().Get();
-			if (ImGui::RadioButton(LocaleProvider::GetC("object"), &v, (int)TargetMode::Object))
-				Settings::TargetMode() = TargetMode::Object;
-			if (ImGui::RadioButton(LocaleProvider::GetC("pivot"), &v, (int)TargetMode::Pivot))
-				Settings::TargetMode() = TargetMode::Pivot;
+			if (Settings::ShouldRestrictTargetModeToPivot().Get()) {
+				auto v = (int)TargetMode::Pivot;
+				ImGui::Extensions::PushActive(false);
+				if (ImGui::RadioButton(LocaleProvider::GetC("object"), &v, (int)TargetMode::Object))
+					Settings::TargetMode() = TargetMode::Object;
+				if (ImGui::RadioButton(LocaleProvider::GetC("pivot"), &v, (int)TargetMode::Pivot))
+					Settings::TargetMode() = TargetMode::Pivot;
+				ImGui::Extensions::PopActive();
+			}
+			else {
+				auto v = (int)Settings::TargetMode().Get();
+				if (ImGui::RadioButton(LocaleProvider::GetC("object"), &v, (int)TargetMode::Object))
+					Settings::TargetMode() = TargetMode::Object;
+				if (ImGui::RadioButton(LocaleProvider::GetC("pivot"), &v, (int)TargetMode::Pivot))
+					Settings::TargetMode() = TargetMode::Pivot;
+			}
 		}
 
 		ImGui::Separator();