coucou

FreeCam/Assets/BlockSpawner.cs

@@ -6,13 +6,11 @@ using UnityEngine.InputSystem;
 public class BlockSpawner : MonoBehaviour
 {
 
-<<<<<<< HEAD
-=======
     private void Start()
     {
         _playerInput = GetComponent<PlayerInput>();
     }
->>>>>>> shader
+
     [SerializeField]
     private GameObject _blockToPlace;
     public GameObject BlockToPlace
@@ -41,8 +39,6 @@ public class BlockSpawner : MonoBehaviour
     public bool _blockRotating = false;
     private Quaternion _lastRotationState;
 
-    private Shader _initialShader;
-
     public void OnPlaceBlock()
     {
         if (!_isPreview) return;
@@ -129,9 +125,5 @@ public class BlockSpawner : MonoBehaviour
         Material vMaterial = vRenderer.material;
         vMaterial.shader = _initialShader;
     }
-<<<<<<< HEAD
-=======
 
-    
->>>>>>> shader
 }

FreeCam/Assets/Effects/wMaillageShader.shader

@@ -1,138 +1,5 @@
 Shader "Custom/wMaillageShader"
 {
-<<<<<<< HEAD
-    Properties
-    {
-		_MainTex("Texture", 2D) = "white" {}
-		_Color("Color", Color) = (1,1,1,1)
-		_Threshold("Threshold", float) = 0.01
-
-		_EdgeColor("Edge color", Color) = (1,0,0,1)
-
-		_Glossiness("Smoothness", Range(0,1)) = 0.5
-		_Metallic("Metallic", Range(0,1)) = 0.0
-    }
-    SubShader
-    {
-        Cull Off ZWrite Off ZTest Always
-		Tags { "RenderType" = "Opaque" }
-        Pass
-
-		{
-
-			CGPROGRAM
-
-			#pragma vertex vert
-
-			#pragma fragment frag 
-			
-
-			#include "UnityCG.cginc"
-
-			struct appdata
-
-			{
-
-				float4 vertex : POSITION;
-
-				float2 uv : TEXCOORD0;
-
-			};
-
-			struct v2f
-
-			{
-
-				float2 uv : TEXCOORD0;
-
-				float4 vertex : SV_POSITION;
-
-			};
-
-			sampler2D _CameraDepthNormalsTexture;
-			float4 _MainTex_ST;
-
-			v2f vert(appdata v)
-
-			{
-
-				v2f o;
-
-				o.vertex = UnityObjectToClipPos(v.vertex);
-
-				o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-
-				return o;
-
-			}
-
-			sampler2D _MainTex;
-
-			float4 _MainTex_TexelSize;
-
-			float _Threshold;
-
-			fixed4 _EdgeColor;
-
-			float4 GetPixelValue(in float2 uv) {
-
-				half3 normal;
-
-				float depth;
-
-				DecodeDepthNormal(tex2D(_CameraDepthNormalsTexture, uv), depth, normal);
-
-				return fixed4(normal, depth);
-
-			}
-
-			fixed4 frag(v2f i) : SV_Target
-
-			{
-
-				fixed4 col = tex2D(_MainTex, i.uv);
-
-				fixed4 orValue = GetPixelValue(i.uv);
-
-				float2 offsets[8] = {
-
-					float2(-1, -1),
-
-					float2(-1, 0),
-
-					float2(-1, 1),
-
-					float2(0, -1),
-
-					float2(0, 1),
-
-					float2(1, -1),
-
-					float2(1, 0),
-
-					float2(1, 1)
-
-				};
-
-				fixed4 sampledValue = fixed4(0,0,0,0);
-
-				for (int j = 0; j < 8; j++) {
-
-					sampledValue += GetPixelValue(i.uv + offsets[j] * _MainTex_TexelSize.xy);
-
-				}
-
-				sampledValue /= 8;
-
-				return lerp(col, _EdgeColor, step(_Threshold, length(orValue - sampledValue)));
-
-			}
-
-			
-			ENDCG
-		}
-    }
-=======
 	Properties
 	{
 	   _InnerColor("Inner Color", Color) = (0.0, 0.0, 0.0, 0.5)
@@ -166,5 +33,4 @@
 		ENDCG
 	}
 		Fallback "Diffuse"
->>>>>>> shader
 }

FreeCam/Assets/Effects/wMaillageShader.shader.meta

@@ -3,11 +3,7 @@ guid: 167cdc0b24acc2f449b7fb1756fbc873
 ShaderImporter:
   externalObjects: {}
   defaultTextures:
-<<<<<<< HEAD
-  - _MainTex: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
-=======
   - _MainTex: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
->>>>>>> shader
   nonModifiableTextures: []
   userData: 
   assetBundleName: 

FreeCam/Assets/Materials/New Material.mat

@@ -8,11 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: New Material
-<<<<<<< HEAD
-  m_Shader: {fileID: 4800000, guid: b0c691a25e854aa488e55c7de961b502, type: 3}
-=======
   m_Shader: {fileID: 4800000, guid: 167cdc0b24acc2f449b7fb1756fbc873, type: 3}
->>>>>>> shader
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0