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 0000000..7a3621e Binary files /dev/null and b/Assets/Models/SpaceShips/Spaceship9.fbx differ 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 0000000..a048a61 Binary files /dev/null and b/Assets/Models/SpaceShips/Spaceship9BlueHullTexture.png differ 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 0000000..6d99fb0 Binary files /dev/null and b/Assets/Models/SpaceShips/Spaceship9RedHullTexture.png differ diff --git a/Assets/Models/SpaceShips/Spaceship9RedHullTexture.png.meta b/Assets/Models/SpaceShips/Spaceship9RedHullTexture.png.meta new file mode 100644 index 0000000..b1f4e72 --- /dev/null +++ b/Assets/Models/SpaceShips/Spaceship9RedHullTexture.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: d83e8545972156d4392e46264489c149 +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/Spaceship9TailTexture.png b/Assets/Models/SpaceShips/Spaceship9TailTexture.png new file mode 100644 index 0000000..e880bd9 Binary files /dev/null and b/Assets/Models/SpaceShips/Spaceship9TailTexture.png differ 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