diff --git a/unity/demo/Assets/Resources/Materials/Default.mat b/unity/demo/Assets/Resources/Materials/Default.mat index 95cf4917..7d056790 100644 Binary files a/unity/demo/Assets/Resources/Materials/Default.mat and b/unity/demo/Assets/Resources/Materials/Default.mat differ diff --git a/unity/demo/Assets/Resources/Shaders/VertexColorGeneric.shader b/unity/demo/Assets/Resources/Shaders/VertexColorGeneric.shader index 5e811398..5defd3d1 100644 --- a/unity/demo/Assets/Resources/Shaders/VertexColorGeneric.shader +++ b/unity/demo/Assets/Resources/Shaders/VertexColorGeneric.shader @@ -21,8 +21,8 @@ struct Input { float2 uv_MainTex; - float2 uv2_MainTex2; - float2 uv3_MainTex3; + float2 uv2_MainTex2 : TEXCOORD1; + float2 uv3_MainTex3 : TEXCOORD2; float4 color : COLOR; }; diff --git a/unity/demo/Assets/Resources/Textures/terrain_textures.png b/unity/demo/Assets/Resources/Textures/terrain_textures.png new file mode 100644 index 00000000..ce45452e Binary files /dev/null and b/unity/demo/Assets/Resources/Textures/terrain_textures.png differ diff --git a/unity/demo/Assets/Resources/Textures/terrain_textures.png.meta b/unity/demo/Assets/Resources/Textures/terrain_textures.png.meta new file mode 100644 index 00000000..f9742219 --- /dev/null +++ b/unity/demo/Assets/Resources/Textures/terrain_textures.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 0c422edd476f66d4fa58838a870f020f +timeCreated: 1475874236 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/demo/Assets/Scripts/Environment/InstallationApi.cs b/unity/demo/Assets/Scripts/Environment/InstallationApi.cs index 2f709689..b737a9d0 100644 --- a/unity/demo/Assets/Scripts/Environment/InstallationApi.cs +++ b/unity/demo/Assets/Scripts/Environment/InstallationApi.cs @@ -10,6 +10,7 @@ namespace Assets.Scripts.Environment /// Provides installation API. internal static class InstallationApi { + private const string Version = "1.1"; private const string MarkerFileName = "install_log.txt"; /// Ensures required filesystem structure. Should be called from main thread. @@ -41,6 +42,7 @@ private static IEnumerable GetMapCssFileNames() "z14.mapcss", "z14-lines.mapcss", "z14-polygons.mapcss", + "z16.txt", "z16.mapcss", "z16-buildings.mapcss", "z16-misc.mapcss", @@ -90,12 +92,13 @@ private static IEnumerable GetDirectories() private static bool IsInstalled() { - return File.Exists(Path.Combine(EnvironmentApi.ExternalDataPath, MarkerFileName)); + var file = Path.Combine(EnvironmentApi.ExternalDataPath, MarkerFileName); + return File.Exists(file) && File.ReadAllText(file) == Version; } private static void MarkAsInstalled() { - File.Create(Path.Combine(EnvironmentApi.ExternalDataPath, MarkerFileName)); + File.WriteAllText(Path.Combine(EnvironmentApi.ExternalDataPath, MarkerFileName), Version); } private static void CopyFiles(IEnumerable files, ITrace trace) diff --git a/unity/library/UtyMap.Unity/Properties/AssemblyInfo.cs b/unity/library/UtyMap.Unity/Properties/AssemblyInfo.cs index 0e5dd4f3..5238b27c 100644 --- a/unity/library/UtyMap.Unity/Properties/AssemblyInfo.cs +++ b/unity/library/UtyMap.Unity/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("97791a51-a81b-45d4-a6fc-5dfa9ebcc603")] -[assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("1.0.*")] +[assembly: AssemblyVersion("1.1.*")] +[assembly: AssemblyFileVersion("1.1.*")] [assembly: InternalsVisibleTo("UtyMap.Unity.Tests")]