Master2 #851
Merged
Master2 #851
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lateGenerator for creating template images from AtlasInfo files, various scripts for assisting with building colorization.
…ing-experiments * commit '402b62a9b89435afe9b0aba9091a1e3f40ebd371': Mapbox styles - MapboxStyles shader for layer colorization, AtlasTemplateGenerator for creating template images from AtlasInfo files, various scripts for assisting with building colorization.
… better match existing nomenclature. Refactored MapboxStylesColorModifier.cs: Run method no longer adds ColorizeMapboxStyles.cs monobehaviour to VectorEntity.GameObject; Run method now includes all logic for color selection and material property setting previously found in ColorizeMapboxStyles.cs; utilizes VectorEntity's cached MeshRenderer component to set colors. Deleted ColorizeMapboxStyles.cs and ColorizeMapboxStylesEditor.cs.
…ing-experiments * commit '5f04419eea029575d034dfecd478a167c5219922': Renamed AddColorizeMapboxStyles.cs to MapboxStylesColorModifier.cs to better match existing nomenclature. Refactored MapboxStylesColorModifier.cs: Run method no longer adds ColorizeMapboxStyles.cs monobehaviour to VectorEntity.GameObject; Run method now includes all logic for color selection and material property setting previously found in ColorizeMapboxStyles.cs; utilizes VectorEntity's cached MeshRenderer component to set colors. Deleted ColorizeMapboxStyles.cs and ColorizeMapboxStylesEditor.cs.
…ing-experiments * commit 'f517b6c733c99ea14b821ec82260e863ce6391d5': Fix indentation Fixed private field naming to meet code style requirements.
* add uv mapping height modifier and a demo scene to show it off * fix TextureSideWallModifier to respect min_height property * fix a bug in wall segment calculation in TextureSideWallModifier where CenterSegment feature yielded long first sections fix a bug in PolygonModifier where it doesn't create tangents fix wrong asset bindings * fix an issue where TextureSideWallModifier doesn't take atlas section height into consideration * change VectorFeatureUnity and VectorLayerVisualizer classes to support buildings ids and do not render duplicates of same featuer from different tiles * add comments for an if clause in VectorFeatureUnity * add a 8 building texture atlas * add new texture from random google images * add roof uv & atlas support * test textures for styling development * add missing constant Vector3Right * fix materials in mat modifier * fix atlas info object * Removed unused properties from shader * New textures/materials for default building style * Updated settings to TextureSideWall * Mapbox styles - MapboxStyles shader for layer colorization, AtlasTemplateGenerator for creating template images from AtlasInfo files, various scripts for assisting with building colorization. * Renamed AddColorizeMapboxStyles.cs to MapboxStylesColorModifier.cs to better match existing nomenclature. Refactored MapboxStylesColorModifier.cs: Run method no longer adds ColorizeMapboxStyles.cs monobehaviour to VectorEntity.GameObject; Run method now includes all logic for color selection and material property setting previously found in ColorizeMapboxStyles.cs; utilizes VectorEntity's cached MeshRenderer component to set colors. Deleted ColorizeMapboxStyles.cs and ColorizeMapboxStylesEditor.cs. * Fixed private field naming to meet code style requirements. * Fix indentation
…ing-experiments * commit 'bf39969723b90ccbd925f23b52990e231325a2ae': Style development - colorization and atlas template generator (#579) more checks if access token is set (#564) # Conflicts: # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/UvModifier.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs
…ses camerabounds by default.
…cks m_scriptablePalette on Initialize and Run, and returns if object is null. Cleanup up names in Scriptable Palette Editor to make inspector look slightly cleaner.
* Initial POC with drop down menu for GameObject mod selection * Continued work on POC * Pop up now lets users create scriptable object classes. * WIP with ability to add custom classes * Deleted unused test files. * Cleanup. * Modifier section of Abstract Map has two buttons; "Add New" and "Add Existing". "Add New" creates a dropdown populated with modifier object base classes, which allows the user to create new instances of modifier objects. "Add Existing" preserves original functionality of "Find Asset". Note on repaint errors: "ArgumentException: Getting control 0's position in a group with only 0 controls when doing Repaint" is thrown when clicking "Add New"; I believe this error is caused by repaint logic somewhere near the PopupWindow.Show calls, which are on 423 and 469 in FeaturesSubLayerPropertiesDrawer. * PopupSelectionMenu uses reflection instead of asset search to populate drop down list. Relevant namespaces added. * - Added User/Modifiers folder to Assets/Mapbox. - Added variable references to User/Modifiers path to Constants.cs - PopupSelectionMenu attempts to save new modifier assets in currently selected folder; uses User/Modifiers as fallback. * Renamed dir MapFeatureStyles to MapboxStyles * Added "_" to private var scrollPos * Added comments and summary to PopupSelectionMenu.
* fix placement options and feature scaling * clean up scaledownwithworld scaling fix * background label sizing issue * adjusting width and height a bit in the poi label text * prefab commit * Fix y scaling issue. * poi text scale fix solution * Good fix for POI Labels Text * phantom objects issue resolved * prefab fix * modifier active fix * Set text scale to 1 * Remove old meta files.
* [wip] log location to file * use persistentDataPath for location log file * log location info. update scene * writing log file seems to work on Android and iOS * string.format fix * Change location provider folder/scene name * make player transparent * LocationProviderScene: Screen.sleepTimeout = SleepTimeout.NeverSleep; * cleanup after merge * add DeviceOrientationMaterial * fix v1.4.2 merge quest using wrong LocationProvider scene and LogLocationProviderData.cs * fix typo in DeviceLocationProvider.cs * disable native Android location plugin for testing purposes * implement proper LocationLogFile Reader and Writer * implement LocationLogWriter * testing: force default location provider for Android * for baran :-) * set scene back to defaults * fine tune parameters * make sure Android native location plugin does not run when deactivated * reattach loggingtoggle * just a little bit of eyecandy for the text panel * FOR DEBUGGING: MockLocationInfo and MockLocationProvider to feed locations logs through `DeviceLocationProvider`. * [wip] work on UserHeading calculation * work on UserHeading and DeviceOrientation * Smoothing algorithms * make heading and orientation material more transparent * update changelog and documentation * add code comments * fix "MonoBehaviours can only be added using AddComponent()" and don't run DeviceLocationProvder CoRoutine when not selected as default location provider * location provider scene: change EditorProvider back to log file provider * Revert to original materials
* Remove warning messages. * Fix build errors. * Fix ARTableTop scene - wrong shaders * Resave Pngs without ETC1 compression
…nto release/v1.4.3 * 'release/v1.4.3' of github.com:mapbox/mapbox-unity-sdk: Add unity bug to known issues. Fix typo
* Fix featureId's being overridden by last features ID. * Fix for replacement of feature with multiple parts. * Code cleanup. * Further code cleanup based on review comments. * Formating change. * Make function less deeply nested. * added a way to explicitly block feature ids * clear feature list after processing * fix for duplicate buildings + zoom/pan
* inital working version * remove Debug.Log * SQLiteCache tests and [wip] hunting a bug in SQLite4Unity3d * properly get TilesetID, more tests, change config windows MBTilesCache -> FileCache * fix ClearCache during PlayMode * more tests * code comments * update changelog * add PR link to changelog * update changelog
…nto release/v1.4.3 * 'release/v1.4.3' of github.com:mapbox/mapbox-unity-sdk: Refactor ambient file caching to be compatible with 4.6 runtime (#825)
* update example scenes in config window * Revert materials to solid color.
…ase/v1.4.3-2 # Conflicts: # documentation/docs/05-changelog.md # sdkproject/Assets/GoogleARCore/SDK/Scripts/Editor/BuildHelper.cs # sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/MapboxUnitTests_CheapRulerCs.cs # sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity # sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/LocationBasedGame.unity # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/DataExplorer.unity # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity # sdkproject/Assets/Mapbox/Examples/5_Playground/Scenes/LocationProvider.unity # sdkproject/Assets/Mapbox/Examples/5_Playground/Scripts/LogLocationProviderData.cs # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/POIPlacement.unity # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources.meta # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab.meta # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab.meta # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/FoodPoiLabelPrefab.prefab # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab.meta # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab.meta # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab.meta # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab.meta # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab # sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab.meta # sdkproject/Assets/Mapbox/Examples/Scripts/PoiLabelTextSetter.cs # sdkproject/Assets/Mapbox/Examples/Scripts/RotateWithLocationProvider.cs # sdkproject/Assets/Mapbox/Prefabs/CitySimulatorMap.prefab # sdkproject/Assets/Mapbox/README.txt # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Materials.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Materials/MapboxStylesFacades.mat # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Materials/MapboxStylesFacades.mat.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Materials/MapboxStylesFacadesPerRenderer.mat # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Materials/MapboxStylesFacadesPerRenderer.mat.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Materials/MapboxStylesRoofs.mat # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Materials/MapboxStylesRoofs.mat.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Materials/MapboxStylesRoofsPerRenderer.mat # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Materials/MapboxStylesRoofsPerRenderer.mat.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasFacades_base.png # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasFacades_base.png.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasFacades_detailMask_1.png # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasFacades_detailMask_1.png.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasFacades_detailMask_2.png # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasFacades_detailMask_2.png.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasRoofs_base.png # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasRoofs_base.png.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasRoofs_detailMask_1.png # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasRoofs_detailMask_1.png.meta # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasRoofs_detailMask_2.png # sdkproject/Assets/Mapbox/Resources/MapBoxStyles/Textures/BuildingAtlasRoofs_detailMask_2.png.meta # sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset # sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkSideMaterial.mat.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkTopMaterial.mat.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteSideMaterial.mat # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteTopMaterial.mat # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleSideMaterial.mat # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleSideMaterial.mat.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleTopMaterial.mat # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleTopMaterial.mat.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes/SimplePalette.asset.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_base.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_base.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_1.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_1.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_2.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_2.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_base.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_base.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_1.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_1.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_2.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_2.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_base.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_base.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_1.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_1.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_2.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_2.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_base.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_base.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_1.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_1.png.meta # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_2.png # sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_2.png.meta # sdkproject/Assets/Mapbox/Unity/Constants.cs # sdkproject/Assets/Mapbox/Unity/DataContainers/GeometryMaterialOptions.cs # sdkproject/Assets/Mapbox/Unity/DataContainers/MapboxEnums.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryMaterialOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/VectorSubLayerTreeView.cs.meta # sdkproject/Assets/Mapbox/Unity/LayerProperties/PrefabItemOptions.cs # sdkproject/Assets/Mapbox/Unity/LayerProperties/VectorSubLayerProperties.cs # sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProvider.cs # sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs # sdkproject/Assets/Mapbox/Unity/Location/Location.cs # sdkproject/Assets/Mapbox/Unity/Location/LocationProviderFactory.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/LocationPrefabsLayerVisualizer.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/VectorLayerVisualizer.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/MaterialModifier.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/PrefabModifier.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs # sdkproject/Assets/MapboxAR/Examples/ARTabletop/Scripts/ARTableTopCameraMovement.cs # sdkproject/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity # sdkproject/Assets/Resources.meta # sdkproject/Assets/UnityARKitPlugin/Examples/Common/Models.meta # sdkproject/Assets/UnityARKitPlugin/Examples/Common/Models/Characters/Materials.meta # sdkproject/ProjectSettings/ProjectSettings.asset
…elease/v1.4.3 # Conflicts: # sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots.meta # sdkproject/Assets/Resources.meta # sdkproject/Assets/StreamingAssets.meta
apavani
approved these changes
Jun 7, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
struggling with merging ...