Revert "Revert "Revert "Revert "Premier essai shader mais jte jure jcomrpend rien\n(est-ce que ça marche même antislash n sur git ?) bref le shader est dans Effects/wMaillage machin truc""""

This reverts commit 907fc4cf11.

FreeCam/Assets/BlockSpawner.cs

@@ -5,6 +5,7 @@ using UnityEngine.InputSystem;
 
 public class BlockSpawner : MonoBehaviour
 {
+
     [SerializeField]
     private GameObject _blockToPlace;
     public GameObject BlockToPlace
@@ -22,14 +23,18 @@ public class BlockSpawner : MonoBehaviour
 
     public float spawnDistance = 3f;
 
+    public Shader previewShader;
     private GameObject _blockInstance;
 
+
     private bool _isPreview = false;
+    private Shader _initialShader;
 
     public void OnPlaceBlock()
     {
         if (!_isPreview) return;
         _blockInstance.transform.SetParent(null);
+        SwitchToDefaultRender();
         _blockInstance = null;
         DisablePreviewMode();
     }
@@ -50,6 +55,7 @@ public class BlockSpawner : MonoBehaviour
         _blockInstance = Instantiate(_blockToPlace, spawnPos, Quaternion.identity);
         _blockInstance.transform.SetParent(this.transform, false);
         _isPreview = true;
+        SwitchToMeshRender();
     }
 
     private void DisablePreviewMode()
@@ -57,4 +63,19 @@ public class BlockSpawner : MonoBehaviour
         if (_blockInstance != null) Destroy(_blockInstance);
         _isPreview = false;
     }
+
+    private void SwitchToMeshRender()
+    {
+        MeshRenderer vRenderer = _blockInstance.GetComponent<MeshRenderer>();
+        Material vMaterial = vRenderer.material;
+        _initialShader = vMaterial.shader;
+        vMaterial.shader = previewShader;
+    }
+
+    private void SwitchToDefaultRender()
+    {
+        MeshRenderer vRenderer = _blockInstance.GetComponent<MeshRenderer>();
+        Material vMaterial = vRenderer.material;
+        vMaterial.shader = _initialShader;
+    }
 }

FreeCam/Assets/BlockSpawner.cs.meta

@@ -3,7 +3,9 @@ guid: b78dfde35e58d1e4c858653eaf06ea64
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - _blockToPlace: {instanceID: 0}
+  - previewShader: {fileID: 4800000, guid: 167cdc0b24acc2f449b7fb1756fbc873, type: 3}
   executionOrder: 0
   icon: {instanceID: 0}
   userData: 

FreeCam/Assets/Effects.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 41582cd70db64bd47b6745a4095c0395
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

FreeCam/Assets/Effects/NewShaderVariants.shadervariants

@@ -0,0 +1,13 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: NewShaderVariants
+  m_Shaders:
+  - first: {fileID: 10512, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants: []

FreeCam/Assets/Effects/NewShaderVariants.shadervariants.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1bac98432915ee94bafd6b815a8663d7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

FreeCam/Assets/Effects/standardSurfaceShader.shader

@@ -0,0 +1,53 @@
+Shader "Custom/standardSurfaceShader"
+{
+    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
+    }
+    SubShader
+    {
+        Tags { "RenderType"="Opaque" }
+        LOD 200
+
+        CGPROGRAM
+        // Physically based Standard lighting model, and enable shadows on all light types
+        #pragma surface surf Standard fullforwardshadows
+
+        // Use shader model 3.0 target, to get nicer looking lighting
+        #pragma target 3.0
+
+        sampler2D _MainTex;
+
+        struct Input
+        {
+            float2 uv_MainTex;
+        };
+
+        half _Glossiness;
+        half _Metallic;
+        fixed4 _Color;
+
+        // 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 surf (Input IN, inout SurfaceOutputStandard o)
+        {
+            // Albedo comes from a texture tinted by color
+            fixed4 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;
+        }
+        ENDCG
+    }
+    FallBack "Diffuse"
+}

FreeCam/Assets/Effects/standardSurfaceShader.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b0c691a25e854aa488e55c7de961b502
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

FreeCam/Assets/Effects/wMaillageShader.shader

@@ -0,0 +1,134 @@
+Shader "Custom/wMaillageShader"
+{
+    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
+		}
+    }
+}

FreeCam/Assets/Effects/wMaillageShader.shader.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 167cdc0b24acc2f449b7fb1756fbc873
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures:
+  - _MainTex: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

FreeCam/Assets/Materials/New Material.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: New Material
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: b0c691a25e854aa488e55c7de961b502, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0

FreeCam/Assets/Scenes/SampleScene.unity

@@ -688,5 +688,9 @@ PrefabInstance:
       propertyPath: _blockToPlace
       value: 
       objectReference: {fileID: 3300812737117657924, guid: 7b30a4c90d614f747872471cf43b8e56, type: 3}
+    - target: {fileID: 6193258497320629589, guid: 37333bbc22b455449a05fcf8aa6b9a8f, type: 3}
+      propertyPath: previewShader
+      value: 
+      objectReference: {fileID: 4800000, guid: 167cdc0b24acc2f449b7fb1756fbc873, type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 37333bbc22b455449a05fcf8aa6b9a8f, type: 3}