From 5f56cd87b10172fb1a8f98dea876ed0786ba3bc4 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 11 Sep 2023 13:31:03 +1000 Subject: [PATCH] lighting fixes --- Assets/Scenes/sr_sfz/sr_sfz.meta | 8 + Assets/Scenes/sr_sfz/sr_sfz.unity | 6 +- .../sr_sfz/{ => sr_sfz}/LightingData.asset | Bin 18192 -> 18192 bytes .../{ => sr_sfz}/LightingData.asset.meta | 2 +- .../sr_sfz/sr_sfz/ReflectionProbe-0.exr | 3 + .../sr_sfz/sr_sfz/ReflectionProbe-0.exr.meta | 140 ++++++++++++++++++ .../sr_sfz/sr_star_fraenkel_zermelo.Lighting | 6 +- .../sr_silverstorage.lighting | 8 +- .../sr_silverstorage/sr_silverstorage.meta | 8 + .../sr_silverstorage/sr_silverstorage.unity | 18 ++- .../sr_silverstorage/LightingData.asset | Bin 0 -> 18192 bytes .../sr_silverstorage/LightingData.asset.meta | 8 + .../sr_silverstorage/ReflectionProbe-0.exr | 3 + .../ReflectionProbe-0.exr.meta | 140 ++++++++++++++++++ ProjectSettings/ProjectSettings.asset | 3 +- 15 files changed, 338 insertions(+), 15 deletions(-) create mode 100644 Assets/Scenes/sr_sfz/sr_sfz.meta rename Assets/Scenes/sr_sfz/{ => sr_sfz}/LightingData.asset (98%) rename Assets/Scenes/sr_sfz/{ => sr_sfz}/LightingData.asset.meta (79%) create mode 100644 Assets/Scenes/sr_sfz/sr_sfz/ReflectionProbe-0.exr create mode 100644 Assets/Scenes/sr_sfz/sr_sfz/ReflectionProbe-0.exr.meta create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage.meta create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta diff --git a/Assets/Scenes/sr_sfz/sr_sfz.meta b/Assets/Scenes/sr_sfz/sr_sfz.meta new file mode 100644 index 0000000..055935f --- /dev/null +++ b/Assets/Scenes/sr_sfz/sr_sfz.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b65c96c56dda8ff9ebdef4f4931ebcfa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/sr_sfz.unity b/Assets/Scenes/sr_sfz/sr_sfz.unity index df201d2..5d86aa7 100644 --- a/Assets/Scenes/sr_sfz/sr_sfz.unity +++ b/Assets/Scenes/sr_sfz/sr_sfz.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.1332247, g: 0.16372603, b: 0.12614998, a: 1} + m_IndirectSpecularColor: {r: 0.20813203, g: 0.2539528, b: 0.19699469, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,8 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 0a517604f1ef27f92b90ad34f06964e9, type: 2} - m_LightingSettings: {fileID: 4890085278179872738, guid: a3b15a07c33f4f1f4905e3aab7e9babb, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 8f20906da7960a4c79018349bf4d8661, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: b02c454e6d6aae0f3957d7ae3a762566, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 diff --git a/Assets/Scenes/sr_sfz/LightingData.asset b/Assets/Scenes/sr_sfz/sr_sfz/LightingData.asset similarity index 98% rename from Assets/Scenes/sr_sfz/LightingData.asset rename to Assets/Scenes/sr_sfz/sr_sfz/LightingData.asset index 1770aa078abe5da77205d2672e78ee26d15a1d79..f62db6625e7654f28c028a5df4b9e90fbb830a72 100644 GIT binary patch delta 176 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 J7^IXj{|$U$1ML6+ literal 0 HcmV?d00001 diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta b/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta new file mode 100644 index 0000000..0546dee --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e8e8369f0899dc7caf8ca9ba57b2d69 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr new file mode 100644 index 0000000..7d05f7a --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6234b1ac26963f2924cc8356aa6259d1e4f574d4a4f4883a2401bb88ff4b637c +size 215937 diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..f4d73cc --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 79b9b74182e675ec39c509ecdad52380 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ba623f8..9bee32d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,8 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1