diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/2D/walnut wood texture.jpg b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/2D/walnut wood texture.jpg new file mode 100644 index 00000000..a2f17a36 Binary files /dev/null and b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/2D/walnut wood texture.jpg differ diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/2D/walnut wood texture.jpg.meta b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/2D/walnut wood texture.jpg.meta new file mode 100644 index 00000000..d1a71ee4 --- /dev/null +++ b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/2D/walnut wood texture.jpg.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 13e1f6d8bfd0dde499f78c670b0213f6 +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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/Ground Atrium.mat b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/Ground Atrium.mat new file mode 100644 index 00000000..e906e8fb --- /dev/null +++ b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/Ground Atrium.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ground Atrium + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + 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} + - _MainTex: + m_Texture: {fileID: 0} + 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} + - _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_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.585 + - _GlossyReflections: 1 + - _Metallic: 0.181 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8301887, g: 0.13705944, b: 0.13705944, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/Ground Atrium.mat.meta b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/Ground Atrium.mat.meta new file mode 100644 index 00000000..57f0e39f --- /dev/null +++ b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/Ground Atrium.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb60bf0b0cce70647b1dbd93e93e5d08 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/walnut wood texture.mat b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/walnut wood texture.mat new file mode 100644 index 00000000..6883c7d6 --- /dev/null +++ b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/walnut wood texture.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: walnut wood texture + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + 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} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 13e1f6d8bfd0dde499f78c670b0213f6, 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} + - _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_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/walnut wood texture.mat.meta b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/walnut wood texture.mat.meta new file mode 100644 index 00000000..499cd186 --- /dev/null +++ b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Materials/walnut wood texture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2dc61f3aade5fc947a21e53496eb5b24 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor.unity b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor.unity index 751c102c..f0d268f8 100644 --- a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor.unity +++ b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -132,7 +132,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 127606842} - m_Layer: 0 + m_Layer: 10 m_Name: Left Redirection Target m_TagString: Untagged m_Icon: {fileID: 0} @@ -181,7 +181,7 @@ GameObject: - component: {fileID: 161320814} - component: {fileID: 161320813} - component: {fileID: 161320812} - m_Layer: 0 + m_Layer: 10 m_Name: Wall (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -275,6 +275,103 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 161320810} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &175867693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 175867696} + - component: {fileID: 175867695} + - component: {fileID: 175867694} + m_Layer: 0 + m_Name: Top Camera Physical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &175867694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175867693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ac678352aafd74fb19b25bbd04bec4, type: 3} + m_Name: + m_EditorClassIdentifier: + trackedObject: {fileID: 726559926} +--- !u!20 &175867695 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175867693} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 4 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 6199 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 1 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &175867696 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175867693} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &176750516 GameObject: m_ObjectHideFlags: 0 @@ -286,7 +383,7 @@ GameObject: - component: {fileID: 176750517} - component: {fileID: 176750518} - component: {fileID: 176750520} - m_Layer: 0 + m_Layer: 10 m_Name: Reference Picasso m_TagString: Untagged m_Icon: {fileID: 0} @@ -535,7 +632,7 @@ GameObject: - component: {fileID: 244547872} - component: {fileID: 244547874} - component: {fileID: 244547873} - m_Layer: 0 + m_Layer: 10 m_Name: End Light m_TagString: Untagged m_Icon: {fileID: 0} @@ -619,7 +716,7 @@ GameObject: - component: {fileID: 280307174} - component: {fileID: 280307173} - component: {fileID: 280307172} - m_Layer: 0 + m_Layer: 10 m_Name: Last Supper m_TagString: Untagged m_Icon: {fileID: 0} @@ -722,7 +819,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 331697246} - m_Layer: 0 + m_Layer: 10 m_Name: Corridor m_TagString: Untagged m_Icon: {fileID: 0} @@ -763,6 +860,10 @@ PrefabInstance: propertyPath: m_Name value: door_01 objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1abf38d82ed5948a6a28aad10d61b678, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 100000, guid: 1abf38d82ed5948a6a28aad10d61b678, type: 3} propertyPath: m_StaticEditorFlags value: 2147483647 @@ -1198,7 +1299,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 358983253} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 51d618b1b4dddf44a8b914838ac6e9b6, type: 3} m_Name: @@ -1217,7 +1318,7 @@ GameObject: - component: {fileID: 398215670} - component: {fileID: 398215669} - component: {fileID: 398215668} - m_Layer: 0 + m_Layer: 10 m_Name: DeadEndWall (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1323,7 +1424,7 @@ GameObject: - component: {fileID: 436469708} - component: {fileID: 436469710} - component: {fileID: 436469709} - m_Layer: 0 + m_Layer: 10 m_Name: Ceiling Light 4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1407,7 +1508,7 @@ GameObject: - component: {fileID: 516543687} - component: {fileID: 516543686} - component: {fileID: 516543685} - m_Layer: 0 + m_Layer: 10 m_Name: Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -1513,7 +1614,7 @@ GameObject: - component: {fileID: 565217527} - component: {fileID: 565217526} - component: {fileID: 565217525} - m_Layer: 0 + m_Layer: 10 m_Name: Girl m_TagString: Untagged m_Icon: {fileID: 0} @@ -1619,7 +1720,7 @@ GameObject: - component: {fileID: 619191476} - component: {fileID: 619191475} - component: {fileID: 619191474} - m_Layer: 0 + m_Layer: 10 m_Name: Last Supper Modified m_TagString: Untagged m_Icon: {fileID: 0} @@ -1878,6 +1979,142 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &720524203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 720524204} + - component: {fileID: 720524205} + m_Layer: 12 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &720524204 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 720524203} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2010236713} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!96 &720524205 +TrailRenderer: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 720524203} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + 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_Time: 5 + m_PreviewTimeScale: 1 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.065475464 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_MaskInteraction: 0 + m_Autodestruct: 0 + m_Emitting: 1 + m_ApplyActiveColorSpace: 1 --- !u!4 &726559926 stripped Transform: m_CorrespondingSourceObject: {fileID: 4368117441950420337, guid: 0949af27169be084f91744164e13647f, type: 3} @@ -1934,7 +2171,7 @@ GameObject: - component: {fileID: 858473994} - component: {fileID: 858473993} - component: {fileID: 858473992} - m_Layer: 0 + m_Layer: 10 m_Name: Picasso m_TagString: Untagged m_Icon: {fileID: 0} @@ -2028,6 +2265,103 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 858473990} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &858594032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 858594035} + - component: {fileID: 858594034} + - component: {fileID: 858594033} + m_Layer: 0 + m_Name: Top Camera Virtual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &858594033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858594032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ac678352aafd74fb19b25bbd04bec4, type: 3} + m_Name: + m_EditorClassIdentifier: + trackedObject: {fileID: 2010236713} +--- !u!20 &858594034 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858594032} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 4 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 5175 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 2 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &858594035 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858594032} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!4 &881506136 stripped Transform: m_CorrespondingSourceObject: {fileID: 7916654614193320361, guid: 0949af27169be084f91744164e13647f, type: 3} @@ -2044,7 +2378,7 @@ GameObject: - component: {fileID: 904384536} - component: {fileID: 904384537} - component: {fileID: 904384539} - m_Layer: 0 + m_Layer: 10 m_Name: Refence Last Supper m_TagString: Untagged m_Icon: {fileID: 0} @@ -2129,7 +2463,7 @@ GameObject: - component: {fileID: 909733690} - component: {fileID: 909733689} - component: {fileID: 909733688} - m_Layer: 0 + m_Layer: 10 m_Name: "Nuit Etoil\xE9e Modified" m_TagString: Untagged m_Icon: {fileID: 0} @@ -2223,7 +2557,7 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 909733686} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1199831050 +--- !u!1 &915038798 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2231,67 +2565,96 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1199831051} + - component: {fileID: 915038801} + - component: {fileID: 915038800} + - component: {fileID: 915038799} m_Layer: 0 - m_Name: Walls + m_Name: Top Camera Both m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1199831051 -Transform: +--- !u!114 &915038799 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199831050} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: -1, y: 0, z: -2.25} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1589834310} - - {fileID: 398215667} - - {fileID: 1925152273} - - {fileID: 1663497882} - - {fileID: 516543684} - - {fileID: 161320811} - m_Father: {fileID: 331697246} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1201636906 -GameObject: + m_GameObject: {fileID: 915038798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ac678352aafd74fb19b25bbd04bec4, type: 3} + m_Name: + m_EditorClassIdentifier: + trackedObject: {fileID: 2010236713} +--- !u!20 &915038800 +Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1201636907} - m_Layer: 0 - m_Name: Right Redirection Target - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &1201636907 + m_GameObject: {fileID: 915038798} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 4 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 3 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &915038801 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1201636906} + m_GameObject: {fileID: 915038798} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 4.3499994, y: 0, z: 4.0900016} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 331697246} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1233369824 + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1114568392 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2299,61 +2662,469 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1233369825} - m_Layer: 0 - m_Name: Start + - component: {fileID: 1114568393} + - component: {fileID: 1114568394} + m_Layer: 12 + m_Name: GameObject (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1233369825 +--- !u!4 &1114568393 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1233369824} + m_GameObject: {fileID: 1114568392} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.85} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 331697246} + m_Father: {fileID: 726559926} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1381258844 -PrefabInstance: +--- !u!96 &1114568394 +TrailRenderer: + serializedVersion: 3 m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2105458143} - m_Modifications: - - target: {fileID: 100002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} - propertyPath: m_Name - value: doorframe_01 - objectReference: {fileID: 0} - - target: {fileID: 100002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} - propertyPath: m_LocalPosition.x - value: 0.078 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} - propertyPath: m_LocalPosition.y - value: -0.009999998 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} - propertyPath: m_LocalPosition.z - value: -1.02 - objectReference: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1114568392} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + 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_Time: 5 + m_PreviewTimeScale: 1 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.065475464 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_MaskInteraction: 0 + m_Autodestruct: 0 + m_Emitting: 1 + m_ApplyActiveColorSpace: 1 +--- !u!1 &1199831050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1199831051} + m_Layer: 10 + m_Name: Walls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1199831051 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1199831050} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: -1, y: 0, z: -2.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1589834310} + - {fileID: 398215667} + - {fileID: 1925152273} + - {fileID: 1663497882} + - {fileID: 516543684} + - {fileID: 161320811} + m_Father: {fileID: 331697246} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1201636906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1201636907} + m_Layer: 10 + m_Name: Right Redirection Target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1201636907 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1201636906} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 4.3499994, y: 0, z: 4.0900016} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 331697246} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1233369824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1233369825} + m_Layer: 10 + m_Name: Start + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1233369825 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1233369824} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.85} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 331697246} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1354001049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1354001050} + - component: {fileID: 1354001053} + - component: {fileID: 1354001052} + - component: {fileID: 1354001051} + m_Layer: 11 + m_Name: Corridor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1354001050 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354001049} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.020000815, y: -0.05, z: 9.020001} + m_LocalScale: {x: 2, y: 1, z: 0.20518707} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1767219245} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1354001051 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354001049} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1354001052 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354001049} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: a301d90d5091345c8810e6cab98f6736, 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!33 &1354001053 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354001049} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1362897594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1362897596} + - component: {fileID: 1362897595} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1362897595 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1362897594} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 6199 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1362897596 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1362897594} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: -3.6044977, y: -2.2482893, z: -6.2060146} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &1381258844 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2105458143} + m_Modifications: + - target: {fileID: 100002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} + propertyPath: m_Name + value: doorframe_01 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} + propertyPath: m_LocalPosition.x + value: 0.078 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} + propertyPath: m_LocalPosition.y + value: -0.009999998 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} + propertyPath: m_LocalPosition.z + value: -1.02 + objectReference: {fileID: 0} - target: {fileID: 400002, guid: 0c7bd497493fc42dd99a9a6f1a4342cd, type: 3} propertyPath: m_LocalRotation.w value: 0.7071068 @@ -2403,7 +3174,7 @@ GameObject: - component: {fileID: 1432806454} - component: {fileID: 1432806455} - component: {fileID: 1432806457} - m_Layer: 0 + m_Layer: 10 m_Name: Reference Girl m_TagString: Untagged m_Icon: {fileID: 0} @@ -2488,7 +3259,7 @@ GameObject: - component: {fileID: 1472388566} - component: {fileID: 1472388565} - component: {fileID: 1472388564} - m_Layer: 0 + m_Layer: 10 m_Name: Picasso Modified m_TagString: Untagged m_Icon: {fileID: 0} @@ -2594,7 +3365,7 @@ GameObject: - component: {fileID: 1552751759} - component: {fileID: 1552751758} - component: {fileID: 1552751757} - m_Layer: 0 + m_Layer: 10 m_Name: Girl Modified m_TagString: Untagged m_Icon: {fileID: 0} @@ -2688,6 +3459,112 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1552751755} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1588515906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1588515907} + - component: {fileID: 1588515910} + - component: {fileID: 1588515909} + - component: {fileID: 1588515908} + m_Layer: 11 + m_Name: Ground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1588515907 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588515906} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.1, z: 6.18} + m_LocalScale: {x: 1.5, y: 1, z: 1.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1767219245} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1588515908 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588515906} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1588515909 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588515906} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: cb60bf0b0cce70647b1dbd93e93e5d08, 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!33 &1588515910 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588515906} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1589834309 GameObject: m_ObjectHideFlags: 0 @@ -2700,7 +3577,7 @@ GameObject: - component: {fileID: 1589834313} - component: {fileID: 1589834312} - component: {fileID: 1589834311} - m_Layer: 0 + m_Layer: 10 m_Name: DeadEndWall m_TagString: Untagged m_Icon: {fileID: 0} @@ -2805,7 +3682,7 @@ GameObject: - component: {fileID: 1603505839} - component: {fileID: 1603505837} - component: {fileID: 1603505836} - m_Layer: 0 + m_Layer: 10 m_Name: Ceiling Light 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2889,7 +3766,7 @@ GameObject: - component: {fileID: 1663497885} - component: {fileID: 1663497884} - component: {fileID: 1663497883} - m_Layer: 0 + m_Layer: 10 m_Name: Ceiling m_TagString: Untagged m_Icon: {fileID: 0} @@ -2992,8 +3869,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1670530968} - m_Layer: 0 - m_Name: World + m_Layer: 10 + m_Name: Virtual World m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3026,7 +3903,7 @@ GameObject: - component: {fileID: 1678945701} - component: {fileID: 1678945702} - component: {fileID: 1678945704} - m_Layer: 0 + m_Layer: 10 m_Name: "Reference Nuit etoil\xE9e" m_TagString: Untagged m_Icon: {fileID: 0} @@ -3110,7 +3987,7 @@ GameObject: - component: {fileID: 1744104657} - component: {fileID: 1744104655} - component: {fileID: 1744104654} - m_Layer: 0 + m_Layer: 10 m_Name: Ceiling Light 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3346,7 +4223,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1761877546} - m_Layer: 0 + m_Layer: 10 m_Name: End m_TagString: Untagged m_Icon: {fileID: 0} @@ -3368,6 +4245,39 @@ Transform: m_Children: [] m_Father: {fileID: 331697246} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1767219244 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1767219245} + m_Layer: 11 + m_Name: Physical World + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1767219245 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767219244} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1588515907} + - {fileID: 1354001050} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1797502496 stripped Transform: m_CorrespondingSourceObject: {fileID: 316408367193774732, guid: 0949af27169be084f91744164e13647f, type: 3} @@ -3385,7 +4295,7 @@ GameObject: - component: {fileID: 1819482686} - component: {fileID: 1819482685} - component: {fileID: 1819482684} - m_Layer: 0 + m_Layer: 10 m_Name: "Nuit Etoil\xE9e" m_TagString: Untagged m_Icon: {fileID: 0} @@ -3490,7 +4400,7 @@ GameObject: - component: {fileID: 1851031367} - component: {fileID: 1851031365} - component: {fileID: 1851031364} - m_Layer: 0 + m_Layer: 10 m_Name: Ceiling Light 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3744,7 +4654,7 @@ GameObject: - component: {fileID: 1925152276} - component: {fileID: 1925152275} - component: {fileID: 1925152274} - m_Layer: 0 + m_Layer: 10 m_Name: Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -3761,7 +4671,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 11.27, y: 0, z: -0.98} - m_LocalScale: {x: 2, y: 1, z: 0.25} + m_LocalScale: {x: 2, y: 1, z: 0.20518705} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1199831051} @@ -3847,7 +4757,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1971012027} - m_Layer: 0 + m_Layer: 10 m_Name: Paintings m_TagString: Untagged m_Icon: {fileID: 0} @@ -3951,7 +4861,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2105458143} - m_Layer: 0 + m_Layer: 10 m_Name: Door m_TagString: Untagged m_Icon: {fileID: 0} @@ -3998,6 +4908,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 239088554103929188, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 316408367193774732, guid: 0949af27169be084f91744164e13647f, type: 3} propertyPath: m_LocalRotation.w value: 0.7071068 @@ -4026,6 +4940,66 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 637648220104366435, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1263795025237762747, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 1304905601023063815, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1397523919201790169, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1449749581878650837, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1896738435274876202, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2108261297423464389, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2126408581571040891, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2154327094717026574, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2395183162870717065, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3093881026102326832, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3576510867656793870, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3979941237910700145, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 4007128444312889018, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 4252188233708761620, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 4368117441950420337, guid: 0949af27169be084f91744164e13647f, type: 3} propertyPath: m_LocalRotation.w value: 1 @@ -4046,6 +5020,50 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4421663777076001505, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4587617932241058036, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4617658732305074556, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4804808406390510937, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6008523905793134380, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6181365339321743854, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7124461681543554004, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7154261291455575668, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7392981191640557577, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7472991848120158430, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7635388853461549179, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 7692102248907039940, guid: 0949af27169be084f91744164e13647f, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -4086,6 +5104,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7827943832283344059, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8208211225452607678, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8573793237866710693, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8780390247339966656, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 8868097291379688984, guid: 0949af27169be084f91744164e13647f, type: 3} propertyPath: m_LocalRotation.w value: 1 @@ -4106,9 +5140,27 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8923113627642087546, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 9002118296703676363, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 9168447942295892488, guid: 0949af27169be084f91744164e13647f, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4368117441950420337, guid: 0949af27169be084f91744164e13647f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1114568393} + - targetCorrespondingSourceObject: {fileID: 8868097291379688984, guid: 0949af27169be084f91744164e13647f, type: 3} + insertIndex: -1 + addedObject: {fileID: 720524204} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0949af27169be084f91744164e13647f, type: 3} --- !u!4 &6303876425754669076 stripped @@ -4182,7 +5234,12 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1670530968} + - {fileID: 1767219245} - {fileID: 3915699329593084359} - {fileID: 8035885238392043497} - - {fileID: 1749714917} - {fileID: 358983252} + - {fileID: 1749714917} + - {fileID: 175867696} + - {fileID: 858594035} + - {fileID: 915038801} + - {fileID: 1362897596} diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/LightingData.asset b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/LightingData.asset index f00ff3ae..22150788 100644 Binary files a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/LightingData.asset and b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/LightingData.asset differ diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/Lightmap-0_comp_dir.png b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/Lightmap-0_comp_dir.png index a6168e6a..99c2c2d0 100644 Binary files a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/Lightmap-0_comp_dir.png and b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/Lightmap-0_comp_dir.png differ diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/Lightmap-0_comp_light.exr b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/Lightmap-0_comp_light.exr index 34431b5a..ddc832c2 100644 Binary files a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/Lightmap-0_comp_light.exr and b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/Lightmap-0_comp_light.exr differ diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/ReflectionProbe-0.exr b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/ReflectionProbe-0.exr index b2627356..f38e7022 100644 Binary files a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/ReflectionProbe-0.exr and b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor/ReflectionProbe-0.exr differ diff --git a/Visuo-haptic Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Visualisation/Socket.cs b/Visuo-haptic Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Visualisation/Socket.cs index 5647e98d..a68439eb 100644 --- a/Visuo-haptic Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Visualisation/Socket.cs +++ b/Visuo-haptic Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Visualisation/Socket.cs @@ -11,35 +11,39 @@ namespace VHToolkit.Logging { [Serializable] struct WorldRedirectionData { - [SerializeField] public float overTime, rotational, curvature, hybrid, total; + [SerializeField] public float overTime, rotational, curvature; + [SerializeField] public float overTimeSum, rotationalSum, curvatureSum; [SerializeField] float time; - public void AddTo(float overTime, float rotational, float curvature, float hybrid, float total, float time) { - this.overTime += Mathf.Abs(overTime); - this.rotational += Mathf.Abs(rotational); - this.curvature += Mathf.Abs(curvature); - this.hybrid += Mathf.Abs(hybrid); - this.total = total; + public void AddTo(float overTime, float rotational, float curvature, float time) { + this.overTime = Mathf.Abs(overTime); + this.rotational = Mathf.Abs(rotational); + this.curvature = Mathf.Abs(curvature); + + this.overTimeSum += Mathf.Abs(overTime); + this.rotationalSum += Mathf.Abs(rotational); + this.curvatureSum += Mathf.Abs(curvature); this.time = time; } } public class Socket : MonoBehaviour { private Scene scene; + private WorldRedirection script; private DateTime startTime; private TcpClient client; private Razzaque2001Hybrid loggingTechnique; - private WorldRedirectionData redirectionData = new(); - - private WorldRedirection script; + private WorldRedirectionData redirectionData; private void Start() { - scene = Toolkit.Instance.GetComponent().scene; + script = Toolkit.Instance.GetComponent(); + scene = script.scene; InvokeRepeating(nameof(StartSendingMessages), 1f, 0.5f); loggingTechnique = new(); - script = GetComponent(); + + redirectionData = new(); } private void StartSendingMessages() { @@ -69,17 +73,15 @@ private void SendMessage(TcpClient client, WorldRedirectionData redirectionData) try { // Send the message to the connected TcpServer. stream.Write(messageBytes, 0, messageBytes.Length); - stream.Flush(); + // stream.Flush(); } catch (SocketException) {Debug.LogWarning("Socket closed.");} } private void Update() { - redirectionData.AddTo(script.redirect ? Razzaque2001OverTimeRotation.GetRedirection(scene): 0, - script.redirect ? Razzaque2001Rotational.GetRedirection(scene): 0, - script.redirect ? Razzaque2001Curvature.GetRedirection(scene): 0, - script.redirect ? loggingTechnique.GetRedirection(scene) : 0, - scene.HeadToHeadRedirection.eulerAngles.y, - (float)(DateTime.Now - startTime).TotalSeconds); + redirectionData.AddTo((script.redirect) ? Razzaque2001OverTimeRotation.GetRedirection(scene) : 0f, + (script.redirect) ? Razzaque2001Rotational.GetRedirection(scene) : 0f, + (script.redirect) ? Razzaque2001Curvature.GetRedirection(scene) : 0f, + (float)(DateTime.Now - startTime).TotalSeconds); } } } diff --git a/Visuo-haptic Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Visualisation/TopViewCamera.CS b/Visuo-haptic Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Visualisation/TopViewCamera.CS index 4655ffe4..dc4f5f05 100644 --- a/Visuo-haptic Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Visualisation/TopViewCamera.CS +++ b/Visuo-haptic Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Visualisation/TopViewCamera.CS @@ -8,5 +8,7 @@ public class TopViewCamera : MonoBehaviour { private void Update() => transform.SetPositionAndRotation( new(trackedObject.position.x, transform.position.y, trackedObject.position.z), - Quaternion.Euler(90f, trackedObject.rotation.eulerAngles.y, 0f)); + transform.rotation + // Quaternion.Euler(90f, trackedObject.rotation.eulerAngles.y, 0f) + ); } \ No newline at end of file diff --git a/python/RedirectionPlotter.py b/python/RedirectionPlotter.py index e4af1ce7..2ce47ad3 100644 --- a/python/RedirectionPlotter.py +++ b/python/RedirectionPlotter.py @@ -10,13 +10,13 @@ fig = plt.figure(figsize=(10,6), constrained_layout=True) ax1 = plt.subplot(211) box = ax1.get_position() -ax1.set_position([box.x0, box.y0, box.width * 0.9, box.height]) +ax1.set_position([box.x0, box.y0, box.width, box.height * 0.8]) ax2 = plt.subplot(212) box = ax2.get_position() -ax2.set_position([box.x0, box.y0, box.width * 0.9, box.height]) +ax2.set_position([box.x0, box.y0, box.width, box.height * 0.9]) -otrs, rs, cs, hybrid, tots, ys = ([] for _ in range(6)) +otrs, rs, cs, otrsSum, rsSum, csSum, ys = ([] for _ in range(7)) serversocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -31,32 +31,32 @@ with clientsocket: while True: try: - chunk = clientsocket.recv(4096).decode() + chunk = clientsocket.recv(8192).decode() except ConnectionResetError: print("Connection reset") break for m in re.finditer(r'\{[^}]*}', chunk): d = json.loads(m[0]) - for k, l in {"overTime": otrs, "rotational": rs, "curvature": cs, "hybrid": hybrid, "total": tots, "time": ys}.items(): + for k, l in {"overTime": otrs, "rotational": rs, "curvature": cs, "overTimeSum": otrsSum, "rotationalSum": rsSum, "curvatureSum": csSum, "time": ys}.items(): l.append(d[k]) ax1.clear() ax2.clear() - ax1.set_xticks(list(map(int, ys[::10]))) - ax1.set_xlim((ys[-1] - 30, ys[-1])) - ax1.set_ylim((0, 190)) - ax1.set_title('Redirection amounts over time') - ax1.set_ylabel('Redirection (degrees)') - ax1.stackplot(ys[-60:], otrs[-60:], rs[-60:], cs[-60:], labels=('Over time\nrotation', 'Rotational', 'Curvature'), linewidth=0.5, linestyle="dashed") + ax1.set_ylim((0, 180)) + ax1.set_title('Redirection amounts over time', y=1.35) + ax1.set_ylabel('Redirection Applied to User (degrees)') + ax1.stackplot(ys, otrsSum, rsSum, csSum, labels=('Over time rotation', 'Rotational', 'Curvature'), colors="rgb") + # ax1.plot(ys[-60:], hybrid[-60:], color='b', label='Hybrid', linewidth=0.5) # ax2.set_xticks(list(map(int, ys[::10]))) # ax2.set_xlim((ys[-1] - 30, ys[-1])) - ax2.set_ylim((0, 190)) - # ax2.set_title('Redirection amounts over time') - ax2.set_ylabel('Redirection (degrees)') - ax2.stackplot(ys, otrs, rs, cs, labels=('Over time\nrotation', 'Rotational', 'Curvature'), linewidth=0.5, linestyle="dashed") + ax2.set_xlabel('Time from start (seconds)', loc='right') + ax2.set_ylabel('Redirection per Second (degrees/s)') + for series, color, label in zip([otrs, rs, cs], "rgb", ["Over Time Rotation", "Rotational", "Curvature"]): + ax2.plot(ys, series, color=color, label=label, linewidth=1) - for ax in (ax1, ax2): - ax.legend(loc='center left', bbox_to_anchor=(1, 0.5)) + + for ax in (ax1,): + ax.legend(loc='lower left', bbox_to_anchor=(0, 1, 1, 0), mode="expand", ncols=3, title="Redirection source") plt.pause(0.05) \ No newline at end of file