Skip to content

Conversation

wilhelmberg
Copy link
Contributor

@wilhelmberg wilhelmberg commented Aug 8, 2018

image

Related issues

#734 #889 #875

Fixes in this PR enable UWP player exports (HoloLens, XBox, Windows Phone, Desktop).

Notes:

  • only works with:
    • Scripting Runtime Version : .NET 4.x
    • Scripting Backend : .NET
    • IL2CPP does not work - for UWP builds.
      This is due to some dynamic features in Mapbox.Json.
  • before exporting to UWP all folders related to other AR devices (MapboxAR, GoogleARCore, UnityARKitPlugin, UnityARInterface) should be deleted. Otherwise strange errors might occur.

TODO:

@atripathi-mb I haven't tested on OSX.

Could you please verify that the assemblies in

  • sdkproject/Assets/Mapbox/Core/Plugins/Mapbox/vector-tile-cs/
  • sdkproject/Assets/Mapbox/Core/Plugins/ThirdParty/Mapbox.IO.Compression/
  • sdkproject/Assets/Mapbox/Core/Plugins/ThirdParty/Mapbox.Json/

have the correct platform set for OSX too?


Description of changes

  • fixes DescriptionAttribute errors with UWP builds
  • fixes Mapbox.Utils.PolygonUtils.PointInPolygon to not rely on the clipper instance which is actually internal to vector-tile-cs.
  • removes git submodules and dependencies folder for dependencies, uses assemblies instead
    • vector-tile-cs
    • Mapbox.IO.Compression
    • Mapbox.Json
    • this allows direct use of the repo, not necessary to run update scripts anymore
  • removes update scripts:
    • update-mapbox-unity-sdk-core.sh
    • update-mapbox-unity-sdk-core.bat
  • removes files associated with UnityPackager
    • unitypackage.config
    • SharpCompress.dll
    • UnityPackager.exe

QA checklists

  • Add relevant code comments. Every API class and method should have <summary> description as well as description of parameters.
  • Add tests for new/changed/updated classes and methods!!!
  • Check out conventions in CONTRIBUTING.md.
  • Check out conventions in CODING-STYLE.md
  • Update the changelog
  • Update documentation.

Reviewers

@atripathi-mb

@wilhelmberg wilhelmberg self-assigned this Aug 8, 2018
* develop: (104 commits)
  Release/v1.4.5 (#974)
  Removed unused variables and unused conditional statements.
  Move scene to ReplaceFeatures Folder.
  Added IconicBuildings scene to build settings. Created prefab of IconicBuildingMap and ReloadMapIconicBuildingCanvas.
  Set zoom slider to 10 to match zoom level in abstract map.
  Updated DataExplorer (SnapToTerrain = true) and ZoomableMap (Zoom value = 16); removed editor script.
  Editor script.
  Corrected typo in description text.
  Changed button look to flat.
  Changed condition logic regarding UI input component reference acquisition.
  Made _cameraPosition and _cameraRotation private.
  Hero building showcase scene and UI.
  Add imagery to interactive scene
  Corrected changlog hero building quantity.
  Update changelog.
  Update prefabs and scenes.
  Removed Guggenheim museum mesh/prefab due to scaling issues. Removed reference from modifier. Removed Willis tower model/prefab as we are not releasing Chicago assets yet.
  Add check to avoid errors with Mapbox Streets.
  Reordered StyleTypes.Color declaration; moved to end of enum. Saved CitySimulator with correct texture setting,
  Remove warnings.
  ...

# Conflicts:
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/LocationPrefabsLayerVisualizer.cs
#	sdkproject/ProjectSettings/ProjectSettings.asset
#	sdkproject/ProjectSettings/ProjectVersion.txt
Copy link
Contributor

@abhishektrip abhishektrip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as advertised.

@abhishektrip abhishektrip merged commit a32ab6e into develop Sep 6, 2018
@abhishektrip abhishektrip deleted the hololens-fixes branch September 6, 2018 21:33
abhishektrip added a commit that referenced this pull request Sep 6, 2018
* develop:
  Updated changelog version to v1.4.6
  update changelog
  change ElevatedTerrainStrategy and ElevatedTerrainWithSidesStrategy classes to create flat terrain mesh on height data errors
  UWP fixes (and more) (#945)
  Release/v1.4.5 (#974)

# Conflicts:
#	sdkproject/ProjectSettings/ProjectSettings.asset
@abhishektrip abhishektrip restored the hololens-fixes branch September 11, 2018 21:55
abhishektrip added a commit that referenced this pull request Sep 13, 2018
* develop:
  Terrain section event refactor apply property changes at end of gui (#1009)
  fix an issue where TerrainFactoryBase didn't respect "none" terrain option (#1006)
  API's for runtime editing.  (#1005)
  Image section event refactor (#1002)
  Fix buildingid setting (#998)
  Map update develop merge fresh (#994)
  Improve query height method (#979)
  Mid floor calculation bug fix (#968)
  Updated changelog version to v1.4.6
  update changelog
  change ElevatedTerrainStrategy and ElevatedTerrainWithSidesStrategy classes to create flat terrain mesh on height data errors
  UWP fixes (and more) (#945)
@abhishektrip abhishektrip deleted the hololens-fixes branch October 12, 2018 05:26
@mertusta1996
Copy link

mertusta1996 commented Jul 13, 2022

For Hololens-2 and Mapbox in Unity UWP, try this repo ;
https://github.com/mertusta1996/Mapbox-Hololens-2-Unity-UWP-

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants