CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added setup files

Browse Source
This commit is contained in:
Vulpovile
2021-03-07 21:10:03 -08:00
parent d0f5c77024
commit 776a0337b5
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Installer/install_script.iss
View File

@@ -13,7 +13,6 @@ Compression=lzma2
PrivilegesRequired=lowest
WizardImageFile=setup.bmp
[UninstallDelete]
Type: filesandordirs; Name: "{app}"

BIN
Installer/setup.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

50
src/source/DataModelV2/PartInstance.cpp
View File

@@ -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());