Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use representation instances for reducers #1089

Merged
merged 3 commits into from
Jan 6, 2025
Merged

Use representation instances for reducers #1089

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0620af2
Use representation instances for reducers
jamesbradleym Dec 24, 2024
2897b96
use the representationinstances cache
jamesbradleym Dec 31, 2024
8355394
revert but keep todo
jamesbradleym Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions Elements.MEP/src/Fittings/FittingRepresentationStorage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,32 @@ static class FittingRepresentationStorage
private static readonly Dictionary<string, List<RepresentationInstance>> _fittings = new Dictionary<string, List<RepresentationInstance>>();
public static Dictionary<string, List<RepresentationInstance>> Fittings => _fittings;

public static void SetFittingRepresentation(Fitting fitting, Func<IList<SolidOperation>> makeSolids)
public static void SetFittingRepresentation(Fitting fitting, Func<IList<SolidOperation>> makeSolids, Boolean unioned = true, Boolean updateTransform = true)
{
var hash = fitting.GetRepresentationHash();
if (!_fittings.ContainsKey(hash))
{
var solids = makeSolids();
_fittings.Add(hash, new List<RepresentationInstance> { new RepresentationInstance(new SolidRepresentation(solids), fitting.Material) });
var representationInstances = new List<RepresentationInstance>();
if (unioned)
{
representationInstances = new List<RepresentationInstance> { new RepresentationInstance(new SolidRepresentation(solids), fitting.Material) };
}
else
{
foreach (var solid in solids)
{
representationInstances.Add(new RepresentationInstance(new SolidRepresentation(solid), fitting.Material));
}
}
_fittings.Add(hash, representationInstances);
}
fitting.RepresentationInstances = _fittings[hash];

fitting.Transform = fitting.GetRotatedTransform().Concatenated(new Transform(fitting.Transform.Origin));
if (updateTransform)
{
fitting.Transform = fitting.GetRotatedTransform().Concatenated(new Transform(fitting.Transform.Origin));
}
}
}
}
6 changes: 5 additions & 1 deletion Elements.MEP/src/Fittings/Reducer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ public override void UpdateRepresentations()
var arrows = this.Start.GetArrow(branchSideTransformInverted.OfPoint(startNodeTransform.Origin))
.Concat(this.End.GetArrow(endNodeTransform.Origin)).Concat(GetExtensions());

this.Representation = new Representation(new List<SolidOperation> { sweep1, sweep2 }.Concat(arrows).ToList());
// TODO: Update the Factory pattern for setting representationInstances to work with Reducer transforms.
// It would also be ideal to fully understand the geometry artifacts seen with certain Reducers that result in
// bad boolean graphics which result in invisible or fractured geometry.
var solidOperations = new List<SolidOperation> { sweep1, sweep2 }.Concat(arrows).ToList();
FittingRepresentationStorage.SetFittingRepresentation(this, () => solidOperations, false, false);
}

public override void ApplyAdditionalTransform()
Expand Down
Loading