diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_AmbientOcclusion.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_AmbientOcclusion.jpg new file mode 100644 index 0000000..9ae8050 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_AmbientOcclusion.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cf41c07f5811ef243860d40a30c4284c9a5f3ef2a7185fd796aaa0a0c783f60 +size 3545410 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Displacement.jpg.meta b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_AmbientOcclusion.jpg.meta similarity index 97% rename from Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Displacement.jpg.meta rename to Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_AmbientOcclusion.jpg.meta index 44648c4..7882dbc 100644 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Displacement.jpg.meta +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_AmbientOcclusion.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c5921728680326a5288e719010cfb356 +guid: a0c4472c4b80d714193aaae710712cb1 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -71,7 +71,7 @@ TextureImporter: platformSettings: - serializedVersion: 4 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Color.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Color.jpg new file mode 100644 index 0000000..a94c8cb --- /dev/null +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Color.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c91beabdc532fa6c334be3093f8116a91b907425ae967558fea7a96de5cc05e +size 405322 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Color.jpg.meta b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Color.jpg.meta similarity index 97% rename from Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Color.jpg.meta rename to Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Color.jpg.meta index ffe7e17..bbcd266 100644 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Color.jpg.meta +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Color.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a1d6a7865279531dbd1fcb2475fbe33 +guid: 6b3e8999f859fd94cb459dc5d07b5263 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -71,7 +71,7 @@ TextureImporter: platformSettings: - serializedVersion: 4 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Displacement.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Displacement.jpg new file mode 100644 index 0000000..08f1009 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Displacement.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd8da1273493888bde1e63571ad1b8db041aa051024c7567eff3184425d73577 +size 2963236 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_AmbientOcclusion.jpg.meta b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Displacement.jpg.meta similarity index 97% rename from Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_AmbientOcclusion.jpg.meta rename to Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Displacement.jpg.meta index 2d60851..3a65fd1 100644 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_AmbientOcclusion.jpg.meta +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Displacement.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d4f2f69ed82d2df38bd07eb1e9d3f68 +guid: b807ed04e789ad94cb9b9df97a5691de TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -71,7 +71,7 @@ TextureImporter: platformSettings: - serializedVersion: 4 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_NormalGL.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_NormalGL.jpg new file mode 100644 index 0000000..0aa7649 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_NormalGL.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca6ee1ca416dbc1b594292a5c29b975c84180fe70838c909c776440139960d6f +size 8380590 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_NormalGL.jpg.meta b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_NormalGL.jpg.meta new file mode 100644 index 0000000..270af39 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_NormalGL.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: c37d4cfa9f9a27d4bba05660f6aee1c2 +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: 2 + 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: 2048 + 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/Ceiling/OfficeCeiling001_2K-JPG_Roughness.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Roughness.jpg new file mode 100644 index 0000000..2bcd025 --- /dev/null +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Roughness.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b52a4f3af0ebe4a2e94e261ffbd32b83ff331b31214d1a700eb1439ede849723 +size 1048224 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Roughness.jpg.meta b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Roughness.jpg.meta similarity index 97% rename from Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Roughness.jpg.meta rename to Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Roughness.jpg.meta index 1aea975..fe8a84b 100644 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Roughness.jpg.meta +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling001_2K-JPG_Roughness.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a2afa0f16fd55fd00a89a04a1801bceb +guid: 633e21ecd2330e6458bfd8bfc380babf TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -71,7 +71,7 @@ TextureImporter: platformSettings: - serializedVersion: 4 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_AmbientOcclusion.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_AmbientOcclusion.jpg deleted file mode 100644 index f58ef16..0000000 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_AmbientOcclusion.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be6218ba85e3c5b449075146334fe375fb27a32964c8496c36b1c6f77ce8bafc -size 13818324 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Color.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Color.jpg deleted file mode 100644 index a3f1f74..0000000 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Color.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e191c09077063536169d69c71b676d9624d42a80003ecbcbdd0ebc3029f11484 -size 1510646 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Displacement.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Displacement.jpg deleted file mode 100644 index 274185a..0000000 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Displacement.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0016dfaa121ddc960d3954b3d3e44f4f43743d429377617de30959e06fa6b716 -size 10695927 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Emission.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Emission.jpg deleted file mode 100644 index cecff4b..0000000 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Emission.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fb2e815590e8955cebb9dd539105e225f5e9822762882f999272fdf224b1eb3 -size 487655 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Emission.jpg.meta b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Emission.jpg.meta deleted file mode 100644 index a9365f5..0000000 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Emission.jpg.meta +++ /dev/null @@ -1,119 +0,0 @@ -fileFormatVersion: 2 -guid: 88a25d49d65b24b8c87c1570173e1f02 -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: 1 - wrapV: 1 - 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: 0 - alphaIsTransparency: 0 - spriteTessellationMethod: 0 - spriteTessellationDetail: -1 - spriteGeometrySubdivision: -1 - textureType: 6 - 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/Ceiling/OfficeCeiling003_4K-JPG_NormalGL.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_NormalGL.jpg deleted file mode 100644 index 9f4b3fa..0000000 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_NormalGL.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63bd99efb912d482352e712806575b5289ea2f6fa29846b28cf52a77cd59c7a0 -size 35516008 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Roughness.jpg b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Roughness.jpg deleted file mode 100644 index faff421..0000000 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_Roughness.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:409ae43c3c2d40dd945bedc40dac88dc3103d69316dd8fbd0634af22a2784122 -size 4689611 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/cei_lab.mat b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/cei_lab.mat index 372909f..304ca14 100644 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/cei_lab.mat +++ b/Assets/RoomAssets/Laboratory/_Textures/Ceiling/cei_lab.mat @@ -38,7 +38,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _AO: - m_Texture: {fileID: 2800000, guid: 7d4f2f69ed82d2df38bd07eb1e9d3f68, type: 3} + m_Texture: {fileID: 2800000, guid: a0c4472c4b80d714193aaae710712cb1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ColorMap: - m_Texture: {fileID: 2800000, guid: 4a1d6a7865279531dbd1fcb2475fbe33, type: 3} + m_Texture: {fileID: 2800000, guid: 6b3e8999f859fd94cb459dc5d07b5263, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -70,7 +70,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Displacment: - m_Texture: {fileID: 2800000, guid: c5921728680326a5288e719010cfb356, type: 3} + m_Texture: {fileID: 2800000, guid: b807ed04e789ad94cb9b9df97a5691de, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Emission: @@ -98,7 +98,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 2800000, guid: fc6e52118de34234797ad6cd7f00ebb1, type: 3} + m_Texture: {fileID: 2800000, guid: c37d4cfa9f9a27d4bba05660f6aee1c2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -110,7 +110,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _RoughnessMap: - m_Texture: {fileID: 2800000, guid: a2afa0f16fd55fd00a89a04a1801bceb, type: 3} + m_Texture: {fileID: 2800000, guid: 633e21ecd2330e6458bfd8bfc380babf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: @@ -131,11 +131,12 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AOMultiplier: -0.22 - _AO_Strength: 1 - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - - _Blend: 1 + - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 @@ -151,8 +152,10 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _HeightAmplitude: 1 + - _HeightAmplitude: 0 + - _MaxSmoothness: 1 - _Metallic: 0 + - _MinSmoothness: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 @@ -161,13 +164,13 @@ Material: - _ScreenSpaceReflections: 1 - _ScreenSpaceReflectionsContributeTransparent: 1 - _Smoothness: 0.5 - - _SmoothnessMultiplier: 1.4 + - _SmoothnessMultiplier: 0.85 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 - - _Tiling: 1 + - _Tiling: 0.4 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/RoomAssets/Laboratory/_Textures/Floor/Floor.mat b/Assets/RoomAssets/Laboratory/_Textures/Floor/Floor.mat index 82887d5..56277de 100644 --- a/Assets/RoomAssets/Laboratory/_Textures/Floor/Floor.mat +++ b/Assets/RoomAssets/Laboratory/_Textures/Floor/Floor.mat @@ -127,6 +127,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AOMultiplier: 0 - _AO_Strength: 0 - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 @@ -147,8 +148,10 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _HeightAmplitude: 1.3 + - _HeightAmplitude: 1 + - _MaxSmoothness: 1 - _Metallic: 0 + - _MinSmoothness: 0 - _OcclusionStrength: 1 - _Parallax: 0.08 - _QueueControl: 0 @@ -157,7 +160,7 @@ Material: - _ScreenSpaceReflections: 1 - _ScreenSpaceReflectionsContributeTransparent: 1 - _Smoothness: 0.665 - - _SmoothnessMultiplier: 1 + - _SmoothnessMultiplier: 1.35 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/RoomAssets/_LightAssets.meta b/Assets/RoomAssets/_LightAssets.meta new file mode 100644 index 0000000..5c54a73 --- /dev/null +++ b/Assets/RoomAssets/_LightAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82538de8c5acc834c81e0a1e848d0d3a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/_LightAssets/Laboratory.asset b/Assets/RoomAssets/_LightAssets/Laboratory.asset new file mode 100644 index 0000000..334473b --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Laboratory.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e8085633f4c4a979daf0e7cbef587ee, type: 3} + m_Name: Laboratory + m_EditorClassIdentifier: Assembly-CSharp::_Project.Scripts.LevelGenerating.RoomLightConfig + lightPrefab: {fileID: 5970180290532969838, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + spacing: 8 + ceilingDrop: -0.03 + rotationOffset: {x: -90, y: 0, z: 0} + overrideLightParameters: 1 + color: {r: 1, g: 1, b: 1, a: 1} + intensity: 15 + range: 15 + shadows: 0 diff --git a/Assets/RoomAssets/_LightAssets/Laboratory.asset.meta b/Assets/RoomAssets/_LightAssets/Laboratory.asset.meta new file mode 100644 index 0000000..d5603e1 --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Laboratory.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbae43ec6af0a0347a9520343db6628f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/_LightAssets/Lightning.meta b/Assets/RoomAssets/_LightAssets/Lightning.meta new file mode 100644 index 0000000..4a5813d --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f22653b733f18b64084c2424c7b680a7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps.meta b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps.meta new file mode 100644 index 0000000..7003749 --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a5c7cfc8b5f2224db5c1bb1006459df +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp.mat b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp.mat new file mode 100644 index 0000000..7e2e2be --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp.mat @@ -0,0 +1,142 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6124336690968519448 +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: Fluorescent_lamp + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + - _NORMALMAP + - _RECEIVE_SHADOWS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 5262ec8ebcdb53546bc0c0b892d8c61c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 225c67029e434ec47ba0900755c63edd, 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} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 7518083f5f9a1744b95c449f5dc78786, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 5262ec8ebcdb53546bc0c0b892d8c61c, 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} + - _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: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _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 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 0 + - _ScreenSpaceReflections: 1 + - _ScreenSpaceReflectionsContributeTransparent: 1 + - _Smoothness: 0.413 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _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.0625, g: 0.0625, b: 0.0625, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp.mat.meta b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp.mat.meta new file mode 100644 index 0000000..cdb465e --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: faf9e77e060d1c44cac3bdc53bc127b9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab new file mode 100644 index 0000000..4f56994 --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab @@ -0,0 +1,218 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8868572391117574485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8503020076790007756} + - component: {fileID: 1988911648128704068} + - component: {fileID: 4968638178065789548} + m_Layer: 0 + m_Name: Area Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8503020076790007756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8868572391117574485} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0029} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6454089254664525780} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!108 &1988911648128704068 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8868572391117574485} + m_Enabled: 1 + serializedVersion: 13 + m_Type: 2 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 20 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 1 + 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: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + 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_ForceVisible: 0 + m_ShapeRadius: 0.025 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!114 &4968638178065789548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8868572391117574485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!1001 &6781082409758404671 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalScale.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalScale.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalScale.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalPosition.x + value: -6.78199 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalPosition.y + value: -3.42543 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalPosition.z + value: 0.92345 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: faf9e77e060d1c44cac3bdc53bc127b9, type: 2} + - target: {fileID: -7511558181221131132, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: 'm_Materials.Array.data[1]' + value: + objectReference: {fileID: 2100000, guid: dc221ff6d9177ed4ba18b8d6df8405ac, type: 2} + - target: {fileID: 919132149155446097, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + propertyPath: m_Name + value: Fluorescent_lamp_prefab + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + insertIndex: -1 + addedObject: {fileID: 8503020076790007756} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} +--- !u!4 &6454089254664525780 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} + m_PrefabInstance: {fileID: 6781082409758404671} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab.meta b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab.meta new file mode 100644 index 0000000..d60cf50 --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c285e50ea57903349a2b10379a60a5a7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamps.fbx b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamps.fbx new file mode 100644 index 0000000..5c787a4 --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamps.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79f52c36ed9c4b491e2e99d58b2704a4c7e4cbc1c8018fbf23f1e65b026075f1 +size 26044 diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamps.fbx.meta b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamps.fbx.meta new file mode 100644 index 0000000..8eee853 --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Fluorescent_lamps.fbx.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 67b3ef2db0b4dd8468b9aedf229ef84f +ModelImporter: + serializedVersion: 24600 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + searchTexturesGlobally: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + preBakeConvexCollisionMesh: 0 + preBakeTriangleCollisionMesh: 0 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + importUVs: -1 + importVertexColors: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + calculateBlendshapeNormalsDeltaFromImportedNormals: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Metal.mat b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Metal.mat new file mode 100644 index 0000000..5c6e2aa --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Metal.mat @@ -0,0 +1,141 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6124336690968519448 +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: Metal + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + - _RECEIVE_SHADOWS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + - _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} + - _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: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _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 + - _Metallic: 0.724 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 0 + - _ScreenSpaceReflections: 1 + - _ScreenSpaceReflectionsContributeTransparent: 1 + - _Smoothness: 0.827 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.745283, g: 0.745283, b: 0.745283, a: 1} + - _Color: {r: 0.745283, g: 0.745283, b: 0.745283, a: 1} + - _EmissionColor: {r: 0.0064858496, g: 0.0064858496, b: 0.0064858496, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Metal.mat.meta b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Metal.mat.meta new file mode 100644 index 0000000..4b404ab --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/Metal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc221ff6d9177ed4ba18b8d6df8405ac +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_ON_3.jpeg b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_ON_3.jpeg new file mode 100644 index 0000000..93102e1 Binary files /dev/null and b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_ON_3.jpeg differ diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_ON_3.jpeg.meta b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_ON_3.jpeg.meta new file mode 100644 index 0000000..afd5132 --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_ON_3.jpeg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: 5262ec8ebcdb53546bc0c0b892d8c61c +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: 512 + 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/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_emissive_2.jpeg b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_emissive_2.jpeg new file mode 100644 index 0000000..474f871 Binary files /dev/null and b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_emissive_2.jpeg differ diff --git a/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_emissive_2.jpeg.meta b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_emissive_2.jpeg.meta new file mode 100644 index 0000000..243713b --- /dev/null +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_emissive_2.jpeg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: 7518083f5f9a1744b95c449f5dc78786 +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: 512 + 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/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_normal_0.jpeg b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_normal_0.jpeg new file mode 100644 index 0000000..c8dd0a9 Binary files /dev/null and b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_normal_0.jpeg differ diff --git a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_NormalGL.jpg.meta b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_normal_0.jpeg.meta similarity index 97% rename from Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_NormalGL.jpg.meta rename to Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_normal_0.jpeg.meta index 868773c..7e6e399 100644 --- a/Assets/RoomAssets/Laboratory/_Textures/Ceiling/OfficeCeiling003_4K-JPG_NormalGL.jpg.meta +++ b/Assets/RoomAssets/_LightAssets/Lightning/Fluorescent_lamps/fluorescent_light_normal_0.jpeg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3320b0e6479e6a52ab2474397af76292 +guid: 225c67029e434ec47ba0900755c63edd TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -71,7 +71,7 @@ TextureImporter: platformSettings: - serializedVersion: 4 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 512 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 diff --git a/Assets/RoomAssets/RoomThemes.meta b/Assets/RoomAssets/_RoomThemes.meta similarity index 100% rename from Assets/RoomAssets/RoomThemes.meta rename to Assets/RoomAssets/_RoomThemes.meta diff --git a/Assets/RoomAssets/RoomThemes/Corridor.asset b/Assets/RoomAssets/_RoomThemes/Corridor.asset similarity index 82% rename from Assets/RoomAssets/RoomThemes/Corridor.asset rename to Assets/RoomAssets/_RoomThemes/Corridor.asset index d7510aa..027f1a5 100644 --- a/Assets/RoomAssets/RoomThemes/Corridor.asset +++ b/Assets/RoomAssets/_RoomThemes/Corridor.asset @@ -15,10 +15,5 @@ MonoBehaviour: floorMaterial: {fileID: 2100000, guid: 9cdf88f5121ccd783bded7cd0b10e03b, type: 2} wallMaterial: {fileID: 2100000, guid: ca8b5252d49ca181c86677df5134a84e, type: 2} ceilingMaterial: {fileID: 2100000, guid: 7da09feeb6b1cc9ae8fdc0ac253c4704, type: 2} - createLights: 0 - lightColor: {r: 1, g: 0, b: 0, a: 1} - lightIntensity: 1 - lightRange: 10 - lightSpacing: 6 - lightDrop: 0.75 - lightShadows: 0 + lightConfig: {fileID: 11400000, guid: bbae43ec6af0a0347a9520343db6628f, type: 2} + propSet: {fileID: 0} diff --git a/Assets/RoomAssets/RoomThemes/Corridor.asset.meta b/Assets/RoomAssets/_RoomThemes/Corridor.asset.meta similarity index 100% rename from Assets/RoomAssets/RoomThemes/Corridor.asset.meta rename to Assets/RoomAssets/_RoomThemes/Corridor.asset.meta diff --git a/Assets/RoomAssets/RoomThemes/Laboratory.asset b/Assets/RoomAssets/_RoomThemes/Laboratory.asset similarity index 80% rename from Assets/RoomAssets/RoomThemes/Laboratory.asset rename to Assets/RoomAssets/_RoomThemes/Laboratory.asset index b8c2afd..9d19917 100644 --- a/Assets/RoomAssets/RoomThemes/Laboratory.asset +++ b/Assets/RoomAssets/_RoomThemes/Laboratory.asset @@ -15,10 +15,5 @@ MonoBehaviour: floorMaterial: {fileID: 2100000, guid: e4d8990be0d4681c2a931521991dd97e, type: 2} wallMaterial: {fileID: 2100000, guid: 7ba770fb31b6867d0a32280ad6623549, type: 2} ceilingMaterial: {fileID: 2100000, guid: 1b307e7eea0ab201e8df8302ccb34c7d, type: 2} - createLights: 0 - lightColor: {r: 0.621796, g: 0.8396226, b: 0.8396226, a: 1} - lightIntensity: 1.5 - lightRange: 8 - lightSpacing: 6 - lightDrop: 0.3 - lightShadows: 0 + lightConfig: {fileID: 11400000, guid: bbae43ec6af0a0347a9520343db6628f, type: 2} + propSet: {fileID: 0} diff --git a/Assets/RoomAssets/RoomThemes/Laboratory.asset.meta b/Assets/RoomAssets/_RoomThemes/Laboratory.asset.meta similarity index 100% rename from Assets/RoomAssets/RoomThemes/Laboratory.asset.meta rename to Assets/RoomAssets/_RoomThemes/Laboratory.asset.meta diff --git a/Assets/RoomAssets/RoomThemes/Office.asset b/Assets/RoomAssets/_RoomThemes/Office.asset similarity index 80% rename from Assets/RoomAssets/RoomThemes/Office.asset rename to Assets/RoomAssets/_RoomThemes/Office.asset index 11eddcc..66f136a 100644 --- a/Assets/RoomAssets/RoomThemes/Office.asset +++ b/Assets/RoomAssets/_RoomThemes/Office.asset @@ -15,10 +15,5 @@ MonoBehaviour: floorMaterial: {fileID: 2100000, guid: e4d8990be0d4681c2a931521991dd97e, 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} - lightIntensity: 1.5 - lightRange: 8 - lightSpacing: 6 - lightDrop: 0.3 - lightShadows: 0 + lightConfig: {fileID: 11400000, guid: bbae43ec6af0a0347a9520343db6628f, type: 2} + propSet: {fileID: 0} diff --git a/Assets/RoomAssets/RoomThemes/Office.asset.meta b/Assets/RoomAssets/_RoomThemes/Office.asset.meta similarity index 100% rename from Assets/RoomAssets/RoomThemes/Office.asset.meta rename to Assets/RoomAssets/_RoomThemes/Office.asset.meta diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 89d0bf6..6c7b759 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -20,10 +20,10 @@ RenderSettings: m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 1, g: 1, b: 1, a: 1} + m_AmbientSkyColor: {r: 0.03125, g: 0.03125, b: 0.03125, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 + m_AmbientIntensity: 0 m_AmbientMode: 3 m_SubtractiveShadowColor: {r: 0, g: 0, b: 0, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: 82b660520bdecce4daf45d270ec93fe4, type: 2} @@ -2612,7 +2612,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!108 &146683185 Light: m_ObjectHideFlags: 0 @@ -40930,6 +40930,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 81044204068d943dd8e46160655d2108, type: 3} +--- !u!1001 &2126357085 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5970180290532969838, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_Name + value: Fluorescent_lamp_prefab + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalPosition.x + value: -3.30838 + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalPosition.z + value: 4.44249 + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6454089254664525780, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c285e50ea57903349a2b10379a60a5a7, type: 3} --- !u!1001 &2132672204 PrefabInstance: m_ObjectHideFlags: 0 @@ -44780,3 +44837,4 @@ SceneRoots: - {fileID: 217181662} - {fileID: 740097205} - {fileID: 552049569} + - {fileID: 2126357085} diff --git a/Assets/Scenes/Main/Global Volume Profile.asset b/Assets/Scenes/Main/Global Volume Profile.asset index 70cfd6d..5d5b880 100644 --- a/Assets/Scenes/Main/Global Volume Profile.asset +++ b/Assets/Scenes/Main/Global Volume Profile.asset @@ -18,19 +18,19 @@ MonoBehaviour: m_Value: 1 threshold: m_OverrideState: 1 - m_Value: 0.9 + m_Value: 1.48 intensity: - m_OverrideState: 1 - m_Value: 0.7 + m_OverrideState: 0 + m_Value: 10.58 scatter: - m_OverrideState: 1 - m_Value: 0.7 + m_OverrideState: 0 + m_Value: 0.727 clamp: m_OverrideState: 0 m_Value: 65472 tint: m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} + m_Value: {r: 1, g: 0.7311321, b: 0.7311321, a: 1} highQualityFiltering: m_OverrideState: 0 m_Value: 0 diff --git a/Assets/_Project/Scripts/LevelGenerating/RoomGenerators.cs b/Assets/_Project/Scripts/LevelGenerating/RoomGenerators.cs index 11c6562..a5fd89e 100644 --- a/Assets/_Project/Scripts/LevelGenerating/RoomGenerators.cs +++ b/Assets/_Project/Scripts/LevelGenerating/RoomGenerators.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using System.Collections.Generic; +using UnityEngine; namespace _Project.Scripts.LevelGenerating { @@ -13,7 +14,7 @@ namespace _Project.Scripts.LevelGenerating void Generate(RoomView view, FloorData floor, RoomTheme theme); } - // Универсальный генератор: материалы из темы и сетка ламп под потолком. + // Универсальный генератор: материалы из темы и сетка светильников под потолком. // Позже сюда добавится расстановка предметов по правилам темы. public class ThemedRoomGenerator : IRoomGenerator { @@ -31,43 +32,72 @@ namespace _Project.Scripts.LevelGenerating ApplyMaterial(view.WallRenderers, theme.wallMaterial); ApplyMaterial(view.CeilingRenderers, theme.ceilingMaterial); - if (theme.createLights) CreateLights(view, theme); + if (theme.lightConfig != null) + { + CreateLights(view, theme.lightConfig); + } } - private static void ApplyMaterial(System.Collections.Generic.List renderers, Material mat) + private static void ApplyMaterial(List renderers, Material mat) { if (mat == null) return; // остаётся материал префаба foreach (var r in renderers) r.sharedMaterial = mat; } - // Сетка ламп: чем больше комната, тем больше ламп (шаг задаёт lightSpacing) - private static void CreateLights(RoomView view, RoomTheme theme) + // Сетка светильников: спавнит префаб из RoomLightConfig и применяет параметры + private static void CreateLights(RoomView view, RoomLightConfig config) { Vector3 size = view.SizeMeters; Vector3 origin = view.OriginMeters; - int nx = Mathf.Max(1, Mathf.CeilToInt(size.x / theme.lightSpacing)); - int nz = Mathf.Max(1, Mathf.CeilToInt(size.z / theme.lightSpacing)); - float y = view.Height - theme.lightDrop; + float spacing = Mathf.Max(0.5f, config.spacing); + int nx = Mathf.Max(1, Mathf.CeilToInt(size.x / spacing)); + int nz = Mathf.Max(1, Mathf.CeilToInt(size.z / spacing)); + float y = view.Height - config.ceilingDrop; var lightsRoot = new GameObject("Lights").transform; lightsRoot.SetParent(view.transform, false); + Quaternion rot = Quaternion.Euler(config.rotationOffset); + for (int ix = 0; ix < nx; ix++) { for (int iz = 0; iz < nz; iz++) { - var go = new GameObject($"Light_{ix}_{iz}"); - go.transform.SetParent(lightsRoot, false); - go.transform.position = origin + new Vector3( - (ix + 0.5f) / nx * size.x, y, (iz + 0.5f) / nz * size.z); + Vector3 pos = origin + new Vector3( + (ix + 0.5f) / nx * size.x, + y, + (iz + 0.5f) / nz * size.z); - var light = go.AddComponent(); - light.type = LightType.Point; - light.color = theme.lightColor; - light.intensity = theme.lightIntensity; - light.range = theme.lightRange; - light.shadows = theme.lightShadows; + GameObject lightGo; + + if (config.lightPrefab != null) + { + lightGo = Object.Instantiate(config.lightPrefab, pos, rot, lightsRoot); + lightGo.name = $"{config.lightPrefab.name}_{ix}_{iz}"; + } + else + { + // Запасной вариант, если префаб забыли назначить в SO + lightGo = new GameObject($"FallbackLight_{ix}_{iz}"); + lightGo.transform.SetParent(lightsRoot, false); + lightGo.transform.SetPositionAndRotation(pos, rot); + var fallbackLight = lightGo.AddComponent(); + fallbackLight.type = LightType.Point; + } + + // Если включена перезапись параметров (или сработал запасной вариант без префаба) + if (config.overrideLightParameters || config.lightPrefab == null) + { + var lights = lightGo.GetComponentsInChildren(true); + foreach (var l in lights) + { + l.color = config.color; + l.intensity = config.intensity; + l.range = config.range; + l.shadows = config.shadows; + } + } } } } diff --git a/Assets/_Project/Scripts/LevelGenerating/RoomLightConfig.cs b/Assets/_Project/Scripts/LevelGenerating/RoomLightConfig.cs new file mode 100644 index 0000000..03fb7cb --- /dev/null +++ b/Assets/_Project/Scripts/LevelGenerating/RoomLightConfig.cs @@ -0,0 +1,36 @@ +using UnityEngine; + +namespace _Project.Scripts.LevelGenerating +{ + // ===================================================================== + // Настройки освещения для темы комнаты. + // Создаётся в проекте: ПКМ -> Create -> Level -> Room Light Config. + // Позволяет спавнить готовый префаб (люстра, лампа) и гибко крутить его параметры. + // ===================================================================== + [CreateAssetMenu(menuName = "Level/Room Light Config", fileName = "RoomLightConfig")] + public class RoomLightConfig : ScriptableObject + { + [Header("Префаб")] + [Tooltip("Префаб светильника (с мешем и Light). Если не задан — создастся обычный объект с Light.")] + public GameObject lightPrefab; + + [Header("Размещение")] + [Tooltip("Расстояние между лампами в метрах: большая комната получает сетку ламп")] + [Min(0.5f)] public float spacing = 6f; + + [Tooltip("На сколько метров ниже потолка висит точка спавна префаба (0 — вплотную к потолку)")] + public float ceilingDrop = 0f; + + [Tooltip("Дополнительный поворот префаба (если моделька криво экспортирована)")] + public Vector3 rotationOffset = Vector3.zero; + + [Header("Параметры источника света")] + [Tooltip("Если включено, параметры ниже перезапишут настройки компонента Light внутри префаба")] + public bool overrideLightParameters = true; + + public Color color = Color.white; + [Min(0f)] public float intensity = 1.5f; + [Min(0.1f)] public float range = 8f; + public LightShadows shadows = LightShadows.None; + } +} \ No newline at end of file diff --git a/Assets/_Project/Scripts/LevelGenerating/RoomLightConfig.cs.meta b/Assets/_Project/Scripts/LevelGenerating/RoomLightConfig.cs.meta new file mode 100644 index 0000000..ab51417 --- /dev/null +++ b/Assets/_Project/Scripts/LevelGenerating/RoomLightConfig.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3e8085633f4c4a979daf0e7cbef587ee +timeCreated: 1792441603 \ No newline at end of file diff --git a/Assets/_Project/Scripts/LevelGenerating/RoomTheme.cs b/Assets/_Project/Scripts/LevelGenerating/RoomTheme.cs index cf0ec92..42438d0 100644 --- a/Assets/_Project/Scripts/LevelGenerating/RoomTheme.cs +++ b/Assets/_Project/Scripts/LevelGenerating/RoomTheme.cs @@ -3,7 +3,7 @@ namespace _Project.Scripts.LevelGenerating { // ===================================================================== - // Набор оформления комнаты: материалы и освещение. + // Набор оформления комнаты: материалы, конфиг освещения и пропсы. // Создаётся в проекте: ПКМ -> Create -> Level -> Room Theme. // Новая тема - это новые данные, код не меняется. // ===================================================================== @@ -16,14 +16,10 @@ namespace _Project.Scripts.LevelGenerating public Material ceilingMaterial; [Header("Освещение")] - public bool createLights = true; - public Color lightColor = Color.white; - public float lightIntensity = 1.5f; - public float lightRange = 8f; - [Tooltip("Расстояние между лампами в метрах: большая комната получает сетку ламп")] - public float lightSpacing = 6f; - [Tooltip("На сколько метров ниже потолка висит лампа")] - public float lightDrop = 0.3f; - public LightShadows lightShadows = LightShadows.None; + [Tooltip("Конфиг света с префабом и настройками. Если пусто — света в комнате не будет.")] + public RoomLightConfig lightConfig; + + [Header("Предметы (опционально)")] + public RoomPropSet propSet; } } \ No newline at end of file diff --git a/Assets/_Project/Shaders/TextureTilingParallaxFloorNCeiling.shadergraph b/Assets/_Project/Shaders/TextureTilingParallaxFloorNCeiling.shadergraph index f8ec21b..691292c 100644 --- a/Assets/_Project/Shaders/TextureTilingParallaxFloorNCeiling.shadergraph +++ b/Assets/_Project/Shaders/TextureTilingParallaxFloorNCeiling.shadergraph @@ -33,14 +33,20 @@ { "m_Id": "8d53893a57574e3486f712b089005dbd" }, - { - "m_Id": "617c36bf7a3f4ff3bd2bf2923c615686" - }, { "m_Id": "6bb36f65dd5343019bc087d03145c945" }, { - "m_Id": "a51ac33f1cc6479a8407866c0e85f6f9" + "m_Id": "8c0a47bcbb0d4912958b2382d6d3bd63" + }, + { + "m_Id": "c393885a2b3643afad3a5a08348111d2" + }, + { + "m_Id": "7be02530bd2744a2928769c40b37cf14" + }, + { + "m_Id": "3dbe1f324aca43db87d8415af5bfc79e" } ], "m_Keywords": [], @@ -132,42 +138,46 @@ { "m_Id": "61e4344d9eb44a37a5bc8227fe63f815" }, - { - "m_Id": "013110f2302740579c50a5c8070b4791" - }, { "m_Id": "14c140b9f8304a0996dfe875cfeb7f17" }, - { - "m_Id": "791ac496a5f147bab897d9fa2ac242fb" - }, - { - "m_Id": "c3267ab9d9cd4236a435252e3c975d6e" - }, { "m_Id": "4f0e4fb3401748d182d4e4e46b7980fa" }, { "m_Id": "24603f5c8f934382be5acf5c3fdd2206" + }, + { + "m_Id": "ff4787611d7a4e858e43338c3a1542a9" + }, + { + "m_Id": "20fbd0e0e0294206a00c2d26324015b0" + }, + { + "m_Id": "37d1196098884123921b4dd18c78dbdb" + }, + { + "m_Id": "6606550feb5e47eeaea8f3a32f757793" + }, + { + "m_Id": "0965123ab4984505b7f845966179274b" + }, + { + "m_Id": "70c7b95bd4524b4c9bdd17cbca22ba27" + }, + { + "m_Id": "9204cbc68cb840b3bf7cf988454f6db2" + }, + { + "m_Id": "79d3672b32da45edbafe182c67f633c5" + }, + { + "m_Id": "d565f9223e4b4dafbc756fae345245af" } ], "m_GroupDatas": [], "m_StickyNoteDatas": [], "m_Edges": [ - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "013110f2302740579c50a5c8070b4791" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "61e4344d9eb44a37a5bc8227fe63f815" - }, - "m_SlotId": 2 - } - }, { "m_OutputSlot": { "m_Node": { @@ -199,17 +209,31 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "14c140b9f8304a0996dfe875cfeb7f17" + "m_Id": "0965123ab4984505b7f845966179274b" }, - "m_SlotId": 4 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "791ac496a5f147bab897d9fa2ac242fb" + "m_Id": "9204cbc68cb840b3bf7cf988454f6db2" }, "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "14c140b9f8304a0996dfe875cfeb7f17" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ff4787611d7a4e858e43338c3a1542a9" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -294,6 +318,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "20fbd0e0e0294206a00c2d26324015b0" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "61e4344d9eb44a37a5bc8227fe63f815" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -317,7 +355,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "8159adf6f42d4f9ebd78fc74f7776beb" + "m_Id": "79d3672b32da45edbafe182c67f633c5" }, "m_SlotId": 0 } @@ -336,6 +374,20 @@ "m_SlotId": 4 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "37d1196098884123921b4dd18c78dbdb" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ff4787611d7a4e858e43338c3a1542a9" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -378,6 +430,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6606550feb5e47eeaea8f3a32f757793" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8159adf6f42d4f9ebd78fc74f7776beb" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -392,6 +458,20 @@ "m_SlotId": 6 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "70c7b95bd4524b4c9bdd17cbca22ba27" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9204cbc68cb840b3bf7cf988454f6db2" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -423,13 +503,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "791ac496a5f147bab897d9fa2ac242fb" + "m_Id": "79d3672b32da45edbafe182c67f633c5" }, - "m_SlotId": 3 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "eb528493b4034e4c86bad16a980a5f71" + "m_Id": "6606550feb5e47eeaea8f3a32f757793" }, "m_SlotId": 0 } @@ -448,6 +528,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "9204cbc68cb840b3bf7cf988454f6db2" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6606550feb5e47eeaea8f3a32f757793" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -507,15 +601,15 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "c3267ab9d9cd4236a435252e3c975d6e" + "m_Id": "d565f9223e4b4dafbc756fae345245af" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "791ac496a5f147bab897d9fa2ac242fb" + "m_Id": "79d3672b32da45edbafe182c67f633c5" }, - "m_SlotId": 2 + "m_SlotId": 1 } }, { @@ -532,6 +626,20 @@ "m_SlotId": 10 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ff4787611d7a4e858e43338c3a1542a9" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "eb528493b4034e4c86bad16a980a5f71" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -549,8 +657,8 @@ ], "m_VertexContext": { "m_Position": { - "x": 1983.9998779296875, - "y": 121.0000228881836 + "x": 2919.000244140625, + "y": 705.9999389648438 }, "m_Blocks": [ { @@ -566,8 +674,8 @@ }, "m_FragmentContext": { "m_Position": { - "x": 1983.9998779296875, - "y": 321.0 + "x": 2919.000244140625, + "y": 996.9998168945313 }, "m_Blocks": [ { @@ -616,42 +724,6 @@ ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "013110f2302740579c50a5c8070b4791", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 1605.9998779296875, - "y": 1311.9998779296875, - "width": 141.0001220703125, - "height": 34.0001220703125 - } - }, - "m_Slots": [ - { - "m_Id": "c0bb20a3291f4f85a08692fb6777243e" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "617c36bf7a3f4ff3bd2bf2923c615686" - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", @@ -766,33 +838,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "03b675e1c5134ec2bfd6dd2da8e17d7e", - "m_Id": 2, - "m_DisplayName": "T", - "m_SlotType": 0, - "m_Hidden": false, - "m_HideConnector": false, - "m_ShaderOutputName": "T", - "m_StageCapability": 3, - "m_CustomBinding": "", - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_LiteralMode": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -857,6 +902,42 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "0965123ab4984505b7f845966179274b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1875.0, + "y": 936.0001220703125, + "width": 159.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "7f10a7ee544249ceb8ee4af5f631fbbb" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "7be02530bd2744a2928769c40b37cf14" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -932,6 +1013,56 @@ "m_SerializedDescriptor": "VertexDescription.Tangent" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "0e9857706de04d65a95cfd40d52ebacd", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 3.8299999237060547, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", @@ -944,10 +1075,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1271.0, - "y": 1697.0, + "x": 1432.000244140625, + "y": 1559.0001220703125, "width": 208.0, - "height": 433.0 + "height": 433.0001220703125 } }, "m_Slots": [ @@ -1192,6 +1323,42 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "20fbd0e0e0294206a00c2d26324015b0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1726.0001220703125, + "y": 2224.000244140625, + "width": 139.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "b5ba2e3c01b0423f98bc1b57849ada37" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "8c0a47bcbb0d4912958b2382d6d3bd63" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1261,10 +1428,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1041.0, - "y": 1134.0, - "width": 0.0, - "height": 0.0 + "x": 1098.0001220703125, + "y": 2207.000244140625, + "width": 99.9998779296875, + "height": 34.0 } }, "m_Slots": [ @@ -1297,9 +1464,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1654.0, - "y": 726.0, - "width": 208.0, + "x": 1224.0001220703125, + "y": 757.0001220703125, + "width": 208.0001220703125, "height": 278.0 } }, @@ -1543,6 +1710,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "37d1196098884123921b4dd18c78dbdb", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1697.000244140625, + "y": 1729.0001220703125, + "width": 151.0001220703125, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "3d22010cd52242f9acb3d0090609a9c6" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "c393885a2b3643afad3a5a08348111d2" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -1567,6 +1770,24 @@ "m_Channel": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "392e8a7b099f493baeee1c842b3acf8f", + "m_Id": 0, + "m_DisplayName": "MaxSmoothness", + "m_SlotType": 1, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1621,21 +1842,21 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "3f34b91c90a14eb29870155907a0e083", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "3d22010cd52242f9acb3d0090609a9c6", + "m_Id": 0, + "m_DisplayName": "EmissionColor", + "m_SlotType": 1, "m_Hidden": false, "m_HideConnector": false, - "m_ShaderOutputName": "B", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_CustomBinding": "", "m_Value": { - "x": 1.0, - "y": 1.0, - "z": 1.0, - "w": 1.0 + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 }, "m_DefaultValue": { "x": 0.0, @@ -1643,7 +1864,52 @@ "z": 0.0, "w": 0.0 }, - "m_LiteralMode": false + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "3dbe1f324aca43db87d8415af5bfc79e", + "m_Guid": { + "m_GuidSerialized": "3dacfc2f-541f-42c3-9241-1707b15a8e39" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "MaxSmoothness", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MaxSmoothness", + "m_DefaultReferenceName": "_MaxSmoothness", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "hideConnector": false, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 0.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] } { @@ -1856,10 +2122,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1005.4658203125, - "y": 1720.862060546875, - "width": 0.0, - "height": 0.0 + "x": 1166.0001220703125, + "y": 1583.0001220703125, + "width": 130.0001220703125, + "height": 34.0 } }, "m_Slots": [ @@ -1880,6 +2146,33 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "500c810ecc924107ba1e6bef6500d392", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "x": -1.0, + "y": -1.0, + "z": -1.0, + "w": -1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2063,48 +2356,121 @@ } { - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "617c36bf7a3f4ff3bd2bf2923c615686", - "m_Guid": { - "m_GuidSerialized": "3ccdb88c-1025-4379-a64c-aa1e3f8edc80" - }, - "promotedFromAssetID": "", - "promotedFromCategoryName": "", - "promotedOrdering": -1, - "m_Name": "AO_Strength", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "AO_Strength", - "m_DefaultReferenceName": "_AO_Strength", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "hideConnector": false, + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "602ebff44273486981537846a0f0d0bf", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, "m_Hidden": false, - "m_PerRendererData": false, - "m_customAttributes": [], - "m_Value": 0.0, - "m_FloatType": 0, - "m_LiteralFloatMode": false, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 + "m_HideConnector": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 }, - "m_SliderType": 0, - "m_SliderPower": 3.0, - "m_EnumType": 0, - "m_CSharpEnumString": "", - "m_EnumNames": [ - "Default" - ], - "m_EnumValues": [ - 0 - ] + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "6055dc6cf7bf44be861e2c52d22b096d", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "614b26f0a36e4cf2b4075c67f014422e", + "m_Id": 1, + "m_DisplayName": "X", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "X", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false } { @@ -2119,8 +2485,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1823.0, - "y": 1149.9998779296875, + "x": 1886.0003662109375, + "y": 2096.000244140625, "width": 207.9998779296875, "height": 326.0 } @@ -2153,6 +2519,29 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "628ef1cecad14ab5b2bb1002c23506e8", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -2177,6 +2566,48 @@ "m_Channel": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RemapNode", + "m_ObjectId": "6606550feb5e47eeaea8f3a32f757793", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Remap", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 2239.0, + "y": 757.0000610351563, + "width": 208.0, + "height": 325.99981689453125 + } + }, + "m_Slots": [ + { + "m_Id": "500c810ecc924107ba1e6bef6500d392" + }, + { + "m_Id": "f54f396495e14eeb95caf5161d998acc" + }, + { + "m_Id": "82d1a93faa3244879a278128a96bd448" + }, + { + "m_Id": "7dacf327af0f480d996ae12e86dc5288" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -2235,6 +2666,24 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "69ea78f95537444c8cacdc7c59218114", + "m_Id": 0, + "m_DisplayName": "SmoothnessMultiplier", + "m_SlotType": 1, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2390,20 +2839,38 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "72413bd87ac84bc88493400af4bf5afe", - "m_Id": 0, - "m_DisplayName": "EmissonMulti", - "m_SlotType": 1, - "m_Hidden": false, - "m_HideConnector": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_CustomBinding": "", - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [], - "m_LiteralMode": false + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "70c7b95bd4524b4c9bdd17cbca22ba27", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1872.0, + "y": 963.0, + "width": 162.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "392e8a7b099f493baeee1c842b3acf8f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "3dbe1f324aca43db87d8415af5bfc79e" + } } { @@ -2463,10 +2930,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1298.9998779296875, + "x": 955.0001831054688, "y": 740.0, - "width": 208.0, - "height": 433.0 + "width": 207.99993896484375, + "height": 433.0001220703125 } }, "m_Slots": [ @@ -2549,40 +3016,37 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.LerpNode", - "m_ObjectId": "791ac496a5f147bab897d9fa2ac242fb", + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "79d3672b32da45edbafe182c67f633c5", "m_Group": { "m_Id": "" }, - "m_Name": "Lerp", + "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1747.0, - "y": 1697.0, + "x": 1654.0, + "y": 757.0000610351563, "width": 208.0, - "height": 326.0 + "height": 302.00006103515625 } }, "m_Slots": [ { - "m_Id": "de9bda8badbb497ababc98a6e93e0a2a" + "m_Id": "602ebff44273486981537846a0f0d0bf" }, { - "m_Id": "3f34b91c90a14eb29870155907a0e083" + "m_Id": "0e9857706de04d65a95cfd40d52ebacd" }, { - "m_Id": "03b675e1c5134ec2bfd6dd2da8e17d7e" - }, - { - "m_Id": "8fcfe37480f84c42a474eca0297ec027" + "m_Id": "7a59508fbb304b1ca6faa6856cac8764" } ], "synonyms": [ - "mix", - "blend", - "linear interpolate" + "multiplication", + "times", + "x" ], "m_Precision": 0, "m_PreviewExpanded": true, @@ -2608,6 +3072,56 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "7a59508fbb304b1ca6faa6856cac8764", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -2628,6 +3142,96 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "7be02530bd2744a2928769c40b37cf14", + "m_Guid": { + "m_GuidSerialized": "01d7148d-7784-4457-997f-283dabdd88f7" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "MinSmoothness", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MinSmoothness", + "m_DefaultReferenceName": "_MinSmoothness", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "hideConnector": false, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 0.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "7dacf327af0f480d996ae12e86dc5288", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7f10a7ee544249ceb8ee4af5f631fbbb", + "m_Id": 0, + "m_DisplayName": "MinSmoothness", + "m_SlotType": 1, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -2768,6 +3372,29 @@ "m_SerializedDescriptor": "SurfaceDescription.Smoothness" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "82d1a93faa3244879a278128a96bd448", + "m_Id": 2, + "m_DisplayName": "Out Min Max", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "OutMinMax", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "x": 0.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 1.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2806,6 +3433,51 @@ "m_DefaultType": 1 } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "8c0a47bcbb0d4912958b2382d6d3bd63", + "m_Guid": { + "m_GuidSerialized": "fe6306e9-1cd1-41af-9cb4-a7d0d00a5043" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "AOMultiplier", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "AOMultiplier", + "m_DefaultReferenceName": "_AOMultiplier", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "hideConnector": false, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 0.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2824,6 +3496,56 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "8d3a2725f76849ba827fefd7481f277c", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -2896,33 +3618,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "8fcfe37480f84c42a474eca0297ec027", - "m_Id": 3, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_HideConnector": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_CustomBinding": "", - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_LiteralMode": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2956,6 +3651,54 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2Node", + "m_ObjectId": "9204cbc68cb840b3bf7cf988454f6db2", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Vector 2", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 2037.0001220703125, + "y": 896.0001220703125, + "width": 127.9998779296875, + "height": 100.9998779296875 + } + }, + "m_Slots": [ + { + "m_Id": "614b26f0a36e4cf2b4075c67f014422e" + }, + { + "m_Id": "bbeb875bf6f04ac3ac18c79b3788a94d" + }, + { + "m_Id": "628ef1cecad14ab5b2bb1002c23506e8" + } + ], + "synonyms": [ + "2", + "v2", + "vec2", + "float2" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": { + "x": 0.0, + "y": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3070,10 +3813,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 989.5230102539063, - "y": 849.5323486328125, - "width": 0.0, - "height": 0.0 + "x": 652.0, + "y": 757.0001220703125, + "width": 164.00006103515625, + "height": 34.0 } }, "m_Slots": [ @@ -3131,9 +3874,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1298.9998779296875, - "y": 1210.9998779296875, - "width": 208.0, + "x": 1362.0001220703125, + "y": 2157.000244140625, + "width": 208.0001220703125, "height": 433.0 } }, @@ -3296,51 +4039,6 @@ "m_DefaultType": 0 } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "a51ac33f1cc6479a8407866c0e85f6f9", - "m_Guid": { - "m_GuidSerialized": "da1f345d-dd78-4085-a98f-05a78b1833be" - }, - "promotedFromAssetID": "", - "promotedFromCategoryName": "", - "promotedOrdering": -1, - "m_Name": "EmissonMulti", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "EmissonMulti", - "m_DefaultReferenceName": "_EmissonMulti", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "hideConnector": false, - "m_Hidden": false, - "m_PerRendererData": false, - "m_customAttributes": [], - "m_Value": 0.0, - "m_FloatType": 0, - "m_LiteralFloatMode": false, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 - }, - "m_SliderType": 0, - "m_SliderPower": 3.0, - "m_EnumType": 0, - "m_CSharpEnumString": "", - "m_EnumNames": [ - "Default" - ], - "m_EnumValues": [ - 0 - ] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", @@ -3414,10 +4112,16 @@ "m_Id": "8d53893a57574e3486f712b089005dbd" }, { - "m_Id": "617c36bf7a3f4ff3bd2bf2923c615686" + "m_Id": "8c0a47bcbb0d4912958b2382d6d3bd63" }, { - "m_Id": "a51ac33f1cc6479a8407866c0e85f6f9" + "m_Id": "c393885a2b3643afad3a5a08348111d2" + }, + { + "m_Id": "7be02530bd2744a2928769c40b37cf14" + }, + { + "m_Id": "3dbe1f324aca43db87d8415af5bfc79e" } ] } @@ -3634,6 +4338,44 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b5ba2e3c01b0423f98bc1b57849ada37", + "m_Id": 0, + "m_DisplayName": "AOMultiplier", + "m_SlotType": 1, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "bbeb875bf6f04ac3ac18c79b3788a94d", + "m_Id": 2, + "m_DisplayName": "Y", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "Y", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "Y" + ], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -3747,56 +4489,88 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "c0bb20a3291f4f85a08692fb6777243e", - "m_Id": 0, - "m_DisplayName": "AO_Strength", - "m_SlotType": 1, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "c02c72449c1746bcafc6462584cdffaf", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, "m_Hidden": false, "m_HideConnector": false, - "m_ShaderOutputName": "Out", + "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_CustomBinding": "", - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [], - "m_LiteralMode": false + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } } { - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "c3267ab9d9cd4236a435252e3c975d6e", - "m_Group": { - "m_Id": "" + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "c393885a2b3643afad3a5a08348111d2", + "m_Guid": { + "m_GuidSerialized": "b5b09955-4ceb-46f2-a114-cfa3a41a0008" }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 1543.0, - "y": 2032.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "72413bd87ac84bc88493400af4bf5afe" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "EmissionColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "EmissionColor", + "m_DefaultReferenceName": "_EmissionColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "hideConnector": false, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 }, - "m_Property": { - "m_Id": "a51ac33f1cc6479a8407866c0e85f6f9" - } + "isMainColor": false, + "m_ColorMode": 1 } { @@ -4049,6 +4823,42 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "d565f9223e4b4dafbc756fae345245af", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1432.0, + "y": 879.0, + "width": 188.0, + "height": 34.00006103515625 + } + }, + "m_Slots": [ + { + "m_Id": "69ea78f95537444c8cacdc7c59218114" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "2d471f15db9044de923be3ace50d9563" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4117,33 +4927,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "de9bda8badbb497ababc98a6e93e0a2a", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_HideConnector": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_CustomBinding": "", - "m_Value": { - "x": 1.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_LiteralMode": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4416,6 +5199,29 @@ "m_SerializedDescriptor": "SurfaceDescription.Occlusion" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "f54f396495e14eeb95caf5161d998acc", + "m_Id": 1, + "m_DisplayName": "In Min Max", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "InMinMax", + "m_StageCapability": 3, + "m_CustomBinding": "", + "m_Value": { + "x": 0.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": -1.0, + "y": 1.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", @@ -4478,6 +5284,49 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "ff4787611d7a4e858e43338c3a1542a9", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1880.0001220703125, + "y": 1583.0001220703125, + "width": 208.0001220703125, + "height": 302.0001220703125 + } + }, + "m_Slots": [ + { + "m_Id": "6055dc6cf7bf44be861e2c52d22b096d" + }, + { + "m_Id": "c02c72449c1746bcafc6462584cdffaf" + }, + { + "m_Id": "8d3a2725f76849ba827fefd7481f277c" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode",