Renamed params

This commit is contained in:
neauoire 2020-05-15 19:18:33 +09:00
parent 0d3ba24107
commit 0ada3dbf9f
2 changed files with 11 additions and 13 deletions

View File

@ -25,7 +25,7 @@ implementation
begin
voff := shape.verticesLength;
foff := shape.facesLength;
eoff := shape.length;
eoff := shape.edgesLength;
SetPt3D(shape.vertices[voff + 1], Long2Fix(x), Long2Fix(y + h div 2), Long2Fix(z));
SetPt3D(shape.vertices[voff + 2], Long2Fix(x + w div 2), Long2Fix(y - h div 2), Long2Fix(z));
SetPt3D(shape.vertices[voff + 3], Long2Fix(x - w div 2), Long2Fix(y - h div 2), Long2Fix(z));
@ -35,7 +35,7 @@ implementation
SetFc3D(shape.faces[foff + 1], @shape.vertices[voff + 1], @shape.vertices[voff + 2], @shape.vertices[voff + 3]);
shape.verticesLength := voff + 3;
shape.facesLength := foff + 1;
shape.length := eoff + 3;
shape.edgesLength := eoff + 3;
end;
procedure AddRect3D (var shape: Shape3D; x, y, z, w, h: Fixed);
@ -44,7 +44,7 @@ implementation
begin
voff := shape.verticesLength;
foff := shape.facesLength;
eoff := shape.length;
eoff := shape.edgesLength;
SetPt3D(shape.vertices[voff + 1], Long2Fix(x + w div 2), Long2Fix(y + h div 2), Long2Fix(z));
SetPt3D(shape.vertices[voff + 2], Long2Fix(x + w div 2), Long2Fix(y - h div 2), Long2Fix(z));
SetPt3D(shape.vertices[voff + 3], Long2Fix(x - w div 2), Long2Fix(y - h div 2), Long2Fix(z));
@ -57,7 +57,7 @@ implementation
SetFc3D(shape.faces[foff + 2], @shape.vertices[voff + 3], @shape.vertices[voff + 4], @shape.vertices[voff + 1]);
shape.verticesLength := voff + 4;
shape.facesLength := foff + 2;
shape.length := eoff + 4;
shape.edgesLength := eoff + 4;
end;
procedure AddCircle3D (var shape: Shape3D; x, y, z, d: Fixed);
@ -69,7 +69,7 @@ implementation
begin
voff := shape.verticesLength;
foff := shape.facesLength;
eoff := shape.length;
eoff := shape.edgesLength;
segs := 12;
arc := FracDiv(360, Long2Fix(segs));
for i := 1 to segs do
@ -84,7 +84,7 @@ implementation
SetLk3D(shape.edges[eoff + segs], @shape.vertices[voff + segs], @shape.vertices[voff + 1]);
shape.verticesLength := voff + segs;
shape.facesLength := foff + 0;
shape.length := eoff + segs;
shape.edgesLength := eoff + segs;
end;
{publics}

View File

@ -25,7 +25,7 @@ interface
Shape3D = record
origin: Point3D;
length, verticesLength, facesLength: Integer;
verticesLength, edgesLength, facesLength: Integer;
vertices: array[1..LIMIT_VERTICES] of Point3D;
edges: array[1..LIMIT_EDGES] of Link3D;
faces: array[1..LIMIT_FACES] of Face3D;
@ -151,8 +151,6 @@ implementation
end;
procedure AddVertice3D (var shape: Shape3D; x, y, z: Fixed);
var
voff: Integer; { vertices offset}
begin
if shape.verticesLength > LIMIT_VERTICES - 1 then
SceneError('Verticles limit reached');
@ -162,10 +160,10 @@ implementation
procedure AddLink3D (var shape: Shape3D; a, b: Integer);
begin
if shape.length > LIMIT_EDGES - 1 then
if shape.EdgesLength > LIMIT_EDGES - 1 then
SceneError('Edges limit reached');
shape.length := shape.length + 1;
SetLk3D(shape.edges[shape.length], @shape.vertices[a], @shape.vertices[b]);
shape.EdgesLength := shape.EdgesLength + 1;
SetLk3D(shape.edges[shape.EdgesLength], @shape.vertices[a], @shape.vertices[b]);
end;
procedure AddFace3D (var shape: Shape3D; a, b, c: Integer);
@ -203,7 +201,7 @@ implementation
begin
for i := 1 to shape^.facesLength do
DrawFace3D(shape^.faces[i]);
for i := 1 to shape^.length do
for i := 1 to shape^.EdgesLength do
DrawLink3D(shape^.edges[i]);
end;