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

Jump to bottom

Jedd/cxpla 55 add required keyword for more geometry types #220

Merged
merged 16 commits into from
Sep 16, 2024
Merged

Jedd/cxpla 55 add required keyword for more geometry types #220

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c8dcc20
Nullability of TryGet function
JR-Morgan Sep 2, 2024
6cf90e7
blip
JR-Morgan Sep 2, 2024
2579c1a
Connector side changes
JR-Morgan Sep 5, 2024
987a01d
Fixes
JR-Morgan Sep 5, 2024
3d5a562
Fixed other SDK changes
JR-Morgan Sep 8, 2024
8b395b5
Merge remote-tracking branch 'origin/dev' into jedd/cxpla-55-add-requ…
JR-Morgan Sep 9, 2024
860a750
Fixed Meters defaulting in Revit
JR-Morgan Sep 9, 2024
2db4dfa
Merge remote-tracking branch 'origin/dev' into jedd/cxpla-55-add-requ…
JR-Morgan Sep 10, 2024
957a4ed
Agis fix required units (#224)
KatKatKateryna Sep 10, 2024
77fcbb1
Merge remote-tracking branch 'origin/dev' into jedd/cxpla-55-add-requ…
JR-Morgan Sep 13, 2024
ceab997
Fixed compiler errors
JR-Morgan Sep 13, 2024
3d2d571
Resolved PR Comments
JR-Morgan Sep 13, 2024
7e3dc1b
Fixed last revit units issue
JR-Morgan Sep 13, 2024
2c90ca7
extras
JR-Morgan Sep 13, 2024
6c2b146
Bumped sdk deps
JR-Morgan Sep 13, 2024
f2d5aee
Merge branch 'dev' into jedd/cxpla-55-add-required-keyword-for-more-g…
JR-Morgan Sep 16, 2024
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
Prev Previous commit
Next Next commit
Fixed compiler errors
  • Loading branch information
@JR-Morgan
JR-Morgan committed Sep 13, 2024
commit ceab997a6fa1a20e6f9684a7fae2ddd0a4a9582c
4 changes: 2 additions & 2 deletions Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadInstanceUnpacker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private void UnpackInstance(BlockReference instance, int depth, Transaction tran
if (
!_instanceObjectsManager.TryGetInstanceProxiesFromDefinitionId(
definitionId.ToString(),
out List<InstanceProxy> instanceProxiesWithSameDefinition
out List<InstanceProxy>? instanceProxiesWithSameDefinition
)
)
{
Expand All @@ -104,7 +104,7 @@ out List<InstanceProxy> instanceProxiesWithSameDefinition
if (
_instanceObjectsManager.TryGetInstanceDefinitionProxy(
definitionId.ToString(),
out InstanceDefinitionProxy value
out InstanceDefinitionProxy? value
)
)
{
Expand Down
7 changes: 6 additions & 1 deletion Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ private RenderMaterialProxy ConvertMaterialToRenderMaterialProxy(Material materi
renderMaterial["ior"] = material.Refraction.Index;
renderMaterial["reflectivity"] = material.Reflectivity;

return new(renderMaterial, new()) { applicationId = id };
return new RenderMaterialProxy()
{
value = renderMaterial,
objects = new(),
applicationId = id
};
}
}
4 changes: 2 additions & 2 deletions Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="RhinoCommon" NoWarn="NU1701" IncludeAssets="compile; build" PrivateAssets="all" />
<PackageReference Include="RhinoWindows" NoWarn="NU1701" IncludeAssets="compile; build" PrivateAssets="all" />
<PackageReference Include="RhinoCommon" IncludeAssets="compile; build" PrivateAssets="all" />
<PackageReference Include="RhinoWindows" IncludeAssets="compile; build" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoInstanceUnpacker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private void UnpackInstance(InstanceObject instance, int depth = 0)
if (
!_instanceObjectsManager.TryGetInstanceProxiesFromDefinitionId(
instanceDefinitionId,
out List<InstanceProxy> instanceProxiesWithSameDefinition
out List<InstanceProxy>? instanceProxiesWithSameDefinition
)
)
{
Expand All @@ -85,7 +85,7 @@ out List<InstanceProxy> instanceProxiesWithSameDefinition
instanceProxiesWithSameDefinition.Add(_instanceObjectsManager.GetInstanceProxy(instanceId));

if (
_instanceObjectsManager.TryGetInstanceDefinitionProxy(instanceDefinitionId, out InstanceDefinitionProxy value)
_instanceObjectsManager.TryGetInstanceDefinitionProxy(instanceDefinitionId, out InstanceDefinitionProxy? value)
)
{
int depthDifference = depth - value.maxDepth;
Expand Down
Loading