diff --git a/Assets/FbxExporters.meta b/Assets/Editor.meta similarity index 77% rename from Assets/FbxExporters.meta rename to Assets/Editor.meta index c40ff53..982e1db 100644 --- a/Assets/FbxExporters.meta +++ b/Assets/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f7b4ca35e8ac3449be0584653a12314 +guid: 9102bde7958c14cdab4168322239413a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Editor/Migration.meta b/Assets/Editor/Migration.meta new file mode 100644 index 0000000..a7face0 --- /dev/null +++ b/Assets/Editor/Migration.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 784c1ed2aa16453488a41efb0eeae8ce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Migration/AddVuforiaEnginePackage.cs b/Assets/Editor/Migration/AddVuforiaEnginePackage.cs new file mode 100644 index 0000000..8e64d76 --- /dev/null +++ b/Assets/Editor/Migration/AddVuforiaEnginePackage.cs @@ -0,0 +1,211 @@ +using System; +using System.IO; +using System.Linq; +using System.Text; +using UnityEditor; +using UnityEngine; + +[InitializeOnLoad] +public class AddVuforiaEnginePackage +{ + const string VUFORIA_VERSION = "8.6.10"; + const string PACKAGE_KEY = "\"com.ptc.vuforia.engine\""; + + static readonly string sManifestJsonPath = Path.Combine(Application.dataPath, "..", "Packages", "manifest.json"); + + + static readonly ScopedRegistry sVuforiaRegistry = new ScopedRegistry() + { + name = "Vuforia", + url = "https://registry.packages.developer.vuforia.com/", + scopes = new[] { "com.ptc.vuforia" } + }; + + + static AddVuforiaEnginePackage() + { + if (Application.isBatchMode) + return; + + var manifest = Manifest.JsonDeserialize(sManifestJsonPath); + var registries = manifest.ScopedRegistries.ToList(); + if (registries.Any(r => r == sVuforiaRegistry)) + return; + + if (EditorUtility.DisplayDialog("Add Vuforia Engine Package", + "Would you like to update your project to always be able to find the latest version of the Vuforia Engine in the package manager window?\n" + + $"If a Vuforia Engine package is already present in your project it will be upgraded to version {VUFORIA_VERSION}", "Update", "Cancel")) + { + UpdateManifest(manifest); + } + } + + static void UpdateManifest(Manifest manifest) + { + AddRegistry(manifest, sVuforiaRegistry); + SetVuforiaVersion(manifest); + + manifest.JsonSerialize(sManifestJsonPath); + + AssetDatabase.Refresh(); + } + + static void SetVuforiaVersion(Manifest manifest) + { + var dependencies = manifest.Dependencies.Split(',').ToList(); + + var versionSet = false; + for(var i = 0; i < dependencies.Count; i++) + { + if(!dependencies[i].Contains(PACKAGE_KEY)) + continue; + + var kvp = dependencies[i].Split(':'); + + kvp[1] = $"\"{VUFORIA_VERSION}\""; //version string of the package + + dependencies[i] = string.Join(":", kvp); + + versionSet = true; + } + + if (!versionSet) + dependencies.Insert(0, $"\n {PACKAGE_KEY}: \"{VUFORIA_VERSION}\""); + + + manifest.Dependencies = string.Join(",", dependencies); + } + + static void AddRegistry(Manifest manifest, ScopedRegistry scopedRegistry) + { + var registries = manifest.ScopedRegistries.ToList(); + if (registries.Any(r => r == scopedRegistry)) + return; + + registries.Add(scopedRegistry); + + manifest.ScopedRegistries = registries.ToArray(); + } + + class Manifest + { + const int INDEX_NOT_FOUND = -1; + const string DEPENDENCIES_KEY = "\"dependencies\""; + + public ScopedRegistry[] ScopedRegistries; + public string Dependencies; + + public void JsonSerialize(string path) + { + var jsonString = JsonUtility.ToJson( + new UnitySerializableManifest {scopedRegistries = ScopedRegistries, dependencies = new DependencyPlaceholder()}, + true); + + var startIndex = GetDependenciesStart(jsonString); + var endIndex = GetDependenciesEnd(jsonString, startIndex); + + var stringBuilder = new StringBuilder(); + + stringBuilder.Append(jsonString.Substring(0, startIndex)); + stringBuilder.Append(Dependencies); + stringBuilder.Append(jsonString.Substring(endIndex, jsonString.Length - endIndex)); + + File.WriteAllText(path, stringBuilder.ToString()); + } + + public static Manifest JsonDeserialize(string path) + { + var jsonString = File.ReadAllText(path); + + var registries = JsonUtility.FromJson(jsonString).scopedRegistries ?? new ScopedRegistry[0]; + var dependencies = DeserializeDependencies(jsonString); + + return new Manifest { ScopedRegistries = registries, Dependencies = dependencies }; + } + + static string DeserializeDependencies(string json) + { + var startIndex = GetDependenciesStart(json); + var endIndex = GetDependenciesEnd(json, startIndex); + + if (startIndex == INDEX_NOT_FOUND || endIndex == INDEX_NOT_FOUND) + return null; + + var dependencies = json.Substring(startIndex, endIndex - startIndex); + return dependencies; + } + + static int GetDependenciesStart(string json) + { + var dependenciesIndex = json.IndexOf(DEPENDENCIES_KEY, StringComparison.InvariantCulture); + if (dependenciesIndex == INDEX_NOT_FOUND) + return INDEX_NOT_FOUND; + + var dependenciesStartIndex = json.IndexOf('{', dependenciesIndex + DEPENDENCIES_KEY.Length); + + if (dependenciesStartIndex == INDEX_NOT_FOUND) + return INDEX_NOT_FOUND; + + dependenciesStartIndex++; //add length of '{' to starting point + + return dependenciesStartIndex; + } + + static int GetDependenciesEnd(string jsonString, int dependenciesStartIndex) + { + return jsonString.IndexOf('}', dependenciesStartIndex); + } + } + + class UnitySerializableManifest + { + public ScopedRegistry[] scopedRegistries; + public DependencyPlaceholder dependencies; + } + + [Serializable] + struct ScopedRegistry + { + public string name; + public string url; + public string[] scopes; + + public override bool Equals(object obj) + { + if (!(obj is ScopedRegistry)) + return false; + + var other = (ScopedRegistry) obj; + + return name == other.name && + url == other.url && + scopes.SequenceEqual(other.scopes); + } + + public static bool operator ==(ScopedRegistry a, ScopedRegistry b) + { + return a.Equals(b); + } + + public static bool operator !=(ScopedRegistry a, ScopedRegistry b) + { + return !a.Equals(b); + } + + public override int GetHashCode() + { + var hash = 17; + + foreach (var scope in scopes) + hash = hash * 23 + (scope == null ? 0 : scope.GetHashCode()); + + hash = hash * 23 + (name == null ? 0 : name.GetHashCode()); + hash = hash * 23 + (url == null ? 0 : url.GetHashCode()); + + return hash; + } + } + + [Serializable] + struct DependencyPlaceholder { } +} diff --git a/Assets/Editor/Migration/AddVuforiaEnginePackage.cs.meta b/Assets/Editor/Migration/AddVuforiaEnginePackage.cs.meta new file mode 100644 index 0000000..d617f0d --- /dev/null +++ b/Assets/Editor/Migration/AddVuforiaEnginePackage.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3bbef22eb814a9647b6c1f03e99d95da +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FbxExporters/Editor.meta b/Assets/Editor/Vuforia.meta similarity index 57% rename from Assets/FbxExporters/Editor.meta rename to Assets/Editor/Vuforia.meta index f197b61..90fc1ec 100644 --- a/Assets/FbxExporters/Editor.meta +++ b/Assets/Editor/Vuforia.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: cdfff6ebcee35e54fa7badbc3d1453c2 +guid: 3b318b5996063a14d95c24c308870509 folderAsset: yes -timeCreated: 1499275053 -licenseType: Store +timeCreated: 1493380881 +licenseType: Pro DefaultImporter: userData: assetBundleName: diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents.meta b/Assets/Editor/Vuforia/CylinderTargetTextures.meta similarity index 70% rename from Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents.meta rename to Assets/Editor/Vuforia/CylinderTargetTextures.meta index c7b7ce7..7cdace2 100644 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents.meta +++ b/Assets/Editor/Vuforia/CylinderTargetTextures.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 1444c473b2c7b4038a415ec9054b9b28 +guid: 21c7256dec9132140af63b32f95af6ad folderAsset: yes -timeCreated: 1506554777 +timeCreated: 1502300586 licenseType: Store DefaultImporter: externalObjects: {} diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS.meta b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images.meta similarity index 70% rename from Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS.meta rename to Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images.meta index 405f6a0..8f732ae 100644 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS.meta +++ b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 733d3555c1fb64f80adf14da0d408e92 +guid: b930a4b8266e83742987b4344dcec5b5 folderAsset: yes -timeCreated: 1506554777 +timeCreated: 1502300586 licenseType: Store DefaultImporter: externalObjects: {} diff --git a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg new file mode 100644 index 0000000..ca80827 Binary files /dev/null and b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg.meta b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg.meta new file mode 100644 index 0000000..bc99394 --- /dev/null +++ b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: f930368b2014406d9fc39e0bc4925f04 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg new file mode 100644 index 0000000..779d224 Binary files /dev/null and b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg.meta b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg.meta new file mode 100644 index 0000000..37e7550 --- /dev/null +++ b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: 88ae6815c2214b71b7e8e53efddf0b22 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/authoringinfo.xml b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/authoringinfo.xml new file mode 100644 index 0000000..8d6650f --- /dev/null +++ b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/authoringinfo.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/authoringinfo.xml.meta b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/authoringinfo.xml.meta new file mode 100644 index 0000000..53c6b08 --- /dev/null +++ b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/authoringinfo.xml.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6e3ac25fe5c94d7d956f50c7c0df72e3 diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64.meta b/Assets/Editor/Vuforia/ForPrint.meta similarity index 67% rename from Assets/FbxExporters/Editor/FbxSdk/Plugins/x64.meta rename to Assets/Editor/Vuforia/ForPrint.meta index 44e1d18..206b74d 100644 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64.meta +++ b/Assets/Editor/Vuforia/ForPrint.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 0dc37544e55cf2a4aac9ab223bf643a9 +guid: 44f8302d27a65c3418ec2fc90f4a81dc folderAsset: yes -timeCreated: 1507217598 +timeCreated: 1493380532 licenseType: Store DefaultImporter: userData: diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative.meta b/Assets/Editor/Vuforia/ForPrint/CylinderTarget.meta similarity index 62% rename from Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative.meta rename to Assets/Editor/Vuforia/ForPrint/CylinderTarget.meta index c451462..a7b02b9 100644 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative.meta +++ b/Assets/Editor/Vuforia/ForPrint/CylinderTarget.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 0028086c2321149ec90e33c0106f2791 -timeCreated: 1506554777 +guid: 911ea977843f1374ea7ceae64e93156f +folderAsset: yes +timeCreated: 1498652026 licenseType: Store DefaultImporter: externalObjects: {} diff --git a/Assets/Editor/Vuforia/ForPrint/CylinderTarget/cylinder_booster_USLetter.pdf b/Assets/Editor/Vuforia/ForPrint/CylinderTarget/cylinder_booster_USLetter.pdf new file mode 100644 index 0000000..6291be8 Binary files /dev/null and b/Assets/Editor/Vuforia/ForPrint/CylinderTarget/cylinder_booster_USLetter.pdf differ diff --git a/Assets/FbxExporters/Editor/FbxSdk/docs.zip.meta b/Assets/Editor/Vuforia/ForPrint/CylinderTarget/cylinder_booster_USLetter.pdf.meta similarity index 64% rename from Assets/FbxExporters/Editor/FbxSdk/docs.zip.meta rename to Assets/Editor/Vuforia/ForPrint/CylinderTarget/cylinder_booster_USLetter.pdf.meta index 1ee7a18..5454a45 100644 --- a/Assets/FbxExporters/Editor/FbxSdk/docs.zip.meta +++ b/Assets/Editor/Vuforia/ForPrint/CylinderTarget/cylinder_booster_USLetter.pdf.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: f864a67b9ccc5d5448cd7298bb5d13ba -timeCreated: 1507217598 +guid: 78eb5653c5b77844196a06006d678259 +timeCreated: 1501795201 licenseType: Store DefaultImporter: userData: diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist.meta b/Assets/Editor/Vuforia/ForPrint/ImageTargets.meta similarity index 62% rename from Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist.meta rename to Assets/Editor/Vuforia/ForPrint/ImageTargets.meta index 0926efc..ad8b0b4 100644 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist.meta +++ b/Assets/Editor/Vuforia/ForPrint/ImageTargets.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: ee1e5b6a4c55e4efb8da620c9bd3fff3 -timeCreated: 1506554777 +guid: 318ac27b67500ea4498f806a3d7df7e6 +folderAsset: yes +timeCreated: 1498652026 licenseType: Store DefaultImporter: externalObjects: {} diff --git a/Assets/Editor/Vuforia/ForPrint/ImageTargets/target_images_USLetter.pdf b/Assets/Editor/Vuforia/ForPrint/ImageTargets/target_images_USLetter.pdf new file mode 100644 index 0000000..d7d69d2 Binary files /dev/null and b/Assets/Editor/Vuforia/ForPrint/ImageTargets/target_images_USLetter.pdf differ diff --git a/Assets/FbxExporters/FBX_Exporter_User_Guide.pdf.meta b/Assets/Editor/Vuforia/ForPrint/ImageTargets/target_images_USLetter.pdf.meta similarity index 64% rename from Assets/FbxExporters/FBX_Exporter_User_Guide.pdf.meta rename to Assets/Editor/Vuforia/ForPrint/ImageTargets/target_images_USLetter.pdf.meta index 6c053a7..87eb20f 100644 --- a/Assets/FbxExporters/FBX_Exporter_User_Guide.pdf.meta +++ b/Assets/Editor/Vuforia/ForPrint/ImageTargets/target_images_USLetter.pdf.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 6de62c7df48192d4bb557c86ee2e69d3 -timeCreated: 1507230141 +guid: e822de06b1e7abf4c9c199de2942c719 +timeCreated: 1501792231 licenseType: Store DefaultImporter: userData: diff --git a/Assets/Editor/Vuforia/ForPrint/MultiTarget.meta b/Assets/Editor/Vuforia/ForPrint/MultiTarget.meta new file mode 100644 index 0000000..bc48fcd --- /dev/null +++ b/Assets/Editor/Vuforia/ForPrint/MultiTarget.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f114e6025da31c947bc12a0004f00b05 +folderAsset: yes +timeCreated: 1498652026 +licenseType: Store +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ForPrint/MultiTarget/mars_box_USLetter.pdf b/Assets/Editor/Vuforia/ForPrint/MultiTarget/mars_box_USLetter.pdf new file mode 100644 index 0000000..8016897 Binary files /dev/null and b/Assets/Editor/Vuforia/ForPrint/MultiTarget/mars_box_USLetter.pdf differ diff --git a/Assets/FbxExporters/UnityFbxForMax.zip.meta b/Assets/Editor/Vuforia/ForPrint/MultiTarget/mars_box_USLetter.pdf.meta similarity index 64% rename from Assets/FbxExporters/UnityFbxForMax.zip.meta rename to Assets/Editor/Vuforia/ForPrint/MultiTarget/mars_box_USLetter.pdf.meta index a4c437d..51c53f4 100644 --- a/Assets/FbxExporters/UnityFbxForMax.zip.meta +++ b/Assets/Editor/Vuforia/ForPrint/MultiTarget/mars_box_USLetter.pdf.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 2ad26927eb7fa4a4485048b20fac7dff -timeCreated: 1510244436 +guid: fc373d9b39a416f438ca99ae10f8d3de +timeCreated: 1501548154 licenseType: Store DefaultImporter: userData: diff --git a/Assets/Editor/Vuforia/ForPrint/ObjectTarget.meta b/Assets/Editor/Vuforia/ForPrint/ObjectTarget.meta new file mode 100644 index 0000000..0d2c9ee --- /dev/null +++ b/Assets/Editor/Vuforia/ForPrint/ObjectTarget.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fc6e98c4f3b3c1d4386f6448c0e24839 +folderAsset: yes +timeCreated: 1498652027 +licenseType: Store +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ForPrint/ObjectTarget/mars_habitat_USLetter.pdf b/Assets/Editor/Vuforia/ForPrint/ObjectTarget/mars_habitat_USLetter.pdf new file mode 100644 index 0000000..2042f4b Binary files /dev/null and b/Assets/Editor/Vuforia/ForPrint/ObjectTarget/mars_habitat_USLetter.pdf differ diff --git a/Assets/FbxExporters/UnityFbxForMaya.zip.meta b/Assets/Editor/Vuforia/ForPrint/ObjectTarget/mars_habitat_USLetter.pdf.meta similarity index 64% rename from Assets/FbxExporters/UnityFbxForMaya.zip.meta rename to Assets/Editor/Vuforia/ForPrint/ObjectTarget/mars_habitat_USLetter.pdf.meta index f52c049..606ab7f 100644 --- a/Assets/FbxExporters/UnityFbxForMaya.zip.meta +++ b/Assets/Editor/Vuforia/ForPrint/ObjectTarget/mars_habitat_USLetter.pdf.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: bd3a79df710fe68418617efeba366df4 -timeCreated: 1510244436 +guid: e609eaf4958111e499e94cfba1eff945 +timeCreated: 1501792214 licenseType: Store DefaultImporter: userData: diff --git a/Assets/Editor/Vuforia/ForPrint/VuMark.meta b/Assets/Editor/Vuforia/ForPrint/VuMark.meta new file mode 100644 index 0000000..465f1da --- /dev/null +++ b/Assets/Editor/Vuforia/ForPrint/VuMark.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 72a30e5a5694fb742a98f324f5ab6b6b +folderAsset: yes +timeCreated: 1498652026 +licenseType: Store +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ForPrint/VuMark/mars_vumarks_USLetter.pdf b/Assets/Editor/Vuforia/ForPrint/VuMark/mars_vumarks_USLetter.pdf new file mode 100644 index 0000000..bb18ee8 Binary files /dev/null and b/Assets/Editor/Vuforia/ForPrint/VuMark/mars_vumarks_USLetter.pdf differ diff --git a/Assets/Editor/Vuforia/ForPrint/VuMark/mars_vumarks_USLetter.pdf.meta b/Assets/Editor/Vuforia/ForPrint/VuMark/mars_vumarks_USLetter.pdf.meta new file mode 100644 index 0000000..69b4055 --- /dev/null +++ b/Assets/Editor/Vuforia/ForPrint/VuMark/mars_vumarks_USLetter.pdf.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2212c039dd5f11644b44fe8ed58b38e7 +timeCreated: 1502302061 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures.meta b/Assets/Editor/Vuforia/ImageTargetTextures.meta new file mode 100644 index 0000000..db1457f --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6de677bb34a9d444abcbc1265b6475ff +folderAsset: yes +timeCreated: 1502300586 +licenseType: Store +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator.meta new file mode 100644 index 0000000..6a3fa25 --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c60fde2f6d3ec6249bf8090fdb0995e8 +folderAsset: yes +timeCreated: 1510162306 +licenseType: Store +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg new file mode 100644 index 0000000..40494f3 Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg.meta new file mode 100644 index 0000000..e1b190d --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: d28f7a8a9b3dfff44bb6faf80929212b +timeCreated: 1510225274 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + 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 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images.meta new file mode 100644 index 0000000..1a92b69 --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4ab1e2e72a52218429d2dc18bab3b618 +folderAsset: yes +timeCreated: 1502300586 +licenseType: Store +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg new file mode 100644 index 0000000..fc3361a Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg.meta new file mode 100644 index 0000000..0d83016 --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: 9acbce508a2246108d4c0212523d1e6b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg new file mode 100644 index 0000000..1a557c5 Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg.meta new file mode 100644 index 0000000..6bb6e14 --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: 9c4e7c8fc8274d33a063152a2a6bb51a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg new file mode 100644 index 0000000..5be6c98 Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg.meta new file mode 100644 index 0000000..16ec21a --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: 47951b4f9ac24e19b37b9f61f4f80454 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg new file mode 100644 index 0000000..2fd2bb2 Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg.meta new file mode 100644 index 0000000..f3329cc --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: dfc35683b33646d6a8f8043d80b539e6 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg new file mode 100644 index 0000000..409ed7c Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg.meta new file mode 100644 index 0000000..9b0f53a --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: 488193fccbc64be4ae69a79dbf3f6c12 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg new file mode 100644 index 0000000..bb61531 Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg.meta new file mode 100644 index 0000000..6234bc0 --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: dea45625aed7476b82266833125f89ae +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg new file mode 100644 index 0000000..c7854ff Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg.meta new file mode 100644 index 0000000..7091c10 --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: ff250dc992224c6c9211919f8b8949dd +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg new file mode 100644 index 0000000..089cce9 Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg.meta new file mode 100644 index 0000000..5d004d7 --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: 5daf145bc2dc451087f87939f13dbe47 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg new file mode 100644 index 0000000..d0aec26 Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg.meta new file mode 100644 index 0000000..5b548c3 --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: 0739de41e8f04076a926bec890f6ec88 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg new file mode 100644 index 0000000..d055d25 Binary files /dev/null and b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg differ diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg.meta new file mode 100644 index 0000000..25f80a5 --- /dev/null +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg.meta @@ -0,0 +1,86 @@ +fileFormatVersion: 2 +guid: aa91900b3d0343f7b6b7ed78b677e0f2 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 6 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk.meta b/Assets/FbxExporters/Editor/FbxSdk.meta deleted file mode 100644 index aed943f..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: ccdb8f785f944094d99c643954f4c176 -folderAsset: yes -timeCreated: 1507225682 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk/LICENSE.txt b/Assets/FbxExporters/Editor/FbxSdk/LICENSE.txt deleted file mode 100644 index c406d96..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/LICENSE.txt +++ /dev/null @@ -1,3 +0,0 @@ -Autodesk FBX SDK. Copyright (c) 2016 Autodesk, Inc. All rights reserved. -Use of the FBX SDK requires agreeing to and complying with the FBX SDK License and Service Agreement terms -accessed at https://damassets.autodesk.net/content/dam/autodesk/www/Company/docs/pdf/legal-notices-&-trademarks/Autodesk_FBX_SDK_2015_License_and_Services_Agreement.pdf" \ No newline at end of file diff --git a/Assets/FbxExporters/Editor/FbxSdk/LICENSE.txt.meta b/Assets/FbxExporters/Editor/FbxSdk/LICENSE.txt.meta deleted file mode 100644 index 5c2ca6a..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/LICENSE.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 070080e279910ff42ad2e323bcb2a737 -timeCreated: 1507217626 -licenseType: Store -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins.meta b/Assets/FbxExporters/Editor/FbxSdk/Plugins.meta deleted file mode 100644 index 7bc16ad..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 90096f7e234e5e449a172fbc78106719 -folderAsset: yes -timeCreated: 1507217598 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll b/Assets/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll deleted file mode 100644 index 03149f1..0000000 Binary files a/Assets/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll and /dev/null differ diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll.meta b/Assets/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll.meta deleted file mode 100644 index 3ea296c..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/UnityFbxSdk.dll.meta +++ /dev/null @@ -1,121 +0,0 @@ -fileFormatVersion: 2 -guid: 1fbcb7a1c49a9ac449ee7443e2202cfe -timeCreated: 1507217610 -licenseType: Store -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - data: - first: - Any: - second: - enabled: 0 - settings: {} - data: - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - data: - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - data: - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - data: - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - data: - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - data: - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS.meta b/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS.meta deleted file mode 100644 index 3a9a396..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 9de5cf2547a2e154aa1f419b1841dc9d -folderAsset: yes -timeCreated: 1507226575 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle.meta b/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle.meta deleted file mode 100644 index edf158a..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle.meta +++ /dev/null @@ -1,28 +0,0 @@ -fileFormatVersion: 2 -guid: d0d661670bd3fc34d8b876b0f3dd9091 -folderAsset: yes -timeCreated: 1507226591 -licenseType: Store -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - Any: - second: - enabled: 0 - settings: {} - data: - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist b/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist deleted file mode 100644 index e85ec5f..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - UnityFbxSdkNative - CFBundleGetInfoString - - CFBundleIconFile - - CFBundleIdentifier - - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLongVersionString - - CFBundleName - - CFBundlePackageType - APPL - CFBundleShortVersionString - - CFBundleSignature - ???? - CFBundleVersion - - CSResourcesFileMapped - - NSHumanReadableCopyright - - NSPrincipalClass - NSApplication - NSHighResolutionCapable - True - - diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative b/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative deleted file mode 100644 index a0870c9..0000000 Binary files a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative and /dev/null differ diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows.meta b/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows.meta deleted file mode 100644 index d853c6e..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: e7d27fd318df0614aa71c66335db7086 -folderAsset: yes -timeCreated: 1507217599 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll b/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll deleted file mode 100644 index dbd7e57..0000000 Binary files a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll and /dev/null differ diff --git a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll.meta b/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll.meta deleted file mode 100644 index 4868b06..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/Plugins/x64/Windows/UnityFbxSdkNative.dll.meta +++ /dev/null @@ -1,114 +0,0 @@ -fileFormatVersion: 2 -guid: b7db48465611e8542b7bc6bd41743306 -timeCreated: 1507217626 -licenseType: Store -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - data: - first: - Any: - second: - enabled: 0 - settings: {} - data: - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: AnyOS - data: - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: None - data: - first: - Facebook: Win64 - second: - enabled: 1 - settings: - CPU: None - data: - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: None - data: - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: None - data: - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - data: - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: None - data: - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: None - data: - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - data: - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - data: - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: None - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk/README.txt b/Assets/FbxExporters/Editor/FbxSdk/README.txt deleted file mode 100644 index ccbb934..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/README.txt +++ /dev/null @@ -1,28 +0,0 @@ -FBX SDK C# Bindings -=================== - -Autodesk FBX SDK. Copyright (c) 2016 Autodesk, Inc. All rights reserved.
-Use of the FBX SDK requires agreeing to and complying with the FBX SDK License and Service Agreement terms -accessed at https://damassets.autodesk.net/content/dam/autodesk/www/Company/docs/pdf/legal-notices-&-trademarks/Autodesk_FBX_SDK_2015_License_and_Services_Agreement.pdf" - -**Version**: 1.3.0a1 - -This package contains only a subset of the FbxSdk, and is designed to work in the Unity Editor only. - -How to Access Bindings in Code -------------------------------- -All the bindings are located under the FbxSdk namespace, -and are accessed almost the same way as in C++. -e.g. FbxManager::Create() in C++ becomes FbxSdk.FbxManager.Create() in C# - - -How to Access Global Variables and Functions --------------------------------------------- -All global variables and functions are in Globals.cs, in the Globals class under the FbxSdk namespace. -e.g. if we want to access the IOSROOT variable, we would do FbxSdk.Globals.IOSROOT - - -How to Access Documentation for Bindings ----------------------------------------- -1. Unzip docs.zip outside of the Assets folder -2. Open docs/html/index.html \ No newline at end of file diff --git a/Assets/FbxExporters/Editor/FbxSdk/README.txt.meta b/Assets/FbxExporters/Editor/FbxSdk/README.txt.meta deleted file mode 100644 index 9cd855d..0000000 --- a/Assets/FbxExporters/Editor/FbxSdk/README.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 479a3739c785a11469f3ee1f463994f7 -timeCreated: 1507217626 -licenseType: Store -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/Editor/FbxSdk/docs.zip b/Assets/FbxExporters/Editor/FbxSdk/docs.zip deleted file mode 100644 index 1d98045..0000000 Binary files a/Assets/FbxExporters/Editor/FbxSdk/docs.zip and /dev/null differ diff --git a/Assets/FbxExporters/Editor/UnityFbxExporterEditor.dll b/Assets/FbxExporters/Editor/UnityFbxExporterEditor.dll deleted file mode 100644 index 09377f7..0000000 Binary files a/Assets/FbxExporters/Editor/UnityFbxExporterEditor.dll and /dev/null differ diff --git a/Assets/FbxExporters/Editor/UnityFbxExporterEditor.dll.meta b/Assets/FbxExporters/Editor/UnityFbxExporterEditor.dll.meta deleted file mode 100644 index f91a805..0000000 --- a/Assets/FbxExporters/Editor/UnityFbxExporterEditor.dll.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 660c183247865bf46a724b508ed5c1a3 -timeCreated: 1507225697 -licenseType: Store -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - Any: - second: - enabled: 0 - settings: {} - data: - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - data: - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/FBX_Exporter_User_Guide.pdf b/Assets/FbxExporters/FBX_Exporter_User_Guide.pdf deleted file mode 100644 index c8e32a2..0000000 Binary files a/Assets/FbxExporters/FBX_Exporter_User_Guide.pdf and /dev/null differ diff --git a/Assets/FbxExporters/LICENSE.txt b/Assets/FbxExporters/LICENSE.txt deleted file mode 100644 index 91fc304..0000000 --- a/Assets/FbxExporters/LICENSE.txt +++ /dev/null @@ -1,5 +0,0 @@ -FBX Exporter copyright © 2017 Unity Technologies ApS - -Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License). - -Unless expressly provided otherwise, the Software under this license is made available strictly on an "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions. \ No newline at end of file diff --git a/Assets/FbxExporters/LICENSE.txt.meta b/Assets/FbxExporters/LICENSE.txt.meta deleted file mode 100644 index ef46894..0000000 --- a/Assets/FbxExporters/LICENSE.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 670c8ffd945c65246ae9ed0224ddf970 -timeCreated: 1500302146 -licenseType: Store -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/README.txt b/Assets/FbxExporters/README.txt deleted file mode 100644 index 5f75866..0000000 --- a/Assets/FbxExporters/README.txt +++ /dev/null @@ -1,23 +0,0 @@ -FBX Exporter Package -==================== - -Copyright (c) 2017 Unity Technologies. All rights reserved. - -See LICENSE.txt file for full license information. - -VERSION: 1.3.0f1 - -Requirements ------------- - -Installing Unity Integration ----------------------------- - -The easiest way to install the Unity integration is from the Fbx Export Settings in Unity. - - MenuBar -> Edit -> Project Settings -> Fbx Export -> Install Unity Integration - -It will use the 3D application specified in the "3D Application" dropdown located above the -button. The dropdown will show all supported Maya, Maya LT and 3ds Max versions located in the default installation location. -To handle non-default installation locations, either select the browse option in the dropdown -and browse to the desired executable location, or set the MAYA_LOCATION environment variable. \ No newline at end of file diff --git a/Assets/FbxExporters/README.txt.meta b/Assets/FbxExporters/README.txt.meta deleted file mode 100644 index aa9537c..0000000 --- a/Assets/FbxExporters/README.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fa5e8bc9da963d949955cf16217de64f -timeCreated: 1500302146 -licenseType: Store -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/RELEASE_NOTES.txt b/Assets/FbxExporters/RELEASE_NOTES.txt deleted file mode 100644 index 595f262..0000000 --- a/Assets/FbxExporters/RELEASE_NOTES.txt +++ /dev/null @@ -1,74 +0,0 @@ -RELEASE NOTES - -**Version**: 1.3.0f1 - -**Version**: 1.3.0b3 - -FIXES -* ConvertToPrefab: fix Mesh Collider not pointing to exported mesh after converting -* FbxExporter: fix so "Compatible Naming" doesn't modify scene on export - -**Version**: 1.3.0b2 - -NEW FEATURES -* Unity3dsMaxIntegration: Allow multi file import -* Unity3dsMaxIntegration: Allow multi file export by scene selection - -**Version**: 1.3.0b1 - -NEW FEATURES -* FbxExporter: Export animation clips from Timeline -* FbxExportSettings: Added new UI to set export settings -* FbxExportSettings: Added option to transfer transform animation on export -* FbxExporterSettings: Added option to export model only -* FbxExporterSettings: Added option to export animation only -* FbxExporterSettings: Added option not to export animation on skinned meshes -* FbxExportSettings: Added option to export meshes without renderers -* FbxExportSettings: Added LOD export option -* UnityMayaIntegration: Allow multi file import -* UnityMayaIntegration: Allow multi file export by scene selection -* FbxPrefabAutoUpdater: new UI to help manage name changes - -FIXES -* FbxExporter: link materials to objects connected to mesh instances -* FbxExporter: export meshes in model prefab instances as mesh instances in fbx -* ConvertToPrefab: Don't re-export fbx model instances -* FbxExportSettings: fix console error on Mac when clicking "Install Unity Integration" -* FbxExporter: fix so animating spot angle in Unity animates cone angle in Maya (not penumbra) -* FbxExporter: export correct rotation order (xyz) for euler rotation animations (previously would export as zxy) - -**Version**: 1.3.0a1 - -NEW FEATURES -* FbxExporter: Added support for exporting Blendshapes -* FbxExporter: Added support for exporting SkinnedMeshes with legacy and generic animation -* FbxExporter: Added support for exporting Lights with animatable properties (Intensity, Spot Angle, Color) -* FbxExporter: Added support for exporting Cameras with animatable properties (Field of View) -* FbxExporter: added ability to export animation on transforms - -FIXES -* fix Universal Windows Platform build errors - -Error caused by UnityFbxSdk.dll being set as compatible with any platform instead of editor only. - -**Version**: 1.2.0b1 - -NEW FEATURES -* Added Maya LT one button import/export -* Added Camera export support - -**Version**: 1.1.0b1 - -NEW FEATURES -* Added 3ds Max one button import/export - -FIXES -* Fix so Object references aren't lost when using Convert to Linked Prefab Instance -* Fix Maya Integration dropdown not appearing in the Export Settings - -**Version**: 1.0.0b1 - -NEW FEATURES -* Ability to export fbx files from Unity -* Convert to linked prefab to create a prefab that auto-updates with the linked fbx -* Maya one button import/export \ No newline at end of file diff --git a/Assets/FbxExporters/RELEASE_NOTES.txt.meta b/Assets/FbxExporters/RELEASE_NOTES.txt.meta deleted file mode 100644 index 42edd68..0000000 --- a/Assets/FbxExporters/RELEASE_NOTES.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 34004d94a3eaab7499e7ae9e76253702 -timeCreated: 1517510435 -licenseType: Store -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FbxExporters/UnityFbxForMax.zip b/Assets/FbxExporters/UnityFbxForMax.zip deleted file mode 100644 index f3de9e9..0000000 Binary files a/Assets/FbxExporters/UnityFbxForMax.zip and /dev/null differ diff --git a/Assets/FbxExporters/UnityFbxForMaya.zip b/Assets/FbxExporters/UnityFbxForMaya.zip deleted file mode 100644 index fea1169..0000000 Binary files a/Assets/FbxExporters/UnityFbxForMaya.zip and /dev/null differ diff --git a/Assets/FbxExporters/UnityFbxPrefab.dll b/Assets/FbxExporters/UnityFbxPrefab.dll deleted file mode 100644 index a1e592d..0000000 Binary files a/Assets/FbxExporters/UnityFbxPrefab.dll and /dev/null differ diff --git a/Assets/FbxExporters/UnityFbxPrefab.dll.meta b/Assets/FbxExporters/UnityFbxPrefab.dll.meta deleted file mode 100644 index 6bf0399..0000000 --- a/Assets/FbxExporters/UnityFbxPrefab.dll.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 628ffbda3fdf4df4588770785d91a698 -timeCreated: 1507225693 -licenseType: Store -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - Any: - second: - enabled: 1 - settings: {} - data: - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - data: - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials.meta b/Assets/Materials.meta new file mode 100644 index 0000000..4fcd90f --- /dev/null +++ b/Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cbb52eb230845884da90d90bb6b32b26 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/RadVizAprilTag.mat b/Assets/Materials/RadVizAprilTag.mat new file mode 100644 index 0000000..9368d22 --- /dev/null +++ b/Assets/Materials/RadVizAprilTag.mat @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RadVizAprilTag + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: b0486459385e9c248afd9c93bd535981, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: [] diff --git a/Assets/Materials/RadVizAprilTag.mat.meta b/Assets/Materials/RadVizAprilTag.mat.meta new file mode 100644 index 0000000..22bae45 --- /dev/null +++ b/Assets/Materials/RadVizAprilTag.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04345bfe216480c40b46c3581632f1df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RadVizAprilTag.png b/Assets/RadVizAprilTag.png new file mode 100644 index 0000000..749869d Binary files /dev/null and b/Assets/RadVizAprilTag.png differ diff --git a/Assets/RadVizAprilTag.png.meta b/Assets/RadVizAprilTag.png.meta new file mode 100644 index 0000000..7447045 --- /dev/null +++ b/Assets/RadVizAprilTag.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b0486459385e9c248afd9c93bd535981 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000..d81a839 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4e89fe582ed0b64ab3868abb9508696 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/VuforiaConfiguration.asset b/Assets/Resources/VuforiaConfiguration.asset new file mode 100644 index 0000000..55795e2 --- /dev/null +++ b/Assets/Resources/VuforiaConfiguration.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2067402452, guid: bab6fa851cf5a1a4bba3cec5f191cb8e, type: 3} + m_Name: VuforiaConfiguration + m_EditorClassIdentifier: + vuforia: + vuforiaLicenseKey: + ufoLicenseKey: QWUrM1dHMy8vLy8vQUFBQUtKNy9nVFNTbWs3enJUaC9XdlpEQ0NZQTA5Ykh6SXA4YmxERnh3RFFuVGJCcGoyTlhCZE1vU1MreU1BQWR6Q05DenZzZzZTaUl5RDhxRUR1YXhjWC93WVllUHUwQ256RG40em5hUkM4RjB6VjBaOStrV2VQWEdVY1BxQldEM2pqREZSN0o0SGVQenpqVDFNWS9zWlFvdEZEditiN042Qk9mMnFoMTZUWGZnYXJMak5tMlZVUHlwRU5XR09LZGVGa2RuNGFTaEg1SlF3Mnc1WFBScFlicEM2b04vVWRCS0ZVT1pCejM0MDd1djVENjRDbm5xakFKT3Y5MkJDVEhxcWRJUkFBV3IrUUFXMVpGVDhZWWdLaDBSQlIxNWxkVlJPT3JjUDhsT1R4NjZYYTdiZzVVMzM5VmdWaUQwbE1wcjJQV0VnVklFK2ZmS281MkQvOUZxUHZ4cUs0aDhrWjBRWkxmRkdSOUYyYTFKNXA= + delayedInitialization: 0 + cameraDeviceModeSetting: -1 + maxSimultaneousImageTargets: 1 + maxSimultaneousObjectTargets: 1 + useDelayedLoadingObjectTargets: 0 + modelTargetRecoWhileExtendedTracked: 1 + version: 8.6.10 + eulaAcceptedVersions: '{"Values":["8.3","8.5","8.0","8.6"]}' + modelTargetMode: 0 + database: + disableModelExtraction: 0 + videoBackground: + numDivisions: 2 + videoBackgroundShader: {fileID: 4800000, guid: f40623b353e2f1943b1b3ba42975db7a, + type: 3} + videoBackgroundEnabled: 1 + deviceTracker: + autoInitTracker: 0 + autoStartTracker: 0 + arcoreRequirement: 0 + autoImportArcore: 0 + smartTerrain: + autoInitTracker: 0 + autoStartTracker: 0 + webcam: + deviceNameSetInEditor: + turnOffWebCam: 0 + renderTextureLayer: 30 diff --git a/Assets/Resources/VuforiaConfiguration.asset.meta b/Assets/Resources/VuforiaConfiguration.asset.meta new file mode 100644 index 0000000..7fe9b58 --- /dev/null +++ b/Assets/Resources/VuforiaConfiguration.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07bcac3de6b8dba4cbda023b1407c0a5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/RosBridge_hololens.unity b/Assets/Scenes/RosBridge_hololens.unity new file mode 100644 index 0000000..94bb600 --- /dev/null +++ b/Assets/Scenes/RosBridge_hololens.unity @@ -0,0 +1,804 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &44316510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 44316514} + - component: {fileID: 44316513} + - component: {fileID: 44316512} + - component: {fileID: 44316511} + m_Layer: 0 + m_Name: debug_ball + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!135 &44316511 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44316510} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &44316512 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44316510} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100034, guid: 267c099eec614aa4fb2e2f615f610657, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &44316513 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44316510} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &44316514 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44316510} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.024399355, y: 0.057888612, z: 1.0804015} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &900373693 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4734764973904715782, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_Name + value: drone_model + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734764973904559142, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4024692175903643334, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4734764972126205026, guid: 969e280da33127f479dd99861267d88a, + type: 3} + propertyPath: server + value: + objectReference: {fileID: 993416929} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 969e280da33127f479dd99861267d88a, type: 3} +--- !u!1 &993416928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 993416930} + - component: {fileID: 993416929} + m_Layer: 0 + m_Name: DataServer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &993416929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993416928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6d5ad1e9b8fd2b44b82598af4921412, type: 3} + m_Name: + m_EditorClassIdentifier: + ball: {fileID: 44316510} + listenPorts: 57c3000058c3000059c30000 + verbose: 0 + line_count: 0 +--- !u!4 &993416930 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993416928} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1215983729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1215983734} + - component: {fileID: 1215983733} + - component: {fileID: 1215983732} + - component: {fileID: 1215983731} + - component: {fileID: 1215983730} + m_Layer: 0 + m_Name: ARCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1215983730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215983729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c47f92041efbb4b429a4eafca855ebe3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1215983731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215983729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1826476478, guid: bab6fa851cf5a1a4bba3cec5f191cb8e, type: 3} + m_Name: + m_EditorClassIdentifier: + mWorldCenterMode: 2 + mWorldCenter: {fileID: 0} +--- !u!81 &1215983732 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215983729} + m_Enabled: 1 +--- !u!20 &1215983733 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215983729} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.05 + far clip plane: 2000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1215983734 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215983729} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1353239784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1353239786} + - component: {fileID: 1353239785} + m_Layer: 0 + m_Name: Radiation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1353239785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1353239784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49d30ac3100375c49bbcb1b6c23d1024, type: 3} + m_Name: + m_EditorClassIdentifier: + initialParticleCount: 20000 + updateInterval: 2 + server: {fileID: 993416929} + ball: {fileID: 44316510} + dataReceived: 0 + flipYZ: 1 +--- !u!4 &1353239786 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1353239784} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1532739535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1532739538} + - component: {fileID: 1532739537} + - component: {fileID: 1532739536} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1532739536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1532739535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1532739537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1532739535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1532739538 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1532739535} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1533316507 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1533316511} + - component: {fileID: 1533316510} + - component: {fileID: 1533316509} + - component: {fileID: 1533316508} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1533316508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533316507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1533316509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533316507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1533316510 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533316507} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1215983733} + m_PlaneDistance: 5 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1533316511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533316507} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1633483101} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1633483100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1633483101} + - component: {fileID: 1633483103} + - component: {fileID: 1633483102} + - component: {fileID: 1633483104} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1633483101 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1633483100} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1533316511} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 80} + m_SizeDelta: {x: 500, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1633483102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1633483100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9245283, g: 0.039248828, b: 0.039248828, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Hello World +--- !u!222 &1633483103 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1633483100} + m_CullTransparentMesh: 0 +--- !u!114 &1633483104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1633483100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab205bd2bb898f348a3bad974ab1a45b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1834576216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1834576218} + - component: {fileID: 1834576217} + m_Layer: 0 + m_Name: PointCloud + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1834576217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834576216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ab3f638c02bc9b458a2c9425efeab5a, type: 3} + m_Name: + m_EditorClassIdentifier: + initialParticleCount: 20000 + updateInterval: 2 + server: {fileID: 993416929} + flipYZ: 1 + msgCount: 0 + radiationDataSource: {fileID: 0} +--- !u!4 &1834576218 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834576216} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/RosBridge_hololens.unity.meta b/Assets/Scenes/RosBridge_hololens.unity.meta new file mode 100644 index 0000000..089277f --- /dev/null +++ b/Assets/Scenes/RosBridge_hololens.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 80832861f71510b47bd085ed376b47f7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DataServer.cs b/Assets/Scripts/DataServer.cs index 69c379a..837bd29 100644 --- a/Assets/Scripts/DataServer.cs +++ b/Assets/Scripts/DataServer.cs @@ -16,6 +16,19 @@ /// public class DataServer : MonoBehaviour { + + public GameObject ball; + + private int flag = 0; + + private int update_ui = 0; + + private int num_subscribe; + + private string update_message1 = "default1"; + private string update_message3 = "default2"; + private float update_message2 = 5002.0f; + /// /// Objects that wish to subscribe to data channels must implement the DataSubscriber interface. /// @@ -157,6 +170,44 @@ private void ListenOnPort(int port) } } + public void Update() + { + //UIElemScript.edit(num_subscribe.ToString()); + UIElemScript.edit(" " + update_message1 + /*update_message2.ToString() + */update_message3); + + if (flag == 1) + { + ball.GetComponent().material.color = Color.red; + } + + else if (flag == 2) + { + ball.GetComponent().material.color = Color.yellow; + } + + else if (flag == 3) + { + ball.GetComponent().material.color = Color.green; + UIElemScript.edit(num_subscribe.ToString()); + } + + else if (flag == 4) + { + ball.GetComponent().material.color = Color.white; + } + else if (flag == 5) + { + } + else + { + ball.GetComponent().material.color = Color.magenta; + } + + if (update_ui == 1) + { + //UIElemScript.edit(num_subscribe.ToString()); + } + } /// /// The callback function for when a client establishes connection with the server. /// @@ -170,7 +221,6 @@ private void ClientConnectCallback(IAsyncResult ar) { Debug.Log("Client connected"); } - NetworkStream stream = client.GetStream(); ConcurrentQueue messageQueue = new ConcurrentQueue(); StringBuilder leftover = new StringBuilder(); @@ -181,6 +231,7 @@ private void ClientConnectCallback(IAsyncResult ar) { clientStreams.Add(state); } + flag = 1; // Start reading data arriving on this network stream. stream.BeginRead(bytes, 0, bytes.Length, new AsyncCallback(ReadMessages), state); @@ -195,6 +246,7 @@ private void ClientConnectCallback(IAsyncResult ar) /// The Tuple state object associated with this stream. private void ReadMessages(IAsyncResult ar) { + //flag = 0; Tuple, StringBuilder> state = (Tuple, StringBuilder>)ar.AsyncState; NetworkStream stream = state.Item2; @@ -292,10 +344,27 @@ private void DelegateMessages() if (parsedMessages.TryDequeue(out currMessage)) { List currSubscribers; + num_subscribe = subscribers.Count; + update_ui = 1; + update_message1 = currMessage.Item1 + currMessage.Item3; + update_message2 = currMessage.Item2; + //update_message3 = currMessage.Item3; + update_message3 = "HELLO"; + flag = 5; + //flag = 2; + //UIElemScript.edit("Subrscribers found: " + subscribers.Count); if (subscribers.TryGetValue(currMessage.Item1, out currSubscribers)) { + flag = 3; + num_subscribe = currSubscribers.Count; + //UIElemScript.edit("Subrscribers found: " + currSubscribers.Count); + //foreach(DataSubscriber cb in currSubscribers) + //{ + // UIElemScript.edit() + //} foreach (DataSubscriber sb in currSubscribers) { + flag = 4; sb.OnReceiveMessage(currMessage.Item2, currMessage.Item3); } } diff --git a/Assets/Scripts/Visualization/DronePositionSubscriber.cs b/Assets/Scripts/Visualization/DronePositionSubscriber.cs index e5c1ac0..de3875f 100644 --- a/Assets/Scripts/Visualization/DronePositionSubscriber.cs +++ b/Assets/Scripts/Visualization/DronePositionSubscriber.cs @@ -79,7 +79,7 @@ void Update() } if (finished) { - PrefabUtility.SaveAsPrefabAsset(gameObject, "Assets/Prefabs/drone_path.prefab"); + //PrefabUtility.SaveAsPrefabAsset(gameObject, "Assets/Prefabs/drone_path.prefab"); finished = false; } } diff --git a/Assets/Scripts/Visualization/RadiationPointSubscriber.cs b/Assets/Scripts/Visualization/RadiationPointSubscriber.cs index 5bcb689..10bace1 100644 --- a/Assets/Scripts/Visualization/RadiationPointSubscriber.cs +++ b/Assets/Scripts/Visualization/RadiationPointSubscriber.cs @@ -10,6 +10,14 @@ public class RadiationPointSubscriber : PointCloudVisualizer2, DataServer.DataSu /// Attach DataServer object. If nonexistant, create an empty GameObject and attach the script `DataServer.cs`. public DataServer server; + //Attaching simple game object for debugging purposes + public GameObject ball; + Renderer ballRenderer; + Material ballMaterial; + public bool dataReceived = false; + + private int flag = 0; + /// Setting this to true will give a horizontal view of the data. public bool flipYZ = false; @@ -28,6 +36,11 @@ void Start() Initialize(); SetShader("Particles/Standard Unlit"); + // Debugging with "ball" GameObject + //ballRenderer = ball.GetComponent(); + //ballMaterial = ballRenderer.material; + // End Debugging with "ball" GameObject + SetColor(new Color(1, 1, 1, 0.2f)); SetEmissionColor(new Color(0, 0, 0, 0)); @@ -37,6 +50,22 @@ void Start() server.RegisterDataSubscriber("Radiation", this); } + void Update() + { + // Debugging with 'ball' GameObject + if (dataReceived) + { + //ball.GetComponent().material.color = Color.red; + // Destroy(ball); + } + else + { + //ball.GetComponent().material.color = Color.blue; + } + + // End debugging with 'ball' GameObject + // End debugging with 'ball' GameObject + } /// /// The callback for receiving data on the subscribed channel. @@ -47,6 +76,21 @@ void Start() /// The raw contents of the message. public void OnReceiveMessage(float timestamp, string message) { + // Debugging with 'ball' GameObject + //if (flag < 10) + //{ + dataReceived = true; + //} + //else + //{ + // dataReceived = false; + //} + //flag += 1; + //flag = flag % 20; + + // End debugging with 'ball' GameObject + // End debugging with 'ball' GameObject + if (string.Compare(message.ToString(), "End of Radiation") == 0) { finished = true; diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 0000000..72dbb70 --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72ecbb38408dd4a359615d7c990a628a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Vuforia.meta b/Assets/StreamingAssets/Vuforia.meta new file mode 100644 index 0000000..9e238c9 --- /dev/null +++ b/Assets/StreamingAssets/Vuforia.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: eab28fbba74990244b40f30d8e190ead +folderAsset: yes +timeCreated: 1502300586 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Vuforia/ISAACS_images.dat b/Assets/StreamingAssets/Vuforia/ISAACS_images.dat new file mode 100644 index 0000000..f980543 Binary files /dev/null and b/Assets/StreamingAssets/Vuforia/ISAACS_images.dat differ diff --git a/Assets/StreamingAssets/Vuforia/ISAACS_images.dat.meta b/Assets/StreamingAssets/Vuforia/ISAACS_images.dat.meta new file mode 100644 index 0000000..cd7b4a6 --- /dev/null +++ b/Assets/StreamingAssets/Vuforia/ISAACS_images.dat.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2214945c2845427faacef41c0699c6b6 diff --git a/Assets/StreamingAssets/Vuforia/ISAACS_images.xml b/Assets/StreamingAssets/Vuforia/ISAACS_images.xml new file mode 100644 index 0000000..96a1c8c --- /dev/null +++ b/Assets/StreamingAssets/Vuforia/ISAACS_images.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Assets/StreamingAssets/Vuforia/ISAACS_images.xml.meta b/Assets/StreamingAssets/Vuforia/ISAACS_images.xml.meta new file mode 100644 index 0000000..55ae941 --- /dev/null +++ b/Assets/StreamingAssets/Vuforia/ISAACS_images.xml.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4e56e2dc8ab34454a13f0bb7b4071562 diff --git a/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.dat b/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.dat new file mode 100644 index 0000000..8dc6d90 Binary files /dev/null and b/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.dat differ diff --git a/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.dat.meta b/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.dat.meta new file mode 100644 index 0000000..ec951bd --- /dev/null +++ b/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.dat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e8ea1fa6394e8d94893c329a44c9a340 +timeCreated: 1502300612 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.xml b/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.xml new file mode 100644 index 0000000..1bafcd7 --- /dev/null +++ b/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.xml.meta b/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.xml.meta new file mode 100644 index 0000000..0074b86 --- /dev/null +++ b/Assets/StreamingAssets/Vuforia/VuforiaMars_Images.xml.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7a7da849527748169c9d1a3dbbff2af1 diff --git a/Assets/UIElemScript.cs b/Assets/UIElemScript.cs new file mode 100644 index 0000000..72ff1b9 --- /dev/null +++ b/Assets/UIElemScript.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class UIElemScript : MonoBehaviour +{ + Text txt; + private static string toDisplay; + private static int toEdit = 0; + // Start is called before the first frame update + void Start() + { + txt = gameObject.GetComponent(); + txt.text = "Hello World"; + } + public static void edit(string str) + { + toDisplay = str; + toEdit = 1; + } + + + // Update is called once per frame + void Update() + { + if (toEdit == 1) + { + txt.text = "Edited: " + toDisplay; + } + } +} diff --git a/Assets/UIElemScript.cs.meta b/Assets/UIElemScript.cs.meta new file mode 100644 index 0000000..97b6764 --- /dev/null +++ b/Assets/UIElemScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab205bd2bb898f348a3bad974ab1a45b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WSATestCertificate.pfx b/Assets/WSATestCertificate.pfx new file mode 100644 index 0000000..a801fae Binary files /dev/null and b/Assets/WSATestCertificate.pfx differ diff --git a/Assets/WSATestCertificate.pfx.meta b/Assets/WSATestCertificate.pfx.meta new file mode 100644 index 0000000..d8726f3 --- /dev/null +++ b/Assets/WSATestCertificate.pfx.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7fc16a9b31c45c2488aed736416ee06b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/LBL/GenerateRadiation.py b/LBL/GenerateRadiation.py index acbe7fe..1f1b5a5 100644 --- a/LBL/GenerateRadiation.py +++ b/LBL/GenerateRadiation.py @@ -62,7 +62,7 @@ y = j * pix_size + lower_lims[1] z = k * pix_size + lower_lims[2] rad = "Radiation:{}:{},{},{},{}\n".format(0,x,y,z,rad_data[i][j][k]) - print(rad) +# print(rad) s.send(rad.encode()) rad = "Radiation:12345:End of Radiation\n" print(rad) diff --git a/Packages/manifest.json b/Packages/manifest.json index 73c0efb..9d4bdb9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,35 @@ { + "scopedRegistries": [ + { + "name": "Vuforia", + "url": "https://registry.packages.developer.vuforia.com/", + "scopes": [ + "com.ptc.vuforia" + ] + } + ], "dependencies": { + "com.ptc.vuforia.engine": "8.6.10", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.2", - "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.7", - "com.unity.purchasing": "2.0.3", - "com.unity.textmeshpro": "1.4.1", + "com.unity.analytics": "3.3.2", + "com.unity.collab-proxy": "1.2.16", + "com.unity.ext.nunit": "1.0.0", + "com.unity.formats.fbx": "3.0.1-preview.2", + "com.unity.ide.rider": "1.1.0", + "com.unity.ide.vscode": "1.1.0", + "com.unity.multiplayer-hlapi": "1.0.2", + "com.unity.package-manager-ui": "2.2.0", + "com.unity.purchasing": "2.0.6", + "com.unity.test-framework": "1.0.13", + "com.unity.textmeshpro": "2.0.1", + "com.unity.timeline": "1.1.0", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.0.2", + "com.unity.xr.windowsmr.metro": "3.0.1", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 9bd6d10..4f46703 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,4 +8,7 @@ EditorBuildSettings: - enabled: 0 path: guid: 00000000000000000000000000000000 + - enabled: 1 + path: Assets/Scenes/RosBridge_hololens.unity + guid: 80832861f71510b47bd085ed376b47f7 m_configObjects: {} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index bd8753c..e8293a6 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,62 +1,65 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!30 &1 -GraphicsSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_Deferred: - m_Mode: 1 - m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} - m_DeferredReflections: - m_Mode: 1 - m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} - m_ScreenSpaceShadows: - m_Mode: 1 - m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} - m_DepthNormals: - m_Mode: 1 - m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} - m_MotionVectors: - m_Mode: 1 - m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} - m_LightHalo: - m_Mode: 1 - m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} - m_LensFlare: - m_Mode: 1 - m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: - - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} - m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} - m_CustomRenderPipeline: {fileID: 0} - m_TransparencySortMode: 0 - m_TransparencySortAxis: {x: 0, y: 0, z: 1} - m_DefaultRenderingPath: 1 - m_DefaultMobileRenderingPath: 1 - m_TierSettings: [] - m_LightmapStripping: 0 - m_FogStripping: 0 - m_InstancingStripping: 0 - m_LightmapKeepPlain: 1 - m_LightmapKeepDirCombined: 1 - m_LightmapKeepDynamicPlain: 1 - m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepShadowMask: 1 - m_LightmapKeepSubtractive: 1 - m_FogKeepLinear: 1 - m_FogKeepExp: 1 - m_FogKeepExp2: 1 - m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!30 &1 +GraphicsSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} + m_LegacyDeferred: + m_Mode: 1 + m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_AlwaysIncludedShaders: + - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, + type: 0} + m_CustomRenderPipeline: {fileID: 0} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] + m_LightmapStripping: 0 + m_FogStripping: 0 + m_InstancingStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_LightsUseLinearIntensity: 0 + m_LightsUseColorTemperature: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 70bd371..5a4a7e6 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 + serializedVersion: 18 productGUID: 8b89504230ff0394e8fa271d81def15a AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -46,14 +46,14 @@ PlayerSettings: defaultScreenHeight: 768 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 - m_StereoRenderingPath: 0 + m_StereoRenderingPath: 2 m_ActiveColorSpace: 0 m_MTRendering: 1 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -65,20 +65,22 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 0 + androidUseSwappy: 0 androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 1 + runInBackground: 0 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 - submitAnalytics: 1 + submitAnalytics: 0 usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games @@ -125,7 +127,6 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 - isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -139,11 +140,21 @@ PlayerSettings: maximumSupportedHeadTracking: 1 hololens: depthFormat: 1 - depthBufferSharingEnabled: 0 + depthBufferSharingEnabled: 1 + lumin: + depthFormat: 0 + frameTiming: 2 + enableGLCache: 0 + glCacheMaxBlobSize: 524288 + glCacheMaxFileSize: 8388608 oculus: sharedDepthBuffer: 1 dashSupport: 1 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 0 enable360StereoCapture: 0 + isWsaHolographicRemotingEnabled: 0 protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 @@ -192,6 +203,10 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + iPhone65inPortraitSplashScreen: {fileID: 0} + iPhone65inLandscapeSplashScreen: {fileID: 0} + iPhone61inPortraitSplashScreen: {fileID: 0} + iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -243,7 +258,7 @@ PlayerSettings: AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: + AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 @@ -251,11 +266,14 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] @@ -294,9 +312,14 @@ PlayerSettings: m_Devices: - Oculus - OpenVR - m_BuildTargetEnableVuforiaSettings: [] + - m_BuildTarget: Windows Store Apps + m_Enabled: 1 + m_Devices: + - WindowsMR openGLRequireES31: 0 openGLRequireES31AEP: 0 + openGLRequireES32: 0 + vuforiaEnabled: 1 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -480,6 +503,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -513,6 +537,7 @@ PlayerSettings: monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 @@ -527,29 +552,34 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - scriptingDefineSymbols: {} + webGLWasmStreaming: 0 + scriptingDefineSymbols: + 14: master platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Windows Store Apps: 2 il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 + gcIncremental: 0 + gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Standalone: 6 m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_3D - metroPackageVersion: - metroCertificatePath: + metroPackageName: Template3D + metroPackageVersion: 1.0.0.0 + metroCertificatePath: Assets\WSATestCertificate.pfx metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: - metroCertificateNotAfter: 0000000000000000 + metroCertificateSubject: DefaultCompany + metroCertificateIssuer: DefaultCompany + metroCertificateNotAfter: 005e9939d5add601 metroApplicationDescription: Template_3D wsaImages: {} - metroTileShortName: + metroTileShortName: ISAACS-RadiationVisualization metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -562,12 +592,56 @@ PlayerSettings: metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 - platformCapabilities: {} - metroTargetDeviceFamilies: {} + platformCapabilities: + WindowsStoreApps: + AllJoyn: False + Appointments: False + BackgroundMediaPlayback: False + BlockedChatMessages: False + Bluetooth: False + Chat: False + CodeGeneration: False + Contacts: False + EnterpriseAuthentication: False + HumanInterfaceDevice: False + InputInjectionBrokered: False + InternetClient: True + InternetClientServer: True + Location: False + LowLevelDevices: False + Microphone: False + MusicLibrary: False + Objects3D: False + OfflineMapsManagement: False + PhoneCall: False + PhoneCallHistoryPublic: False + PicturesLibrary: False + PointOfService: False + PrivateNetworkClientServer: True + Proximity: False + RecordedCallsFolder: False + RemoteSystem: False + RemovableStorage: False + SharedUserCertificates: False + SpatialPerception: True + SystemManagement: False + UserAccountInformation: False + UserDataTasks: False + UserNotificationListener: False + VideosLibrary: False + VoipCall: False + WebCam: True + metroTargetDeviceFamilies: + Desktop: False + Holographic: True + IoT: False + IoTHeadless: False + Mobile: False + Team: False + Xbox: False metroFTAName: metroFTAFileTypes: [] metroProtocolName: - metroCompilationOverrides: 1 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -592,7 +666,7 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 + xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: vrEditorSettings: daydream: @@ -606,7 +680,7 @@ PlayerSettings: m_PortalFolderPath: luminCert: m_CertPath: - m_PrivateKeyPath: + m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index f20e536..2146a1e 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.4.2f1 +m_EditorVersion: 2019.2.6f1 +m_EditorVersionWithRevision: 2019.2.6f1 (fe82a0e88406) diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index c3ae9a0..fa0b146 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 1 + m_Enabled: 0 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file