From da030c09efd370dea88791a0b669750c2acf7520 Mon Sep 17 00:00:00 2001 From: vladislove Date: Sat, 17 Oct 2026 00:11:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=84=D0=B8=D0=BA=D1=81=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B5=D0=B1=D1=83=D1=87=D0=B8=D0=B9=20=D1=88=D0=B5?= =?UTF-8?q?=D0=B9=D0=B4=D0=B5=D1=80,=20=D0=BF=D0=BE=D1=80=D0=B0=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=D1=82=D1=8C=20=D1=82=D0=B5=D0=BA=D1=81=D1=82?= =?UTF-8?q?=D1=83=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Corridor/Texture/Floor/Floor.mat | 2 +- .../Laboratory/Textures/Floor/Floor.mat | 6 +- .../RoomAssets/Laboratory/Textures/Wall.meta | 8 + .../Wall/Rock055_4K-JPG_AmbientOcclusion.jpg | 3 + .../Rock055_4K-JPG_AmbientOcclusion.jpg.meta | 119 +++++++++++++ .../Textures/Wall/Rock055_4K-JPG_Color.jpg | 3 + .../Wall/Rock055_4K-JPG_Color.jpg.meta | 119 +++++++++++++ .../Wall/Rock055_4K-JPG_Displacement.jpg | 3 + .../Wall/Rock055_4K-JPG_Displacement.jpg.meta | 119 +++++++++++++ .../Textures/Wall/Rock055_4K-JPG_NormalGL.jpg | 3 + .../Wall/Rock055_4K-JPG_NormalGL.jpg.meta | 119 +++++++++++++ .../Wall/Rock055_4K-JPG_Roughness.jpg | 3 + .../Wall/Rock055_4K-JPG_Roughness.jpg.meta | 119 +++++++++++++ .../Laboratory/Textures/Wall/Wall_lab.mat | 163 ++++++++++++++++++ .../Textures/Wall/Wall_lab.mat.meta | 8 + Assets/RoomAssets/RoomThemes/Laboratory.asset | 2 +- .../TextureTilingParallaxFloor.shadergraph | 6 +- ...extureTilingParallaxFloor.shadergraph.meta | 2 +- 18 files changed, 798 insertions(+), 9 deletions(-) create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall.meta create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_AmbientOcclusion.jpg create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_AmbientOcclusion.jpg.meta create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Color.jpg create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Color.jpg.meta create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Displacement.jpg create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Displacement.jpg.meta create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_NormalGL.jpg create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_NormalGL.jpg.meta create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Roughness.jpg create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Roughness.jpg.meta create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Wall_lab.mat create mode 100644 Assets/RoomAssets/Laboratory/Textures/Wall/Wall_lab.mat.meta diff --git a/Assets/RoomAssets/Corridor/Texture/Floor/Floor.mat b/Assets/RoomAssets/Corridor/Texture/Floor/Floor.mat index a7fa448..b243650 100644 --- a/Assets/RoomAssets/Corridor/Texture/Floor/Floor.mat +++ b/Assets/RoomAssets/Corridor/Texture/Floor/Floor.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Floor - m_Shader: {fileID: -6465566751694194690, guid: 1769116f262dfe87583bea2c74e75b9d, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 03b882816f6dbe412b828ec7ef116046, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] diff --git a/Assets/RoomAssets/Laboratory/Textures/Floor/Floor.mat b/Assets/RoomAssets/Laboratory/Textures/Floor/Floor.mat index 23e51c9..3c2a3d1 100644 --- a/Assets/RoomAssets/Laboratory/Textures/Floor/Floor.mat +++ b/Assets/RoomAssets/Laboratory/Textures/Floor/Floor.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Floor - m_Shader: {fileID: -6465566751694194690, guid: 1769116f262dfe87583bea2c74e75b9d, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 03b882816f6dbe412b828ec7ef116046, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ColorMap: - m_Texture: {fileID: 2800000, guid: b832a69575a0a86c7ac2002bc848c30c, type: 3} + m_Texture: {fileID: 2800000, guid: 108e748399f6e52d18d7dc416b0534f8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -142,7 +142,7 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _HeightAmplitude: 0 + - _HeightAmplitude: 1.35 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.08 diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall.meta b/Assets/RoomAssets/Laboratory/Textures/Wall.meta new file mode 100644 index 0000000..cf32257 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b9b3cc057a532817b905f72b4a7b475 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_AmbientOcclusion.jpg b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_AmbientOcclusion.jpg new file mode 100644 index 0000000..bd2ee6e --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_AmbientOcclusion.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20f2d3725c33e19caaea3bdbbb0540034bdfed1024613c86f488bc483d965b31 +size 4330821 diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_AmbientOcclusion.jpg.meta b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_AmbientOcclusion.jpg.meta new file mode 100644 index 0000000..8f3a277 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_AmbientOcclusion.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: 34193c94aec00445c84ca4569b11cac4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Color.jpg b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Color.jpg new file mode 100644 index 0000000..45c8de8 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Color.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2ebd21318c8b7c478b4af68a4056036181216a95dd70866414bf7b1f36dbff8 +size 10267104 diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Color.jpg.meta b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Color.jpg.meta new file mode 100644 index 0000000..474aa79 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Color.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: 6e8d0b91660a3cd46b36e9e754493925 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Displacement.jpg b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Displacement.jpg new file mode 100644 index 0000000..d8468f4 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Displacement.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ba873d830ba9d4a67f0de33af8c7950cc8b4dc1c4b14bb60b0ed83f4b75ae81 +size 1029366 diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Displacement.jpg.meta b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Displacement.jpg.meta new file mode 100644 index 0000000..b2cdf4a --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Displacement.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: 9110b7dc0484bed989907e01d36881ed +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_NormalGL.jpg b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_NormalGL.jpg new file mode 100644 index 0000000..9cd4d15 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_NormalGL.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c85d437713ad08e3ae31eba4eb92bc5f84921685ae611a6f751a52f3206ab50 +size 13130037 diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_NormalGL.jpg.meta b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_NormalGL.jpg.meta new file mode 100644 index 0000000..b8d7b67 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_NormalGL.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: e272e7bc94fd01c0a9eb1942b1df2ae3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Roughness.jpg b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Roughness.jpg new file mode 100644 index 0000000..70969b4 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Roughness.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d45f66712810df20415aae1edd064d8609e76eded7223ced2a5860ef96fc1466 +size 3213905 diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Roughness.jpg.meta b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Roughness.jpg.meta new file mode 100644 index 0000000..8060fad --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Rock055_4K-JPG_Roughness.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: 6baefd403f79fbe809f81772044e21e0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Wall_lab.mat b/Assets/RoomAssets/Laboratory/Textures/Wall/Wall_lab.mat new file mode 100644 index 0000000..1198c4d --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Wall_lab.mat @@ -0,0 +1,163 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7704039038363923511 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wall_lab + m_Shader: {fileID: -6465566751694194690, guid: 51dd303bafe2f22c9af50cf59ea942ff, type: 3} + 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: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AO: + m_Texture: {fileID: 2800000, guid: 34193c94aec00445c84ca4569b11cac4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorMap: + m_Texture: {fileID: 2800000, guid: 6e8d0b91660a3cd46b36e9e754493925, type: 3} + 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} + - _Displacement: + m_Texture: {fileID: 2800000, guid: 9110b7dc0484bed989907e01d36881ed, type: 3} + 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} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: e272e7bc94fd01c0a9eb1942b1df2ae3, type: 3} + 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} + - _RoughnessMap: + m_Texture: {fileID: 2800000, guid: 6baefd403f79fbe809f81772044e21e0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AO_Strength: 1 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 1 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _HeightAmplitude: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _ScreenSpaceReflections: 1 + - _ScreenSpaceReflectionsContributeTransparent: 1 + - _Smoothness: 0.5 + - _SmoothnessMultiplier: 1.4 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _Tiling: 0.25 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/RoomAssets/Laboratory/Textures/Wall/Wall_lab.mat.meta b/Assets/RoomAssets/Laboratory/Textures/Wall/Wall_lab.mat.meta new file mode 100644 index 0000000..28b4f61 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/Textures/Wall/Wall_lab.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ba770fb31b6867d0a32280ad6623549 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/RoomThemes/Laboratory.asset b/Assets/RoomAssets/RoomThemes/Laboratory.asset index 85babd6..13f9a60 100644 --- a/Assets/RoomAssets/RoomThemes/Laboratory.asset +++ b/Assets/RoomAssets/RoomThemes/Laboratory.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Laboratory m_EditorClassIdentifier: Assembly-CSharp::_Project.Scripts.LevelGenerating.RoomTheme floorMaterial: {fileID: 2100000, guid: e4d8990be0d4681c2a931521991dd97e, type: 2} - wallMaterial: {fileID: 2100000, guid: ca8b5252d49ca181c86677df5134a84e, type: 2} + wallMaterial: {fileID: 2100000, guid: 7ba770fb31b6867d0a32280ad6623549, type: 2} ceilingMaterial: {fileID: 5398659014882694498, guid: 5ffefc05c8840a644a89d935b25c2f3d, type: 3} createLights: 0 lightColor: {r: 0.621796, g: 0.8396226, b: 0.8396226, a: 1} diff --git a/Assets/_Project/Shaders/TextureTilingParallaxFloor.shadergraph b/Assets/_Project/Shaders/TextureTilingParallaxFloor.shadergraph index a587d97..ff9ed0d 100644 --- a/Assets/_Project/Shaders/TextureTilingParallaxFloor.shadergraph +++ b/Assets/_Project/Shaders/TextureTilingParallaxFloor.shadergraph @@ -2120,7 +2120,7 @@ "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0, + "m_NormalMapSpace": 1, "m_EnableGlobalMipBias": true, "m_MipSamplingMode": 0 } @@ -3073,7 +3073,7 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_TextureType": 0, + "m_TextureType": 1, "m_NormalMapSpace": 0, "m_EnableGlobalMipBias": true, "m_MipSamplingMode": 0 @@ -3216,7 +3216,7 @@ "m_SerializedTexture": "", "m_Guid": "" }, - "m_DefaultType": 0 + "m_DefaultType": 3 } { diff --git a/Assets/_Project/Shaders/TextureTilingParallaxFloor.shadergraph.meta b/Assets/_Project/Shaders/TextureTilingParallaxFloor.shadergraph.meta index 31f27bc..80cc3fd 100644 --- a/Assets/_Project/Shaders/TextureTilingParallaxFloor.shadergraph.meta +++ b/Assets/_Project/Shaders/TextureTilingParallaxFloor.shadergraph.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1769116f262dfe87583bea2c74e75b9d +guid: 03b882816f6dbe412b828ec7ef116046 ScriptedImporter: internalIDToNameTable: [] externalObjects: {}