From 6b4834e98d55fe3423f5cb07447c7bf9eddac108 Mon Sep 17 00:00:00 2001 From: Nathan Rashleigh Date: Tue, 28 Oct 2025 21:50:54 +1100 Subject: [PATCH] rdy to build but vs sux --- Assets/Scenes/sr_pascal.unity | 76 +++++++++++++++++++++ Assets/Scenes/sr_pascal/paul-ricard.blend | 4 +- Assets/Scenes/sr_pascal/paul-ricard.blend1 | 4 +- Assets/Scenes/sr_sfz.unity | 22 +++--- Assets/Scenes/sr_sfz/LightingData.asset | Bin 23624 -> 23624 bytes Assets/Scenes/sr_sfz/ReflectionProbe-0.exr | 4 +- Assets/Scenes/sr_sfz/SpaSkyboxCube.mat | 0 Assets/Scenes/sr_sfz/sfz.mat | 44 ++++++++++++ Assets/Scenes/sr_sfz/sfz.mat.meta | 8 +++ ProjectSettings/ProjectSettings.asset | 3 +- 10 files changed, 147 insertions(+), 18 deletions(-) mode change 100644 => 100755 Assets/Scenes/sr_pascal.unity mode change 100644 => 100755 Assets/Scenes/sr_pascal/paul-ricard.blend mode change 100644 => 100755 Assets/Scenes/sr_pascal/paul-ricard.blend1 mode change 100644 => 100755 Assets/Scenes/sr_sfz/SpaSkyboxCube.mat create mode 100755 Assets/Scenes/sr_sfz/sfz.mat create mode 100755 Assets/Scenes/sr_sfz/sfz.mat.meta diff --git a/Assets/Scenes/sr_pascal.unity b/Assets/Scenes/sr_pascal.unity old mode 100644 new mode 100755 index f123356..d63144d --- a/Assets/Scenes/sr_pascal.unity +++ b/Assets/Scenes/sr_pascal.unity @@ -352,6 +352,10 @@ PrefabInstance: propertyPath: m_TagString value: TrackLimits objectReference: {fileID: 0} + - target: {fileID: -5568371526223589888, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -5485083322598717351, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} propertyPath: m_IsActive value: 0 @@ -396,10 +400,18 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: c3980cf3065e76ef8bb1c807b696fd68, type: 2} + - target: {fileID: -1116976929616911257, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 03e7d908ae22c1f4ca56323ae44af97a, type: 2} - target: {fileID: 919132149155446097, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} propertyPath: m_Name value: paul-ricard objectReference: {fileID: 0} + - target: {fileID: 1368983517304260266, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2306952061754472651, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -456,6 +468,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7202271454713460447, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7954373289912020213, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} propertyPath: m_Enabled value: 0 @@ -475,6 +491,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5175987247869535664, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} insertIndex: -1 addedObject: {fileID: 578121446} + - targetCorrespondingSourceObject: {fileID: -5568371526223589888, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1385210709} - targetCorrespondingSourceObject: {fileID: -5844372059692666277, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} insertIndex: -1 addedObject: {fileID: 578121452} @@ -496,6 +515,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -2257578806414144183, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} insertIndex: -1 addedObject: {fileID: 997526826} + - targetCorrespondingSourceObject: {fileID: -8133817665253494782, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} + insertIndex: -1 + addedObject: {fileID: 707686095} - targetCorrespondingSourceObject: {fileID: 1368983517304260266, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} insertIndex: -1 addedObject: {fileID: 1483192638} @@ -768,6 +790,33 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!1 &707686091 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8133817665253494782, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} + m_PrefabInstance: {fileID: 578121444} + m_PrefabAsset: {fileID: 0} +--- !u!64 &707686095 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707686091} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -6462759412183437804, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} --- !u!1001 &766862834 PrefabInstance: m_ObjectHideFlags: 0 @@ -1093,6 +1142,33 @@ Transform: - {fileID: 1531864509} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1385210705 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} + m_PrefabInstance: {fileID: 578121444} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1385210709 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1385210705} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2534964839176971238, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} --- !u!1 &1483192634 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1368983517304260266, guid: 9e02259251e81fb4495d78d7408fe8bb, type: 3} diff --git a/Assets/Scenes/sr_pascal/paul-ricard.blend b/Assets/Scenes/sr_pascal/paul-ricard.blend old mode 100644 new mode 100755 index 3258754..81870e3 --- a/Assets/Scenes/sr_pascal/paul-ricard.blend +++ b/Assets/Scenes/sr_pascal/paul-ricard.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9938ce2e55d257d07e1b7226144e7a29f96d4573ed7494057252d25aeff2d83 -size 7740372 +oid sha256:5aa84bc5fab431c488855d65e930a31535be87d31f0c0cc685f9538d295464a5 +size 13542920 diff --git a/Assets/Scenes/sr_pascal/paul-ricard.blend1 b/Assets/Scenes/sr_pascal/paul-ricard.blend1 old mode 100644 new mode 100755 index a817262..da31a4c --- a/Assets/Scenes/sr_pascal/paul-ricard.blend1 +++ b/Assets/Scenes/sr_pascal/paul-ricard.blend1 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b7b4b48b04c36d4c5565603387cecab13a26831403331a5c871d7e80f91363f -size 7736564 +oid sha256:79ec8b8ba7f66085bceae9be0155702f4688e034f5dfb145867f2e782d907eff +size 13542360 diff --git a/Assets/Scenes/sr_sfz.unity b/Assets/Scenes/sr_sfz.unity index ed9ca1d..bd6f6d5 100755 --- a/Assets/Scenes/sr_sfz.unity +++ b/Assets/Scenes/sr_sfz.unity @@ -24,9 +24,9 @@ RenderSettings: 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_AmbientMode: 0 + m_AmbientMode: 3 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: 53f61f84ef5541141a5f1a32c65c1e39, type: 2} + m_SkyboxMaterial: {fileID: 2100000, guid: 2910c04ca7c5bcc53a03f41f2ce1c9d7, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -35,10 +35,10 @@ RenderSettings: m_DefaultReflectionMode: 0 m_DefaultReflectionResolution: 128 m_ReflectionBounces: 2 - m_ReflectionIntensity: 0.258 + m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.007496972, g: 0.025948292, b: 0.021539414, a: 0.258} + m_IndirectSpecularColor: {r: 0.13712281, g: 0.16803813, b: 0.13085577, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -206,31 +206,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalRotation.w - value: 0.25549674 + value: 0.25516886 objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0.012942131 objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalRotation.y - value: 0.9668099 + value: 0.9655687 objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0.048973575 objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -5.047 objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 150.394 + value: 150.267 objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 2.876 objectReference: {fileID: 0} - target: {fileID: 4388149188352537970, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_ClearFlags diff --git a/Assets/Scenes/sr_sfz/LightingData.asset b/Assets/Scenes/sr_sfz/LightingData.asset index 9dc7ce08adf40a1a8af583a6f9ea608b49053247..76c55c79f61c086389b0c088c2380495401d47ad 100755 GIT binary patch delta 161 zcmX@HgYm=;#tjEt>$^)kZI0~Gv<^7-*HZLPn^ny3RhDVnC+uo?_SwQ?$6-sOJ-77T*yR}-5gYcpkrjkUx2K8qvg zORY>o7g?^E_HLJhTbPC3f~l4%`AIt&&;TO?!(@B6Vm@hGGfOvHfsHn{3=9qSn-92k Ghynoi%0Tr1 delta 161 zcmX@HgYm=;#tjEt>y1){t%D6V?POs1vEiHcuAL{D*6n0yC^Ski+pvwHVVU7P^{nj; zBLA(owf65~VA!>3(u*m(9wv70Vt9~h{9r=xb_Rx91}n8ZcDV1oY`wNN2dL)2`ieuP zyP_|p>|#ieG+tnoxSip_7NZGMn07Fr0Y(Of$@Xr=d<+c#fxwa}?Cj68tgf36xOIpE E0Kor3$p8QV diff --git a/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr index 4bafa30..da40e28 100755 --- a/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr +++ b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86375b86b2c747d3dde1fc1965f79f73de576413fc3ee67e81839c9e9f6077e8 -size 306520 +oid sha256:c509cbfa07a84ddbd305cabb24fb20335793087d8d5bf6ef0415eb18d1177e03 +size 208224 diff --git a/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat b/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat old mode 100644 new mode 100755 diff --git a/Assets/Scenes/sr_sfz/sfz.mat b/Assets/Scenes/sr_sfz/sfz.mat new file mode 100755 index 0000000..88d4487 --- /dev/null +++ b/Assets/Scenes/sr_sfz/sfz.mat @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: sfz + m_Shader: {fileID: 4800000, guid: b69140c2d2b33f242a02a99441d6f952, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DistCenterPower: 0.1 + - _GlowDistance: 0.536 + - _MAX_ITER: 1.24 + - _NumLayers: 4 + - _Scale: 2 + - _Speed: 0.01 + - _StarCrossLines: 1000 + - _StarISize: 0.0179 + - _StarScale: 11.2 + - _TILING_FACTOR: 1.65 + - _TimeScale: 0.001 + m_Colors: + - _BackgroundColor: {r: 0.05, g: 0.05, b: 0.1, a: 1} + - _Color: {r: 0.13333334, g: 0.21568629, b: 0.16470589, a: 1} + - _NebulaColor: {r: 0, g: 0.35, b: 0.5, a: 1} + - _StarColor: {r: 1, g: 0.92375815, b: 0.7216981, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Scenes/sr_sfz/sfz.mat.meta b/Assets/Scenes/sr_sfz/sfz.mat.meta new file mode 100755 index 0000000..3f47647 --- /dev/null +++ b/Assets/Scenes/sr_sfz/sfz.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b131874702b559409f272a582d81b8a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 505bd1b..7f92654 100755 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -138,7 +138,8 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 1.2 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1