diff --git a/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/EnvironmentPrefab.prefab b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/EnvironmentPrefab.prefab new file mode 100644 index 00000000000..06e645f7503 --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/EnvironmentPrefab.prefab @@ -0,0 +1,223 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7745099856251551156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5422486298752037142} + - component: {fileID: 3423980984410735625} + - component: {fileID: 4189874717589334920} + - component: {fileID: 6854880630505661628} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5422486298752037142 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745099856251551156} + m_LocalRotation: {x: 0.0000031188667, y: 1, z: 0.0000014901161, w: -0.000000115904186} + m_LocalPosition: {x: 0.005026, y: -0.001964, z: 0.00013} + m_LocalScale: {x: 0.0044485484, y: 0.0032591606, z: 0.005189973} + m_Children: [] + m_Father: {fileID: 5262670674033937590} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: -180} +--- !u!33 &3423980984410735625 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745099856251551156} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4189874717589334920 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745099856251551156} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f5e93540fd856314183084315ea2453a, type: 2} + 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &6854880630505661628 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745099856251551156} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &8814742530214482224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8151393333055720330} + - component: {fileID: 1090510631116119755} + m_Layer: 0 + m_Name: EnvironmentPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8151393333055720330 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8814742530214482224} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8514610126979445488} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!114 &1090510631116119755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8814742530214482224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e5ac6eef6eaecb42a21a13c07de0043, type: 3} + m_Name: + m_EditorClassIdentifier: + targetObject: {fileID: 9034828198616885322} +--- !u!1001 &8188460776712885531 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8151393333055720330} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1461304994638716399, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: cb93607d1eaac094f93cad9763b32353, type: 2} + - target: {fileID: -1461304994638716399, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: cb93607d1eaac094f93cad9763b32353, type: 2} + - target: {fileID: 919132149155446097, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + propertyPath: m_Name + value: Room + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} +--- !u!1 &9034828198616885322 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + m_PrefabInstance: {fileID: 8188460776712885531} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8514610126979445488 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + m_PrefabInstance: {fileID: 8188460776712885531} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5262670674033937590 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4083501151425157549, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} + m_PrefabInstance: {fileID: 8188460776712885531} + m_PrefabAsset: {fileID: 0} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/RoomPrefab.prefab.meta b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/EnvironmentPrefab.prefab.meta similarity index 100% rename from UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/RoomPrefab.prefab.meta rename to UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/EnvironmentPrefab.prefab.meta diff --git a/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.mat b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.mat new file mode 100644 index 00000000000..2cf0a37cf7e --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.mat @@ -0,0 +1,194 @@ +%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: MRTK3_Engraved + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ShaderKeywords: _ALPHABLEND_ON _DIRECTIONAL_LIGHT _HOVER_LIGHT _REFLECTIONS _SPECULAR_HIGHLIGHTS + _USE_WORLD_SCALE + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Fade + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 45887b6ec0d6c244384f36ab9c7bcebe, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 0 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ColorWriteMask: 15 + - _CullMode: 2 + - _CustomMode: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 10 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 0 + - _EnableHoverColorOverride: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0 + - _MipmapBias: -2 + - _Mode: 5 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 0 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 0.25 + - _RoundCornerMargin: 0.01 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 5 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClippingBorderColor: {r: 1, g: 0.19999996, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.mat.meta b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.mat.meta new file mode 100644 index 00000000000..6721dbd806d --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5e93540fd856314183084315ea2453a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.png b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.png new file mode 100644 index 00000000000..ad733de1ac9 Binary files /dev/null and b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.png differ diff --git a/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.png.meta b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.png.meta new file mode 100644 index 00000000000..110f83cc2a2 --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/MRTK3_Engraved.png.meta @@ -0,0 +1,133 @@ +fileFormatVersion: 2 +guid: 45887b6ec0d6c244384f36ab9c7bcebe +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/RoomPrefab.prefab b/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/RoomPrefab.prefab deleted file mode 100644 index 43005755051..00000000000 --- a/UnityProjects/MRTKDevTemplate/Assets/Example Assets/room/RoomPrefab.prefab +++ /dev/null @@ -1,192 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1027766260150840433 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5638131629905098188} - - component: {fileID: 6617231595093284833} - - component: {fileID: 2102423086962134640} - - component: {fileID: 8109946847869331357} - m_Layer: 0 - m_Name: Cube.001 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5638131629905098188 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027766260150840433} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 0.65676373, z: -0.7} - m_LocalScale: {x: 116.666664, y: 159.24263, z: 100} - m_Children: [] - m_Father: {fileID: 8151393333055720330} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6617231595093284833 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027766260150840433} - m_Mesh: {fileID: 4493585093827132993, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} ---- !u!23 &2102423086962134640 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027766260150840433} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: cb93607d1eaac094f93cad9763b32353, type: 2} - - {fileID: 2100000, guid: cb93607d1eaac094f93cad9763b32353, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &8109946847869331357 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027766260150840433} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4493585093827132993, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} ---- !u!1 &4341625919259258056 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3720680212623092329} - m_Layer: 0 - m_Name: Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3720680212623092329 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4341625919259258056} - m_LocalRotation: {x: -0.00000003774895, y: 0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 1.9007708, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_Children: [] - m_Father: {fileID: 8151393333055720330} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5090441940898183724 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5382708896632745925} - m_Layer: 0 - m_Name: Spot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5382708896632745925 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5090441940898183724} - m_LocalRotation: {x: -0.00000003774895, y: 0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 1.9038757, z: -0.6999314} - m_LocalScale: {x: 100, y: 100, z: 100} - m_Children: [] - m_Father: {fileID: 8151393333055720330} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8814742530214482224 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8151393333055720330} - m_Layer: 0 - m_Name: RoomPrefab - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8151393333055720330 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8814742530214482224} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3720680212623092329} - - {fileID: 5638131629905098188} - - {fileID: 5382708896632745925} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity index b2ecf52f1ff..895d0ad6c1f 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity @@ -2501,71 +2501,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1001 &389055594 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -1461304994638716399, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: cb93607d1eaac094f93cad9763b32353, type: 2} - - target: {fileID: -1461304994638716399, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: cb93607d1eaac094f93cad9763b32353, type: 2} - - target: {fileID: 919132149155446097, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} - propertyPath: m_Name - value: room - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6b0debf97988b7445b5111a86fcb716e, type: 3} --- !u!1001 &392741044 PrefabInstance: m_ObjectHideFlags: 0 @@ -11306,41 +11241,13 @@ PrefabInstance: propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 37.638 objectReference: {fileID: 0} - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -18898,3 +18805,108 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} +--- !u!1001 &8544780333815162891 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2761244293469162367, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5638131629905098188, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5638131629905098188, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5638131629905098188, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6860170321090765764, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6860170321090765764, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6860170321090765764, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6860170321090765764, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6860170321090765764, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6860170321090765764, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6860170321090765764, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8151393333055720330, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8814742530214482224, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_Name + value: EnvironmentPrefab + objectReference: {fileID: 0} + - target: {fileID: 9034828198616885322, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9f5d32e0dbd62864dab5bce7ff38a4e7, type: 3} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/OnlyShowWhileOpaque.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/OnlyShowWhileOpaque.cs index 4de84f85ae4..e132f9f7c45 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/OnlyShowWhileOpaque.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/OnlyShowWhileOpaque.cs @@ -9,19 +9,23 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos { /// - /// This script disables the GameObject if the first detected XRDisplaySubsystem is - /// not opaque. (If no XRDisplaySubsystem is found, the script assumes the platform's - /// display is opaque.) Useful for only showing environment models on opaque/VR devices. + /// This script disables the target gameObject if the first detected XRDisplaySubsystem is + /// not opaque. Useful for only showing environment models on opaque/VR devices. /// internal class OnlyShowWhileOpaque : MonoBehaviour { + [SerializeField] + [Tooltip("GameObject to enable/disable based on XR display opacity. If null, defaults to this GameObject.")] + private GameObject targetObject; + private XRDisplaySubsystem displaySubsystem = null; - - private bool isVisible = false; private void Awake() { - isVisible = gameObject.activeSelf; + if (targetObject == null) + { + targetObject = gameObject; + } } private void Update() @@ -34,10 +38,9 @@ private void Update() // If we've successfully found a displaySubsystem, but the current visibility // doesn't match the opacity of the XR display... - if (displaySubsystem != null && isVisible != displaySubsystem.displayOpaque) + if (displaySubsystem != null && targetObject.activeSelf != displaySubsystem.displayOpaque) { - isVisible = displaySubsystem.displayOpaque; - gameObject.SetActive(isVisible); + targetObject.SetActive(displaySubsystem.displayOpaque); } } }