Skip to content

Commit 521d62e

Browse files
morganeabhishektrip
authored andcommitted
Recreate ZoomableMap and Globe with new Plug and Play functionality (#585)
1 parent a0e604b commit 521d62e

21 files changed

+849
-70
lines changed

sdkproject/.vscode/settings.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"files.exclude":
3+
{
4+
"**/.DS_Store":true,
5+
"**/.git":true,
6+
"**/.gitignore":true,
7+
"**/.gitmodules":true,
8+
"**/*.booproj":true,
9+
"**/*.pidb":true,
10+
"**/*.suo":true,
11+
"**/*.user":true,
12+
"**/*.userprefs":true,
13+
"**/*.unityproj":true,
14+
"**/*.dll":true,
15+
"**/*.exe":true,
16+
"**/*.pdf":true,
17+
"**/*.mid":true,
18+
"**/*.midi":true,
19+
"**/*.wav":true,
20+
"**/*.gif":true,
21+
"**/*.ico":true,
22+
"**/*.jpg":true,
23+
"**/*.jpeg":true,
24+
"**/*.png":true,
25+
"**/*.psd":true,
26+
"**/*.tga":true,
27+
"**/*.tif":true,
28+
"**/*.tiff":true,
29+
"**/*.3ds":true,
30+
"**/*.3DS":true,
31+
"**/*.fbx":true,
32+
"**/*.FBX":true,
33+
"**/*.lxo":true,
34+
"**/*.LXO":true,
35+
"**/*.ma":true,
36+
"**/*.MA":true,
37+
"**/*.obj":true,
38+
"**/*.OBJ":true,
39+
"**/*.asset":true,
40+
"**/*.cubemap":true,
41+
"**/*.flare":true,
42+
"**/*.mat":true,
43+
"**/*.meta":true,
44+
"**/*.prefab":true,
45+
"**/*.unity":true,
46+
"build/":true,
47+
"Build/":true,
48+
"Library/":true,
49+
"library/":true,
50+
"obj/":true,
51+
"Obj/":true,
52+
"ProjectSettings/":true,
53+
"temp/":true,
54+
"Temp/":true
55+
}
56+
}

sdkproject/Assets/MapFromCode.cs.meta

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

sdkproject/Assets/Mapbox/Examples/5_ZoomableMap/ZoomableMap.unity

Lines changed: 109 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44648886, g: 0.49632663, b: 0.5747252, a: 1}
41+
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1}
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
@@ -77,15 +77,18 @@ LightmapSettings:
7777
m_PVRDirectSampleCount: 32
7878
m_PVRSampleCount: 500
7979
m_PVRBounces: 2
80-
m_PVRFiltering: 0
80+
m_PVRFilterTypeDirect: 0
81+
m_PVRFilterTypeIndirect: 0
82+
m_PVRFilterTypeAO: 0
8183
m_PVRFilteringMode: 1
8284
m_PVRCulling: 1
8385
m_PVRFilteringGaussRadiusDirect: 1
8486
m_PVRFilteringGaussRadiusIndirect: 5
8587
m_PVRFilteringGaussRadiusAO: 2
86-
m_PVRFilteringAtrousColorSigma: 1
87-
m_PVRFilteringAtrousNormalSigma: 1
88-
m_PVRFilteringAtrousPositionSigma: 1
88+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
89+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
90+
m_PVRFilteringAtrousPositionSigmaAO: 1
91+
m_ShowResolutionOverlay: 1
8992
m_LightingDataAsset: {fileID: 0}
9093
m_UseShadowmask: 1
9194
--- !u!196 &4
@@ -107,6 +110,8 @@ NavMeshSettings:
107110
manualTileSize: 0
108111
tileSize: 256
109112
accuratePlacement: 0
113+
debug:
114+
m_Flags: 0
110115
m_NavMeshData: {fileID: 0}
111116
--- !u!1001 &197266180
112117
Prefab:
@@ -238,7 +243,7 @@ Prefab:
238243
- target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33,
239244
type: 2}
240245
propertyPath: m_AnchoredPosition.y
241-
value: -55.335487
246+
value: -56.283787
242247
objectReference: {fileID: 0}
243248
- target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33,
244249
type: 2}
@@ -248,12 +253,12 @@ Prefab:
248253
- target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33,
249254
type: 2}
250255
propertyPath: m_SizeDelta.y
251-
value: 90.670975
256+
value: 92.56757
252257
objectReference: {fileID: 0}
253258
- target: {fileID: 224857786874416376, guid: 98be219873e6d4dffb5949746f515a33,
254259
type: 2}
255260
propertyPath: m_SizeDelta.y
256-
value: 110.670975
261+
value: 0
257262
objectReference: {fileID: 0}
258263
- target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33,
259264
type: 2}
@@ -277,6 +282,11 @@ Prefab:
277282
starting point for creating a traditional web-based zoomable map. Go anywhere
278283
in the world and check out Mapbox\u2019s high-quality satellite imagery. "
279284
objectReference: {fileID: 0}
285+
- target: {fileID: 224857786874416376, guid: 98be219873e6d4dffb5949746f515a33,
286+
type: 2}
287+
propertyPath: m_AnchoredPosition.y
288+
value: 0.000015258789
289+
objectReference: {fileID: 0}
280290
m_RemovedComponents: []
281291
m_ParentPrefab: {fileID: 100100000, guid: 98be219873e6d4dffb5949746f515a33, type: 2}
282292
m_IsPrefabParent: 0
@@ -407,17 +417,97 @@ MonoBehaviour:
407417
m_GameObject: {fileID: 555018382}
408418
m_Enabled: 1
409419
m_EditorHideFlags: 0
410-
m_Script: {fileID: 11500000, guid: 46b7feaa380a94707acb19bfd72fd4f5, type: 3}
420+
m_Script: {fileID: 11500000, guid: cd961b1c9541a4cee99686069ecce852, type: 3}
411421
m_Name:
412422
m_EditorClassIdentifier:
413-
_zoom: 10
414-
_initializeOnStart: 1
415-
_latitudeLongitudeString: 37.7648, -122.463
416-
_root: {fileID: 0}
417-
_tileProvider: {fileID: 555018385}
418-
_mapVisualizer: {fileID: 11400000, guid: 84a94dcf8a4f944f8bc89a06e9e105d5, type: 2}
419-
_unityTileSize: 100
420-
_snapMapHeightToZero: 1
423+
_options:
424+
locationOptions:
425+
latitudeLongitude: 37.7648, -122.463
426+
zoom: 10
427+
extentOptions:
428+
extentType: 0
429+
cameraBoundsOptions:
430+
camera: {fileID: 1787361574}
431+
visibleBuffer: 0
432+
disposeBuffer: 0
433+
updateInterval: 0
434+
rangeAroundCenterOptions:
435+
west: 1
436+
north: 1
437+
east: 1
438+
south: 1
439+
rangeAroundTransformOptions:
440+
targetTransform: {fileID: 0}
441+
visibleBuffer: 0
442+
disposeBuffer: 0
443+
placementOptions:
444+
placementType: 1
445+
snapMapToZero: 0
446+
scalingOptions:
447+
scalingType: 1
448+
unityTileSize: 100
449+
loadingTexture: {fileID: 0}
450+
_imagery:
451+
_layerProperty:
452+
sourceType: 4
453+
sourceOptions:
454+
isActive: 1
455+
layerSource:
456+
Name: Streets
457+
Id: mapbox.satellite
458+
Modified:
459+
UserName:
460+
rasterOptions:
461+
useRetina: 0
462+
useCompression: 0
463+
useMipMap: 0
464+
_terrain:
465+
_layerProperty:
466+
sourceType: 0
467+
sourceOptions:
468+
isActive: 1
469+
layerSource:
470+
Name:
471+
Id: mapbox.terrain-rgb
472+
Modified:
473+
UserName:
474+
elevationLayerType: 0
475+
requiredOptions:
476+
baseMaterial: {fileID: 2100000, guid: b9f23e9bce724fa4daac57ecded470b8, type: 2}
477+
addCollider: 0
478+
exaggerationFactor: 1
479+
modificationOptions:
480+
sampleCount: 10
481+
useRelativeHeight: 1
482+
earthRadius: 1000
483+
unityLayerOptions:
484+
addToLayer: 0
485+
layerId: 0
486+
sideWallOptions:
487+
isActive: 0
488+
wallHeight: 10
489+
wallMaterial: {fileID: 0}
490+
_vectorData:
491+
_layerProperty:
492+
sourceType: 1
493+
sourceOptions:
494+
isActive: 1
495+
layerSource:
496+
Name: Mapbox Streets
497+
Id: mapbox.mapbox-streets-v7
498+
Modified:
499+
UserName:
500+
useOptimizedStyle: 0
501+
optimizedStyle:
502+
Name:
503+
Id:
504+
Modified:
505+
UserName:
506+
performanceOptions:
507+
isEnabled: 1
508+
entityPerCoroutine: 20
509+
vectorSubLayers: []
510+
_tileProvider: {fileID: 0}
421511
--- !u!4 &555018384
422512
Transform:
423513
m_ObjectHideFlags: 0
@@ -442,8 +532,6 @@ MonoBehaviour:
442532
m_Script: {fileID: 11500000, guid: 756a01a914208439d8d2fc8dcd68b229, type: 3}
443533
m_Name:
444534
m_EditorClassIdentifier:
445-
_camera: {fileID: 1787361574}
446-
_updateInterval: 0
447535
--- !u!114 &555018386
448536
MonoBehaviour:
449537
m_ObjectHideFlags: 0
@@ -458,8 +546,7 @@ MonoBehaviour:
458546
_panSpeed: 1
459547
_zoomSpeed: 0.25
460548
_referenceCamera: {fileID: 1787361574}
461-
_quadTreeTileProvider: {fileID: 555018385}
462-
_dynamicZoomMap: {fileID: 555018383}
549+
_mapManager: {fileID: 555018383}
463550
_useDegreeMethod: 0
464551
--- !u!114 &555018388
465552
MonoBehaviour:
@@ -529,20 +616,6 @@ Light:
529616
m_Lightmapping: 4
530617
m_AreaSize: {x: 1, y: 1}
531618
m_BounceIntensity: 1
532-
m_FalloffTable:
533-
m_Table[0]: 0
534-
m_Table[1]: 0
535-
m_Table[2]: 0
536-
m_Table[3]: 0
537-
m_Table[4]: 0
538-
m_Table[5]: 0
539-
m_Table[6]: 0
540-
m_Table[7]: 0
541-
m_Table[8]: 0
542-
m_Table[9]: 0
543-
m_Table[10]: 0
544-
m_Table[11]: 0
545-
m_Table[12]: 0
546619
m_ColorTemperature: 6570
547620
m_UseColorTemperature: 0
548621
m_ShadowRadius: 0
@@ -741,11 +814,11 @@ Camera:
741814
m_TargetEye: 3
742815
m_HDR: 1
743816
m_AllowMSAA: 1
817+
m_AllowDynamicResolution: 0
744818
m_ForceIntoRT: 0
745819
m_OcclusionCulling: 1
746820
m_StereoConvergence: 10
747821
m_StereoSeparation: 0.022
748-
m_StereoMirrorMode: 0
749822
--- !u!4 &1787361575
750823
Transform:
751824
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)