diff --git a/Disp/DemoDiscreteRgb.cs b/Disp/DemoDiscreteRgb.cs
index a614120..c9f3218 100644
--- a/Disp/DemoDiscreteRgb.cs
+++ b/Disp/DemoDiscreteRgb.cs
@@ -20,16 +20,16 @@ namespace Sample.Disp
public void Display(Bind bind)
{
bind.Rgb = ColorUtil.GetDiscreteRGB_Env();
- new Box3d(0, 0, 0, 1, 1, 1).ToDraw_Face().Display(bind);
+ new box3d_t(0, 0, 0, 1, 1, 1).ToDraw_Face().Display(bind);
bind.Rgb = ColorUtil.GetDiscreteRGB_Env();
- new Box3d(1, 0, 0, 2, 1, 1).ToDraw_Face().Display(bind);
+ new box3d_t(1, 0, 0, 2, 1, 1).ToDraw_Face().Display(bind);
bind.Rgb = ColorUtil.GetDiscreteRGB_Env();
- new Box3d(2, 0, 0, 3, 1, 1).ToDraw_Face().Display(bind);
+ new box3d_t(2, 0, 0, 3, 1, 1).ToDraw_Face().Display(bind);
}
///
- public void ExpandToBox3d(ref Box3d dst)
+ public void ExpandToBox3d(ref box3d_t dst)
{
dst = dst.Expanded(new vec3d_t(0, 0, 0));
dst = dst.Expanded(new vec3d_t(3, 1, 1));
diff --git a/Disp/DemoDrawing.cs b/Disp/DemoDrawing.cs
index 14bb496..f8453ec 100644
--- a/Disp/DemoDrawing.cs
+++ b/Disp/DemoDrawing.cs
@@ -126,7 +126,7 @@ namespace Sample.Disp
{
//the rgb values set as casual.
vec3d_t rgb = ColorUtil.GetDiscreteRgb(i);
- Tri3d tri = new Tri3d(new vec3d_t(i, 0, 0), new vec3d_t(i + 1, 0, 0), new vec3d_t(i + 0.5, 0, 1));
+ tri3d_t tri = new tri3d_t(new vec3d_t(i, 0, 0), new vec3d_t(i + 1, 0, 0), new vec3d_t(i + 0.5, 0, 1));
for (int j = 0; j < 3; j++)
{
vs[k++] = rgb.x;
@@ -147,7 +147,7 @@ namespace Sample.Disp
{
//the rgb values set as casual.
vec3d_t rgb = ColorUtil.GetDiscreteRgb(i);
- Tri3d tri = new Tri3d(new vec3d_t(i, 0, 3), new vec3d_t(i + 1, 0, 3), new vec3d_t(i + 0.5, 0, 4));
+ tri3d_t tri = new tri3d_t(new vec3d_t(i, 0, 3), new vec3d_t(i + 1, 0, 3), new vec3d_t(i + 0.5, 0, 4));
vec3d_t nn = tri.GetNormal();
for (int j = 0; j < 3; j++)
{
@@ -171,16 +171,16 @@ namespace Sample.Disp
}
///
- /// Demonstrates drawing 3D triangles using the Tri3d helper class.
+ /// Demonstrates drawing 3D triangles using the tri3d_t helper class.
/// Creates a series of triangles and renders them as both face (filled) and line (wireframe) drawings.
/// Shows how to apply different colors to faces and lines of the same geometry.
///
public static void DrawTri3d()
{
int n = 10;
- List tris = new List(n);
+ List tris = new List(n);
for (int i = 0; i < n; i++)
- tris.Add(new Tri3d(new vec3d_t(i, 0, 0), new vec3d_t(i + 1, 0, 0), new vec3d_t(i + 0.5, 0, 1)));
+ tris.Add(new tri3d_t(new vec3d_t(i, 0, 0), new vec3d_t(i + 1, 0, 0), new vec3d_t(i + 0.5, 0, 1)));
Drawing faceDraw = tris.GetFaceDrawing();
Drawing linesDraw = tris.ToLineDrawing();
diff --git a/Disp/DemoPick1.cs b/Disp/DemoPick1.cs
index be05019..faf944d 100644
--- a/Disp/DemoPick1.cs
+++ b/Disp/DemoPick1.cs
@@ -21,11 +21,11 @@ namespace Sample.Disp
{
bind.PickID = PickingID;
bind.Rgb = new vec3d_t(isMouseOver ? 0 : 1, 1, 1);
- new Box3d(0, 0, 0, 1, 1, 1).DisplayFace(bind);
+ new box3d_t(0, 0, 0, 1, 1, 1).DisplayFace(bind);
bind.PickID = 0;
}
///
- public void ExpandToBox3d(ref Box3d dst)
+ public void ExpandToBox3d(ref box3d_t dst)
{
dst = dst.Expanded(new vec3d_t(0, 0, 0));
dst = dst.Expanded(new vec3d_t(1, 1, 1));
diff --git a/Disp/DemoPick2.cs b/Disp/DemoPick2.cs
index 4174dbb..1b3d0ea 100644
--- a/Disp/DemoPick2.cs
+++ b/Disp/DemoPick2.cs
@@ -24,20 +24,20 @@ namespace Sample.Disp
{
bind.PickID = pickableA.PickingID;
bind.Rgb = ColorUtil.GetDiscreteRgb(1);
- new Box3d(0, 0, 0, 1, 1, 1).DisplayFace(bind);
+ new box3d_t(0, 0, 0, 1, 1, 1).DisplayFace(bind);
bind.PickID = pickableB.PickingID;
bind.Rgb = ColorUtil.GetDiscreteRgb(2);
- new Box3d(0, 0, 1, 1, 1, 2).DisplayFace(bind);
+ new box3d_t(0, 0, 1, 1, 1, 2).DisplayFace(bind);
bind.PickID = pickableC.PickingID;
bind.Rgb = ColorUtil.GetDiscreteRgb(3);
- new Box3d(0, 0, 2, 1, 1, 3).DisplayFace(bind);
+ new box3d_t(0, 0, 2, 1, 1, 3).DisplayFace(bind);
bind.PickID = 0;
}
///
- public void ExpandToBox3d(ref Box3d dst)
+ public void ExpandToBox3d(ref box3d_t dst)
{
dst = dst.Expanded(new vec3d_t(0, 0, 0));
dst = dst.Expanded(new vec3d_t(1, 1, 3));
diff --git a/Disp/DemoPickable.cs b/Disp/DemoPickable.cs
index a682d9d..e4e83d3 100644
--- a/Disp/DemoPickable.cs
+++ b/Disp/DemoPickable.cs
@@ -40,7 +40,7 @@ public class DemoPickable : IDisplayee
draw.Display(bind);
}
///
- public void ExpandToBox3d(ref Box3d dst)
+ public void ExpandToBox3d(ref box3d_t dst)
{
draw.ExpandToBox3d(ref dst);
}
diff --git a/Disp/DemoSatellite.cs b/Disp/DemoSatellite.cs
index 930323e..265b755 100644
--- a/Disp/DemoSatellite.cs
+++ b/Disp/DemoSatellite.cs
@@ -21,9 +21,9 @@ namespace Sample.Disp
double angle_moon;
DemoSatellite()
{
- sun = Box3d.CenterUnitBox.ScaledFromCenter(4).ToDraw_Face();
- earth = Box3d.CenterUnitBox.ScaledFromCenter(2).ToDraw_Face();
- moon = Box3d.CenterUnitBox.ToDraw_Face();
+ sun = box3d_t.CenterUnitBox.ScaledFromCenter(4).ToDraw_Face();
+ earth = box3d_t.CenterUnitBox.ScaledFromCenter(2).ToDraw_Face();
+ moon = box3d_t.CenterUnitBox.ToDraw_Face();
}
///
public void Display(Bind bind)
@@ -41,7 +41,7 @@ namespace Sample.Disp
bind.ModelMatStack.Pop();
}
///
- public void ExpandToBox3d(ref Box3d dst)
+ public void ExpandToBox3d(ref box3d_t dst)
{
dst = dst.Expanded(new vec3d_t(-14, -14, -2));
dst = dst.Expanded(new vec3d_t(14, 14, 2));
diff --git a/Disp/DemoUtil.cs b/Disp/DemoUtil.cs
index fd14fa1..314e4fd 100644
--- a/Disp/DemoUtil.cs
+++ b/Disp/DemoUtil.cs
@@ -32,7 +32,7 @@ public static class DemoUtil
LocalApp.AppBegin(loggerFactory.CreateLogger("Hi.Sample"));
try
{
- Box3d box = new Box3d();
+ box3d_t box = new box3d_t();
displayee.ExpandToBox3d(ref box);
Console.WriteLine($"{title}: {displayee.GetType().Name} bounding {box}");
Console.WriteLine("Assign it to your canvas' DispEngine.Displayee to see it.");
diff --git a/Disp/HeidenhainCoordinateEntryDisplayee.cs b/Disp/HeidenhainCoordinateEntryDisplayee.cs
index de9d7cb..0c0402f 100644
--- a/Disp/HeidenhainCoordinateEntryDisplayee.cs
+++ b/Disp/HeidenhainCoordinateEntryDisplayee.cs
@@ -90,7 +90,7 @@ namespace Sample.Disp
bind.ModelMatStack.Pop();
}
///
- public void ExpandToBox3d(ref Box3d dst)
+ public void ExpandToBox3d(ref box3d_t dst)
{
HardNcEnv ncEnv = NcEnv;
if (ncEnv == null || NcEnv.CncBrand != CncBrand.Heidenhain)
diff --git a/Disp/IsoCoordinateEntryDisplayee.cs b/Disp/IsoCoordinateEntryDisplayee.cs
index 7ef8e42..e055196 100644
--- a/Disp/IsoCoordinateEntryDisplayee.cs
+++ b/Disp/IsoCoordinateEntryDisplayee.cs
@@ -59,7 +59,7 @@ public class IsoCoordinateEntryDisplayee : IAnchoredDisplayee
bind.ModelMatStack.Pop();
}
///
- public void ExpandToBox3d(ref Box3d dst)
+ public void ExpandToBox3d(ref box3d_t dst)
{
HardNcEnv ncEnv = NcEnv;
if (ncEnv == null)
diff --git a/Disp/MachiningProjectDisplayee.cs b/Disp/MachiningProjectDisplayee.cs
index 4ed3dae..901d5ee 100644
--- a/Disp/MachiningProjectDisplayee.cs
+++ b/Disp/MachiningProjectDisplayee.cs
@@ -239,7 +239,7 @@ public class MachiningProjectDisplayee : IDisplayee, IGetAnchor
bind.PopColor();
}
///
- public void ExpandToBox3d(ref Box3d dst)
+ public void ExpandToBox3d(ref box3d_t dst)
{
//Console.WriteLine($"dst.A: {dst}");
LocalProjectService?.MachiningEquipment?.GetAsmb()?.ExpandToBox3d(ref dst,
diff --git a/Geom/DemoBuildGeom.cs b/Geom/DemoBuildGeom.cs
index a77419f..9a2f0ef 100644
--- a/Geom/DemoBuildGeom.cs
+++ b/Geom/DemoBuildGeom.cs
@@ -22,7 +22,7 @@ public static class DemoBuildGeom
/// A list of geometries implementing the IGetStl interface
public static List GenGeoms()
{
- Box3d box = new Box3d(0, 0, -50, 70, 50, 0);
+ box3d_t box = new box3d_t(0, 0, -50, 70, 50, 0);
Cylindroid cylindroid = new Cylindroid([ new PairZr(0,12),new PairZr(20,12),
new PairZr(20,16),new PairZr(30,16)]);
Stl stl = new Stl("geom.stl");
diff --git a/Geom/DemoIExpandToBox3d.cs b/Geom/DemoIExpandToBox3d.cs
index abb99f0..6cfd8a9 100644
--- a/Geom/DemoIExpandToBox3d.cs
+++ b/Geom/DemoIExpandToBox3d.cs
@@ -5,7 +5,7 @@ namespace Sample.Geom;
///
/// Demonstrates how to create and calculate bounding boxes for different geometric objects.
-/// Shows the use of Box3d to encompass multiple geometric elements with a single boundary.
+/// Shows the use of box3d_t to encompass multiple geometric elements with a single boundary.
///
///
/// ### Source Code
@@ -16,11 +16,11 @@ public static class DemoIExpandToBox3d
static void Main()
{
#region DocSite.CountBoundingBox
- Box3d objA = new Box3d(0, 0, 0, 1, 1, 1);
- Box3d objB = new Box3d(-1, -2, -3, 3, 2, 1);
+ box3d_t objA = new box3d_t(0, 0, 0, 1, 1, 1);
+ box3d_t objB = new box3d_t(-1, -2, -3, 3, 2, 1);
vec3d_t objC = new vec3d_t(-2, 3, -5);
- Box3d boundingbox = new Box3d(objA, objB, objC);
+ box3d_t boundingbox = new box3d_t(objA, objB, objC);
Console.WriteLine("boundingbox: " + boundingbox);
#endregion
}
diff --git a/Machining/DemoBuildGeomOnlyMachiningProject.cs b/Machining/DemoBuildGeomOnlyMachiningProject.cs
index ef584be..1eb53d0 100644
--- a/Machining/DemoBuildGeomOnlyMachiningProject.cs
+++ b/Machining/DemoBuildGeomOnlyMachiningProject.cs
@@ -74,7 +74,7 @@ public static class DemoBuildGeomOnlyMachiningProject
//geometry anchor to each mount, so the workpiece mount is placed by the
//transformer of the branch to it: on top of the 10 mm thick fixture geom.
Fixture fixture = Fixture.CreateDefault();
- fixture.Geom = new Box3d(new vec3d_t(-40, -40, 0), new vec3d_t(40, 40, 10));
+ fixture.Geom = new box3d_t(new vec3d_t(-40, -40, 0), new vec3d_t(40, 40, 10));
Branch.Get(fixture.GeomAnchor, fixture.WorkpieceMount).Transformer
= new StaticTranslation(new vec3d_t(0, 0, 10));
localProjectService.Fixture = fixture;
@@ -83,7 +83,7 @@ public static class DemoBuildGeomOnlyMachiningProject
//mount and to program zero by zero translations.
Workpiece workpiece = Workpiece.CreateDefault();
workpiece.InitResolution = 0.25;
- workpiece.InitGeom = new Box3d(0, 0, -50, 70, 50, 0);
+ workpiece.InitGeom = new box3d_t(0, 0, -50, 70, 50, 0);
workpiece.IdealGeom = null;
localProjectService.Workpiece = workpiece;
diff --git a/Machining/DemoBuildMachiningProject.cs b/Machining/DemoBuildMachiningProject.cs
index 7bf12bc..a3175f9 100644
--- a/Machining/DemoBuildMachiningProject.cs
+++ b/Machining/DemoBuildMachiningProject.cs
@@ -187,7 +187,7 @@ public static class DemoBuildMachiningProject
//geometry anchor to each mount, so the workpiece mount is placed by the
//transformer of the branch to it: on top of the 10 mm thick fixture geom.
Fixture fixture = Fixture.CreateDefault();
- fixture.Geom = new Box3d(new vec3d_t(-40, -40, 0), new vec3d_t(40, 40, 10));
+ fixture.Geom = new box3d_t(new vec3d_t(-40, -40, 0), new vec3d_t(40, 40, 10));
Branch.Get(fixture.GeomAnchor, fixture.WorkpieceMount).Transformer
= new StaticTranslation(new vec3d_t(0, 0, 10));
localProjectService.Fixture = fixture;
@@ -198,7 +198,7 @@ public static class DemoBuildMachiningProject
//mount and to program zero by zero translations.
Workpiece workpiece = Workpiece.CreateDefault();
workpiece.InitResolution = 0.25;
- workpiece.InitGeom = new Box3d(0, 0, -50, 70, 50, 0);
+ workpiece.InitGeom = new box3d_t(0, 0, -50, 70, 50, 0);
workpiece.IdealGeom = null;
workpiece.CuttingPara = XFactory.GenByFile(
"Resource/CuttingParameter", "Al6061T6.default.mp", progress);