Skip to content

Commit 02ce514

Browse files
committed
Merged with Development
1 parent 1ec19ba commit 02ce514

File tree

7 files changed

+63
-78
lines changed

7 files changed

+63
-78
lines changed

Xbim.Geometry.Engine.Interop.Tests/Xbim.Geometry.Engine.Interop.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<None Include="..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net47\Xbim.Geometry.Engine32.dll" Link="Xbim.Geometry.Engine32.dll">
20+
<None Include="..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net472\Xbim.Geometry.Engine32.dll" Link="Xbim.Geometry.Engine32.dll">
2121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2222
</None>
23-
<None Include="..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net47\Xbim.Geometry.Engine64.dll" Link="Xbim.Geometry.Engine64.dll">
23+
<None Include="..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net472\Xbim.Geometry.Engine64.dll" Link="Xbim.Geometry.Engine64.dll">
2424
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2525
</None>
2626
</ItemGroup>

Xbim.Geometry.Engine.Interop/Xbim.Geometry.Engine.Interop.csproj

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Description>Provides support for the Ifc4 and Ifc2x3 Geometry conversion.</Description>
88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
99
<PackageId>Xbim.Geometry.Engine.Interop</PackageId>
10-
<PackageIcon>logo.png</PackageIcon>
10+
<PackageIcon>xbim-toolkit-icon.png</PackageIcon>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
@@ -26,8 +26,8 @@
2626
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
2727
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
2828
<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
29-
<PackageReference Include="Xbim.Ifc" Version="5.1.322-develop" />
30-
<PackageReference Include="Xbim.Tessellator" Version="5.1.322-develop" />
29+
<PackageReference Include="Xbim.Ifc" Version="5.1.323" />
30+
<PackageReference Include="Xbim.Tessellator" Version="5.1.323" />
3131
</ItemGroup>
3232

3333
<ItemGroup>
@@ -44,35 +44,35 @@
4444
</ItemGroup>
4545

4646
<!--We need to execute this after a build to ensure the nuget packages are in the correct place for the c++ binding-->
47-
<Target Name="BuildNativeCodeEngine" AfterTargets="Build">
47+
<Target Name="BuildNativeCodeEngine" BeforeTargets="Build">
4848
<Message Text="Building Xbim.Geometry.Engine x32 and x64 Native Dlls" Importance="High" />
49-
<MSBuild Projects="@(NativeGeometryEngine)" Properties="Configuration=$(Configuration) ; OutDir=..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net47\" Targets="Build">
49+
<MSBuild Projects="@(NativeGeometryEngine)" Properties="Configuration=$(Configuration) ; OutDir=..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net472\" Targets="Build">
5050
<Output TaskParameter="TargetOutputs" ItemName="AssembliesBuiltByChildProjects" />
5151
</MSBuild>
5252
</Target>
5353

5454
<Target Name=" CleanNativeCodeEngine" BeforeTargets="Clean">
5555
<Message Text="Cleaning Xbim.Geometry.Engine x32 Native Dlls" Importance="High" />
56-
<MSBuild Projects="$(MSBuildProjectDirectory)\..\Xbim.Geometry.Engine\Xbim.Geometry.Engine.vcxproj" Properties="Configuration=$(Configuration);Platform=Win32;OutDir=..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net47\" Targets="Clean">
56+
<MSBuild Projects="$(MSBuildProjectDirectory)\..\Xbim.Geometry.Engine\Xbim.Geometry.Engine.vcxproj" Properties="Configuration=$(Configuration);Platform=Win32;OutDir=..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net472\" Targets="Clean">
5757
</MSBuild>
5858
<Message Text="Cleaning Xbim.Geometry.Engine x64 Native Dlls" Importance="High" />
59-
<MSBuild Projects="$(MSBuildProjectDirectory)\..\Xbim.Geometry.Engine\Xbim.Geometry.Engine.vcxproj" Properties="Configuration=$(Configuration);Platform=x64;OutDir=..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net47\" Targets="Clean">
59+
<MSBuild Projects="$(MSBuildProjectDirectory)\..\Xbim.Geometry.Engine\Xbim.Geometry.Engine.vcxproj" Properties="Configuration=$(Configuration);Platform=x64;OutDir=..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net472\" Targets="Clean">
6060
</MSBuild>
6161
</Target>
6262

6363
<ItemGroup>
64-
<Content Include="bin\$(Configuration)\net47\Xbim.Geometry.Engine32.dll">
64+
<Content Include="bin\$(Configuration)\net472\Xbim.Geometry.Engine32.dll">
6565
<Pack>true</Pack>
66-
<PackagePath>build\net47;</PackagePath>
66+
<PackagePath>build\net472;</PackagePath>
6767
</Content>
68-
<Content Include="bin\$(Configuration)\net47\Xbim.Geometry.Engine64.dll">
68+
<Content Include="bin\$(Configuration)\net472\Xbim.Geometry.Engine64.dll">
6969
<Pack>true</Pack>
70-
<PackagePath>build\net47;</PackagePath>
70+
<PackagePath>build\net472;</PackagePath>
7171
</Content>
7272
<Content Include="..\Xbim.Geometry.Engine.Interop.targets">
7373
<Link>Xbim.Geometry.Interop.targets</Link>
7474
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
75-
<PackagePath>build\net47;</PackagePath>
75+
<PackagePath>build\net472;</PackagePath>
7676
<Pack>true</Pack>
7777
</Content>
7878
</ItemGroup>
@@ -81,12 +81,7 @@
8181
<Folder Include="images\" />
8282
</ItemGroup>
8383

84-
<ItemGroup>
85-
<None Include="images\logo.png">
86-
<Pack>True</Pack>
87-
<PackagePath></PackagePath>
88-
</None>
89-
</ItemGroup>
84+
9085
<ItemGroup>
9186
<None Include="..\xbim-toolkit-icon.png" Pack="True" PackagePath="\" />
9287
</ItemGroup>

Xbim.Geometry.Engine.Interop/XbimGeometryEngine.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public XbimGeometryEngine() : this(null)
3030
public XbimGeometryEngine(ILogger<XbimGeometryEngine> logger)
3131
{
3232

33-
// Warn if runtime for Engine is not present, this is not necessary any more as we are net47
33+
// Warn if runtime for Engine is not present, this is not necessary any more as we are net472
3434
//XbimPrerequisitesValidator.Validate();
3535

3636

@@ -837,11 +837,7 @@ public IXbimGeometryObjectSet CreateSurfaceModel(IIfcPolygonalFaceSet shell, ILo
837837
}
838838
}
839839

840-
// TODO: Stubbed until we merge https://github.com/xBimTeam/XbimGeometry/commit/86bc1e83eeed0fd84b33bf64045cb6afeac3807b#diff-569f41af2079f5a015416a3c37bb6a5a1b81c5f97b33a341d506634abbfbe52b
841-
public XbimShapeGeometry CreateShapeGeometry(double oneMillimetre, IXbimGeometryObject geometryObject, double precision, ILogger logger = null)
842-
{
843-
throw new NotImplementedException();
844-
}
840+
845841
}
846842

847843
public static class LogHelper

Xbim.Geometry.Engine/XbimGeometryCreator.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,11 +1348,7 @@ namespace Xbim
13481348
return nullptr;
13491349
}
13501350

1351-
Xbim::Common::Geometry::XbimShapeGeometry^ XbimGeometryCreator::CreateShapeGeometry(double oneMillimetre, Xbim::Common::Geometry::IXbimGeometryObject^ geometryObject, double precision, Microsoft::Extensions::Logging::ILogger^ logger)
1352-
{
1353-
throw gcnew System::NotImplementedException();
1354-
// TODO: This is stubbed out until we merge the implementation from develop. temp fix for broken build
1355-
}
1351+
13561352

13571353
IXbimGeometryObject^ XbimGeometryCreator::Trim(XbimSetObject^ geometryObject)
13581354
{

Xbim.Geometry.Engine/XbimGeometryCreator.h

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,30 @@ namespace Xbim
2323

2424
public ref class XbimGeometryCreator : IXbimGeometryEngine
2525
{
26-
27-
static Assembly^ ResolveHandler(Object^ /*Sender*/, ResolveEventArgs^ /*args*/)
26+
27+
static Assembly^ ResolveHandler(Object^ /*Sender*/, ResolveEventArgs^ /*args*/)
2828
{
29-
29+
3030
// Warning: this should check the args for the assembly name!
3131
return nullptr;
3232
}
3333
bool Is3D(IIfcCurve^ rep);
34-
34+
3535
public:
3636

3737
static String^ SurfaceOfLinearExtrusion = "#SurfaceOfLinearExtrusion";
3838
static String^ PolylineTrimLengthOneForEntireLine = "#PolylineTrimLengthOneForEntireLine";
3939

4040
private:
41-
42-
IXbimGeometryObject ^ Trim(XbimSetObject ^geometryObject);
41+
42+
IXbimGeometryObject^ Trim(XbimSetObject^ geometryObject);
4343
static XbimGeometryCreator()
4444
{
4545
//AppDomain::CurrentDomain->AssemblyResolve += gcnew ResolveEventHandler(ResolveHandler);
4646
/*Assembly::Load("Xbim.Ifc4");
4747
Assembly::Load("Xbim.Common");
4848
Assembly::Load("Xbim.Tessellator");*/
49-
49+
5050
String^ timeOut = ConfigurationManager::AppSettings["BooleanTimeOut"];
5151
if (!int::TryParse(timeOut, BooleanTimeOut))
5252
BooleanTimeOut = 60;
@@ -63,18 +63,18 @@ namespace Xbim
6363
AngularDeflectionInRadians = 0.5;// deflection of 28 degrees
6464

6565
String^ ignoreIfcSweptDiskSolidParamsString = ConfigurationManager::AppSettings["IgnoreIfcSweptDiskSolidParams"];
66-
if(!bool::TryParse(ignoreIfcSweptDiskSolidParamsString,IgnoreIfcSweptDiskSolidParams))
66+
if (!bool::TryParse(ignoreIfcSweptDiskSolidParamsString, IgnoreIfcSweptDiskSolidParams))
6767
IgnoreIfcSweptDiskSolidParams = false;
68-
68+
6969
}
7070
protected:
7171
~XbimGeometryCreator()
7272
{
7373
}
74-
74+
7575
public:
7676

77-
77+
7878
//Central point for logging all errors
7979
static void LogInfo(ILogger^ logger, Object^ entity, String^ format, ... array<Object^>^ arg);
8080
static void LogWarning(ILogger^ logger, Object^ entity, String^ format, ... array<Object^>^ arg);
@@ -86,17 +86,17 @@ namespace Xbim
8686
static double LinearDeflectionInMM;
8787
static double AngularDeflectionInRadians;
8888
static bool IgnoreIfcSweptDiskSolidParams;
89-
89+
9090
virtual XbimShapeGeometry^ CreateShapeGeometry(IXbimGeometryObject^ geometryObject, double precision, double deflection, double angle, XbimGeometryType storageType, ILogger^ logger);
91-
91+
9292
virtual XbimShapeGeometry^ CreateShapeGeometry(IXbimGeometryObject^ geometryObject, double precision, double deflection, ILogger^ logger/*, double angle = 0.5, XbimGeometryType storageType = XbimGeometryType::Polyhedron*/)
9393
{
94-
return CreateShapeGeometry(geometryObject, precision, deflection, 0.5, XbimGeometryType::PolyhedronBinary,logger);
94+
return CreateShapeGeometry(geometryObject, precision, deflection, 0.5, XbimGeometryType::PolyhedronBinary, logger);
9595
};
9696

9797
virtual XbimShapeGeometry^ CreateShapeGeometry(double oneMillimetre, IXbimGeometryObject^ geometryObject, double precision, ILogger^ logger)
9898
{
99-
double linearDeflection = oneMillimetre * LinearDeflectionInMM;
99+
double linearDeflection = oneMillimetre * LinearDeflectionInMM;
100100
return CreateShapeGeometry(geometryObject, precision, linearDeflection, AngularDeflectionInRadians, XbimGeometryType::PolyhedronBinary, logger);
101101
};
102102

@@ -131,16 +131,16 @@ namespace Xbim
131131

132132
//Create Wire
133133
virtual IXbimWire^ CreateWire(IIfcCurve^ curve, ILogger^ logger);
134-
134+
135135
virtual IXbimWire^ CreateWire(IIfcCompositeCurveSegment^ compCurveSeg, ILogger^ logger);
136136
//Face creation
137-
virtual IXbimFace^ CreateFace(IIfcProfileDef ^ profile, ILogger^ logger);
138-
virtual IXbimFace^ CreateFace(IIfcCompositeCurve ^ cCurve, ILogger^ logger);
139-
virtual IXbimFace^ CreateFace(IIfcPolyline ^ pline, ILogger^ logger);
140-
virtual IXbimFace^ CreateFace(IIfcPolyLoop ^ loop, ILogger^ logger);
141-
virtual IXbimFace^ CreateFace(IIfcSurface ^ surface, ILogger^ logger);
142-
virtual IXbimFace^ CreateFace(IIfcPlane ^ plane, ILogger^ logger);
143-
virtual IXbimFace^ CreateFace(IXbimWire ^ wire, ILogger^ logger);
137+
virtual IXbimFace^ CreateFace(IIfcProfileDef^ profile, ILogger^ logger);
138+
virtual IXbimFace^ CreateFace(IIfcCompositeCurve^ cCurve, ILogger^ logger);
139+
virtual IXbimFace^ CreateFace(IIfcPolyline^ pline, ILogger^ logger);
140+
virtual IXbimFace^ CreateFace(IIfcPolyLoop^ loop, ILogger^ logger);
141+
virtual IXbimFace^ CreateFace(IIfcSurface^ surface, ILogger^ logger);
142+
virtual IXbimFace^ CreateFace(IIfcPlane^ plane, ILogger^ logger);
143+
virtual IXbimFace^ CreateFace(IXbimWire^ wire, ILogger^ logger);
144144

145145
//Shells creation
146146
virtual IXbimShell^ CreateShell(IIfcOpenShell^ shell, ILogger^ logger);
@@ -164,7 +164,7 @@ namespace Xbim
164164

165165
virtual IXbimSolid^ CreateSolid(IIfcBooleanResult^ ifcSolid, ILogger^ logger);
166166
virtual IXbimSolid^ CreateSolid(IIfcBooleanClippingResult^ ifcSolid, ILogger^ logger);
167-
167+
168168
virtual IXbimSolid^ CreateSolid(IIfcHalfSpaceSolid^ ifcSolid, ILogger^ logger);
169169
virtual IXbimSolid^ CreateSolid(IIfcPolygonalBoundedHalfSpace^ ifcSolid, ILogger^ logger);
170170
virtual IXbimSolid^ CreateSolid(IIfcBoxedHalfSpace^ ifcSolid, ILogger^ logger);
@@ -188,7 +188,7 @@ namespace Xbim
188188
virtual IXbimSolid^ CreateSolid(IIfcFaceBasedSurfaceModel^ ifcSurface, ILogger^ logger);
189189

190190
virtual IXbimSolid^ CreateSolid(IIfcCsgPrimitive3D^ ifcSolid, ILogger^ logger);
191-
191+
192192
virtual IXbimSolid^ CreateSolid(IIfcSphere^ ifcSolid, ILogger^ logger);
193193
virtual IXbimSolid^ CreateSolid(IIfcBlock^ ifcSolid, ILogger^ logger);
194194
virtual IXbimSolid^ CreateSolid(IIfcRightCircularCylinder^ ifcSolid, ILogger^ logger);
@@ -233,26 +233,25 @@ namespace Xbim
233233
virtual IXbimCurve^ CreateCurve(IIfcBSplineCurveWithKnots^ curve, ILogger^ logger);
234234
virtual IXbimCurve^ CreateCurve(IIfcOffsetCurve3D^ curve, ILogger^ logger);
235235
virtual IXbimCurve^ CreateCurve(IIfcOffsetCurve2D^ curve, ILogger^ logger);
236-
virtual XbimMatrix3D ToMatrix3D(IIfcObjectPlacement ^ objPlacement, ILogger^ logger);
236+
virtual XbimMatrix3D ToMatrix3D(IIfcObjectPlacement^ objPlacement, ILogger^ logger);
237237
virtual IXbimSolidSet^ CreateGrid(IIfcGrid^ grid, ILogger^ logger);
238238

239239
// Inherited via IXbimGeometryEngine
240-
virtual IXbimGeometryObject ^ Transformed(IXbimGeometryObject ^geometryObject, IIfcCartesianTransformationOperator ^transformation);
241-
virtual IXbimGeometryObject ^ Moved(IXbimGeometryObject ^geometryObject, IIfcPlacement ^placement);
242-
virtual IXbimGeometryObject ^ Moved(IXbimGeometryObject ^geometryObject, IIfcAxis2Placement3D ^placement)
240+
virtual IXbimGeometryObject^ Transformed(IXbimGeometryObject^ geometryObject, IIfcCartesianTransformationOperator^ transformation);
241+
virtual IXbimGeometryObject^ Moved(IXbimGeometryObject^ geometryObject, IIfcPlacement^ placement);
242+
virtual IXbimGeometryObject^ Moved(IXbimGeometryObject^ geometryObject, IIfcAxis2Placement3D^ placement)
243243
{
244-
return Moved(geometryObject, (IIfcPlacement ^)placement);
244+
return Moved(geometryObject, (IIfcPlacement^)placement);
245245
};
246-
virtual IXbimGeometryObject ^ Moved(IXbimGeometryObject ^geometryObject, IIfcAxis2Placement2D ^placement)
246+
virtual IXbimGeometryObject^ Moved(IXbimGeometryObject^ geometryObject, IIfcAxis2Placement2D^ placement)
247247
{
248-
return Moved(geometryObject, (IIfcPlacement ^)placement);
248+
return Moved(geometryObject, (IIfcPlacement^)placement);
249249
};
250-
virtual IXbimGeometryObject ^ Moved(IXbimGeometryObject ^geometryObject, IIfcObjectPlacement ^objectPlacement, ILogger^ logger);
250+
virtual IXbimGeometryObject^ Moved(IXbimGeometryObject^ geometryObject, IIfcObjectPlacement^ objectPlacement, ILogger^ logger);
251251
virtual IXbimGeometryObject^ FromBrep(String^ brepStr);
252252
virtual String^ ToBrep(IXbimGeometryObject^ geometryObject);
253253

254+
};
254255

255-
virtual Xbim::Common::Geometry::XbimShapeGeometry^ CreateShapeGeometry(double oneMillimetre, Xbim::Common::Geometry::IXbimGeometryObject^ geometryObject, double precision, Microsoft::Extensions::Logging::ILogger^ logger);
256-
};
257-
}
256+
};
258257
}

Xbim.Geometry.Regression/XbimRegression.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
1616
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1717
<PackageReference Include="NReco.Logging.File" Version="1.0.4" />
18-
<PackageReference Include="Xbim.Ifc" Version="5.1.314" />
19-
<PackageReference Include="Xbim.IO.Esent" Version="5.1.314" />
18+
<PackageReference Include="Xbim.Ifc" Version="5.1.323" />
19+
<PackageReference Include="Xbim.IO.Esent" Version="5.1.323" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<ProjectReference Include="..\Xbim.Geometry.Engine.Interop\Xbim.Geometry.Engine.Interop.csproj" />
2323
<ProjectReference Include="..\Xbim.ModelGeometry.Scene\Xbim.ModelGeometry.Scene.csproj" />
2424
</ItemGroup>
2525
<ItemGroup>
26-
<None Include="..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net47\Xbim.Geometry.Engine32.dll" Link="Xbim.Geometry.Engine32.dll">
26+
<None Include="..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net472\Xbim.Geometry.Engine32.dll" Link="Xbim.Geometry.Engine32.dll">
2727
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2828
</None>
29-
<None Include="..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net47\Xbim.Geometry.Engine64.dll" Link="Xbim.Geometry.Engine64.dll">
29+
<None Include="..\Xbim.Geometry.Engine.Interop\bin\$(Configuration)\net472\Xbim.Geometry.Engine64.dll" Link="Xbim.Geometry.Engine64.dll">
3030
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3131
</None>
3232
</ItemGroup>

Xbim.ModelGeometry.Scene/Xbim.ModelGeometry.Scene.csproj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Description>Provides support for the Geometry Scene creation.</Description>
88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
99
<EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
10-
<PackageIcon>logo.png</PackageIcon>
10+
<PackageIcon>xbim-toolkit-icon.png</PackageIcon>
1111
<Version>5.1.0.0-Dev</Version>
1212
<AssemblyVersion>5.1.0.1</AssemblyVersion>
1313
<FileVersion>5.1.0.1</FileVersion>
@@ -18,18 +18,17 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Xbim.Ifc" Version="5.1.314" />
22-
<PackageReference Include="Xbim.Tessellator" Version="5.1.314" />
21+
<PackageReference Include="Xbim.Ifc" Version="5.1.323" />
22+
<PackageReference Include="Xbim.Tessellator" Version="5.1.323" />
2323
</ItemGroup>
2424

2525
<ItemGroup>
2626
<ProjectReference Include="..\Xbim.Geometry.Engine.Interop\Xbim.Geometry.Engine.Interop.csproj" />
2727
</ItemGroup>
28-
28+
<ItemGroup>
29+
<None Include="..\xbim-toolkit-icon.png" Pack="True" PackagePath="\" />
30+
</ItemGroup>
2931
<ItemGroup>
3032
<Reference Include="System.Configuration" />
3133
</ItemGroup>
32-
<ItemGroup>
33-
<None Include="..\xbim-toolkit-icon.png" Pack="True" PackagePath="\" />
34-
</ItemGroup>
3534
</Project>

0 commit comments

Comments
 (0)