From 741edc72a72b3c63e981fe96b04206215c9c3651 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Thu, 22 Feb 2024 00:21:32 +0100 Subject: [PATCH] feat: multiple ripples for nimble zone shader, boundary post processing glow --- .../BloomTest.mat} | 126 ++--- .../BloomTest.mat.meta} | 5 +- Assets/Materials/GlossyPBRRipples Variant.mat | 31 ++ .../GlossyPBRRipples Variant.mat.meta} | 5 +- Assets/Materials/GlossyPBRRipples.mat | 38 +- Assets/Materials/GlowingWireFrame Variant.mat | 48 ++ .../GlowingWireFrame Variant.mat.meta} | 4 +- Assets/Materials/GlowingWireFrame.shadergraph | 126 +---- .../ShipColors.meta} | 2 +- .../Materials/ShipColors/Spaceship9Blue.mat | 138 +++++ .../ShipColors/Spaceship9Blue.mat.meta | 8 + Assets/Materials/ShipColors/Spaceship9Red.mat | 138 +++++ .../ShipColors/Spaceship9Red.mat.meta | 8 + Assets/Models/HexSphere Variant.mat | 59 +++ Assets/Models/HexSphere Variant.mat.meta | 8 + .../High-Poly-Sphere-JellyShader.obj} | 0 .../High-Poly-Sphere-JellyShader.obj.meta} | 0 .../Models.meta => Models/Legacy.meta} | 5 +- Assets/Models/{ => Legacy}/bluePlayer.fbx | Bin .../Models/{ => Legacy}/bluePlayer.fbx.meta | 0 Assets/Models/{ => Legacy}/grayPlayer.fbx | Bin .../Models/{ => Legacy}/grayPlayer.fbx.meta | 0 .../texture_0_6195987693227547908.png | Bin .../texture_0_6195987693227547908.png.meta | 0 .../texture_1_17319628118832143767.png | Bin .../texture_1_17319628118832143767.png.meta | 0 .../texture_1_17650290037541193437.png | Bin .../texture_1_17650290037541193437.png.meta | 0 .../texture_1_3010182785424325454.png | Bin .../texture_1_3010182785424325454.png.meta | 0 .../texture_4_11563080508590297124.png | Bin .../texture_4_11563080508590297124.png.meta | 0 .../texture_7_5628616909738884392.png | Bin .../texture_7_5628616909738884392.png.meta | 0 .../Example.meta => Models/SpaceShips.meta} | 5 +- Assets/Models/SpaceShips/Spaceship9.fbx | Bin 0 -> 64076 bytes Assets/Models/SpaceShips/Spaceship9.fbx.meta | 109 ++++ .../SpaceShips/Spaceship9BlueHullTexture.png | Bin 0 -> 15954 bytes .../Spaceship9BlueHullTexture.png.meta | 140 +++++ .../SpaceShips/Spaceship9RedHullTexture.png | Bin 0 -> 15953 bytes .../Spaceship9RedHullTexture.png.meta | 140 +++++ .../SpaceShips/Spaceship9TailTexture.png | Bin 0 -> 20280 bytes .../SpaceShips/Spaceship9TailTexture.png.meta | 140 +++++ Assets/Prefabs/Chars.meta | 8 + Assets/Prefabs/{ => Chars}/Player Blue.prefab | 54 +- .../{ => Chars}/Player Blue.prefab.meta | 0 Assets/Prefabs/{ => Chars}/Player Red.prefab | 66 ++- .../{ => Chars}/Player Red.prefab.meta | 0 Assets/Prefabs/Legacy.meta | 8 + Assets/Prefabs/{ => Legacy}/Blue Model.prefab | 0 .../{ => Legacy}/Blue Model.prefab.meta | 0 Assets/Prefabs/{ => Legacy}/Gray Model.prefab | 0 .../{ => Legacy}/Gray Model.prefab.meta | 0 Assets/Prefabs/NimbleZoneHexSphere.prefab | 117 ++++ ...b.meta => NimbleZoneHexSphere.prefab.meta} | 2 +- .../Prefabs/NimbleZoneSphere Variant.prefab | 115 ---- Assets/Prefabs/NimbleZoneSphere.prefab | 117 ++++ Assets/Prefabs/NimbleZoneSphere.prefab.meta | 7 + Assets/{Models => }/RenderingPipeline.meta | 0 .../{Models => }/RenderingPipeline/URP.asset | 6 +- .../RenderingPipeline/URP.asset.meta | 0 .../RenderingPipeline/URP_Renderer.asset | 0 .../RenderingPipeline/URP_Renderer.asset.meta | 0 ...niversalRenderPipelineGlobalSettings.asset | 0 ...salRenderPipelineGlobalSettings.asset.meta | 0 .../JellyShader/Example/Models/Materials.meta | 9 - .../Samples/JellyShader/Example/Scenes.meta | 9 - .../Example/Scenes/ExampleScene.unity | 501 ------------------ .../Example/Scenes/ExampleScene.unity.meta | 8 - .../Scenes/ExampleSceneSettings.lighting | 66 --- Assets/Samples/JellyShader/Scripts.meta | 9 - .../JellyShader/Scripts/JellyClickReceiver.cs | 37 -- .../Scripts/JellyClickReceiver.cs.meta | 12 - Assets/Samples/JellyShader/Shaders.meta | 9 - .../JellyShader/Shaders/JellyMaterial.mat | 45 -- .../JellyShader/Shaders/JellyShader.shader | 114 ---- .../Shaders/JellyShader.shader.meta | 9 - Assets/Scenes/BattleField.meta | 8 + Assets/Scenes/BattleField.unity | 205 ++++--- .../PostProcessingVolume Profile.asset | 63 +++ .../PostProcessingVolume Profile.asset.meta | 8 + Assets/Scripts/NimbleZoneDetection.cs | 122 ++++- Assets/Scripts/PlayerController.cs | 1 - Assets/Shaders/PBRLitRipples.shader | 98 ++-- ProjectSettings/ProjectSettings.asset | 4 +- ProjectSettings/QualitySettings.asset | 2 +- 86 files changed, 1728 insertions(+), 1394 deletions(-) rename Assets/{Samples/JellyShader/Example/Models/Materials/defaultMat.mat => Materials/BloomTest.mat} (52%) rename Assets/{Samples/JellyShader/Example/Models/Materials/defaultMat.mat.meta => Materials/BloomTest.mat.meta} (60%) create mode 100644 Assets/Materials/GlossyPBRRipples Variant.mat rename Assets/{Samples/JellyShader/Shaders/JellyMaterial.mat.meta => Materials/GlossyPBRRipples Variant.mat.meta} (60%) create mode 100644 Assets/Materials/GlowingWireFrame Variant.mat rename Assets/{Samples/JellyShader/Example/Scenes/ExampleSceneSettings.lighting.meta => Materials/GlowingWireFrame Variant.mat.meta} (60%) rename Assets/{Samples/JellyShader.meta => Materials/ShipColors.meta} (77%) create mode 100644 Assets/Materials/ShipColors/Spaceship9Blue.mat create mode 100644 Assets/Materials/ShipColors/Spaceship9Blue.mat.meta create mode 100644 Assets/Materials/ShipColors/Spaceship9Red.mat create mode 100644 Assets/Materials/ShipColors/Spaceship9Red.mat.meta create mode 100644 Assets/Models/HexSphere Variant.mat create mode 100644 Assets/Models/HexSphere Variant.mat.meta rename Assets/{Samples/JellyShader/Example/Models/High-Poly-Sphere.obj => Models/High-Poly-Sphere-JellyShader.obj} (100%) rename Assets/{Samples/JellyShader/Example/Models/High-Poly-Sphere.obj.meta => Models/High-Poly-Sphere-JellyShader.obj.meta} (100%) rename Assets/{Samples/JellyShader/Example/Models.meta => Models/Legacy.meta} (57%) rename Assets/Models/{ => Legacy}/bluePlayer.fbx (100%) rename Assets/Models/{ => Legacy}/bluePlayer.fbx.meta (100%) rename Assets/Models/{ => Legacy}/grayPlayer.fbx (100%) rename Assets/Models/{ => Legacy}/grayPlayer.fbx.meta (100%) rename Assets/Models/{ => Legacy}/texture_0_6195987693227547908.png (100%) rename Assets/Models/{ => Legacy}/texture_0_6195987693227547908.png.meta (100%) rename Assets/Models/{ => Legacy}/texture_1_17319628118832143767.png (100%) rename Assets/Models/{ => Legacy}/texture_1_17319628118832143767.png.meta (100%) rename Assets/Models/{ => Legacy}/texture_1_17650290037541193437.png (100%) rename Assets/Models/{ => Legacy}/texture_1_17650290037541193437.png.meta (100%) rename Assets/Models/{ => Legacy}/texture_1_3010182785424325454.png (100%) rename Assets/Models/{ => Legacy}/texture_1_3010182785424325454.png.meta (100%) rename Assets/Models/{ => Legacy}/texture_4_11563080508590297124.png (100%) rename Assets/Models/{ => Legacy}/texture_4_11563080508590297124.png.meta (100%) rename Assets/Models/{ => Legacy}/texture_7_5628616909738884392.png (100%) rename Assets/Models/{ => Legacy}/texture_7_5628616909738884392.png.meta (100%) rename Assets/{Samples/JellyShader/Example.meta => Models/SpaceShips.meta} (57%) create mode 100644 Assets/Models/SpaceShips/Spaceship9.fbx create mode 100644 Assets/Models/SpaceShips/Spaceship9.fbx.meta create mode 100644 Assets/Models/SpaceShips/Spaceship9BlueHullTexture.png create mode 100644 Assets/Models/SpaceShips/Spaceship9BlueHullTexture.png.meta create mode 100644 Assets/Models/SpaceShips/Spaceship9RedHullTexture.png create mode 100644 Assets/Models/SpaceShips/Spaceship9RedHullTexture.png.meta create mode 100644 Assets/Models/SpaceShips/Spaceship9TailTexture.png create mode 100644 Assets/Models/SpaceShips/Spaceship9TailTexture.png.meta create mode 100644 Assets/Prefabs/Chars.meta rename Assets/Prefabs/{ => Chars}/Player Blue.prefab (93%) rename Assets/Prefabs/{ => Chars}/Player Blue.prefab.meta (100%) rename Assets/Prefabs/{ => Chars}/Player Red.prefab (92%) rename Assets/Prefabs/{ => Chars}/Player Red.prefab.meta (100%) create mode 100644 Assets/Prefabs/Legacy.meta rename Assets/Prefabs/{ => Legacy}/Blue Model.prefab (100%) rename Assets/Prefabs/{ => Legacy}/Blue Model.prefab.meta (100%) rename Assets/Prefabs/{ => Legacy}/Gray Model.prefab (100%) rename Assets/Prefabs/{ => Legacy}/Gray Model.prefab.meta (100%) create mode 100644 Assets/Prefabs/NimbleZoneHexSphere.prefab rename Assets/Prefabs/{NimbleZoneSphere Variant.prefab.meta => NimbleZoneHexSphere.prefab.meta} (74%) delete mode 100644 Assets/Prefabs/NimbleZoneSphere Variant.prefab create mode 100644 Assets/Prefabs/NimbleZoneSphere.prefab create mode 100644 Assets/Prefabs/NimbleZoneSphere.prefab.meta rename Assets/{Models => }/RenderingPipeline.meta (100%) rename Assets/{Models => }/RenderingPipeline/URP.asset (97%) rename Assets/{Models => }/RenderingPipeline/URP.asset.meta (100%) rename Assets/{Models => }/RenderingPipeline/URP_Renderer.asset (100%) rename Assets/{Models => }/RenderingPipeline/URP_Renderer.asset.meta (100%) rename Assets/{Models => }/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset (100%) rename Assets/{Models => }/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset.meta (100%) delete mode 100644 Assets/Samples/JellyShader/Example/Models/Materials.meta delete mode 100644 Assets/Samples/JellyShader/Example/Scenes.meta delete mode 100644 Assets/Samples/JellyShader/Example/Scenes/ExampleScene.unity delete mode 100644 Assets/Samples/JellyShader/Example/Scenes/ExampleScene.unity.meta delete mode 100644 Assets/Samples/JellyShader/Example/Scenes/ExampleSceneSettings.lighting delete mode 100644 Assets/Samples/JellyShader/Scripts.meta delete mode 100644 Assets/Samples/JellyShader/Scripts/JellyClickReceiver.cs delete mode 100644 Assets/Samples/JellyShader/Scripts/JellyClickReceiver.cs.meta delete mode 100644 Assets/Samples/JellyShader/Shaders.meta delete mode 100644 Assets/Samples/JellyShader/Shaders/JellyMaterial.mat delete mode 100644 Assets/Samples/JellyShader/Shaders/JellyShader.shader delete mode 100644 Assets/Samples/JellyShader/Shaders/JellyShader.shader.meta create mode 100644 Assets/Scenes/BattleField.meta create mode 100644 Assets/Scenes/BattleField/PostProcessingVolume Profile.asset create mode 100644 Assets/Scenes/BattleField/PostProcessingVolume Profile.asset.meta diff --git a/Assets/Samples/JellyShader/Example/Models/Materials/defaultMat.mat b/Assets/Materials/BloomTest.mat similarity index 52% rename from Assets/Samples/JellyShader/Example/Models/Materials/defaultMat.mat rename to Assets/Materials/BloomTest.mat index d9aec37..fde78a1 100644 --- a/Assets/Samples/JellyShader/Example/Models/Materials/defaultMat.mat +++ b/Assets/Materials/BloomTest.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2791394294732022838 +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: + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -7,27 +20,22 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: defaultMat - m_Shader: {fileID: 4800000, guid: 8a7f26cb4a0b4d446b2ca031d3ff37df, type: 3} + m_Name: BloomTest + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - - _ENVIRONMENTREFLECTIONS_OFF + - _EMISSION - _RECEIVE_SHADOWS_OFF - - _SPECULARHIGHLIGHTS_OFF - - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: - - _CLEARCOAT - - _SURFACE_ON - m_LightmapFlags: 4 + - _SPECULAR_COLOR + m_InvalidKeywords: [] + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -40,10 +48,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _ClearCoatMap: - 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} @@ -68,10 +72,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _MetallicSpecGlossMap: - 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} @@ -99,80 +99,42 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _AlphaTestToggle: 0 - _AlphaToMask: 0 - - _Amplitude: 5 - _Blend: 0 - _BlendModePreserveSpecular: 1 - - _BlendOp: 0 - - _BumpScale: 46.8 - - _ClearCoat: 0 - - _ClearCoatMask: 0.51 - - _ClearCoatSmoothness: 0.08 - - _ControlTime: 1.99 - - _Cull: 0 - - _Cutoff: 0.234 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 - - _Emission: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - - _EnvironmentalReflections: 1 - - _Frequency: 300 - - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _GlossMapScale: 0 + - _Glossiness: 0 - _GlossinessSource: 0 - - _GlossyReflections: 1 - - _ImpactSpeed: 0.5 - - _MaxWaveDistortion: 2 - - _Metallic: 0.649 - - _MetallicSpecGlossMapToggle: 0 - - _MetallicSpecToggle: 0 - - _Mode: 0 - - _NormalMapToggle: 0 - - _OcclusionStrength: 0 - - _OcclusionToggle: 0 - - _Parallax: 0.02 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 0 - _Shininess: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessSource: 0 - _SmoothnessTextureChannel: 0 - _SpecSource: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 - - _UVSec: 0 - - _WaveFalloff: 1.61 - - _WaveSpeed: -2.21 + - _Surface: 0 - _WorkflowMode: 1 - - _ZWrite: 0 - - _base_alpha: 0.5 - - _impact_amplitude: 6 - - _impact_anim: 0 - - _impact_blend: 0 - - _impact_density: 5 - - _impact_frequency: 5 - - _impact_radius: 1.1 - - _shield_color_brightness: 10 - - _shield_intensity: 2 - - _shield_pulse_amplitude: 1 - - _shield_pulse_blend: 1 - - _shield_pulse_density: 1 - - _shield_pulse_frequency: 1 - - _shield_pulse_radius: 1 - - _shield_size: 0 + - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 0.7481065, b: 0.33490568, a: 0.36862746} - - _Color: {r: 1, g: 1, b: 1, a: 0.23529412} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - - _ImpactOrigin: {r: 25, g: 25, b: 0, a: 0} - - _ModelOrigin: {r: 0, g: 0, b: 0, a: 0} - - _SpecColor: {r: 1, g: 1, b: 1, a: 0.6156863} - - _impact_origin: {r: 1, g: 0, b: 0, a: 1} - - _rotation: {r: 0.1, g: 0, b: 0, a: 1} - - _shield_color: {r: 0, g: 0, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 5.3403134, g: 0.24957718, b: 0, a: 1} + - _SpecColor: {r: 0.19999993, g: 0.19999993, b: 0.19999993, a: 0.5} m_BuildTextureStacks: [] diff --git a/Assets/Samples/JellyShader/Example/Models/Materials/defaultMat.mat.meta b/Assets/Materials/BloomTest.mat.meta similarity index 60% rename from Assets/Samples/JellyShader/Example/Models/Materials/defaultMat.mat.meta rename to Assets/Materials/BloomTest.mat.meta index 7373b60..30865a4 100644 --- a/Assets/Samples/JellyShader/Example/Models/Materials/defaultMat.mat.meta +++ b/Assets/Materials/BloomTest.mat.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 0b425997046656b499075b77834259af -timeCreated: 1493663071 -licenseType: Store +guid: ede4fd81521fbf14290f76017e016f6d NativeFormatImporter: + externalObjects: {} mainObjectFileID: 2100000 userData: assetBundleName: diff --git a/Assets/Materials/GlossyPBRRipples Variant.mat b/Assets/Materials/GlossyPBRRipples Variant.mat new file mode 100644 index 0000000..307edfb --- /dev/null +++ b/Assets/Materials/GlossyPBRRipples Variant.mat @@ -0,0 +1,31 @@ +%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: GlossyPBRRipples Variant + m_Shader: {fileID: 4800000, guid: 8a7f26cb4a0b4d446b2ca031d3ff37df, type: 3} + m_Parent: {fileID: 2100000, guid: 78cb0d90576fe15439f3fd294d5eaaba, type: 2} + m_ModifiedSerializedProperties: 8 + m_ValidKeywords: + - _SPECULARHIGHLIGHTS_OFF + 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: + - _Smoothness: 0.898 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Samples/JellyShader/Shaders/JellyMaterial.mat.meta b/Assets/Materials/GlossyPBRRipples Variant.mat.meta similarity index 60% rename from Assets/Samples/JellyShader/Shaders/JellyMaterial.mat.meta rename to Assets/Materials/GlossyPBRRipples Variant.mat.meta index 56a48ac..003315b 100644 --- a/Assets/Samples/JellyShader/Shaders/JellyMaterial.mat.meta +++ b/Assets/Materials/GlossyPBRRipples Variant.mat.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 5e20463e1312b8f43b99301c132f0122 -timeCreated: 1493664981 -licenseType: Store +guid: 1338539d65504394f8f2dd0a628dc423 NativeFormatImporter: + externalObjects: {} mainObjectFileID: 2100000 userData: assetBundleName: diff --git a/Assets/Materials/GlossyPBRRipples.mat b/Assets/Materials/GlossyPBRRipples.mat index 566baa3..6c8b1d3 100644 --- a/Assets/Materials/GlossyPBRRipples.mat +++ b/Assets/Materials/GlossyPBRRipples.mat @@ -24,7 +24,8 @@ Material: m_Shader: {fileID: 4800000, guid: 8a7f26cb4a0b4d446b2ca031d3ff37df, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -101,13 +102,16 @@ Material: - _AlphaClip: 0 - _AlphaTestToggle: 0 - _AlphaToMask: 0 + - _Amplitude: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 + - _BumpScale: 2.7 + - _ClearCoat: 0 + - _ClearCoatMask: 1 + - _ClearCoatSmoothness: 1 + - _ControlTime: 0.06 - _Cull: 2 - - _Cutoff: 0.5 + - _Cutoff: 0.43 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -115,10 +119,13 @@ Material: - _Emission: 0 - _EnvironmentReflections: 1 - _EnvironmentalReflections: 0 + - _Frequency: 155 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _Metallic: 0.681 + - _ImpactSpeed: 4.22 + - _MaxWaveDistortion: 1.13 + - _Metallic: 0.951 - _MetallicSpecGlossMapToggle: 0 - _MetallicSpecToggle: 0 - _NormalMapToggle: 0 @@ -127,13 +134,21 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.91 + - _Smoothness: 0.979 - _SmoothnessSource: 0 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _WaveAmplitude: 0.08 + - _WaveBlend: 1.1 + - _WaveDensity: 20 + - _WaveFalloff: 1 + - _WaveFrequency: 50 + - _WaveProgress: 0.888 + - _WaveRadius: 2 + - _WaveSpeed: 1.6 - _WorkflowMode: 1 - _ZWrite: 1 - _base_alpha: 0.5 @@ -152,10 +167,13 @@ Material: - _shield_pulse_radius: 1 - _shield_size: 0 m_Colors: - - _BaseColor: {r: 1, g: 0.75, b: 0.75, a: 1} + - _BaseColor: {r: 0, g: 1, b: 0.029850721, a: 0.45490196} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.0051758625, g: 0.046813726, b: 0, a: 1} + - _ImpactOrigin: {r: 1, g: 0, b: 0, a: 0} + - _ModelOrigin: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1} + - _WaveOrigin: {r: 1, g: 0, b: 0, a: 0} - _impact_origin: {r: 1, g: 0, b: 0, a: 1} - _rotation: {r: 0.1, g: 0, b: 0, a: 1} - _shield_color: {r: 0, g: 0, b: 1, a: 1} diff --git a/Assets/Materials/GlowingWireFrame Variant.mat b/Assets/Materials/GlowingWireFrame Variant.mat new file mode 100644 index 0000000..834df8c --- /dev/null +++ b/Assets/Materials/GlowingWireFrame Variant.mat @@ -0,0 +1,48 @@ +%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: GlowingWireFrame Variant + m_Shader: {fileID: -6465566751694194690, guid: 7bbccc5c40aae3e478e0205f25cd16ef, type: 3} + m_Parent: {fileID: -876546973899608171, guid: 7bbccc5c40aae3e478e0205f25cd16ef, type: 3} + m_ModifiedSerializedProperties: 8 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _Antialiasing: 9.12 + - _QueueControl: 0 + - _Wireframe_Thickness: 0.38 + - _Wireframe_Threshold: 1 + m_Colors: + - _BaseColor: {r: 1, g: 0, b: 0, a: 0} + - _MeshColor: {r: 1, g: 1, b: 1, a: 0} + m_BuildTextureStacks: [] +--- !u!114 &3196445936170896987 +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: + version: 7 diff --git a/Assets/Samples/JellyShader/Example/Scenes/ExampleSceneSettings.lighting.meta b/Assets/Materials/GlowingWireFrame Variant.mat.meta similarity index 60% rename from Assets/Samples/JellyShader/Example/Scenes/ExampleSceneSettings.lighting.meta rename to Assets/Materials/GlowingWireFrame Variant.mat.meta index 460ef49..1d17554 100644 --- a/Assets/Samples/JellyShader/Example/Scenes/ExampleSceneSettings.lighting.meta +++ b/Assets/Materials/GlowingWireFrame Variant.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 1ac1d7b5446bd1345b08537c67b90617 +guid: a083c2375dfafc045bc617fac3e32033 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 4890085278179872738 + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/GlowingWireFrame.shadergraph b/Assets/Materials/GlowingWireFrame.shadergraph index 5ee0a40..7602e27 100644 --- a/Assets/Materials/GlowingWireFrame.shadergraph +++ b/Assets/Materials/GlowingWireFrame.shadergraph @@ -95,12 +95,6 @@ }, { "m_Id": "6074e5764f2a4915b3e0a2ae87b0a7c3" - }, - { - "m_Id": "fd967c4ddd4b4b17adf524857d173c18" - }, - { - "m_Id": "da225a0e943b4d5bb4b1dde0a9d2bdb4" } ], "m_GroupDatas": [], @@ -468,12 +462,6 @@ "m_Blocks": [ { "m_Id": "7aeef950db424153806a870f28754e27" - }, - { - "m_Id": "fd967c4ddd4b4b17adf524857d173c18" - }, - { - "m_Id": "da225a0e943b4d5bb4b1dde0a9d2bdb4" } ] }, @@ -667,10 +655,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2784.0, - "y": 184.00003051757813, - "width": 128.0, - "height": 94.0 + "x": -2852.0, + "y": 124.99998474121094, + "width": 132.0, + "height": 94.00001525878906 } }, "m_Slots": [ @@ -1441,7 +1429,7 @@ "m_ZWriteControl": 0, "m_AlphaMode": 0, "m_RenderFace": 2, - "m_AlphaClip": true, + "m_AlphaClip": false, "m_CastShadows": false, "m_ReceiveShadows": true, "m_SupportsLODCrossFade": false, @@ -2027,21 +2015,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "9ab01fc67f0043d4aa5da058f8814d91", - "m_Id": 0, - "m_DisplayName": "Alpha Clip Threshold", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "AlphaClipThreshold", - "m_StageCapability": 2, - "m_Value": 0.5, - "m_DefaultValue": 0.5, - "m_Labels": [] -} - { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -2586,40 +2559,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "da225a0e943b4d5bb4b1dde0a9d2bdb4", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.AlphaClipThreshold", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "9ab01fc67f0043d4aa5da058f8814d91" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -2657,10 +2596,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -188.0000457763672, - "y": -96.99998474121094, + "x": -318.00006103515627, + "y": -103.99998474121094, "width": 134.00003051757813, - "height": 33.99998092651367 + "height": 34.00000762939453 } }, "m_Slots": [ @@ -2772,21 +2711,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "e9fbbe99eb3a45d9b4f34eb37d22009e", - "m_Id": 0, - "m_DisplayName": "Alpha", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Alpha", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", @@ -2955,40 +2879,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "fd967c4ddd4b4b17adf524857d173c18", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Alpha", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "e9fbbe99eb3a45d9b4f34eb37d22009e" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Alpha" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", diff --git a/Assets/Samples/JellyShader.meta b/Assets/Materials/ShipColors.meta similarity index 77% rename from Assets/Samples/JellyShader.meta rename to Assets/Materials/ShipColors.meta index ddf3560..61e6931 100644 --- a/Assets/Samples/JellyShader.meta +++ b/Assets/Materials/ShipColors.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ce8cda91a8fab047a9d645e35700f23 +guid: 275caff9900342640beb744fef4ac8b4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Materials/ShipColors/Spaceship9Blue.mat b/Assets/Materials/ShipColors/Spaceship9Blue.mat new file mode 100644 index 0000000..250e327 --- /dev/null +++ b/Assets/Materials/ShipColors/Spaceship9Blue.mat @@ -0,0 +1,138 @@ +%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: Spaceship9Blue + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SPECULAR_COLOR + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 5f43755c9a498124588879f21d03b111, type: 3} + 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: 2800000, guid: 5f43755c9a498124588879f21d03b111, 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: + - _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 + - _GlossinessSource: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999993, g: 0.19999993, b: 0.19999993, a: 0.5} + m_BuildTextureStacks: [] +--- !u!114 &881496485627628667 +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: + version: 7 diff --git a/Assets/Materials/ShipColors/Spaceship9Blue.mat.meta b/Assets/Materials/ShipColors/Spaceship9Blue.mat.meta new file mode 100644 index 0000000..6cf7b67 --- /dev/null +++ b/Assets/Materials/ShipColors/Spaceship9Blue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f6e84aae9fb6894bb48024ee9b61470 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/ShipColors/Spaceship9Red.mat b/Assets/Materials/ShipColors/Spaceship9Red.mat new file mode 100644 index 0000000..fe9c8c5 --- /dev/null +++ b/Assets/Materials/ShipColors/Spaceship9Red.mat @@ -0,0 +1,138 @@ +%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: Spaceship9Red + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SPECULAR_COLOR + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: d83e8545972156d4392e46264489c149, type: 3} + 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: 2800000, guid: d83e8545972156d4392e46264489c149, 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: + - _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 + - _GlossinessSource: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 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: 1, g: 0.030918136, b: 0, a: 1} + - _SpecColor: {r: 0.19999993, g: 0.19999993, b: 0.19999993, a: 0.5} + m_BuildTextureStacks: [] +--- !u!114 &881496485627628667 +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: + version: 7 diff --git a/Assets/Materials/ShipColors/Spaceship9Red.mat.meta b/Assets/Materials/ShipColors/Spaceship9Red.mat.meta new file mode 100644 index 0000000..c2b97b8 --- /dev/null +++ b/Assets/Materials/ShipColors/Spaceship9Red.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63912637f2eed304ebf5d1888fb559e0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/HexSphere Variant.mat b/Assets/Models/HexSphere Variant.mat new file mode 100644 index 0000000..afe429e --- /dev/null +++ b/Assets/Models/HexSphere Variant.mat @@ -0,0 +1,59 @@ +%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: HexSphere Variant + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: -3033667219593020291, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + m_ModifiedSerializedProperties: 18 + m_ValidKeywords: + - _EMISSION + - _SPECULARHIGHLIGHTS_OFF + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _Blend: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _Metallic: 1 + - _Smoothness: 0.713 + - _SpecularHighlights: 0 + - _Surface: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.13100708, g: 1, b: 0, a: 0.05882353} + - _Color: {r: 0.13100705, g: 1, b: 0, a: 0.05882353} + - _EmissionColor: {r: 0.09129923, g: 0.32117453, b: 0, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &8233587454769063442 +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: + version: 7 diff --git a/Assets/Models/HexSphere Variant.mat.meta b/Assets/Models/HexSphere Variant.mat.meta new file mode 100644 index 0000000..2edbcc9 --- /dev/null +++ b/Assets/Models/HexSphere Variant.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e79eeda1380b64c43977676d55c7e196 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/JellyShader/Example/Models/High-Poly-Sphere.obj b/Assets/Models/High-Poly-Sphere-JellyShader.obj similarity index 100% rename from Assets/Samples/JellyShader/Example/Models/High-Poly-Sphere.obj rename to Assets/Models/High-Poly-Sphere-JellyShader.obj diff --git a/Assets/Samples/JellyShader/Example/Models/High-Poly-Sphere.obj.meta b/Assets/Models/High-Poly-Sphere-JellyShader.obj.meta similarity index 100% rename from Assets/Samples/JellyShader/Example/Models/High-Poly-Sphere.obj.meta rename to Assets/Models/High-Poly-Sphere-JellyShader.obj.meta diff --git a/Assets/Samples/JellyShader/Example/Models.meta b/Assets/Models/Legacy.meta similarity index 57% rename from Assets/Samples/JellyShader/Example/Models.meta rename to Assets/Models/Legacy.meta index 0a330b6..c9992ae 100644 --- a/Assets/Samples/JellyShader/Example/Models.meta +++ b/Assets/Models/Legacy.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 6739b0b69f4f57941bbda9b80f3dd176 +guid: fd8208c25a9920b43837d5d0d74aea79 folderAsset: yes -timeCreated: 1493663059 -licenseType: Store DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Models/bluePlayer.fbx b/Assets/Models/Legacy/bluePlayer.fbx similarity index 100% rename from Assets/Models/bluePlayer.fbx rename to Assets/Models/Legacy/bluePlayer.fbx diff --git a/Assets/Models/bluePlayer.fbx.meta b/Assets/Models/Legacy/bluePlayer.fbx.meta similarity index 100% rename from Assets/Models/bluePlayer.fbx.meta rename to Assets/Models/Legacy/bluePlayer.fbx.meta diff --git a/Assets/Models/grayPlayer.fbx b/Assets/Models/Legacy/grayPlayer.fbx similarity index 100% rename from Assets/Models/grayPlayer.fbx rename to Assets/Models/Legacy/grayPlayer.fbx diff --git a/Assets/Models/grayPlayer.fbx.meta b/Assets/Models/Legacy/grayPlayer.fbx.meta similarity index 100% rename from Assets/Models/grayPlayer.fbx.meta rename to Assets/Models/Legacy/grayPlayer.fbx.meta diff --git a/Assets/Models/texture_0_6195987693227547908.png b/Assets/Models/Legacy/texture_0_6195987693227547908.png similarity index 100% rename from Assets/Models/texture_0_6195987693227547908.png rename to Assets/Models/Legacy/texture_0_6195987693227547908.png diff --git a/Assets/Models/texture_0_6195987693227547908.png.meta b/Assets/Models/Legacy/texture_0_6195987693227547908.png.meta similarity index 100% rename from Assets/Models/texture_0_6195987693227547908.png.meta rename to Assets/Models/Legacy/texture_0_6195987693227547908.png.meta diff --git a/Assets/Models/texture_1_17319628118832143767.png b/Assets/Models/Legacy/texture_1_17319628118832143767.png similarity index 100% rename from Assets/Models/texture_1_17319628118832143767.png rename to Assets/Models/Legacy/texture_1_17319628118832143767.png diff --git a/Assets/Models/texture_1_17319628118832143767.png.meta b/Assets/Models/Legacy/texture_1_17319628118832143767.png.meta similarity index 100% rename from Assets/Models/texture_1_17319628118832143767.png.meta rename to Assets/Models/Legacy/texture_1_17319628118832143767.png.meta diff --git a/Assets/Models/texture_1_17650290037541193437.png b/Assets/Models/Legacy/texture_1_17650290037541193437.png similarity index 100% rename from Assets/Models/texture_1_17650290037541193437.png rename to Assets/Models/Legacy/texture_1_17650290037541193437.png diff --git a/Assets/Models/texture_1_17650290037541193437.png.meta b/Assets/Models/Legacy/texture_1_17650290037541193437.png.meta similarity index 100% rename from Assets/Models/texture_1_17650290037541193437.png.meta rename to Assets/Models/Legacy/texture_1_17650290037541193437.png.meta diff --git a/Assets/Models/texture_1_3010182785424325454.png b/Assets/Models/Legacy/texture_1_3010182785424325454.png similarity index 100% rename from Assets/Models/texture_1_3010182785424325454.png rename to Assets/Models/Legacy/texture_1_3010182785424325454.png diff --git a/Assets/Models/texture_1_3010182785424325454.png.meta b/Assets/Models/Legacy/texture_1_3010182785424325454.png.meta similarity index 100% rename from Assets/Models/texture_1_3010182785424325454.png.meta rename to Assets/Models/Legacy/texture_1_3010182785424325454.png.meta diff --git a/Assets/Models/texture_4_11563080508590297124.png b/Assets/Models/Legacy/texture_4_11563080508590297124.png similarity index 100% rename from Assets/Models/texture_4_11563080508590297124.png rename to Assets/Models/Legacy/texture_4_11563080508590297124.png diff --git a/Assets/Models/texture_4_11563080508590297124.png.meta b/Assets/Models/Legacy/texture_4_11563080508590297124.png.meta similarity index 100% rename from Assets/Models/texture_4_11563080508590297124.png.meta rename to Assets/Models/Legacy/texture_4_11563080508590297124.png.meta diff --git a/Assets/Models/texture_7_5628616909738884392.png b/Assets/Models/Legacy/texture_7_5628616909738884392.png similarity index 100% rename from Assets/Models/texture_7_5628616909738884392.png rename to Assets/Models/Legacy/texture_7_5628616909738884392.png diff --git a/Assets/Models/texture_7_5628616909738884392.png.meta b/Assets/Models/Legacy/texture_7_5628616909738884392.png.meta similarity index 100% rename from Assets/Models/texture_7_5628616909738884392.png.meta rename to Assets/Models/Legacy/texture_7_5628616909738884392.png.meta diff --git a/Assets/Samples/JellyShader/Example.meta b/Assets/Models/SpaceShips.meta similarity index 57% rename from Assets/Samples/JellyShader/Example.meta rename to Assets/Models/SpaceShips.meta index b114a60..a14e4fd 100644 --- a/Assets/Samples/JellyShader/Example.meta +++ b/Assets/Models/SpaceShips.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: fa1e7e577de9c49408f94823ed212cc1 +guid: 2edf2f12c7acfd74e8e58550d0739d29 folderAsset: yes -timeCreated: 1507246503 -licenseType: Store DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Models/SpaceShips/Spaceship9.fbx b/Assets/Models/SpaceShips/Spaceship9.fbx new file mode 100644 index 0000000000000000000000000000000000000000..7a3621e0876e6f02f17e518e4d0bbe2d79dfaf58 GIT binary patch literal 64076 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 literal 0 HcmV?d00001 diff --git a/Assets/Models/SpaceShips/Spaceship9.fbx.meta b/Assets/Models/SpaceShips/Spaceship9.fbx.meta new file mode 100644 index 0000000..687a0b6 --- /dev/null +++ b/Assets/Models/SpaceShips/Spaceship9.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 40527c707fffde84c99533c25bbcd8cd +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + 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 + 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 + 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 + 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/Models/SpaceShips/Spaceship9BlueHullTexture.png b/Assets/Models/SpaceShips/Spaceship9BlueHullTexture.png new file mode 100644 index 0000000000000000000000000000000000000000..a048a61094a7dc515601705e6e515245e74326c7 GIT binary patch literal 15954 zcmeHOKS&!<82{egHQs50X9fwD;92Yv5Or~JFi8`e1dLHqus9eYI{6Q~bkd88AVMjn z8A^xJPMJD%aB_$s2tqq(skF3II_XewbhyFyp2>^5F2XNxy!Y;X?_ZL;@B96}@7u~{ zp9Y#cnu#coP9?^P3|=+J)Oc~Ry8E3M12Yrp*^v>7@OsF|OrKF}JX$YFV;%H>_b`5$ z?4hdLyiH$IUXd5p;_&bb(UzZIk)3b6VlAbf^P4R}aj~O6D;|+U=|n95lKnr4wUOi3 z_tqYH@7H4o^Woz0=#O`UuZU@eX**GuN}JV%{kLy!+~_UPrC#r5S{Kuu{7$7N&d2#_ zh>xpH;B*&gH}~^XP^=_J^pU4Tsr1@qc4RW&Sj^{kDpAJ{ z_ECIhJEIn>(uLmGM_ltoD|2I(JcgJ&L@P?vji#z(mU|+#eew>y+Nwlt(+bhYFUiOC zeL4Kl4N)9gev$a4@%I*w44!Gc$nf^QR+ms&LN!27!#ELE9xO5gW+-fLp&9@#lC%tH>H!=#OHWn?Fz>h@>~D_ literal 0 HcmV?d00001 diff --git a/Assets/Models/SpaceShips/Spaceship9BlueHullTexture.png.meta b/Assets/Models/SpaceShips/Spaceship9BlueHullTexture.png.meta new file mode 100644 index 0000000..f56c09c --- /dev/null +++ b/Assets/Models/SpaceShips/Spaceship9BlueHullTexture.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 5f43755c9a498124588879f21d03b111 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SpaceShips/Spaceship9RedHullTexture.png b/Assets/Models/SpaceShips/Spaceship9RedHullTexture.png new file mode 100644 index 0000000000000000000000000000000000000000..6d99fb067679b33a024b468bb3b2de99fa4713bb GIT binary patch literal 15953 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 literal 0 HcmV?d00001 diff --git a/Assets/Models/SpaceShips/Spaceship9TailTexture.png.meta b/Assets/Models/SpaceShips/Spaceship9TailTexture.png.meta new file mode 100644 index 0000000..75f86f4 --- /dev/null +++ b/Assets/Models/SpaceShips/Spaceship9TailTexture.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: d65d2632d6fd7b742af5e79a120bf603 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Chars.meta b/Assets/Prefabs/Chars.meta new file mode 100644 index 0000000..65a7757 --- /dev/null +++ b/Assets/Prefabs/Chars.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e3fefb9e42e5604baac3e73829bb3d1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player Blue.prefab b/Assets/Prefabs/Chars/Player Blue.prefab similarity index 93% rename from Assets/Prefabs/Player Blue.prefab rename to Assets/Prefabs/Chars/Player Blue.prefab index fdb14ae..e190476 100644 --- a/Assets/Prefabs/Player Blue.prefab +++ b/Assets/Prefabs/Chars/Player Blue.prefab @@ -158,12 +158,12 @@ Transform: m_LocalScale: {x: 1.4, y: 1.4, z: 1.4} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 5411380178870337943} - {fileID: 8593468838974035070} - {fileID: 5739110816181282754} - {fileID: 3489597143813469327} - {fileID: 8571208796381655806} - {fileID: 7642085096940465448} + - {fileID: 1483206452300237684} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &4827981227876901225 @@ -896,7 +896,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1001 &1212181588597568899 +--- !u!1001 &1378049901460532383 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -904,77 +904,77 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5042970769659716555} m_Modifications: - - target: {fileID: 1449859540681565401, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalScale.x value: 0.25 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalScale.y value: 0.25 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalScale.z value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalPosition.y value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalRotation.w value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalRotation.x value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} - propertyPath: m_ConstrainProportionsScale + - target: {fileID: -1642744634756266859, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} + propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 6614553244487116852, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} + - target: {fileID: -1642744634756266859, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 6f6e84aae9fb6894bb48024ee9b61470, type: 2} + - target: {fileID: 919132149155446097, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_Name - value: Spaceship9_2 + value: Spaceship9 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} ---- !u!4 &5411380178870337943 stripped + m_SourcePrefab: {fileID: 100100000, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} +--- !u!4 &1483206452300237684 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6614553244486628372, guid: 890f62b9a20bd804694a554dc9ed54ef, type: 3} - m_PrefabInstance: {fileID: 1212181588597568899} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} + m_PrefabInstance: {fileID: 1378049901460532383} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Player Blue.prefab.meta b/Assets/Prefabs/Chars/Player Blue.prefab.meta similarity index 100% rename from Assets/Prefabs/Player Blue.prefab.meta rename to Assets/Prefabs/Chars/Player Blue.prefab.meta diff --git a/Assets/Prefabs/Player Red.prefab b/Assets/Prefabs/Chars/Player Red.prefab similarity index 92% rename from Assets/Prefabs/Player Red.prefab rename to Assets/Prefabs/Chars/Player Red.prefab index fd6f459..9db2613 100644 --- a/Assets/Prefabs/Player Red.prefab +++ b/Assets/Prefabs/Chars/Player Red.prefab @@ -86,7 +86,7 @@ Transform: m_LocalScale: {x: 1.4, y: 1.4, z: 1.4} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 6404588952757641278} + - {fileID: 1324887603253715774} - {fileID: 8571208796381655806} - {fileID: 3841992206182845443} - {fileID: 6616209870729500669} @@ -896,7 +896,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1001 &5227971862751345099 +--- !u!1001 &1578594390765257941 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -904,81 +904,77 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5042970769659716555} m_Modifications: - - target: {fileID: 1183557257129018837, guid: 30826cb523470f8438175cec7a95a293, type: 3} - propertyPath: m_Name - value: Spaceship9_1 - objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalScale.x value: 0.25 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalScale.y value: 0.25 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalScale.z value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalPosition.y value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalRotation.w value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalRotation.x value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 + - target: {fileID: -1642744634756266859, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} + propertyPath: m_Materials.Array.size + value: 1 objectReference: {fileID: 0} - - target: {fileID: 1183557257130957589, guid: 30826cb523470f8438175cec7a95a293, type: 3} + - target: {fileID: -1642744634756266859, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 26822db3b4da49241a6120e26a2546bc, type: 2} - - target: {fileID: 3618727443262803803, guid: 30826cb523470f8438175cec7a95a293, type: 3} - propertyPath: m_Enabled - value: 0 + objectReference: {fileID: 2100000, guid: 63912637f2eed304ebf5d1888fb559e0, type: 2} + - target: {fileID: 919132149155446097, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} + propertyPath: m_Name + value: Spaceship9 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 30826cb523470f8438175cec7a95a293, type: 3} ---- !u!4 &6404588952757641278 stripped + m_SourcePrefab: {fileID: 100100000, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} +--- !u!4 &1324887603253715774 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1183557257129187829, guid: 30826cb523470f8438175cec7a95a293, type: 3} - m_PrefabInstance: {fileID: 5227971862751345099} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} + m_PrefabInstance: {fileID: 1578594390765257941} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Player Red.prefab.meta b/Assets/Prefabs/Chars/Player Red.prefab.meta similarity index 100% rename from Assets/Prefabs/Player Red.prefab.meta rename to Assets/Prefabs/Chars/Player Red.prefab.meta diff --git a/Assets/Prefabs/Legacy.meta b/Assets/Prefabs/Legacy.meta new file mode 100644 index 0000000..1a96069 --- /dev/null +++ b/Assets/Prefabs/Legacy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c96b04ee23ef3447be3bf4f1eef2bfb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Blue Model.prefab b/Assets/Prefabs/Legacy/Blue Model.prefab similarity index 100% rename from Assets/Prefabs/Blue Model.prefab rename to Assets/Prefabs/Legacy/Blue Model.prefab diff --git a/Assets/Prefabs/Blue Model.prefab.meta b/Assets/Prefabs/Legacy/Blue Model.prefab.meta similarity index 100% rename from Assets/Prefabs/Blue Model.prefab.meta rename to Assets/Prefabs/Legacy/Blue Model.prefab.meta diff --git a/Assets/Prefabs/Gray Model.prefab b/Assets/Prefabs/Legacy/Gray Model.prefab similarity index 100% rename from Assets/Prefabs/Gray Model.prefab rename to Assets/Prefabs/Legacy/Gray Model.prefab diff --git a/Assets/Prefabs/Gray Model.prefab.meta b/Assets/Prefabs/Legacy/Gray Model.prefab.meta similarity index 100% rename from Assets/Prefabs/Gray Model.prefab.meta rename to Assets/Prefabs/Legacy/Gray Model.prefab.meta diff --git a/Assets/Prefabs/NimbleZoneHexSphere.prefab b/Assets/Prefabs/NimbleZoneHexSphere.prefab new file mode 100644 index 0000000..231ebfc --- /dev/null +++ b/Assets/Prefabs/NimbleZoneHexSphere.prefab @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2195374933886378074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1530196321467136736} + m_Layer: 0 + m_Name: NimbleZoneHexSphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1530196321467136736 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2195374933886378074} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 30} + m_LocalScale: {x: 25, y: 25, z: 25} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2111182450316364728} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7204143390722316419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2111182450316364728} + - component: {fileID: 3862753796044583666} + - component: {fileID: 341983564929455718} + m_Layer: 0 + m_Name: HexSphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2111182450316364728 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7204143390722316419} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1530196321467136736} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3862753796044583666 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7204143390722316419} + m_Mesh: {fileID: -2432090755550338912, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} +--- !u!23 &341983564929455718 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7204143390722316419} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 78cb0d90576fe15439f3fd294d5eaaba, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/NimbleZoneSphere Variant.prefab.meta b/Assets/Prefabs/NimbleZoneHexSphere.prefab.meta similarity index 74% rename from Assets/Prefabs/NimbleZoneSphere Variant.prefab.meta rename to Assets/Prefabs/NimbleZoneHexSphere.prefab.meta index 736c5a7..c64d5c3 100644 --- a/Assets/Prefabs/NimbleZoneSphere Variant.prefab.meta +++ b/Assets/Prefabs/NimbleZoneHexSphere.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f203a425ae690043b270d1723b430ad +guid: f2efefd732ebd9a49bd7cc42b38a69be PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/NimbleZoneSphere Variant.prefab b/Assets/Prefabs/NimbleZoneSphere Variant.prefab deleted file mode 100644 index ee291ab..0000000 --- a/Assets/Prefabs/NimbleZoneSphere Variant.prefab +++ /dev/null @@ -1,115 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &1348511493726215435 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalScale.x - value: 25 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalScale.y - value: 25 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalScale.z - value: 25 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalPosition.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalPosition.z - value: 30 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_DynamicOccludee - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_RenderingLayerMask - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 718528fdc05822c4aacc4f77a39ecdb1, type: 2} - - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: 04d4f548420aa714c92f89f38a108165, type: 2} - - target: {fileID: 919132149155446097, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_Name - value: NimbleZoneSphere Variant - objectReference: {fileID: 0} - - target: {fileID: 8164078558771037576, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_Name - value: HexSphere - objectReference: {fileID: 0} - - target: {fileID: 8164078558771037576, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_Layer - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8164078558771037576, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} diff --git a/Assets/Prefabs/NimbleZoneSphere.prefab b/Assets/Prefabs/NimbleZoneSphere.prefab new file mode 100644 index 0000000..118f82f --- /dev/null +++ b/Assets/Prefabs/NimbleZoneSphere.prefab @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &930210402018179141 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 930210402018337893} + - component: {fileID: 930210402017043525} + - component: {fileID: 930210402015913605} + m_Layer: 0 + m_Name: HighPolySphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &930210402018337893 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930210402018179141} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 930210402018337895} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &930210402017043525 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930210402018179141} + m_Mesh: {fileID: 4300000, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} +--- !u!23 &930210402015913605 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930210402018179141} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0b425997046656b499075b77834259af, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &930210402018179143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 930210402018337895} + m_Layer: 0 + m_Name: NimbleZoneSphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &930210402018337895 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930210402018179143} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 30} + m_LocalScale: {x: 25, y: 25, z: 25} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 930210402018337893} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/NimbleZoneSphere.prefab.meta b/Assets/Prefabs/NimbleZoneSphere.prefab.meta new file mode 100644 index 0000000..bf77946 --- /dev/null +++ b/Assets/Prefabs/NimbleZoneSphere.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 42641a1e05f4e084bae7d69b644dfd81 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/RenderingPipeline.meta b/Assets/RenderingPipeline.meta similarity index 100% rename from Assets/Models/RenderingPipeline.meta rename to Assets/RenderingPipeline.meta diff --git a/Assets/Models/RenderingPipeline/URP.asset b/Assets/RenderingPipeline/URP.asset similarity index 97% rename from Assets/Models/RenderingPipeline/URP.asset rename to Assets/RenderingPipeline/URP.asset index f1fbbc8..85e60af 100644 --- a/Assets/Models/RenderingPipeline/URP.asset +++ b/Assets/RenderingPipeline/URP.asset @@ -25,7 +25,7 @@ MonoBehaviour: m_SupportsTerrainHoles: 1 m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 - m_MSAA: 1 + m_MSAA: 2 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 @@ -34,7 +34,7 @@ MonoBehaviour: m_LODCrossFadeDitheringType: 1 m_ShEvalMode: 0 m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 1 + m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 2048 m_AdditionalLightsRenderingMode: 1 m_AdditionalLightsPerObjectLimit: 4 @@ -68,7 +68,7 @@ MonoBehaviour: m_DebugLevel: 0 m_StoreActionsOptimization: 0 m_EnableRenderGraph: 0 - m_UseAdaptivePerformance: 1 + m_UseAdaptivePerformance: 0 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 m_UseFastSRGBLinearConversion: 0 diff --git a/Assets/Models/RenderingPipeline/URP.asset.meta b/Assets/RenderingPipeline/URP.asset.meta similarity index 100% rename from Assets/Models/RenderingPipeline/URP.asset.meta rename to Assets/RenderingPipeline/URP.asset.meta diff --git a/Assets/Models/RenderingPipeline/URP_Renderer.asset b/Assets/RenderingPipeline/URP_Renderer.asset similarity index 100% rename from Assets/Models/RenderingPipeline/URP_Renderer.asset rename to Assets/RenderingPipeline/URP_Renderer.asset diff --git a/Assets/Models/RenderingPipeline/URP_Renderer.asset.meta b/Assets/RenderingPipeline/URP_Renderer.asset.meta similarity index 100% rename from Assets/Models/RenderingPipeline/URP_Renderer.asset.meta rename to Assets/RenderingPipeline/URP_Renderer.asset.meta diff --git a/Assets/Models/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset b/Assets/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset similarity index 100% rename from Assets/Models/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset rename to Assets/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset diff --git a/Assets/Models/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset.meta b/Assets/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset.meta similarity index 100% rename from Assets/Models/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset.meta rename to Assets/RenderingPipeline/UniversalRenderPipelineGlobalSettings.asset.meta diff --git a/Assets/Samples/JellyShader/Example/Models/Materials.meta b/Assets/Samples/JellyShader/Example/Models/Materials.meta deleted file mode 100644 index 6a99970..0000000 --- a/Assets/Samples/JellyShader/Example/Models/Materials.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: bf11418522fb3a846bee9a6073030adc -folderAsset: yes -timeCreated: 1493663071 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/JellyShader/Example/Scenes.meta b/Assets/Samples/JellyShader/Example/Scenes.meta deleted file mode 100644 index 643737c..0000000 --- a/Assets/Samples/JellyShader/Example/Scenes.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 1579d82fba038904e9d3d9cded8ce4e6 -folderAsset: yes -timeCreated: 1493667125 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/JellyShader/Example/Scenes/ExampleScene.unity b/Assets/Samples/JellyShader/Example/Scenes/ExampleScene.unity deleted file mode 100644 index 6abcae4..0000000 --- a/Assets/Samples/JellyShader/Example/Scenes/ExampleScene.unity +++ /dev/null @@ -1,501 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, 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_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 0 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 0 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 0 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 1ac1d7b5446bd1345b08537c67b90617, type: 2} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &487304636 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - m_PrefabInstance: {fileID: 2060434464} - m_PrefabAsset: {fileID: 0} ---- !u!135 &487304637 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 487304636} - 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: 3 - m_Radius: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &487304640 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 487304636} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c9b16efbc4e4cd408c6d7610e3066ee, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &942940043 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 942940048} - - component: {fileID: 942940047} - - component: {fileID: 942940045} - - component: {fileID: 942940044} - - component: {fileID: 942940049} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &942940044 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942940043} - m_Enabled: 1 ---- !u!124 &942940045 -Behaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942940043} - m_Enabled: 1 ---- !u!20 &942940047 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942940043} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.01 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &942940048 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942940043} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -3} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &942940049 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942940043} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!1 &1161057388 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1161057390} - - component: {fileID: 1161057389} - - component: {fileID: 1161057391} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &1161057389 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1161057388} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - 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: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &1161057390 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1161057388} - serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &1161057391 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1161057388} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1001 &2060434464 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 5e20463e1312b8f43b99301c132f0122, type: 2} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 100000, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - insertIndex: -1 - addedObject: {fileID: 487304637} - - targetCorrespondingSourceObject: {fileID: 100000, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - insertIndex: -1 - addedObject: {fileID: 487304640} - m_SourcePrefab: {fileID: 100100000, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 942940048} - - {fileID: 1161057390} - - {fileID: 2060434464} diff --git a/Assets/Samples/JellyShader/Example/Scenes/ExampleScene.unity.meta b/Assets/Samples/JellyShader/Example/Scenes/ExampleScene.unity.meta deleted file mode 100644 index c367b2e..0000000 --- a/Assets/Samples/JellyShader/Example/Scenes/ExampleScene.unity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f928b5cc7e6a9ca41b1920896c2353ac -timeCreated: 1493667137 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/JellyShader/Example/Scenes/ExampleSceneSettings.lighting b/Assets/Samples/JellyShader/Example/Scenes/ExampleSceneSettings.lighting deleted file mode 100644 index a4166ee..0000000 --- a/Assets/Samples/JellyShader/Example/Scenes/ExampleSceneSettings.lighting +++ /dev/null @@ -1,66 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!850595691 &4890085278179872738 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ExampleSceneSettings - serializedVersion: 6 - m_GIWorkflowMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 - m_BakeBackend: 0 - m_LightmapMaxSize: 1024 - m_BakeResolution: 40 - m_Padding: 2 - m_LightmapCompression: 3 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVREnvironmentSampleCount: 512 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRMinBounces: 2 - m_PVREnvironmentImportanceSampling: 0 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_PVRTiledBaking: 0 - m_NumRaysToShootPerTexel: -1 - m_RespectSceneVisibilityWhenBakingGI: 0 diff --git a/Assets/Samples/JellyShader/Scripts.meta b/Assets/Samples/JellyShader/Scripts.meta deleted file mode 100644 index 79d7893..0000000 --- a/Assets/Samples/JellyShader/Scripts.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c967961565254514085dacc83b0c8e0c -folderAsset: yes -timeCreated: 1506985770 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/JellyShader/Scripts/JellyClickReceiver.cs b/Assets/Samples/JellyShader/Scripts/JellyClickReceiver.cs deleted file mode 100644 index 2feb571..0000000 --- a/Assets/Samples/JellyShader/Scripts/JellyClickReceiver.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class JellyClickReceiver : MonoBehaviour { - - RaycastHit hit; - Ray clickRay; - - Renderer modelRenderer; - float controlTime; - - // Use this for initialization - void Start () { - modelRenderer = GetComponent(); - } - - // Update is called once per frame - void Update () { - controlTime += Time.deltaTime; - - if (Input.GetMouseButtonDown(0)) - { - clickRay = Camera.main.ScreenPointToRay(Input.mousePosition); - - if (Physics.Raycast(clickRay, out hit)) - { - controlTime = 0; - - modelRenderer.material.SetVector("_ModelOrigin", transform.position); - modelRenderer.material.SetVector("_ImpactOrigin", hit.point); - } - } - - modelRenderer.material.SetFloat("_ControlTime", controlTime); - } -} diff --git a/Assets/Samples/JellyShader/Scripts/JellyClickReceiver.cs.meta b/Assets/Samples/JellyShader/Scripts/JellyClickReceiver.cs.meta deleted file mode 100644 index 37be572..0000000 --- a/Assets/Samples/JellyShader/Scripts/JellyClickReceiver.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 6c9b16efbc4e4cd408c6d7610e3066ee -timeCreated: 1506985824 -licenseType: Store -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/JellyShader/Shaders.meta b/Assets/Samples/JellyShader/Shaders.meta deleted file mode 100644 index 82cd43d..0000000 --- a/Assets/Samples/JellyShader/Shaders.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 12b45238a37895745a829098d8acb415 -folderAsset: yes -timeCreated: 1493664871 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/JellyShader/Shaders/JellyMaterial.mat b/Assets/Samples/JellyShader/Shaders/JellyMaterial.mat deleted file mode 100644 index f14d99e..0000000 --- a/Assets/Samples/JellyShader/Shaders/JellyMaterial.mat +++ /dev/null @@ -1,45 +0,0 @@ -%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: JellyMaterial - m_Shader: {fileID: 4800000, guid: f8e2acc75b227a44c8fb810f20e25443, 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: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Amplitude: 0.1 - - _ControlTime: 0 - - _Frequency: 10 - - _Glossiness: 0.5 - - _ImpactSpeed: 0.2 - - _MaxWaveDistortion: 1 - - _Metallic: 0 - - _WaveFalloff: 4 - - _WaveSpeed: -5 - m_Colors: - - _Color: {r: 0.31985295, g: 0.74264693, b: 0.85294116, a: 1} - - _ImpactOrigin: {r: -5, g: 0, b: 0, a: 0} - - _ModelOrigin: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Samples/JellyShader/Shaders/JellyShader.shader b/Assets/Samples/JellyShader/Shaders/JellyShader.shader deleted file mode 100644 index dd5185c..0000000 --- a/Assets/Samples/JellyShader/Shaders/JellyShader.shader +++ /dev/null @@ -1,114 +0,0 @@ -// Upgrade NOTE: upgraded instancing buffer 'Props' to new syntax. - -Shader "Custom/JellyShader" { - Properties { - _Color ("Color", Color) = (1,1,1,1) - _MainTex ("Albedo (RGB)", 2D) = "white" {} - _Glossiness ("Smoothness", Range(0,1)) = 0.5 - _Metallic ("Metallic", Range(0,1)) = 0.0 - - _ControlTime ("Time", float) = 0 - _ModelOrigin ("Model Origin", Vector) = (0,0,0,0) - _ImpactOrigin ("Impact Origin", Vector) = (-5,0,0,0) - - _Frequency ("Frequency", Range(0, 1000)) = 10 - _Amplitude ("Amplitude", Range(0, 5)) = 0.1 - _WaveFalloff ("Wave Falloff", Range(1, 8)) = 4 - _MaxWaveDistortion ("Max Wave Distortion", Range(0.1, 2.0)) = 1 - _ImpactSpeed ("Impact Speed", Range(0, 10)) = 0.5 - _WaveSpeed ("Wave Speed", Range(-10, 10)) = -5 - } - SubShader { - Tags { - "RenderType"="Opaque" - "RenderPipeline"="UniversalPipeline" - "UniversalMaterialType" = "SimpleLit" - "LightMode"="UniversalForward" - } - LOD 200 - - // Render State Commands - // Use same blending / depth states as Standard shader - Blend[_SrcBlend][_DstBlend], [_SrcBlendAlpha][_DstBlendAlpha] - ZWrite[_ZWrite] - Cull[_Cull] - AlphaToMask[_AlphaToMask] - - HLSLPROGRAM - // Use shader model 3.0 target, to get nicer looking lighting - #pragma target 3.0 - #pragma vertex vert - #pragma fragment frag - #pragma surface surf Standard fullforwardshadows - // ------------------------------------- - // Includes - #include "Packages/com.unity.render-pipelines.universal/Shaders/SimpleLitInput.hlsl" - #include "Packages/com.unity.render-pipelines.universal/Shaders/SimpleLitForwardPass.hlsl" - - sampler2D _MainTex; - - struct Input { - float2 uv_MainTex; - }; - - half _Glossiness; - half _Metallic; - half4 _Color; - - float _ControlTime; - float4 _ModelOrigin; - float4 _ImpactOrigin; - - half _Frequency; //Base frequency for our waves. - half _Amplitude; //Base amplitude for our waves. - half _WaveFalloff; //How quickly our distortion should fall off given distance. - half _MaxWaveDistortion; //Smaller number here will lead to larger distortion as the vertex approaches origin. - half _ImpactSpeed; //How quickly our wave origin moves across the sphere. - half _WaveSpeed; //Oscillation speed of an individual wave. - - // Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader. - // See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing. - // #pragma instancing_options assumeuniformscaling - UNITY_INSTANCING_BUFFER_START(Props) - // put more per-instance properties here - UNITY_INSTANCING_BUFFER_END(Props) - - void vert (inout appdata_base v) { - float4 world_space_vertex = mul(unity_ObjectToWorld, v.vertex); - - float4 direction = normalize(_ModelOrigin - _ImpactOrigin); - float4 origin = _ImpactOrigin + _ControlTime * _ImpactSpeed * direction; - - //Get the distance in world space from our vertex to the wave origin. - float dist = distance(world_space_vertex, origin); - - //Adjust our distance to be non-linear. - dist = pow(dist, _WaveFalloff); - - //Set the max amount a wave can be distorted based on distance. - dist = max(dist, _MaxWaveDistortion); - - //Convert direction and _ImpactOrigin to model space for later trig magic. - float4 l_ImpactOrigin = mul(unity_WorldToObject, _ImpactOrigin); - float4 l_direction = mul(unity_WorldToObject, direction); - - //Magic - float impactAxis = l_ImpactOrigin + dot((v.vertex - l_ImpactOrigin), l_direction); - - v.vertex.xyz += v.normal * sin(impactAxis * _Frequency + _ControlTime * _WaveSpeed) * _Amplitude * (1 / dist); - } - - void surf (Input IN, inout SurfaceOutputStandard o) { - // Albedo comes from a texture tinted by color - float4 c = _Color; - //half4 c = tex2D (_MainTex, IN.uv_MainTex) * _Color; - o.Albedo = c.rgb; - // Metallic and smoothness come from slider variables - o.Metallic = _Metallic; - o.Smoothness = _Glossiness; - o.Alpha = c.a; - } - ENDHLSL - } - FallBack "Diffuse" -} diff --git a/Assets/Samples/JellyShader/Shaders/JellyShader.shader.meta b/Assets/Samples/JellyShader/Shaders/JellyShader.shader.meta deleted file mode 100644 index 7b3c2e1..0000000 --- a/Assets/Samples/JellyShader/Shaders/JellyShader.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f8e2acc75b227a44c8fb810f20e25443 -timeCreated: 1493664882 -licenseType: Store -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/BattleField.meta b/Assets/Scenes/BattleField.meta new file mode 100644 index 0000000..19987b0 --- /dev/null +++ b/Assets/Scenes/BattleField.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4c8f68c4372c194eae1f877b1bd0ec0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/BattleField.unity b/Assets/Scenes/BattleField.unity index 60b7518..2810f88 100644 --- a/Assets/Scenes/BattleField.unity +++ b/Assets/Scenes/BattleField.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.003931217, g: 0.019188203, b: 0.030662213, a: 1} + m_IndirectSpecularColor: {r: 0.004074199, g: 0.019367827, b: 0.030757796, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -235,7 +235,7 @@ Transform: m_GameObject: {fileID: 3628760} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.8725471, y: 6.1180573, z: -72} + m_LocalPosition: {x: 0, y: 0, z: -72} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -309,7 +309,61 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &343400027 +--- !u!1 &513454604 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7204143390722316419, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} + m_PrefabInstance: {fileID: 724984873} + m_PrefabAsset: {fileID: 0} +--- !u!1 &664696267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 664696269} + - component: {fileID: 664696268} + m_Layer: 0 + m_Name: PostProcessingVolume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &664696268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664696267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 370f519260c4e8345bb4ecadf6199694, type: 2} +--- !u!4 &664696269 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664696267} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -23.223543, y: -4.569291, z: 27.381897} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &724984873 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -317,88 +371,59 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 100002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_Name - value: High-Poly-Sphere - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalScale.x - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalScale.y - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_LocalScale.z - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 341983564929455718, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 1338539d65504394f8f2dd0a628dc423, type: 2} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalPosition.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalPosition.z value: 30 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} + - target: {fileID: 1530196321467136736, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400002, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 + - target: {fileID: 2195374933886378074, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} + propertyPath: m_Name + value: NimbleZoneHexSphere objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fc5f274d483f9d24b95d2f4a7eb88be9, type: 3} ---- !u!1 &479218515 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6404588952757812254, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3} - m_PrefabInstance: {fileID: 1491164188991312957} - m_PrefabAsset: {fileID: 0} ---- !u!114 &479218517 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 479218515} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9f2a6e75f30c618429854af62cf7010c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_SourcePrefab: {fileID: 100100000, guid: f2efefd732ebd9a49bd7cc42b38a69be, type: 3} --- !u!1 &754823974 GameObject: m_ObjectHideFlags: 0 @@ -698,7 +723,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} m_Name: m_EditorClassIdentifier: - m_RenderShadows: 1 + m_RenderShadows: 0 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 @@ -709,7 +734,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 @@ -740,7 +765,6 @@ GameObject: m_Component: - component: {fileID: 1185564593} - component: {fileID: 1185564592} - - component: {fileID: 1185564591} - component: {fileID: 1185564590} - component: {fileID: 1185564594} m_Layer: 3 @@ -771,48 +795,6 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1185564591 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1185564589} - m_Enabled: 0 - m_CastShadows: 0 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1185564592 MeshFilter: m_ObjectHideFlags: 0 @@ -848,9 +830,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 456d6ebbd09c16d488cbe8451ae0e5f6, type: 3} m_Name: m_EditorClassIdentifier: + forcesManager: {fileID: 1659830376} + renderedZoneObject: {fileID: 513454604} outsideGravityFunction: 0 zone: 0 - forcesManager: {fileID: 1659830376} + rippleFrequency: 18 + rippleDensity: 20 + rippleAmplitude: 0.1 + rippleBlend: 1 + rippleRadius: 1.62 + rippleDuration: 1.2 --- !u!1001 &1361581063 PrefabInstance: m_ObjectHideFlags: 0 @@ -863,10 +852,14 @@ PrefabInstance: propertyPath: m_Name value: PlayZone objectReference: {fileID: 0} + - target: {fileID: -990798463411063789, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: -990798463411063789, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 15303, guid: 0000000000000000f000000000000000, type: 0} + objectReference: {fileID: 2100000, guid: ede4fd81521fbf14290f76017e016f6d, type: 2} - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_LocalScale.x value: 100 @@ -919,10 +912,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8385590999942887681, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8385590999942887681, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 15303, guid: 0000000000000000f000000000000000, type: 0} + objectReference: {fileID: 2100000, guid: ede4fd81521fbf14290f76017e016f6d, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1144,6 +1141,10 @@ PrefabInstance: propertyPath: m_Name value: Player Red objectReference: {fileID: 0} + - target: {fileID: 2704141135220834432, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3} + propertyPath: playerName + value: Red + objectReference: {fileID: 0} - target: {fileID: 2704141135220834432, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3} propertyPath: cameraOperator value: @@ -1231,10 +1232,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 6404588952757812254, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3} - insertIndex: -1 - addedObject: {fileID: 479218517} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3} --- !u!1001 &6412728625559011621 PrefabInstance: @@ -1308,11 +1306,12 @@ SceneRoots: - {fileID: 796181415} - {fileID: 2052728260} - {fileID: 963194228} + - {fileID: 724984873} - {fileID: 1185564593} - - {fileID: 343400027} - {fileID: 1491164188991312957} - {fileID: 6412728625559011621} - {fileID: 1361581063} - {fileID: 1659830377} - {fileID: 201450955} - {fileID: 3628763} + - {fileID: 664696269} diff --git a/Assets/Scenes/BattleField/PostProcessingVolume Profile.asset b/Assets/Scenes/BattleField/PostProcessingVolume Profile.asset new file mode 100644 index 0000000..243ec94 --- /dev/null +++ b/Assets/Scenes/BattleField/PostProcessingVolume Profile.asset @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5921147102793617387 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + skipIterations: + m_OverrideState: 0 + m_Value: 1 + threshold: + m_OverrideState: 1 + m_Value: 0.9 + intensity: + m_OverrideState: 1 + m_Value: 0.2 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + clamp: + m_OverrideState: 0 + m_Value: 65472 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + downscale: + m_OverrideState: 0 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dimension: 1 + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 +--- !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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: PostProcessingVolume Profile + m_EditorClassIdentifier: + components: + - {fileID: -5921147102793617387} diff --git a/Assets/Scenes/BattleField/PostProcessingVolume Profile.asset.meta b/Assets/Scenes/BattleField/PostProcessingVolume Profile.asset.meta new file mode 100644 index 0000000..9007898 --- /dev/null +++ b/Assets/Scenes/BattleField/PostProcessingVolume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 370f519260c4e8345bb4ecadf6199694 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NimbleZoneDetection.cs b/Assets/Scripts/NimbleZoneDetection.cs index c6a4f52..9d51e62 100644 --- a/Assets/Scripts/NimbleZoneDetection.cs +++ b/Assets/Scripts/NimbleZoneDetection.cs @@ -1,20 +1,51 @@ using System; +using System.Linq; using UnityEngine; using static AffectingForcesManager; public class NimbleZoneDetection : MonoBehaviour { + public AffectingForcesManager forcesManager; + + public GameObject renderedZoneObject; + + + public enum Gravities + { + DownGravity, NoGravity, InwardsGravity, OutwardsGravity + } + [SerializeField] private static float gravityFactor = 30f; [SerializeField] private Gravities outsideGravityFunction = Gravities.NoGravity; [SerializeField] private Zone zone = Zone.NimbleZone; - public AffectingForcesManager forcesManager; - public enum Gravities + // Ripple properties + [SerializeField] + private float rippleFrequency = 3f; + [SerializeField] + private float rippleDensity = 30f; + [SerializeField] + private float rippleAmplitude = 0.2f; + [SerializeField] + private float rippleBlend = 1f; + [SerializeField] + private float rippleRadius = 2f; + [SerializeField] + private float rippleDuration = 2f; + private int maxRippleAmount = 5; + private int playerCount = 2; + private int spawnedCount = 0; + private MeshRenderer meshRenderer; + private Material material; + + void Awake() { - DownGravity, NoGravity, InwardsGravity, OutwardsGravity + meshRenderer = renderedZoneObject.GetComponent(); + material = meshRenderer.material; + ResetShaderProperties(); } private Func[] gravityFunctions = { DownGravity, NoGravity, InwardsGravity, OutwardsGravity }; @@ -34,6 +65,9 @@ public class NimbleZoneDetection : MonoBehaviour private void OnTriggerEnter(Collider collider) { int instanceID = collider.gameObject.GetInstanceID(); + if (spawnedCount < playerCount) + ++spawnedCount; + else SpawnRipple(collider, false); forcesManager.SetGravityForInstance(instanceID, NoGravity); forcesManager.SetZoneForInstance(instanceID, zone); } @@ -41,8 +75,90 @@ public class NimbleZoneDetection : MonoBehaviour private void OnTriggerExit(Collider collider) { int instanceID = collider.gameObject.GetInstanceID(); + SpawnRipple(collider, true); forcesManager.SetGravityForInstance(instanceID, GetGravityFunction(outsideGravityFunction)); forcesManager.SetZoneForInstance(instanceID, Zone.OutsideZone); } + private void Update() + { + material.SetFloat("_ShaderTime", Time.timeSinceLevelLoad); + } + + private void SpawnRipple(Collider collider, bool isOutwardsRipple) + { + Rigidbody body = collider.attachedRigidbody; + GameObject gameObject = collider.gameObject; + + float velocity = body.velocity.magnitude; + Vector3 position = (gameObject.transform.position - transform.position).normalized; + + Vector4[] rippleOrigins = material.GetVectorArray("_RippleOrigins"); + + float currentTime = Time.timeSinceLevelLoad; + var whyGodWhy = material.GetVector("_TIME"); + Console.WriteLine(whyGodWhy); + float[] startedTimes = material.GetFloatArray("_RippleStartTimes"); + float[] startedRippleDurations = material.GetFloatArray("_RippleDurations"); + + float[] rippleAmplitudes = material.GetFloatArray("_RippleAmplitudes"); + float[] rippleFrequencies = material.GetFloatArray("_RippleFrequencies"); + float[] rippleDensities = material.GetFloatArray("_RippleDensities"); + float[] rippleBlends = material.GetFloatArray("_RippleBlends"); + float[] rippleRadii = material.GetFloatArray("_RippleRadii"); + + for (int i = 0; i < startedTimes.Length; ++i) + { + if (startedTimes[i] + startedRippleDurations[i] < currentTime) + { + rippleOrigins[i] = new Vector4(position.x, position.y, position.z, 0); + material.SetVectorArray("_RippleOrigins", rippleOrigins); + startedTimes[i] = currentTime; + material.SetFloatArray("_RippleStartTimes", startedTimes); + + rippleAmplitudes[i] = isOutwardsRipple ? rippleAmplitude : -rippleAmplitude; + rippleFrequencies[i] = rippleFrequency; + rippleDensities[i] = rippleDensity; + rippleBlends[i] = rippleBlend; + startedRippleDurations[i] = rippleDuration; + rippleRadii[i] = rippleRadius; + material.SetFloatArray("_RippleAmplitudes", rippleAmplitudes); + material.SetFloatArray("_RippleFrequencies", rippleFrequencies); + material.SetFloatArray("_RippleDensities", rippleDensities); + material.SetFloatArray("_RippleAmplitudes", rippleAmplitudes); + material.SetFloatArray("_RippleBlends", rippleBlends); + material.SetFloatArray("_RippleDurations", startedRippleDurations); + material.SetFloatArray("_RippleRadii", rippleRadii); + break; + } + + } + } + + private void ResetShaderProperties() + { + Vector4[] rippleOrigins = new Vector4[maxRippleAmount]; + float[] startedTimes = new float[maxRippleAmount]; + float[] rippleAmplitudes = new float[maxRippleAmount]; + float[] rippleFrequencies = new float[maxRippleAmount]; + float[] rippleDensities = new float[maxRippleAmount]; + float[] rippleDurations = new float[maxRippleAmount]; + float[] rippleRadii = new float[maxRippleAmount]; + float[] rippleBlends = new float[maxRippleAmount]; + + // Initialize Ripple Shader Properties + material.SetVectorArray("_RippleOrigins", rippleOrigins); + material.SetFloatArray("_RippleStartTimes", startedTimes); + material.SetFloatArray("_RippleAmplitudes", rippleAmplitudes); + material.SetFloatArray("_RippleFrequencies", rippleFrequencies); + material.SetFloatArray("_RippleDensities", rippleDensities); + material.SetFloatArray("_RippleBlends", rippleBlends); + material.SetFloatArray("_RippleDurations", rippleDurations); + material.SetFloatArray("_RippleRadii", rippleRadii); + } + + private void OnDestroy() + { + ResetShaderProperties(); + } } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index a756c4d..e304744 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -1,6 +1,5 @@ using System; using Unity.Mathematics; -using UnityEditor.ShaderGraph.Internal; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.SceneManagement; diff --git a/Assets/Shaders/PBRLitRipples.shader b/Assets/Shaders/PBRLitRipples.shader index fd67da0..59da836 100644 --- a/Assets/Shaders/PBRLitRipples.shader +++ b/Assets/Shaders/PBRLitRipples.shader @@ -50,7 +50,7 @@ Shader "CustomShaders/GlossyPBRRipples" { [Space(20)] [Toggle(_EMISSION)] _Emission ("Emission", Float) = 0 [HDR] _EmissionColor("Emission Color", Color) = (0,0,0) - [NoScaleOffset]_EmissionMap("Emission Map", 2D) = "black" {} + [NoScaleOffset]_EmissionMap("Emission Map", 2D) = "white" {} [Space(20)] [Toggle(_SPECULARHIGHLIGHTS_OFF)] _SpecularHighlights("Turn Specular Highlights Off", Float) = 0 @@ -58,19 +58,6 @@ Shader "CustomShaders/GlossyPBRRipples" { // These are inverted fom what the URP/Lit shader does which is a bit annoying. // They would usually be handled by the Lit ShaderGUI but I'm using Toggle instead, // which assumes the keyword is more of an "on" state. - - [Space(20)] - _ControlTime ("Time", float) = 0 - _ModelOrigin ("Model Origin", Vector) = (0,0,0,0) - _ImpactOrigin ("Impact Origin", Vector) = (-5,0,0,0) - - _Frequency ("Frequency", Range(0, 1000)) = 10 - _Amplitude ("Amplitude", Range(0, 5)) = 0.1 - _WaveFalloff ("Wave Falloff", Range(1, 8)) = 4 - _MaxWaveDistortion ("Max Wave Distortion", Range(0.1, 2.0)) = 1 - _ImpactSpeed ("Impact Speed", Range(0, 10)) = 0.5 - _WaveSpeed ("Wave Speed", Range(-10, 10)) = -5 - // Not including Detail maps in this template } SubShader { @@ -97,6 +84,30 @@ Shader "CustomShaders/GlossyPBRRipples" { half _ClearCoatMask; half _ClearCoatSmoothness; CBUFFER_END + half _ShaderTime; + + half _SpikeEase(half x){ + return 1.0 - pow(abs(sin(3.14159265359* (x + 0.5)/2.0)), 0.5); + } + + half _TriangleEase(half x){ + return min(cos(3.14159265359 * x/2.0), 1 - abs(x)); + } + + half _FadeRipple(half dist, half blend, half radius) { + // create a radius + return smoothstep(radius, 0, dist); + } + + half _ComputeRipple(half3 vert, half3 orig, half blend, half radius, half freq, half dens, half ampl, half start_time, half duration) { + // calculate the intensity of the impact + half dist = distance(vert, orig); + half anim = smoothstep(start_time, start_time + duration, _ShaderTime); + half i = sin((freq * anim - dist * dens)) * ampl * _TriangleEase(anim * 2 - 1); + return i * _FadeRipple(dist, blend, radius); + } + + ENDHLSL Pass { @@ -109,6 +120,17 @@ Shader "CustomShaders/GlossyPBRRipples" { Blend One OneMinusSrcAlpha HLSLPROGRAM + // Ripple Properties + + half3 _RippleOrigins[5]; + half _RippleFrequencies[5]; + half _RippleDensities[5]; + half _RippleAmplitudes[5]; + half _RippleBlends[5]; + half _RippleRadii[5]; + half _RippleStartTimes[5]; + half _RippleDurations[5]; + #pragma vertex LitPassVertex #pragma fragment LitPassFragment @@ -158,17 +180,6 @@ Shader "CustomShaders/GlossyPBRRipples" { // GPU Instancing (not supported) //#pragma multi_compile_instancing - float _ControlTime; - float4 _ModelOrigin; - float4 _ImpactOrigin; - - half _Frequency; //Base frequency for our waves. - half _Amplitude; //Base amplitude for our waves. - half _WaveFalloff; //How quickly our distortion should fall off given distance. - half _MaxWaveDistortion; //Smaller number here will lead to larger distortion as the vertex approaches origin. - half _ImpactSpeed; //How quickly our wave origin moves across the sphere. - half _WaveSpeed; //Oscillation speed of an individual wave. - // --------------------------------------------------------------------------- // Structs // --------------------------------------------------------------------------- @@ -229,29 +240,20 @@ Shader "CustomShaders/GlossyPBRRipples" { //UNITY_SETUP_INSTANCE_ID(IN); //UNITY_TRANSFER_INSTANCE_ID(IN, OUT); //UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT); + half ripple_displacement = 0.0; - float4 world_space_vertex = mul(unity_ObjectToWorld, IN.positionOS); - - float4 direction = normalize(_ModelOrigin - _ImpactOrigin); - float4 origin = _ImpactOrigin + _ControlTime * _ImpactSpeed * direction; - - //Get the distance in world space from our vertex to the wave origin. - float dist = distance(world_space_vertex, origin); - - //Adjust our distance to be non-linear. - dist = pow(dist, _WaveFalloff); - - //Set the max amount a wave can be distorted based on distance. - dist = max(dist, _MaxWaveDistortion); - - //Convert direction and _ImpactOrigin to model space for later trig magic. - float4 l_ImpactOrigin = mul(unity_WorldToObject, _ImpactOrigin); - float4 l_direction = mul(unity_WorldToObject, direction); - - //Magic - float impactAxis = l_ImpactOrigin + dot((IN.positionOS - l_ImpactOrigin), l_direction); - - IN.positionOS.xyz += IN.normalOS * sin(impactAxis * _Frequency + _ControlTime * _WaveSpeed) * _Amplitude * (1 / dist); + [unroll(5)] + for(int i = 0; i < 5; i++) + ripple_displacement += _ComputeRipple(IN.positionOS.xyz, + _RippleOrigins[i], + _RippleBlends[i], + _RippleRadii[i], + _RippleFrequencies[i], + _RippleDensities[i], + _RippleAmplitudes[i], + _RippleStartTimes[i], + _RippleDurations[i]); + IN.positionOS.xyz += IN.normalOS * ripple_displacement; VertexPositionInputs positionInputs = GetVertexPositionInputs(IN.positionOS.xyz); #ifdef _NORMALMAP @@ -263,8 +265,6 @@ Shader "CustomShaders/GlossyPBRRipples" { OUT.positionCS = positionInputs.positionCS; OUT.positionWS = positionInputs.positionWS; - - half3 viewDirWS = GetWorldSpaceViewDir(positionInputs.positionWS); half3 vertexLight = VertexLighting(positionInputs.positionWS, normalInputs.normalWS); half fogFactor = ComputeFogFactor(positionInputs.positionCS.z); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index dae0bd3..2322cc1 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,9 +134,7 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 - preloadedAssets: - - {fileID: 7907058041053682329, guid: 4b98f800e99c70140ac675a637d71d3a, type: 2} - - {fileID: 11400000, guid: 7d6dd64b5f2213d4f8cc395ae58ffb43, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 37f6b3e..f2a4f8c 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -267,7 +267,7 @@ QualitySettings: globalTextureMipmapLimit: 1 textureMipmapLimitSettings: [] anisotropicTextures: 2 - antiAliasing: 0 + antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1