diff --git a/Climb/Assets/Editor/GridControllerEditor.cs b/Climb/Assets/Editor/GridControllerEditor.cs index c9eace9..6c86d2a 100644 --- a/Climb/Assets/Editor/GridControllerEditor.cs +++ b/Climb/Assets/Editor/GridControllerEditor.cs @@ -1,4 +1,5 @@ using UnityEditor; +using UnityEngine; namespace Editor { [CustomEditor(typeof(GridController))] @@ -14,6 +15,9 @@ namespace Editor { controller.UpdateShader(PropertyName.Values); controller.UpdateShader(PropertyName.ValueLength); } + + controller.gridMaterial = + (Material) EditorGUILayout.ObjectField("Grid Material", controller.gridMaterial, typeof(Material)); EditorGUI.BeginChangeCheck(); controller.perlinScale = EditorGUILayout.Slider("Perlin Scale", controller.perlinScale, 0.001f, 0.5f); diff --git a/Climb/Assets/Grid Material.mat b/Climb/Assets/Grid Material.mat index 8f8ab3e..57311d8 100644 --- a/Climb/Assets/Grid Material.mat +++ b/Climb/Assets/Grid Material.mat @@ -4,10 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: GridMat - m_Shader: {fileID: 4800000, guid: 27a637801b8646a4182d0a32a8d2f4d9, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Grid Material + m_Shader: {fileID: 4800000, guid: d6cad9defc554804fb8bd9e6a8128f69, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -18,67 +19,20 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _GridSize: 10 - - _LineSize: 0.16 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectCell: 1 - - _SelectedCellX: 2 - - _SelectedCellY: 3 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 + - _GridSize: 20 + - _LineSize: 0 + - _SelectCell: 0 + - _SelectedCellX: 6 + - _SelectedCellY: 0 + - _valueLength: 400 m_Colors: - - _CellColor: {r: 1, g: 0, b: 0, a: 0} - - _Color: {r: 0.935151, g: 0.9705882, b: 0.3282872, a: 0} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _ActiveColor: {r: 1, g: 1, b: 1, a: 1} + - _CellColor: {r: 0, g: 1, b: 0, a: 1} + - _InactiveColor: {r: 0, g: 0, b: 0, a: 1} - _LineColor: {r: 1, g: 1, b: 1, a: 1} - - _SelectedColor: {r: 0.1586206, g: 1, b: 0, a: 1} + - _SelectedColor: {r: 1, g: 0, b: 0, a: 1} diff --git a/Climb/Assets/GridShader.shader b/Climb/Assets/GridShader.shader index aa9f11d..ff1cd95 100644 --- a/Climb/Assets/GridShader.shader +++ b/Climb/Assets/GridShader.shader @@ -31,7 +31,260 @@ Shader "PDT Shaders/TestGrid" { float4 _LineColor; float4 _InactiveColor; float4 _ActiveColor; - + + static const float4 _gradient[250] = { + float4(0.443, 0.0, 0.0, 1.0), + float4(0.486, 0.0, 0.0, 1.0), + float4(0.506, 0.0, 0.0, 1.0), + float4(0.522, 0.0, 0.0, 1.0), + float4(0.537, 0.0, 0.0, 1.0), + float4(0.553, 0.0, 0.0, 1.0), + float4(0.573, 0.0, 0.0, 1.0), + float4(0.588, 0.0, 0.0, 1.0), + float4(0.604, 0.0, 0.0, 1.0), + float4(0.62, 0.0, 0.0, 1.0), + float4(0.639, 0.0, 0.0, 1.0), + float4(0.659, 0.0, 0.0, 1.0), + float4(0.675, 0.0, 0.0, 1.0), + float4(0.69, 0.0, 0.0, 1.0), + float4(0.706, 0.0, 0.0, 1.0), + float4(0.725, 0.0, 0.0, 1.0), + float4(0.741, 0.0, 0.0, 1.0), + float4(0.757, 0.0, 0.0, 1.0), + float4(0.792, 0.0, 0.0, 1.0), + float4(0.808, 0.0, 0.0, 1.0), + float4(0.808, 0.0, 0.0, 1.0), + float4(0.824, 0.0, 0.0, 1.0), + float4(0.843, 0.0, 0.0, 1.0), + float4(0.875, 0.012, 0.0, 1.0), + float4(0.89, 0.027, 0.0, 1.0), + float4(0.91, 0.039, 0.0, 1.0), + float4(0.91, 0.039, 0.0, 1.0), + float4(0.925, 0.055, 0.0, 1.0), + float4(0.945, 0.078, 0.0, 1.0), + float4(0.945, 0.094, 0.0, 1.0), + float4(0.945, 0.11, 0.0, 1.0), + float4(0.945, 0.125, 0.0, 1.0), + float4(0.945, 0.133, 0.0, 1.0), + float4(0.945, 0.149, 0.0, 1.0), + float4(0.945, 0.165, 0.0, 1.0), + float4(0.945, 0.176, 0.0, 1.0), + float4(0.945, 0.192, 0.0, 1.0), + float4(0.945, 0.204, 0.0, 1.0), + float4(0.945, 0.216, 0.0, 1.0), + float4(0.945, 0.231, 0.0, 1.0), + float4(0.945, 0.247, 0.0, 1.0), + float4(0.945, 0.263, 0.0, 1.0), + float4(0.945, 0.271, 0.0, 1.0), + float4(0.945, 0.286, 0.0, 1.0), + float4(0.945, 0.302, 0.0, 1.0), + float4(0.945, 0.314, 0.0, 1.0), + float4(0.945, 0.329, 0.0, 1.0), + float4(0.945, 0.341, 0.0, 1.0), + float4(0.945, 0.353, 0.0, 1.0), + float4(0.945, 0.369, 0.0, 1.0), + float4(0.945, 0.384, 0.0, 1.0), + float4(0.945, 0.4, 0.0, 1.0), + float4(0.945, 0.408, 0.0, 1.0), + float4(0.945, 0.424, 0.0, 1.0), + float4(0.945, 0.439, 0.0, 1.0), + float4(0.945, 0.451, 0.0, 1.0), + float4(0.945, 0.467, 0.0, 1.0), + float4(0.945, 0.478, 0.0, 1.0), + float4(0.945, 0.494, 0.0, 1.0), + float4(0.945, 0.506, 0.0, 1.0), + float4(0.945, 0.522, 0.0, 1.0), + float4(0.945, 0.537, 0.0, 1.0), + float4(0.945, 0.545, 0.0, 1.0), + float4(0.945, 0.576, 0.0, 1.0), + float4(0.945, 0.576, 0.0, 1.0), + float4(0.945, 0.588, 0.0, 1.0), + float4(0.945, 0.604, 0.0, 1.0), + float4(0.945, 0.616, 0.0, 1.0), + float4(0.945, 0.643, 0.0, 1.0), + float4(0.945, 0.659, 0.0, 1.0), + float4(0.945, 0.675, 0.0, 1.0), + float4(0.945, 0.675, 0.0, 1.0), + float4(0.945, 0.682, 0.0, 1.0), + float4(0.945, 0.714, 0.0, 1.0), + float4(0.945, 0.725, 0.0, 1.0), + float4(0.945, 0.741, 0.0, 1.0), + float4(0.945, 0.753, 0.0, 1.0), + float4(0.945, 0.769, 0.0, 1.0), + float4(0.945, 0.78, 0.0, 1.0), + float4(0.945, 0.796, 0.0, 1.0), + float4(0.945, 0.808, 0.0, 1.0), + float4(0.945, 0.82, 0.0, 1.0), + float4(0.945, 0.835, 0.0, 1.0), + float4(0.945, 0.851, 0.0, 1.0), + float4(0.945, 0.867, 0.0, 1.0), + float4(0.941, 0.875, 0.0, 1.0), + float4(0.929, 0.89, 0.0, 1.0), + float4(0.918, 0.906, 0.0, 1.0), + float4(0.902, 0.918, 0.004, 1.0), + float4(0.89, 0.933, 0.02, 1.0), + float4(0.878, 0.945, 0.031, 1.0), + float4(0.871, 0.945, 0.043, 1.0), + float4(0.855, 0.945, 0.055, 1.0), + float4(0.843, 0.945, 0.067, 1.0), + float4(0.831, 0.945, 0.078, 1.0), + float4(0.82, 0.945, 0.09, 1.0), + float4(0.808, 0.945, 0.102, 1.0), + float4(0.796, 0.945, 0.114, 1.0), + float4(0.784, 0.945, 0.129, 1.0), + float4(0.773, 0.945, 0.137, 1.0), + float4(0.761, 0.945, 0.149, 1.0), + float4(0.745, 0.945, 0.161, 1.0), + float4(0.737, 0.945, 0.176, 1.0), + float4(0.725, 0.945, 0.188, 1.0), + float4(0.714, 0.945, 0.2, 1.0), + float4(0.702, 0.945, 0.208, 1.0), + float4(0.686, 0.945, 0.22, 1.0), + float4(0.675, 0.945, 0.235, 1.0), + float4(0.655, 0.945, 0.259, 1.0), + float4(0.655, 0.945, 0.259, 1.0), + float4(0.639, 0.945, 0.267, 1.0), + float4(0.627, 0.945, 0.282, 1.0), + float4(0.616, 0.945, 0.294, 1.0), + float4(0.592, 0.945, 0.318, 1.0), + float4(0.58, 0.945, 0.333, 1.0), + float4(0.569, 0.945, 0.341, 1.0), + float4(0.569, 0.945, 0.341, 1.0), + float4(0.557, 0.945, 0.353, 1.0), + float4(0.533, 0.945, 0.376, 1.0), + float4(0.522, 0.945, 0.392, 1.0), + float4(0.51, 0.945, 0.404, 1.0), + float4(0.498, 0.945, 0.412, 1.0), + float4(0.498, 0.945, 0.412, 1.0), + float4(0.471, 0.945, 0.439, 1.0), + float4(0.463, 0.945, 0.451, 1.0), + float4(0.451, 0.945, 0.463, 1.0), + float4(0.439, 0.945, 0.471, 1.0), + float4(0.424, 0.945, 0.482, 1.0), + float4(0.412, 0.945, 0.498, 1.0), + float4(0.404, 0.945, 0.51, 1.0), + float4(0.392, 0.945, 0.522, 1.0), + float4(0.376, 0.945, 0.533, 1.0), + float4(0.365, 0.945, 0.545, 1.0), + float4(0.353, 0.945, 0.557, 1.0), + float4(0.341, 0.945, 0.569, 1.0), + float4(0.333, 0.945, 0.58, 1.0), + float4(0.318, 0.945, 0.592, 1.0), + float4(0.306, 0.945, 0.604, 1.0), + float4(0.294, 0.945, 0.616, 1.0), + float4(0.282, 0.945, 0.627, 1.0), + float4(0.267, 0.945, 0.639, 1.0), + float4(0.259, 0.945, 0.655, 1.0), + float4(0.247, 0.945, 0.667, 1.0), + float4(0.235, 0.945, 0.675, 1.0), + float4(0.22, 0.945, 0.686, 1.0), + float4(0.208, 0.945, 0.702, 1.0), + float4(0.2, 0.945, 0.714, 1.0), + float4(0.188, 0.945, 0.725, 1.0), + float4(0.176, 0.945, 0.737, 1.0), + float4(0.161, 0.945, 0.745, 1.0), + float4(0.149, 0.945, 0.761, 1.0), + float4(0.137, 0.945, 0.773, 1.0), + float4(0.129, 0.945, 0.784, 1.0), + float4(0.102, 0.945, 0.808, 1.0), + float4(0.102, 0.945, 0.808, 1.0), + float4(0.09, 0.945, 0.82, 1.0), + float4(0.078, 0.945, 0.831, 1.0), + float4(0.067, 0.937, 0.843, 1.0), + float4(0.043, 0.906, 0.871, 1.0), + float4(0.031, 0.89, 0.878, 1.0), + float4(0.031, 0.89, 0.878, 1.0), + float4(0.02, 0.875, 0.89, 1.0), + float4(0.004, 0.859, 0.902, 1.0), + float4(0.0, 0.831, 0.929, 1.0), + float4(0.0, 0.816, 0.941, 1.0), + float4(0.0, 0.804, 0.945, 1.0), + float4(0.0, 0.788, 0.945, 1.0), + float4(0.0, 0.788, 0.945, 1.0), + float4(0.0, 0.757, 0.945, 1.0), + float4(0.0, 0.741, 0.945, 1.0), + float4(0.0, 0.729, 0.945, 1.0), + float4(0.0, 0.714, 0.945, 1.0), + float4(0.0, 0.698, 0.945, 1.0), + float4(0.0, 0.682, 0.945, 1.0), + float4(0.0, 0.671, 0.945, 1.0), + float4(0.0, 0.655, 0.945, 1.0), + float4(0.0, 0.639, 0.945, 1.0), + float4(0.0, 0.62, 0.945, 1.0), + float4(0.0, 0.608, 0.945, 1.0), + float4(0.0, 0.596, 0.945, 1.0), + float4(0.0, 0.58, 0.945, 1.0), + float4(0.0, 0.565, 0.945, 1.0), + float4(0.0, 0.549, 0.945, 1.0), + float4(0.0, 0.537, 0.945, 1.0), + float4(0.0, 0.522, 0.945, 1.0), + float4(0.0, 0.502, 0.945, 1.0), + float4(0.0, 0.49, 0.945, 1.0), + float4(0.0, 0.475, 0.945, 1.0), + float4(0.0, 0.463, 0.945, 1.0), + float4(0.0, 0.447, 0.945, 1.0), + float4(0.0, 0.427, 0.945, 1.0), + float4(0.0, 0.416, 0.945, 1.0), + float4(0.0, 0.404, 0.945, 1.0), + float4(0.0, 0.388, 0.945, 1.0), + float4(0.0, 0.369, 0.945, 1.0), + float4(0.0, 0.357, 0.945, 1.0), + float4(0.0, 0.341, 0.945, 1.0), + float4(0.0, 0.329, 0.945, 1.0), + float4(0.0, 0.298, 0.945, 1.0), + float4(0.0, 0.298, 0.945, 1.0), + float4(0.0, 0.282, 0.945, 1.0), + float4(0.0, 0.267, 0.945, 1.0), + float4(0.0, 0.251, 0.945, 1.0), + float4(0.0, 0.224, 0.945, 1.0), + float4(0.0, 0.208, 0.945, 1.0), + float4(0.0, 0.208, 0.945, 1.0), + float4(0.0, 0.192, 0.945, 1.0), + float4(0.0, 0.18, 0.945, 1.0), + float4(0.0, 0.149, 0.945, 1.0), + float4(0.0, 0.133, 0.945, 1.0), + float4(0.0, 0.122, 0.945, 1.0), + float4(0.0, 0.106, 0.945, 1.0), + float4(0.0, 0.106, 0.945, 1.0), + float4(0.0, 0.071, 0.945, 1.0), + float4(0.0, 0.063, 0.945, 1.0), + float4(0.0, 0.047, 0.945, 1.0), + float4(0.0, 0.031, 0.945, 1.0), + float4(0.0, 0.012, 0.945, 1.0), + float4(0.0, 0.0, 0.945, 1.0), + float4(0.0, 0.0, 0.945, 1.0), + float4(0.0, 0.0, 0.945, 1.0), + float4(0.0, 0.0, 0.945, 1.0), + float4(0.0, 0.0, 0.945, 1.0), + float4(0.0, 0.0, 0.925, 1.0), + float4(0.0, 0.0, 0.91, 1.0), + float4(0.0, 0.0, 0.89, 1.0), + float4(0.0, 0.0, 0.875, 1.0), + float4(0.0, 0.0, 0.859, 1.0), + float4(0.0, 0.0, 0.839, 1.0), + float4(0.0, 0.0, 0.824, 1.0), + float4(0.0, 0.0, 0.808, 1.0), + float4(0.0, 0.0, 0.792, 1.0), + float4(0.0, 0.0, 0.773, 1.0), + float4(0.0, 0.0, 0.757, 1.0), + float4(0.0, 0.0, 0.741, 1.0), + float4(0.0, 0.0, 0.725, 1.0), + float4(0.0, 0.0, 0.706, 1.0), + float4(0.0, 0.0, 0.69, 1.0), + float4(0.0, 0.0, 0.675, 1.0), + float4(0.0, 0.0, 0.659, 1.0), + float4(0.0, 0.0, 0.639, 1.0), + float4(0.0, 0.0, 0.62, 1.0), + float4(0.0, 0.0, 0.604, 1.0), + float4(0.0, 0.0, 0.588, 1.0), + float4(0.0, 0.0, 0.573, 1.0), + float4(0.0, 0.0, 0.553, 1.0), + float4(0.0, 0.0, 0.537, 1.0), + float4(0.0, 0.0, 0.522, 1.0), + float4(0.0, 0.0, 0.486, 1.0), + float4(0.0, 0.0, 0.471, 1.0) + }; + float _GridSize; float _LineSize; @@ -73,7 +326,9 @@ Shader "PDT Shaders/TestGrid" { } else { float pos = id.y * _GridSize + id.x; if(pos < _valueLength) { - color = lerp(_InactiveColor, _ActiveColor, _values[pos]); + float index = clamp(floor(_values[pos] * 250), 0, 99); + color = _gradient[index]; + // color = lerp(_InactiveColor, _ActiveColor, _values[pos]); brightness = color.w; } } diff --git a/Climb/Assets/Scenes/SampleScene.unity b/Climb/Assets/Scenes/SampleScene.unity deleted file mode 100644 index e5ecd0a..0000000 --- a/Climb/Assets/Scenes/SampleScene.unity +++ /dev/null @@ -1,188 +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: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 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, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 10 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 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_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - 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 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &519420028 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 519420032} - - component: {fileID: 519420031} - - component: {fileID: 519420029} - 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 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 ---- !u!20 &519420031 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - 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: 0 - m_HDR: 1 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 0 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &519420032 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Climb/Assets/Scenes/Scene.unity b/Climb/Assets/Scenes/Scene.unity new file mode 100644 index 0000000..ae8a4af --- /dev/null +++ b/Climb/Assets/Scenes/Scene.unity @@ -0,0 +1,481 @@ +%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: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 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, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + 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_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + 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 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &519420028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 519420032} + - component: {fileID: 519420031} + - component: {fileID: 519420029} + 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 &519420029 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 +--- !u!20 &519420031 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.122641504, g: 0.122641504, b: 0.122641504, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + 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: 0 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 0 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &519420032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &757291286 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 757291288} + - component: {fileID: 757291287} + 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 &757291287 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 757291286} + m_Enabled: 1 + serializedVersion: 9 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + 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_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &757291288 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 757291286} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &768816416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 768816418} + - component: {fileID: 768816417} + m_Layer: 0 + m_Name: Area Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &768816417 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768816416} + m_Enabled: 1 + serializedVersion: 9 + m_Type: 3 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 25.36 + m_Range: 15.89 + m_SpotAngle: 179 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + 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: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 10, y: 10} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &768816418 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768816416} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1360326143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1360326147} + - component: {fileID: 1360326146} + - component: {fileID: 1360326145} + - component: {fileID: 1360326144} + m_Layer: 0 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1360326144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1360326143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35bdea3d1990c0243b6232d11c458737, type: 3} + m_Name: + m_EditorClassIdentifier: + gridMaterial: {fileID: 2100000, guid: 249dd0147b28b3d4398583f303bdd107, type: 2} + size: 20 + perlinScale: 0.5 + offsetChange: {x: 1, y: 0} +--- !u!23 &1360326145 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1360326143} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 249dd0147b28b3d4398583f303bdd107, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 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 +--- !u!33 &1360326146 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1360326143} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1360326147 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1360326143} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Climb/Assets/Scenes/SampleScene.unity.meta b/Climb/Assets/Scenes/Scene.unity.meta similarity index 74% rename from Climb/Assets/Scenes/SampleScene.unity.meta rename to Climb/Assets/Scenes/Scene.unity.meta index c1e3c88..a3d4d70 100644 --- a/Climb/Assets/Scenes/SampleScene.unity.meta +++ b/Climb/Assets/Scenes/Scene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2cda990e2423bbf4892e6590ba056729 +guid: 265c2425b87c8f74d9ce215b31fc9298 DefaultImporter: externalObjects: {} userData: diff --git a/Climb/Assets/Scripts/GridController.cs b/Climb/Assets/Scripts/GridController.cs index 460008b..6a605ab 100644 --- a/Climb/Assets/Scripts/GridController.cs +++ b/Climb/Assets/Scripts/GridController.cs @@ -1,5 +1,6 @@ using System; using UnityEngine; +using Random = UnityEngine.Random; public enum PropertyName { GridSize, @@ -15,11 +16,11 @@ public class GridController : MonoBehaviour { public int size = 32; public float perlinScale = 16; public Vector2 offsetChange = new Vector2(1, 0); - + private Vector2 _offset; private float[] _values; private ComputeBuffer _buffer; - + // Get all property IDs private static readonly int ValueLength = Shader.PropertyToID("_valueLength"); private static readonly int Values = Shader.PropertyToID("_values"); @@ -29,7 +30,9 @@ public class GridController : MonoBehaviour { _values = new float[size * size]; for (int x = 0; x < size; x++) { for (int y = 0; y < size; y++) { - SetValue(x, y, Mathf.PerlinNoise((x + _offset.x) * perlinScale, (y + _offset.y) * perlinScale)); + // SetValue(x, y, Random.value); + SetValue(x, y, + Mathf.PerlinNoise((x + _offset.x) * perlinScale, (y + _offset.y) * perlinScale)); } } } @@ -38,9 +41,9 @@ public class GridController : MonoBehaviour { _offset = new Vector2(0, 0); _buffer = new ComputeBuffer((int) Mathf.Pow(2048, 2), 4); RegenerateValues(); - + // Update all Shader properties - foreach(PropertyName property in Enum.GetValues(typeof(PropertyName))) + foreach (PropertyName property in Enum.GetValues(typeof(PropertyName))) UpdateShader(property); } @@ -70,7 +73,7 @@ public class GridController : MonoBehaviour { // Regenerate new position then send values to Shader RegenerateValues(); UpdateShader(PropertyName.Values); - + // Move offset _offset += offsetChange * Time.deltaTime; } diff --git a/Climb/ProjectSettings/EditorBuildSettings.asset b/Climb/ProjectSettings/EditorBuildSettings.asset index 82ab0f5..2cd9e9e 100644 --- a/Climb/ProjectSettings/EditorBuildSettings.asset +++ b/Climb/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,6 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity - guid: 2cda990e2423bbf4892e6590ba056729 + path: Assets/Scenes/Scene.unity + guid: 265c2425b87c8f74d9ce215b31fc9298 m_configObjects: {} diff --git a/Climb/ProjectSettings/EditorSettings.asset b/Climb/ProjectSettings/EditorSettings.asset index 8d9e83b..81e78ca 100644 --- a/Climb/ProjectSettings/EditorSettings.asset +++ b/Climb/ProjectSettings/EditorSettings.asset @@ -8,14 +8,18 @@ EditorSettings: m_SerializationMode: 2 m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 1 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 4 m_SpritePackerPaddingPower: 1 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_AsyncShaderCompilation: 1 diff --git a/Climb/ProjectSettings/GraphicsSettings.asset b/Climb/ProjectSettings/GraphicsSettings.asset index 6c2632a..ab4d074 100644 --- a/Climb/ProjectSettings/GraphicsSettings.asset +++ b/Climb/ProjectSettings/GraphicsSettings.asset @@ -31,6 +31,9 @@ GraphicsSettings: m_AlwaysIncludedShaders: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/Climb/ProjectSettings/UnityConnectSettings.asset b/Climb/ProjectSettings/UnityConnectSettings.asset index fa0b146..c3ae9a0 100644 --- a/Climb/ProjectSettings/UnityConnectSettings.asset +++ b/Climb/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events