From 776a0337b588ab05c2dd63f4cf4fc1b3ea4072bd Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Sun, 7 Mar 2021 21:10:03 -0800 Subject: [PATCH] Added setup files --- Installer/install_script.iss | 1 - Installer/setup.png | Bin 0 -> 6589 bytes src/source/DataModelV2/PartInstance.cpp | 50 ++++++++++++------------ 3 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 Installer/setup.png diff --git a/Installer/install_script.iss b/Installer/install_script.iss index 2ed2351..1231157 100644 --- a/Installer/install_script.iss +++ b/Installer/install_script.iss @@ -13,7 +13,6 @@ Compression=lzma2 PrivilegesRequired=lowest WizardImageFile=setup.bmp - [UninstallDelete] Type: filesandordirs; Name: "{app}" diff --git a/Installer/setup.png b/Installer/setup.png new file mode 100644 index 0000000000000000000000000000000000000000..4e42e7b70f72f214ce3060a593fd9f2ac0097c0d GIT binary patch literal 6589 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 PS4ecV^fl|%?W6t&G9R+l literal 0 HcmV?d00001 diff --git a/src/source/DataModelV2/PartInstance.cpp b/src/source/DataModelV2/PartInstance.cpp index 9a9033c..28417ab 100644 --- a/src/source/DataModelV2/PartInstance.cpp +++ b/src/source/DataModelV2/PartInstance.cpp @@ -343,14 +343,15 @@ void PartInstance::addSmoothTriangle(Vector3 v1, Vector3 v2, Vector3 v3) void PartInstance::addPlus(Vector3 v1) { + Color3 c = Color3(0.5F,0.5F,0.5F); float renderY = max(size.z, max(size.x, size.y))/2 * 0.775; Vector3 vx1 = v1 + Vector3(0, -renderY, -0.1f); Vector3 vx2 = v1 + Vector3(0, -renderY, 0.1f); Vector3 vx3 = v1 + Vector3(0, renderY, 0.1f); - addVertex(vx1,Color3::WHITE); - addVertex(vx2,Color3::WHITE); - addVertex(vx3,Color3::WHITE); + addVertex(vx1,c); + addVertex(vx2,c); + addVertex(vx3,c); //addNormals(cross(v2-v1,v3-v1).direction()); addSingularNormal(cross(vx2-vx1,vx3-vx1).direction()); addSingularNormal(cross(vx3-vx2,vx1-vx2).direction()); @@ -360,9 +361,9 @@ void PartInstance::addPlus(Vector3 v1) vx2 = v1 + Vector3(0, renderY, -0.1f); vx3 = v1 + Vector3(0, -renderY, -0.1f); - addVertex(vx1,Color3::WHITE); - addVertex(vx2,Color3::WHITE); - addVertex(vx3,Color3::WHITE); + addVertex(vx1,c); + addVertex(vx2,c); + addVertex(vx3,c); //addNormals(cross(v2-v1,v3-v1).direction()); addSingularNormal(cross(vx2-vx1,vx3-vx1).direction()); addSingularNormal(cross(vx3-vx2,vx1-vx2).direction()); @@ -372,9 +373,9 @@ void PartInstance::addPlus(Vector3 v1) vx2 = v1 + Vector3(0, 0.1f, -renderY); vx1 = v1 + Vector3(0, 0.1f, renderY); - addVertex(vx1,Color3::WHITE); - addVertex(vx2,Color3::WHITE); - addVertex(vx3,Color3::WHITE); + addVertex(vx1,c); + addVertex(vx2,c); + addVertex(vx3,c); //addNormals(cross(v2-v1,v3-v1).direction()); addSingularNormal(cross(vx2-vx1,vx3-vx1).direction()); addSingularNormal(cross(vx3-vx2,vx1-vx2).direction()); @@ -384,9 +385,9 @@ void PartInstance::addPlus(Vector3 v1) vx2 = v1 + Vector3(0, -0.1f, renderY); vx1 = v1 + Vector3(0, -0.1f, -renderY); - addVertex(vx1,Color3::WHITE); - addVertex(vx2,Color3::WHITE); - addVertex(vx3,Color3::WHITE); + addVertex(vx1,c); + addVertex(vx2,c); + addVertex(vx3,c); //addNormals(cross(v2-v1,v3-v1).direction()); addSingularNormal(cross(vx2-vx1,vx3-vx1).direction()); addSingularNormal(cross(vx3-vx2,vx1-vx2).direction()); @@ -397,14 +398,15 @@ void PartInstance::addPlus(Vector3 v1) void PartInstance::addPlus2(Vector3 v1) { + Color3 c = Color3(0.5F,0.5F,0.5F); float renderY = max(size.z, max(size.x, size.y))/2 * 0.775; Vector3 vx3 = v1 + Vector3(0, -renderY, -0.1f); Vector3 vx2 = v1 + Vector3(0, -renderY, 0.1f); Vector3 vx1 = v1 + Vector3(0, renderY, 0.1f); - addVertex(vx1,Color3::WHITE); - addVertex(vx2,Color3::WHITE); - addVertex(vx3,Color3::WHITE); + addVertex(vx1,c); + addVertex(vx2,c); + addVertex(vx3,c); //addNormals(cross(v2-v1,v3-v1).direction()); addSingularNormal(cross(vx2-vx1,vx3-vx1).direction()); addSingularNormal(cross(vx3-vx2,vx1-vx2).direction()); @@ -414,9 +416,9 @@ void PartInstance::addPlus2(Vector3 v1) vx2 = v1 + Vector3(0, renderY, -0.1f); vx1 = v1 + Vector3(0, -renderY, -0.1f); - addVertex(vx1,Color3::WHITE); - addVertex(vx2,Color3::WHITE); - addVertex(vx3,Color3::WHITE); + addVertex(vx1,c); + addVertex(vx2,c); + addVertex(vx3,c); //addNormals(cross(v2-v1,v3-v1).direction()); addSingularNormal(cross(vx2-vx1,vx3-vx1).direction()); addSingularNormal(cross(vx3-vx2,vx1-vx2).direction()); @@ -426,9 +428,9 @@ void PartInstance::addPlus2(Vector3 v1) vx2 = v1 + Vector3(0, 0.1f, -renderY); vx3 = v1 + Vector3(0, 0.1f, renderY); - addVertex(vx1,Color3::WHITE); - addVertex(vx2,Color3::WHITE); - addVertex(vx3,Color3::WHITE); + addVertex(vx1,c); + addVertex(vx2,c); + addVertex(vx3,c); //addNormals(cross(v2-v1,v3-v1).direction()); addSingularNormal(cross(vx2-vx1,vx3-vx1).direction()); addSingularNormal(cross(vx3-vx2,vx1-vx2).direction()); @@ -438,9 +440,9 @@ void PartInstance::addPlus2(Vector3 v1) vx2 = v1 + Vector3(0, -0.1f, renderY); vx3 = v1 + Vector3(0, -0.1f, -renderY); - addVertex(vx1,Color3::WHITE); - addVertex(vx2,Color3::WHITE); - addVertex(vx3,Color3::WHITE); + addVertex(vx1,c); + addVertex(vx2,c); + addVertex(vx3,c); //addNormals(cross(v2-v1,v3-v1).direction()); addSingularNormal(cross(vx2-vx1,vx3-vx1).direction()); addSingularNormal(cross(vx3-vx2,vx1-vx2).direction());