Skip to content

Commit b2dd958

Browse files
apprentice3dapprentice3d
authored
Merge pull request #29 from rinku-thakur/SDK6.3.0
Update to DX SDK 6.3.0
2 parents 07d6360 + f104be6 commit b2dd958

File tree

7 files changed

+189
-171
lines changed

7 files changed

+189
-171
lines changed

‎src/CreateExchangeHelper.cs‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class CreateExchangeHelper
3434

3535
private static readonly Autodesk.GeometryUtilities.MeshAPI.Mesh SampleMeshApiObject = new Autodesk.GeometryUtilities.MeshAPI.Mesh
3636
{
37-
MeshColor = new Color(0.5f, 0.0f, 0.70f, 1.0f),
37+
MeshColor = new Color(127, 0, 178, 255),
3838
Vertices = new List<Vertex>
3939
{
4040
new Vertex(-1, -1, -1),
@@ -48,18 +48,18 @@ public class CreateExchangeHelper
4848
},
4949
Faces = new List<Face>
5050
{
51-
new Face { Corners = new List<int> { 0, 2, 1 }, FaceColor = new Color(1.0f, 1.0f, 1.0f, 1.0f) },
52-
new Face { Corners = new List<int> { 0, 3, 2 }, FaceColor = new Color(1.0f, 1.0f, 1.0f, 1.0f) },
53-
new Face { Corners = new List<int> { 4, 5, 6 }, FaceColor = new Color(1.0f, 1.0f, 1.0f, 1.0f) },
54-
new Face { Corners = new List<int> { 4, 6, 7 }, FaceColor = new Color(0.0f, 0.4f, 1.0f, 1.0f) },
55-
new Face { Corners = new List<int> { 0, 3, 7 }, FaceColor = new Color(1.0f, 1.0f, 1.0f, 1.0f) },
56-
new Face { Corners = new List<int> { 0, 7, 4 }, FaceColor = new Color(1.0f, 1.0f, 1.0f, 1.0f) },
57-
new Face { Corners = new List<int> { 1, 5, 6 }, FaceColor = new Color(1.0f, 1.0f, 1.0f, 1.0f) },
58-
new Face { Corners = new List<int> { 1, 6, 2 }, FaceColor = new Color(1.0f, 0.3f, 1.0f, 1.0f) },
59-
new Face { Corners = new List<int> { 3, 2, 7 }, FaceColor = new Color(1.0f, 1.0f, 1.0f, 1.0f) },
60-
new Face { Corners = new List<int> { 2, 6, 7 }, FaceColor = new Color(1.0f, 1.0f, 0.1f, 1.0f) },
61-
new Face { Corners = new List<int> { 0, 1, 5 }, FaceColor = new Color(1.0f, 1.0f, 1.0f, 1.0f) },
62-
new Face { Corners = new List<int> { 0, 5, 4 }, FaceColor = new Color(1.0f, 1.0f, 0.8f, 1.0f) }
51+
new Face { Corners = new List<int> { 0, 2, 1 }, FaceColor = new Color(255, 255, 255, 255) },
52+
new Face { Corners = new List<int> { 0, 3, 2 }, FaceColor = new Color(255, 255, 255, 255) },
53+
new Face { Corners = new List<int> { 4, 5, 6 }, FaceColor = new Color(255, 255, 255, 255) },
54+
new Face { Corners = new List<int> { 4, 6, 7 }, FaceColor = new Color(0, 102, 255, 255) },
55+
new Face { Corners = new List<int> { 0, 3, 7 }, FaceColor = new Color(255, 255, 255, 255) },
56+
new Face { Corners = new List<int> { 0, 7, 4 }, FaceColor = new Color(255, 255, 255, 255) },
57+
new Face { Corners = new List<int> { 1, 5, 6 }, FaceColor = new Color(255, 255, 255, 255) },
58+
new Face { Corners = new List<int> { 1, 6, 2 }, FaceColor = new Color(255, 76, 255, 255) },
59+
new Face { Corners = new List<int> { 3, 2, 7 }, FaceColor = new Color(255, 255, 255, 255) },
60+
new Face { Corners = new List<int> { 2, 6, 7 }, FaceColor = new Color(255, 255, 25, 255) },
61+
new Face { Corners = new List<int> { 0, 1, 5 }, FaceColor = new Color(255, 255, 255, 255) },
62+
new Face { Corners = new List<int> { 0, 5, 4 }, FaceColor = new Color(255, 255, 204, 255) }
6363

6464
}
6565
};
@@ -170,7 +170,7 @@ private void AddPrimitiveLineGeometries(ElementDataModel data)
170170

171171
var newBRepElementGeometry = new List<ElementGeometry>();
172172

173-
CurveSet setOfLines = new CurveSet();
173+
GeometryContainer setOfLines = new GeometryContainer();
174174

175175
Line lineone = new Line(new Point3d { X = 200, Y = 200, Z = 200 }, new Vector3d { X = 100, Y = 400, Z = 300 });
176176
ParamRange range = new ParamRange
@@ -180,7 +180,7 @@ private void AddPrimitiveLineGeometries(ElementDataModel data)
180180
Type = ParamRange.RangeType.Finite
181181
};
182182
lineone.Range = range;
183-
setOfLines.Add(lineone);
183+
setOfLines.Curves.Add(lineone);
184184

185185
newBRepElementGeometry.Add(ElementDataModel.CreatePrimitiveGeometry(new GeometryProperties(setOfLines, commonRenderStyle)));
186186
data.SetElementGeometry(newElement, newBRepElementGeometry);
@@ -189,17 +189,17 @@ private void AddPrimitiveLineGeometries(ElementDataModel data)
189189

190190
var newlineElementGeometry = new List<ElementGeometry>();
191191

192-
CurveSet settwoOfLines = new CurveSet();
192+
GeometryContainer settwoOfLines = new GeometryContainer();
193193
Line linetwo = new Line(new Point3d { X = -53.34, Y = 10.16, Z = 220.98 }, new Vector3d { X = 0, Y = 0, Z = -30.48 });
194194

195195
linetwo.Range = range;
196-
settwoOfLines.Add(linetwo);
196+
settwoOfLines.Curves.Add(linetwo);
197197

198-
CurveSet setthreeOfLines = new CurveSet();
198+
GeometryContainer setthreeOfLines = new GeometryContainer();
199199
Line linethree = new Line(new Point3d { X = -53.34, Y = 10.16, Z = 220.98 }, new Vector3d { X = 30.48, Y = 5.7, Z = 0 });
200200

201201
linethree.Range = range;
202-
setthreeOfLines.Add(linethree);
202+
setthreeOfLines.Curves.Add(linethree);
203203

204204
newlineElementGeometry.Add(ElementDataModel.CreatePrimitiveGeometry(new GeometryProperties(settwoOfLines, commonRenderStyle)));
205205
newlineElementGeometry.Add(ElementDataModel.CreatePrimitiveGeometry(new GeometryProperties(setthreeOfLines, commonRenderStyle)));
@@ -388,7 +388,7 @@ public void AddMeshGeometry(ElementDataModel data)
388388

389389
var meshObjWithColor = new Autodesk.GeometryUtilities.MeshAPI.Mesh()
390390
{
391-
MeshColor = new Color(0.9f, 0.2f, 0.2f, 1.0f), // mesh body color
391+
MeshColor = new Color(229, 51, 51, 255), // mesh body color
392392
Vertices = new List<Vertex>
393393
{
394394
new Vertex(0.0, 0.0, 0.0),
@@ -407,7 +407,7 @@ public void AddMeshGeometry(ElementDataModel data)
407407
new Normal(0, 0, 1),
408408
new Normal(0, 0, 1),
409409
},
410-
FaceColor = new Color(0.2f, 0.2f, 0.9f, 1.0f), // face color
410+
FaceColor = new Color(51, 51, 229, 255), // face color
411411
},
412412
new Face()
413413
{
@@ -418,14 +418,14 @@ public void AddMeshGeometry(ElementDataModel data)
418418
new Normal(0, 0, 1),
419419
new Normal(0, 0, 1),
420420
},
421-
FaceColor = new Color(0.2f, 0.9f, 0.2f, 1.0f), // face color
421+
FaceColor = new Color(51, 229, 51, 255), // face color
422422
},
423423
},
424424
};
425425

426426
var complexMesh = new Autodesk.GeometryUtilities.MeshAPI.Mesh()
427427
{
428-
MeshColor = new Color(0.5f, 0.5f, 0.5f, 1.0f), // mesh body color
428+
MeshColor = new Color(127, 127, 127, 255), // mesh body color
429429
Vertices = new List<Vertex>
430430
{
431431
new Vertex(0.0, 0.0, 0.0),
@@ -449,7 +449,7 @@ public void AddMeshGeometry(ElementDataModel data)
449449
new Normal(0, 0, 1),
450450
new Normal(0, 0, 1),
451451
},
452-
FaceColor = new Color(0.2f, 0.2f, 0.9f, 1.0f), // face color
452+
FaceColor = new Color(51, 51, 229, 255), // face color
453453
},
454454
new Face()
455455
{
@@ -460,7 +460,7 @@ public void AddMeshGeometry(ElementDataModel data)
460460
new Normal(0, 0, 1),
461461
new Normal(0, 0, 1),
462462
},
463-
FaceColor = new Color(0.2f, 0.9f, 0.2f, 1.0f), // face color
463+
FaceColor = new Color(51, 229, 51, 255), // face color
464464
},
465465
new Face()
466466
{
@@ -471,7 +471,7 @@ public void AddMeshGeometry(ElementDataModel data)
471471
new Normal(0, 1, 0),
472472
new Normal(0, 1, 0),
473473
},
474-
FaceColor = new Color(0.9f, 0.2f, 0.2f, 1.0f), // face color
474+
FaceColor = new Color(229, 51, 51, 255), // face color
475475
},
476476
new Face()
477477
{
@@ -482,7 +482,7 @@ public void AddMeshGeometry(ElementDataModel data)
482482
new Normal(0, 1, 0),
483483
new Normal(0, 1, 0),
484484
},
485-
FaceColor = new Color(0.9f, 0.2f, 0.2f, 1.0f), // face color
485+
FaceColor = new Color(229, 51, 51, 255), // face color
486486
},
487487
new Face()
488488
{
@@ -493,7 +493,7 @@ public void AddMeshGeometry(ElementDataModel data)
493493
new Normal(1, 0, 0),
494494
new Normal(1, 0, 0),
495495
},
496-
FaceColor = new Color(0.2f, 0.9f, 0.9f, 1.0f), // face color
496+
FaceColor = new Color(51, 229, 229, 255), // face color
497497
},
498498
new Face()
499499
{
@@ -504,7 +504,7 @@ public void AddMeshGeometry(ElementDataModel data)
504504
new Normal(1, 0, 0),
505505
new Normal(1, 0, 0),
506506
},
507-
FaceColor = new Color(0.2f, 0.9f, 0.9f, 1.0f), // face color
507+
FaceColor = new Color(51, 229, 229, 255), // face color
508508
},
509509
new Face()
510510
{
@@ -515,7 +515,7 @@ public void AddMeshGeometry(ElementDataModel data)
515515
new Normal(0, -1, 0),
516516
new Normal(0, -1, 0),
517517
},
518-
FaceColor = new Color(0.9f, 0.9f, 0.2f, 1.0f), // face color
518+
FaceColor = new Color(229, 229, 51, 255), // face color
519519
},
520520
new Face()
521521
{
@@ -526,7 +526,7 @@ public void AddMeshGeometry(ElementDataModel data)
526526
new Normal(0, -1, 0),
527527
new Normal(0, -1, 0),
528528
},
529-
FaceColor = new Color(0.9f, 0.9f, 0.2f, 1.0f), // face color
529+
FaceColor = new Color(229, 229, 51, 255), // face color
530530
},
531531
new Face()
532532
{
@@ -537,7 +537,7 @@ public void AddMeshGeometry(ElementDataModel data)
537537
new Normal(-1, 0, 0),
538538
new Normal(-1, 0, 0),
539539
},
540-
FaceColor = new Color(0.9f, 0.2f, 0.9f, 1.0f), // face color
540+
FaceColor = new Color(229, 51, 229, 255), // face color
541541
},
542542
new Face()
543543
{
@@ -548,7 +548,7 @@ public void AddMeshGeometry(ElementDataModel data)
548548
new Normal(-1, 0, 0),
549549
new Normal(-1, 0, 0),
550550
},
551-
FaceColor = new Color(0.9f, 0.2f, 0.9f, 1.0f), // face color
551+
FaceColor = new Color(229, 51, 229, 255), // face color
552552
},
553553
new Face()
554554
{
@@ -559,7 +559,7 @@ public void AddMeshGeometry(ElementDataModel data)
559559
new Normal(0, 0, -1),
560560
new Normal(0, 0, -1),
561561
},
562-
FaceColor = new Color(0.2f, 0.2f, 0.2f, 1.0f), // face color
562+
FaceColor = new Color(51, 51, 51, 255), // face color
563563
},
564564
new Face()
565565
{
@@ -570,7 +570,7 @@ public void AddMeshGeometry(ElementDataModel data)
570570
new Normal(0, 0, -1),
571571
new Normal(0, 0, -1),
572572
},
573-
FaceColor = new Color(0.2f, 0.2f, 0.2f, 1.0f), // face color
573+
FaceColor = new Color(51, 51, 51, 255), // face color
574574
},
575575
new Face()
576576
{
@@ -581,7 +581,7 @@ public void AddMeshGeometry(ElementDataModel data)
581581
new Normal(0, 0, 1),
582582
new Normal(0, 0, 1),
583583
},
584-
FaceColor = new Color(0.5f, 0.5f, 0.5f, 1.0f), // face color
584+
FaceColor = new Color(127, 127, 127, 255), // face color
585585
},
586586
new Face()
587587
{
@@ -592,7 +592,7 @@ public void AddMeshGeometry(ElementDataModel data)
592592
new Normal(0, 0, 1),
593593
new Normal(0, 0, 1),
594594
},
595-
FaceColor = new Color(0.5f, 0.5f, 0.5f, 1.0f), // face color
595+
FaceColor = new Color(127, 127, 127, 255), // face color
596596
},
597597
new Face()
598598
{
@@ -603,7 +603,7 @@ public void AddMeshGeometry(ElementDataModel data)
603603
new Normal(0, 0, 1),
604604
new Normal(0, 0, 1),
605605
},
606-
FaceColor = new Color(0.5f, 0.5f, 0.5f, 1.0f), // face color
606+
FaceColor = new Color(127, 127, 127, 255), // face color
607607
},
608608
},
609609
};
@@ -630,7 +630,7 @@ public void AddElementsForExchangeUpdate(ElementDataModel data)
630630

631631
var meshObjWithColor = new Autodesk.GeometryUtilities.MeshAPI.Mesh()
632632
{
633-
MeshColor = new Color(0.9f, 0.9f, 0.9f, 1.0f), // mesh body color
633+
MeshColor = new Color(229, 229, 229, 255), // mesh body color
634634
Vertices = new List<Vertex>
635635
{
636636
new Vertex(0.0, 0.0, 0.0),
@@ -649,7 +649,7 @@ public void AddElementsForExchangeUpdate(ElementDataModel data)
649649
new Normal(0, 0, 1),
650650
new Normal(0, 0, 1),
651651
},
652-
FaceColor = new Color(0.2f, 0.2f, 0.9f, 1.0f), // face color
652+
FaceColor = new Color(51, 51, 229, 255), // face color
653653
},
654654
new Face()
655655
{
@@ -660,7 +660,7 @@ public void AddElementsForExchangeUpdate(ElementDataModel data)
660660
new Normal(0, 0, 1),
661661
new Normal(0, 0, 1),
662662
},
663-
FaceColor = new Color(0.9f, 0.9f, 0.2f, 1.0f), // face color
663+
FaceColor = new Color(229, 229, 51, 255), // face color
664664
},
665665
},
666666
};

‎src/CustomReadWriteModel.cs‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Autodesk.DataExchange.Models;
1616
using Autodesk.DataExchange.UI.Core.Interfaces;
1717
using SeverityEnum = Autodesk.DataExchange.UI.Core.Enums.Severity;
18+
using Autodesk.DataExchange.ProgressManager.Enums;
1819

1920
class CustomReadWriteModel : BaseReadWriteExchangeModel
2021
{
@@ -61,6 +62,12 @@ public override async Task<DataExchange> GetExchangeAsync(DataExchangeIdentifier
6162
public async Task GetLatestExchangeDataAsync(GetLatestExchangeDetailsEventArgs arg)
6263
{
6364
var exchangeItem = arg.ExchangeItem;
65+
66+
var cancellationToken = arg.CancellationToken;
67+
var progressManager = this.Client.ProgressStepsManager;
68+
var fetchExchangeStep = progressManager.GetProgressStep(ProgressStepId.FetchExchange);
69+
fetchExchangeStep.SubSteps = 2;
70+
6471
this.Bridge?.SetProgressMessage(DownloadingMessage);
6572
this.Bridge?.SendNotification($"Downloading '{exchangeItem.Name}'", SeverityEnum.Info, 5000);
6673

@@ -100,6 +107,9 @@ private async Task DownloadExchangeGeometry(DataExchangeIdentifier exchangeIdent
100107
exchangeIdentifier.ExchangeId,
101108
exchangeIdentifier.CollectionId);
102109

110+
var downloadExchangeDataStep = this.Client.ProgressStepsManager.GetProgressStep(ProgressStepId.DownloadExchangeData);
111+
downloadExchangeDataStep?.MarkAsComplete();
112+
103113
Console.WriteLine($"Downloaded geometry: STEP={stepFilePath}, OBJ={objFilePath}");
104114
}
105115

@@ -116,7 +126,13 @@ private async Task ProcessExchangeRevisions(DataExchangeIdentifier exchangeIdent
116126
return;
117127
}
118128

129+
// Update progress for FetchExchange step
130+
var fetchExchangeStep = this.Client.ProgressStepsManager.GetProgressStep(ProgressStepId.FetchExchange);
131+
fetchExchangeStep?.UpdateProgress();
132+
119133
ElementDataModel data = await this.GetOrUpdateElementData(exchangeIdentifier, latestRevisionId, revisions, newerRevisions);
134+
fetchExchangeStep?.MarkAsComplete();
135+
120136
await this.AnalyzeExchangeElements(data, newerRevisions);
121137
}
122138

@@ -150,7 +166,7 @@ private async Task<ElementDataModel> GetOrUpdateElementData(
150166
var response = await this.Client.GetElementDataModelAsync(exchangeIdentifier);
151167
this.currentElementDataModel = response.Value;
152168
this.currentRevision = latestRevisionId;
153-
data = ElementDataModel.Create(Client);
169+
data = this.currentElementDataModel;
154170
newerRevisions.Add(latestRevisionId);
155171
}
156172
else

0 commit comments

Comments
 (0)