Skip to content

Commit

Permalink
Merge tag '2.1.0-alpha.23' into dmuravskyi/polycurve-transform-at
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	Elements/test/IndexedPolyCurveTests.cs
#	Elements/test/PolylineTests.cs
  • Loading branch information
DmytroMuravskyi committed Oct 23, 2023
2 parents d491da7 + 7ba0558 commit cbe03f9
Show file tree
Hide file tree
Showing 147 changed files with 768 additions and 105,505 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
- `Bezier.Intersects(Ellipse ellipse, out List<Vector3> results)`
- `Bezier.Intersects(Bezier other, out List<Vector3> results)`
- `Elements.Geometry.ThickenedPolyline`
- `Polygon.IntersectionLines`
- `Model.ToGlTF(MemoryStream stream...)`
- `Model.ToIFC(MemoryStream stream ...)`
- `Model.ToJson(MemoryStream stream ...)`
Expand All @@ -53,11 +54,16 @@

- `Polygon.Contains3D` passed wrong `out Containment containment` parameter in some cases.
- Code generation supports `Vector3?` and `Color?` types.
- `IndexedPolycurve.GetSubdivisionParameters` now works correctly with `startSetbackDistance` and `endSetbackDistance` parameters.
- `Polyline.Frames` now works correctly with `startSetbackDistance` and `endSetbackDistance` parameters.
- `Polygon.Frames` now works correctly with `startSetbackDistance` and `endSetbackDistance` parameters.
- `Polyline.TransformAt` returns correct transformations when parameter on domain is provided.
- `IndexedPolycurve` constructor that takes list of `BoundedCurve` now produces `CurveIndices` that share vertices and are withing index range. This means `IndexedPolyline.TransformedPolyline` preserves `CurveIndicies` on new `IndexedPolyline`.

### Changed
- `GltfExtensions.UseReferencedContentExtension` is now true by default.
- `GeometricElement.Intersects` method now supports multiple representations.
- `GltfExtensions.ToGlTF` creates parent node for element and child nodes for representation instances.

## 2.0.0

Expand Down
3 changes: 1 addition & 2 deletions Elements.MEP/Examples-Create Tree.dib
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

#!csharp

#r "nuget: Hypar.Elements,2.0.0-alpha.15"
#r "nuget: Hypar.Elements.MEP,2.0.0-alpha.15"
#r "nuget: Hypar.Elements.MEP,2.1.0-alpha.8"

#!markdown

Expand Down
7 changes: 3 additions & 4 deletions Elements.MEP/Examples-Routing Tree.dib
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

#!csharp

#r "nuget: Hypar.Elements,2.0.0-alpha.15"
#r "nuget: Hypar.Elements.MEP,2.0.0-alpha.15"
#r "nuget: Hypar.Elements.MEP,2.1.0-alpha.8"

#!markdown

Expand All @@ -18,8 +17,8 @@ var startPoints = new Vector3[] {(-3,10), (-2,5) ,
(4,6), (8,10)};
var endPoint = new Vector3(-5,-3);

var modelPoints = new ModelPoints(startPoints.Concat(new[] {endPoint}).ToList());
return modelPoints;
var circlesAtPoints = startPoints.Select(p => new ModelCurve(new Circle(p, 0.1), BuiltInMaterials.XAxis));
return circlesAtPoints;

#!markdown

Expand Down
2 changes: 1 addition & 1 deletion Elements.MEP/test/FittingsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public void PipeNetworkOperations(bool resizeNewPipe)
var pipeToResize = resizeNewPipe ? newEndPipe : pipe;
fittings.ResizePipe(pipeToResize, 0.06);
SaveToGltf("Operation resize after", fittings, "Resizing", true);
File.WriteAllText("../../../results/conns.dot", fittings.ToDotConnectors());
File.WriteAllText(TestUtils.GetTestPath() + "conns.dot", fittings.ToDotConnectors());

fittings.CheckComponentLabeling();

Expand Down
2 changes: 1 addition & 1 deletion Elements.MEP/test/TestUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class TestUtils
{
public static string GetTestPath(string directoryName = null)
{
var path = "../../../results/";
var path = "../../../TestResults/";
if (directoryName != null)
{
path = Path.Combine(path, directoryName);
Expand Down
Loading

0 comments on commit cbe03f9

Please sign in to comment.