Skip to content

Commit 104765f

Browse files
committed
updated for nuget 0.2.0
1 parent 4a99928 commit 104765f

File tree

4 files changed

+77
-100
lines changed

4 files changed

+77
-100
lines changed

DEMNet.Sample.sln

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{BC338F65-6
1010
EndProject
1111
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DEMNet.Sample", "DEMNet.Sample\DEMNet.Sample.csproj", "{3E719AA3-6920-4566-AB99-9735D048D042}"
1212
EndProject
13-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dem.Net Core", "Dem.Net Core", "{6FD310F1-3AE4-465D-8745-A39615517CC9}"
14-
EndProject
15-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DEM.Net.Core", "..\..\DEM.Net\DEM.Net.Core\DEM.Net.Core.csproj", "{B9B17D9F-9495-406A-945C-92459AD906D8}"
16-
EndProject
17-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DEM.Net.glTF", "..\..\DEM.Net\DEM.Net.glTF\DEM.Net.glTF.csproj", "{465AFB48-67E2-4565-8EFB-B5D2B9FCBBEC}"
18-
EndProject
1913
Global
2014
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2115
Debug|Any CPU = Debug|Any CPU
@@ -26,24 +20,10 @@ Global
2620
{3E719AA3-6920-4566-AB99-9735D048D042}.Debug|Any CPU.Build.0 = Debug|Any CPU
2721
{3E719AA3-6920-4566-AB99-9735D048D042}.Release|Any CPU.ActiveCfg = Release|Any CPU
2822
{3E719AA3-6920-4566-AB99-9735D048D042}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{B9B17D9F-9495-406A-945C-92459AD906D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{B9B17D9F-9495-406A-945C-92459AD906D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{B9B17D9F-9495-406A-945C-92459AD906D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{B9B17D9F-9495-406A-945C-92459AD906D8}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{465AFB48-67E2-4565-8EFB-B5D2B9FCBBEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{465AFB48-67E2-4565-8EFB-B5D2B9FCBBEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{465AFB48-67E2-4565-8EFB-B5D2B9FCBBEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{465AFB48-67E2-4565-8EFB-B5D2B9FCBBEC}.Release|Any CPU.Build.0 = Release|Any CPU
3723
EndGlobalSection
3824
GlobalSection(SolutionProperties) = preSolution
3925
HideSolutionNode = FALSE
4026
EndGlobalSection
41-
GlobalSection(NestedProjects) = preSolution
42-
{E8381EFB-9264-40D7-B9B2-3C72F039A1F5} = {8CCD6B02-86A2-4704-B1B6-6566864473BE}
43-
{A3BB17D5-D793-4977-9907-00E90F4C4C91} = {8CCD6B02-86A2-4704-B1B6-6566864473BE}
44-
{B9B17D9F-9495-406A-945C-92459AD906D8} = {6FD310F1-3AE4-465D-8745-A39615517CC9}
45-
{465AFB48-67E2-4565-8EFB-B5D2B9FCBBEC} = {6FD310F1-3AE4-465D-8745-A39615517CC9}
46-
EndGlobalSection
4727
GlobalSection(ExtensibilityGlobals) = postSolution
4828
SolutionGuid = {1661BA82-EB48-448E-9940-DD9FEE6B67F5}
4929
EndGlobalSection

DEMNet.Sample/DEMNet.Sample.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28+
<PackageReference Include="DEM.Net.Core" Version="0.2.0" />
29+
<PackageReference Include="DEM.Net.glTF" Version="0.2.0" />
2830
<PackageReference Include="GeoJSON.Net" Version="1.1.73" />
2931
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.0" />
3032
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
@@ -35,11 +37,6 @@
3537
<PackageReference Include="SharpGLTF.Toolkit" Version="1.0.0-alpha0014" />
3638
</ItemGroup>
3739

38-
<ItemGroup>
39-
<ProjectReference Include="..\..\..\DEM.Net\DEM.Net.Core\DEM.Net.Core.csproj" />
40-
<ProjectReference Include="..\..\..\DEM.Net\DEM.Net.glTF\DEM.Net.glTF.csproj" />
41-
</ItemGroup>
42-
4340

4441
<ItemGroup>
4542
<None Update="SampleData\20191022-Puch-Pöllau.gpx">

DEMNet.Sample/SampleApplication.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public Task StartAsync(CancellationToken cancellationToken)
103103
}
104104
using (_logger.BeginScope($"Running {nameof(AerialGpxSample)}.."))
105105
{
106-
aerialGpxSample.Run(DEMDataSet.SRTM_GL3, DEMDataSet.ASTER_GDEMV3, useSensorLog: true);
106+
aerialGpxSample.Run(DEMDataSet.SRTM_GL3, DEMDataSet.ASTER_GDEMV3, useSensorLog: false);
107107
//aerialGpxSample.Run(DEMDataSet.SRTM_GL1);
108108
//aerialGpxSample.Run(DEMDataSet.AW3D30);
109109
//gpx3DSamples.Run(DEMDataSet.SRTM_GL1, true, false, Reprojection.SRID_PROJECTED_MERCATOR);

DEMNet.Sample/Samples/AerialGpxSample.cs

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -137,80 +137,80 @@ private void RunSimpleAnimation(string name, Vector3 translation, Vector3 localT
137137

138138
internal void RunSensorLog(DEMDataSet largeDataSet, DEMDataSet localDataset)
139139
{
140-
// sensor log needs data filtering
141-
// => some coordinates are null (not in the json data)
142-
// => most accurate is RelativeElevation
143-
// => this is height above initial point, need to sum with start elevation
144-
try
145-
{
146-
string outputDir = Path.GetFullPath(".");
147-
//string _gpxFile = Path.Combine("SampleData", "20191022-Puch-Pöllau.gpx");
148-
string sensorLogFile = Path.Combine("SampleData", "20191023-Puch-Pöllau-sensorlog.json");
149-
var sensorLog = SensorLog.FromJson(sensorLogFile);
150-
//sensorLog.Plot("sensorLog.png");
151-
string balloonModel = Path.Combine("SampleData", "OE-SOE.glb");
152-
float Z_FACTOR = 2f;
153-
float trailWidthMeters = 5f;
154-
155-
156-
ModelRoot balloon = ModelRoot.Load(balloonModel);
157-
158-
//=======================
159-
/// Line strip from SensorLog
160-
///
161-
var pointsGpx = sensorLog.ToGPX().ToList();
162-
var geoPoints = sensorLog.ToGeoPoints().ToList();
163-
164-
var firstElevation = _elevationService.GetPointElevation(geoPoints.First(), localDataset);
165-
foreach (var p in pointsGpx) p.Elevation += firstElevation.Elevation.Value;
166-
foreach (var p in geoPoints) p.Elevation += firstElevation.Elevation.Value;
167-
168-
var model = _sharpGltfService.CreateNewModel();
169-
//var largeMesh = GetMeshFromGpxTrack(outputDir, largeDataSet, geoPoints
170-
// , bboxScale: 5
171-
// , zFactor: Z_FACTOR
172-
// , generateTIN: false
173-
// , tinPrecision: 500d
174-
// , drawGpxOnTexture: false
175-
// , ImageryProvider.OpenTopoMap);
176-
//meshes.Add(largeMesh);
177-
178-
model = GetMeshFromGpxTrack(model, outputDir, localDataset, geoPoints
179-
, bboxScale: (1.05, 1.05)
180-
, zFactor: Z_FACTOR
181-
, generateTIN: false
182-
, tinPrecision: 50d
183-
, drawGpxOnTexture: true
184-
, ImageryProvider.EsriWorldImagery);
185-
186-
187-
var gpxPoints = geoPoints.ReprojectGeodeticToCartesian().ZScale(Z_FACTOR);
188-
189-
model = _sharpGltfService.AddLine(model, gpxPoints, new Vector4(0, 1, 0, 0.5f), trailWidthMeters);
190-
191-
// model export
192-
Console.WriteLine("GenerateModel...");
193-
194-
var node = model.LogicalNodes.First();
195-
pointsGpx = pointsGpx.ReprojectGeodeticToCartesian().ZScale(Z_FACTOR);
196-
// animations
197-
node = CreateAnimationFromGpx("GPX", node, pointsGpx, 1f);
198-
node = CreateAnimationFromGpx("GPX x500", node, pointsGpx, 500f);
199-
200-
201-
//var sceneBuilderBalloon = balloon.DefaultScene.ToSceneBuilder();
202-
203-
//var sceneBuilderTerrain = model.DefaultScene.ToSceneBuilder();
204-
//sceneBuilderBalloon.
205-
206-
207-
208-
model.SaveGLB(Path.Combine(Directory.GetCurrentDirectory(), $"{GetType().Name}.glb"));
209-
}
210-
catch (Exception ex)
211-
{
212-
_logger.LogError(ex, ex.Message);
213-
}
140+
//// sensor log needs data filtering
141+
//// => some coordinates are null (not in the json data)
142+
//// => most accurate is RelativeElevation
143+
//// => this is height above initial point, need to sum with start elevation
144+
//try
145+
//{
146+
// string outputDir = Path.GetFullPath(".");
147+
// //string _gpxFile = Path.Combine("SampleData", "20191022-Puch-Pöllau.gpx");
148+
// string sensorLogFile = Path.Combine("SampleData", "20191023-Puch-Pöllau-sensorlog.json");
149+
// var sensorLog = SensorLog.FromJson(sensorLogFile);
150+
// //sensorLog.Plot("sensorLog.png");
151+
// string balloonModel = Path.Combine("SampleData", "OE-SOE.glb");
152+
// float Z_FACTOR = 2f;
153+
// float trailWidthMeters = 5f;
154+
155+
156+
// ModelRoot balloon = ModelRoot.Load(balloonModel);
157+
158+
// //=======================
159+
// /// Line strip from SensorLog
160+
// ///
161+
// var pointsGpx = sensorLog.ToGPX().ToList();
162+
// var geoPoints = sensorLog.ToGeoPoints().ToList();
163+
164+
// var firstElevation = _elevationService.GetPointElevation(geoPoints.First(), localDataset);
165+
// foreach (var p in pointsGpx) p.Elevation += firstElevation.Elevation.Value;
166+
// foreach (var p in geoPoints) p.Elevation += firstElevation.Elevation.Value;
167+
168+
// var model = _sharpGltfService.CreateNewModel();
169+
// //var largeMesh = GetMeshFromGpxTrack(outputDir, largeDataSet, geoPoints
170+
// // , bboxScale: 5
171+
// // , zFactor: Z_FACTOR
172+
// // , generateTIN: false
173+
// // , tinPrecision: 500d
174+
// // , drawGpxOnTexture: false
175+
// // , ImageryProvider.OpenTopoMap);
176+
// //meshes.Add(largeMesh);
177+
178+
// model = GetMeshFromGpxTrack(model, outputDir, localDataset, geoPoints
179+
// , bboxScale: (1.05, 1.05)
180+
// , zFactor: Z_FACTOR
181+
// , generateTIN: false
182+
// , tinPrecision: 50d
183+
// , drawGpxOnTexture: true
184+
// , ImageryProvider.EsriWorldImagery);
185+
186+
187+
// var gpxPoints = geoPoints.ReprojectGeodeticToCartesian().ZScale(Z_FACTOR);
188+
189+
// model = _sharpGltfService.AddLine(model, gpxPoints, new Vector4(0, 1, 0, 0.5f), trailWidthMeters);
190+
191+
// // model export
192+
// Console.WriteLine("GenerateModel...");
193+
194+
// var node = model.LogicalNodes.First();
195+
// pointsGpx = pointsGpx.ReprojectGeodeticToCartesian().ZScale(Z_FACTOR);
196+
// // animations
197+
// node = CreateAnimationFromGpx("GPX", node, pointsGpx, 1f);
198+
// node = CreateAnimationFromGpx("GPX x500", node, pointsGpx, 500f);
199+
200+
201+
// //var sceneBuilderBalloon = balloon.DefaultScene.ToSceneBuilder();
202+
203+
// //var sceneBuilderTerrain = model.DefaultScene.ToSceneBuilder();
204+
// //sceneBuilderBalloon.
205+
206+
207+
208+
// model.SaveGLB(Path.Combine(Directory.GetCurrentDirectory(), $"{GetType().Name}.glb"));
209+
//}
210+
//catch (Exception ex)
211+
//{
212+
// _logger.LogError(ex, ex.Message);
213+
//}
214214

215215
}
216216

0 commit comments

Comments
 (0)