Skip to content

Commit

Permalink
chore: update road coordinates (#125)
Browse files Browse the repository at this point in the history
  • Loading branch information
dalkia authored May 13, 2024
1 parent 08ce7c0 commit adab0e3
Show file tree
Hide file tree
Showing 8 changed files with 7,798 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dispatch-lod-conversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- name: Copy road coordinates
run: |
Copy-Item -Path "${{ github.workspace }}\DCL_PiXYZ\bin\Release\netcoreapp3.1\win10-x64\RoadCoordinates.json" -Destination "${{ github.workspace }}\publish"
Copy-Item -Path "${{ github.workspace }}\DCL_PiXYZ\bin\Release\netcoreapp3.1\win10-x64\SingleParcelRoadCoordinates.json" -Destination "${{ github.workspace }}\publish"
shell: pwsh

- name: Install Vulkan SDK
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-lod-conversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

- name: Copy road coordinates
run: |
Copy-Item -Path "${{ github.workspace }}\DCL_PiXYZ\bin\Release\netcoreapp3.1\win10-x64\RoadCoordinates.json" -Destination "${{ github.workspace }}\publish"
Copy-Item -Path "${{ github.workspace }}\DCL_PiXYZ\bin\Release\netcoreapp3.1\win10-x64\SingleParcelRoadCoordinates.json" -Destination "${{ github.workspace }}\publish"
shell: pwsh

- name: Copy license file
Expand Down
2 changes: 1 addition & 1 deletion DCL_PiXYZ/DCL_PiXYZ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<SceneLODManifestFolder Include="@(SceneLODManifest->'%(FullPath)')" TargetPath="scene-lod-entities-manifest-builder\%(RecursiveDir)%(Filename)%(Extension)" />

<!-- Addition of a single file with the same relative output path -->
<RoadManifest Include="..\RoadCoordinates.json" />
<RoadManifest Include="..\SingleParcelRoadCoordinates.json" />
<RoadCoordinatesFolder Include="@(RoadManifest->'%(FullPath)')" TargetPath="%(Filename)%(Extension)" />

<!-- Addition of a single file with the same relative output path -->
Expand Down
2 changes: 1 addition & 1 deletion DCL_PiXYZ/PXZEntryPoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ private static bool IsRoad(List<string> roadCoordinates, string currentScene)

private static List<string> LoadRoads()
{
string filePath = Path.Combine(Directory.GetCurrentDirectory(), "RoadCoordinates.json");
string filePath = Path.Combine(Directory.GetCurrentDirectory(), "SingleParcelRoadCoordinates.json");
return JsonConvert.DeserializeObject<List<string>>(File.ReadAllText(filePath));
}

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ FROM base as consumer-server-build

WORKDIR /app

COPY RoadCoordinates.json ./RoadCoordinates.json
COPY SingleParcelRoadCoordinates.json ./SingleParcelRoadCoordinates.json

WORKDIR /app/consumer-server

Expand All @@ -51,7 +51,7 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as dotnet-build
WORKDIR /build

COPY ./pixyz_license_decentraland.bin ./
COPY RoadCoordinates.json ./
COPY SingleParcelRoadCoordinates.json ./
COPY DCL_PiXYZ/ ./DCL_PiXYZ
COPY nuget.config ./
ARG PIXYZ_PACKAGE
Expand Down Expand Up @@ -91,7 +91,7 @@ COPY pixyz_license_decentraland.bin ./pixyz_license_decentraland.bin
WORKDIR /app

COPY pixyz_license_decentraland.bin ./pixyz_license_decentraland.bin
COPY RoadCoordinates.json ./RoadCoordinates.json
COPY SingleParcelRoadCoordinates.json ./SingleParcelRoadCoordinates.json
COPY --from=scene-lod-build /scene-lod/dist ./scene-lod/dist
COPY --from=scene-lod-build /scene-lod/package.json ./scene-lod/
COPY --from=scene-lod-build /scene-lod/package-lock.json ./scene-lod/
Expand Down
1 change: 0 additions & 1 deletion RoadCoordinates.json

This file was deleted.

Loading

0 comments on commit adab0e3

Please sign in to comment.