Science
/
tesselada
1
0
Fork 0
Code Releases Activity

Refactors Pad and Scale operations into + and * operations on the Dtm_Data type

This commit is contained in:
Shawn Nock 2019-03-12 12:45:56 -04:00
parent c6692dcb74
commit 1bb7279f33
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/dtm.adb
View File

@ -22,18 +22,22 @@ package body Dtm is
return Max_Val; return Max_Val;
end Max; end Max;
procedure Scale(Data : in out Dtm_Data; Scale_Factor : Dtm_Value := 100.0) is function "+"(D : Dtm_Data; V : Dtm_Value) return Dtm_Data is
R : Dtm_Data := D;
begin begin
for Element of Data.Grid loop for El of R.Grid loop
Element := Element * Scale_Factor; El := El + V;
end loop; end loop;
end Scale; return R;
end;
procedure Pad(Data :in out Dtm_Data; Pad_Factor : Dtm_Value := 2.0) is function "*"(D : Dtm_Data; V : Dtm_Value) return Dtm_Data is
R : Dtm_Data := D;
begin begin
for Element of Data.Grid loop for El of R.Grid loop
Element := Element + Pad_Factor; El := El * V;
end loop; end loop;
return R;
end; end;
function Triangle_Count(Info : Dtm_Info) return Natural is function Triangle_Count(Info : Dtm_Info) return Natural is

4
src/dtm.ads
View File

@ -12,9 +12,9 @@ package Dtm with SPARK_Mode is
Global => null; Global => null;
function Max(Data : Dtm_Data) return Dtm_Value; function Max(Data : Dtm_Data) return Dtm_Value;
procedure Scale(Data : in out Dtm_Data; Scale_Factor : Dtm_Value := 100.0);
procedure Pad(Data :in out Dtm_Data; Pad_Factor : Dtm_Value := 2.0);
function Triangle_Count(Info : Dtm_Info) return Natural; function Triangle_Count(Info : Dtm_Info) return Natural;
function "+"(D : Dtm_Data; V : Dtm_Value) return Dtm_Data;
function "*"(D : Dtm_Data; V : Dtm_Value) return Dtm_Data;
private private
type Dtm_Data(X, Y : Integer) is tagged type Dtm_Data(X, Y : Integer) is tagged

10
src/tess.adb
View File

@ -10,8 +10,8 @@ procedure Tess is
use Ada.Text_IO; use Ada.Text_IO;
Info : Dtm_Info; Info : Dtm_Info;
Input : File_Type; Input : File_Type;
Minimum_Thickness : constant := 2.0; Minimum_Thickness : constant := 1.0;
Z_Scaling_Value : constant := 100.0; Z_Scaling_Value : constant := 20.0;
begin begin
Ada.Text_IO.Put_Line("Tess started."); Ada.Text_IO.Put_Line("Tess started.");
Open(Input, In_File, "sample-data/katie.dat"); Open(Input, In_File, "sample-data/katie.dat");
@ -27,11 +27,11 @@ begin
begin begin
Dtm.Katie.Get_Data(Data, Input); Dtm.Katie.Get_Data(Data, Input);
Normalize_and_Scale_Factor := Z_Scaling_Value / Max(Data); Normalize_and_Scale_Factor := Z_Scaling_Value / Max(Data);
Data.Scale(Normalize_and_Scale_Factor); Data := Data * Normalize_and_Scale_Factor;
Data.Pad(Minimum_Thickness); Data := Data + Minimum_Thickness;
Triangles.Reserve_Capacity(Count_Type(Info.Triangle_Count)); Triangles.Reserve_Capacity(Count_Type(Info.Triangle_Count));
Dtm.Surface.Surface_From_Grid(Triangles, Data); Dtm.Surface.Surface_From_Grid(Triangles, Data);
Stl.Write(Triangles, "Farts.stl"); -- Stl.Write(Triangles, "Farts.stl");
Stl.Write_Binary(Triangles, "Binary_Farts.stl"); Stl.Write_Binary(Triangles, "Binary_Farts.stl");
end; end;
end Tess; end Tess;