Skip to content

Commit ad6c22a

Browse files
committed
Merge commit '9455db58e622c893563d03ac5bc7507655983bf1' into styleDevelopment
* commit '9455db58e622c893563d03ac5bc7507655983bf1': more checks if access token is set (#564) Uv mapping (#503) Layer Visualizer for Building Ids (#502) Add code comments for LatitudeLongitudeToTileId change. (#573) Added a API call to query height Fix compile error related to return type. (#572) add QueryTerrainHeight function to AbstractMap (#571) appveyor: don't use PowerShell to download docfx Integrate mapbox-ar-unity (#544) Enable loading external configurations - take 2 (#552) update PR template MBTilesCache: Windows fix for path and filenames with +260 chars fix Unity's bytecode stripping with IL2CPP discarding "ystem.Linq.Expressions.Expression" Auto refreshing cache (#521) Editor layer key fix (#506) Create PRODUCT_ROADMAP.md change MapId to Style URL in Map Image Editor (#536) Zoomable map scaling fix (#527) Add EditorConfig to enforce coding style (#508) # Conflicts: # sdkproject/Assets/Mapbox/Examples/4_VectorTileMaps/BasicUvMap/AtlasInfo.asset # sdkproject/Assets/Mapbox/Examples/4_VectorTileMaps/BasicUvMap/AtlasInfo.asset.meta # sdkproject/Assets/Mapbox/Examples/4_VectorTileMaps/BasicUvMap/BasicUvMap.unity # sdkproject/Assets/Mapbox/Examples/4_VectorTileMaps/BasicUvMap/TextureSideWallModifier.asset # sdkproject/Assets/Mapbox/Examples/4_VectorTileMaps/BasicUvMap/UvMapVisualizer.asset # sdkproject/Assets/Mapbox/Examples/4_VectorTileMaps/BasicUvMap/UvVectorTileFactory.asset # sdkproject/Assets/Mapbox/Examples/_sharedModules/TransparentGreyPolygonStack.asset # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/AtlasInfo.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs # sdkproject/ProjectSettings/ProjectVersion.txt
2 parents f517b6c + 9455db5 commit ad6c22a

File tree

796 files changed

+63449
-580
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

796 files changed

+63449
-580
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ sdkproject/Assets/WSATestCertificate.pfx.meta
1313
# Documentation
1414
docfx.zip
1515
/docfx
16-
api
16+
#api
1717
_site
1818
src/Documentation/log.txt
19+
obj.meta
1920

2021
# build
2122
.vs/

CODING-STYLE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
- Use an IDE that respects `.editorconfig` file (http://editorconfig.org/#download) and you won't have to worry about most of the stuff below :smirk:
2+
13
- Use tabs, not spaces, for indentation.
24

35
- Private fields should be prefixed with an underscore (`_privateField`) and generally avoid `this` keyword.

PRODUCT_ROADMAP.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Mapbox Maps SDK for Unity Product Roadmap
2+
3+
4+
### Overview
5+
6+
The Unity/AR team vision is to enable developers to use Mapbox’s global location data to power immersive, location-based experiences in 3D and world scale AR.
7+
8+
We want to make our priorities transparent and reliable for our community and we’d love your input. Below is a list of major projects and features currently in active development, upcoming, or we are thinking about long-term.
9+
10+
11+
12+
### Current Roadmap
13+
14+
15+
**Near Term (SDK 1.4)**
16+
17+
*Given the location-based experience and AR fields are new areas of exploration for many developers, our near term goals are to make the process of development in the space intuitive without sacrificing on the full power and flexibility of our tools. In addition, the full potential of AR will be realized at world scale, which will rely on our data to power context. We’re building out the backbone and tools for location context in world scale AR. Expected features include:*
18+
19+
20+
21+
- “Plug and play” templates for major use cases- get a map in a minute or less:
22+
- Location-based games and experiences
23+
- City simulation and modeling
24+
- Location-based AR
25+
- Beautiful out of the box styling templates:
26+
- Choose from new Mapbox styles or use them as starting points to create your own custom styles for buildings
27+
- More intuitive functionality, less time learning about the SDK and GIS:
28+
- Surface common functionality into the user interface to speed up the development process and lower the time to ramp up on the SDK and its factories
29+
- Easier use of POIs for triggering events
30+
- Easier custom POI import
31+
- Fix split buildings at tile edges
32+
- Improve AR localization as a major step for empowering developers to use our data to create compelling world scale AR experiences
33+
- Continue to improve documentation and tutorials, including creating video-based tutorials
34+
35+
**Medium Term**
36+
37+
- New layers of data designed for location-based gaming & experiences and AR
38+
- Easier procedural and manual mesh & texture styling
39+
- Runtime styling for design efficiency gains
40+
- Simplify external data import and usage
41+
- World scale AR
42+
- Enable multiuser, persistent AR experiences
43+
- Optimize for AR drift
44+
45+
**Long Term**
46+
47+
- Computer vision aided world scale AR
48+
49+
50+
51+
52+
53+
___
54+
55+
_Note: This roadmap is for informational purposes only. Placement on the roadmap represents our estimate of when each project will enter production. Items on the roadmap are subject to change or delay, so you shouldn't use this for major planning or purchasing purposes. We'll revise the roadmap at least quarterly to ensure it reflects our most up-to-date thinking._

PULL_REQUEST_TEMPLATE.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1+
**Related issue**
12

3+
Example: Closes #832. Relates to #832.
24

5+
**Description of changes**
36

7+
Your text here!
48

9+
**QA checklists**
510

11+
- [ ] Add relevant code comments. Every API class and method should have `<summary>` description as well as description of parameters.
12+
- [ ] **Add tests for new/changed/updated classes and methods!!!**
13+
- [ ] Check out conventions in [CONTRIBUTING.md](https://github.com/mapbox/mapbox-unity-sdk/blob/develop/CONTRIBUTING.md).
14+
- [ ] Check out conventions in [CODING-STYLE.md](https://github.com/mapbox/mapbox-unity-sdk/blob/develop/CODING-STYLE.md)
15+
- [ ] Update the [changelog](https://github.com/mapbox/mapbox-unity-sdk/blob/develop/documentation/docs/05-changelog.md)
16+
- [ ] Update documentation.
617

18+
**Reviewers**
719

8-
9-
___
10-
_As part of the process of submitting this PR, please:_
11-
- [ ] Document the PR changes
12-
- [ ] Update the changelog
20+
Tag your reviewer(s). Choose wisely.

README-AR.md

Lines changed: 204 additions & 0 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
# Mapbox-unity-sdk
22
### For Unity 2017.1+
33

4+
**AR support requires Unity 2017.3+, Android 7+ (Nougat), iOS 11.3**
5+
6+
Find the [AR specific README here](README-AR.md).
7+
8+
If AR support is not needed these subfolders of `sdkproject/Assets/` maybe deleted:
9+
* MapboxAR
10+
* UnityARInterface
11+
* GoogleARCore
12+
* UnityARKitPlugin
13+
414
(for 5.4x compatible versions, please use [this commit](https://github.com/mapbox/mapbox-unity-sdk/releases/tag/Last-official-Unity5x-support))
515

616
Tools for using Mapbox APIs with C# / Unity. If you'd like to contribute to the project, [read CONTRIBUTING.md](CONTRIBUTING.md).

documentation/docs/05-changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
## CHANGELOG
22

3+
### v.?.?.?
4+
*TBD*
5+
6+
#####
7+
- Added a API call on AbstractMap to query height at a certain latitude longitude.
8+
- Included EditorConfig file to enforce coding style
9+
- Integration of previously seperate AR support https://github.com/mapbox/mapbox-unity-sdk/pull/544
10+
311
### v.1.3.0
412
*12/18/2017*
513

scripts/build.csx

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Collections.Generic;
44
using System.Diagnostics;
55
using System.IO;
6+
using System.Net;
67
using System.Text;
78

89
public bool RunCommand(string cmd, bool showCmd = false, bool logOnErrorOnly = false) {
@@ -116,7 +117,7 @@ if (triggerCloudBuild) {
116117
}
117118

118119

119-
Console.WriteLine(string.Format("GITHUB_TOKEN: {0} set", string.IsNullOrWhiteSpace(githubToken) ? "not": "is"));
120+
Console.WriteLine(string.Format("GITHUB_TOKEN: {0} set", string.IsNullOrWhiteSpace(githubToken) ? "not" : "is"));
120121
Console.WriteLine($"%UNITYPACKAGER_RAISE_ERROR_ON_FAILURE%: {raiseErrorOnFailure}");
121122
Console.WriteLine($"%APPVEYOR_BUILD_FOLDER%: {rootDir}");
122123
Console.WriteLine($"%APPVEYOR_REPO_COMMIT_MESSAGE%: {commitMessage}");
@@ -135,7 +136,7 @@ if (!triggerCloudBuild) {
135136
Console.WriteLine($"sdkproject directory: {projectDir}");
136137

137138
Environment.CurrentDirectory = projectDir;
138-
if(!RunCommand("del /F /S /Q .gitignore")){
139+
if (!RunCommand("del /F /S /Q .gitignore")) {
139140
Console.Error.WriteLine("could not delete .gitignore");
140141
Environment.Exit(1);
141142
}
@@ -177,8 +178,17 @@ if (!triggerCloudBuild) {
177178

178179
//---------- documentation
179180
Console.WriteLine("downloading docfx ...");
180-
if (!RunCommand("powershell Invoke-WebRequest https://github.com/dotnet/docfx/releases/download/v2.14.1/docfx.zip -OutFile docfx.zip", true, true)) {
181-
Console.Error.WriteLine("could not download docfx");
181+
try {
182+
ServicePointManager.Expect100Continue = true;
183+
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
184+
using (WebClient wc = new WebClient()) {
185+
wc.DownloadFile(
186+
"https://github.com/dotnet/docfx/releases/download/v2.14.1/docfx.zip"
187+
, "docfx.zip"
188+
);
189+
}
190+
} catch (Exception ex) {
191+
Console.Error.WriteLine("could not download docfx: " + ex.ToString());
182192
Environment.Exit(1);
183193
}
184194

sdkproject/Assets/GoogleARCore.meta

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdkproject/Assets/GoogleARCore/Configurations.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)