Resolved merge conflicts incorporating both solutions

FreeCam/Assets/BlockSpawner.cs

@@ -0,0 +1,129 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.InputSystem;
+
+public class BlockSpawner : MonoBehaviour
+{
+
+    private void Start()
+    {
+        _playerInput = GetComponent<PlayerInput>();
+    }
+
+    [SerializeField]
+    private GameObject _blockToPlace;
+    public GameObject BlockToPlace
+    {
+        get
+        {
+            return _blockToPlace;
+        }
+        set
+        {
+            DisablePreviewMode();
+            _blockToPlace = value;
+        }
+    }
+    PlayerInput _playerInput;
+
+    public float spawnDistance = 3f;
+
+    public Shader previewShader;
+    private GameObject _blockInstance;
+
+    private bool _isPreview = false;
+    private Shader _initialShader;
+
+    public bool _blockRotating = false;
+    private Quaternion _lastRotationState;
+
+    public void OnPlaceBlock()
+    {
+        if (!_isPreview) return;
+        _blockInstance.transform.SetParent(null);
+        SwitchToDefaultRender();
+        _blockInstance = null;
+        DisablePreviewMode();
+    }
+
+    public void OnTogglePreviewMode(InputValue value)
+    {
+        float valueAsFloat = value.Get<float>();
+
+        if (valueAsFloat == 1f)
+        {
+            EnablePreviewMode();
+        }
+        else
+        {
+            DisablePreviewMode();
+        }
+    }
+
+    public void OnEnterRotateBlock(InputValue value)
+    {
+        float valueAsFloat = value.Get<float>();
+        Debug.Log(valueAsFloat);
+        _blockRotating = true;
+    }
+
+    public void OnExitRotateBlock(InputValue value)
+    {
+        float valueAsFloat = value.Get<float>();
+        Debug.Log(valueAsFloat);
+        _blockRotating = false;
+    }
+
+    public void OnRotateBlock(InputValue value)
+    {
+        if (_isPreview && _blockRotating)
+        {
+            Vector2 iMouseMovement = value.Get<Vector2>();
+
+            Transform vTransform = _blockInstance.transform;
+            //vTransform.Rotate(iMouseMovement.y / 10, iMouseMovement.x / 10, 0);
+            vTransform.RotateAround(vTransform.position, transform.right, iMouseMovement.y / 10.0f);
+            vTransform.RotateAround(vTransform.position, transform.up, iMouseMovement.x / 10.0f);
+            //vTransform.eulerAngles += vTransform.worldToLocalMatrix.MultiplyVector(new Vector3(iMouseMovement.y / 10, iMouseMovement.x / 10, 0));
+            //vTransform.Rotate(iMouseMovement.y/10, iMouseMovement.x/10, 0);
+            _lastRotationState = vTransform.rotation;
+        } 
+    }
+
+    private void EnablePreviewMode()
+    {
+        if (_blockToPlace == null) return;
+
+        Vector3 spawnPos = Vector3.forward * spawnDistance;
+
+        _blockInstance = Instantiate(_blockToPlace, spawnPos, Quaternion.identity);
+        _blockInstance.transform.SetParent(this.transform, false);
+        _blockInstance.transform.rotation = _lastRotationState;
+        _isPreview = true;
+        SwitchToMeshRender();
+    }
+
+    private void DisablePreviewMode()
+    {
+        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/Controls.inputactions

@@ -52,6 +52,30 @@
                     "expectedControlType": "Axis",
                     "processors": "",
                     "interactions": ""
+                },
+                {
+                    "name": "Enter Rotate Block",
+                    "type": "Button",
+                    "id": "b22358ff-4b1a-4885-b252-f3f61eb2e897",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "Press"
+                },
+                {
+                    "name": "Exit Rotate Block",
+                    "type": "Button",
+                    "id": "38b2fbd1-ab2b-49f0-b20c-12ede099fd44",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "Press(behavior=1)"
+                },
+                {
+                    "name": "Rotate Block",
+                    "type": "PassThrough",
+                    "id": "83900c91-8eb5-4324-aed3-52d0adf00fad",
+                    "expectedControlType": "Vector2",
+                    "processors": "",
+                    "interactions": ""
                 }
             ],
             "bindings": [
@@ -222,7 +246,7 @@
                 },
                 {
                     "name": "",
-                    "id": "b00386e1-8b81-4b23-add0-14dfd7c1fc48",
+                    "id": "a13b0893-b67b-4b60-819c-a2a88e0a551c",
                     "path": "<Mouse>/delta",
                     "interactions": "",
                     "processors": "",
@@ -362,9 +386,42 @@
                     "action": "Scroll",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "",=======
+                    "id": "14041b54-6b2c-4248-8d13-d3652f618c8f",
+                    "path": "<Mouse>/middleButton",
+                    "interactions": "Press",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Enter Rotate Block",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "3ce3e2d9-ec9a-4062-971e-3f524008af63",
+                    "path": "<Mouse>/middleButton",
+                    "interactions": "Press(behavior=1)",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Exit Rotate Block",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "ccc8db9a-4581-4a39-9c88-6834536d8888",
+                    "path": "<Mouse>/delta",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Rotate Block",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                 }
             ]
         }
     ],
     "controlSchemes": []
-}
+}

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,36 @@
+Shader "Custom/wMaillageShader"
+{
+	Properties
+	{
+	   _InnerColor("Inner Color", Color) = (0.0, 0.0, 0.0, 0.5)
+	   _RimColor("Rim Color", Color) = (1.0,1.0,1.0,0.5)
+	   _RimPower("Rim Power", Range(0.5,8.0)) = 2.47
+	}
+		SubShader
+	{
+	  Tags { "Queue" = "Transparent" }
+	  Cull Off ZWrite Off ZTest Less
+		//Blend based on output Alpha, not color value
+		Blend One OneMinusSrcAlpha
+		CGPROGRAM
+		#pragma surface surf Lambert alpha:fade
+		struct Input
+		{
+			float3 viewDir;
+		};
+		float4 _InnerColor;
+		float4 _RimColor;
+		float _RimPower;
+		void surf(Input IN, inout SurfaceOutput o)
+		{
+			half rim = 1.0 - saturate(dot(normalize(IN.viewDir), o.Normal));
+			rim = pow(rim, _RimPower);
+			//Shift inner color to rim color by rim value adjusted by _InnerColor transparency to reduce its effect
+			//on semi-transparent part of rim color the more transparent inner color becomes.
+			o.Emission = lerp(_InnerColor.rgb, _RimColor.rgb, saturate(rim + (1 - _InnerColor.a) - (1 - _RimColor.a)));
+			o.Alpha = lerp(_InnerColor.a, _RimColor.a, rim);
+		}
+		ENDCG
+	}
+		Fallback "Diffuse"
+}

FreeCam/Assets/Effects/wMaillageShader.shader.meta

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

FreeCam/Assets/Player.prefab

@@ -362,3 +362,5 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _blockToPlace: {fileID: 0}
   spawnDistance: 3
+  previewShader: {fileID: 4800000, guid: 167cdc0b24acc2f449b7fb1756fbc873, type: 3}
+  _blockRotating: 0

FreeCam/Assets/Scripts/BlockSpawner.cs.meta

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

FreeCam/Assets/Scripts/FreeCam.cs

@@ -23,6 +23,8 @@ public class FreeCam : MonoBehaviour
     private Vector2 _inputMouse;
     private Vector2 _velocity;
     private CharacterController _controller;
+    private BlockSpawner _blockSpawner;
+
 
     private float _rotationX;
     private bool _isSprinting;
@@ -37,7 +39,7 @@ public class FreeCam : MonoBehaviour
         _inputMouse = Vector2.zero;
         _velocity = Vector2.zero;
         _controller = gameObject.GetComponent<CharacterController>();
-
+        _blockSpawner = gameObject.GetComponent<BlockSpawner>();
         _rotationX = 0;
         _isSprinting = false;
     }
@@ -77,8 +79,17 @@ public class FreeCam : MonoBehaviour
     public void OnLook(InputValue value)
     {
         Vector2 valueAsVector2 = value.Get<Vector2>();
-        _inputMouse.x = valueAsVector2.x;
-        _inputMouse.y = valueAsVector2.y;
+        float xVelocity = valueAsVector2.x;
+        float yVelocity = valueAsVector2.y;
+
+        if (_blockSpawner._blockRotating)
+        {
+            xVelocity *= 0.05f;
+            yVelocity *= 0.05f;
+        }
+        _inputMouse.x = xVelocity;
+        _inputMouse.y = yVelocity;
+
     }
 
     public void OnMovement(InputValue value)
@@ -88,6 +99,11 @@ public class FreeCam : MonoBehaviour
         _velocity.y = valueAsVector2.y;
     }
 
+    public void OnMovementBlockRotating(InputValue value)
+    {
+        OnMovement(value);
+    }
+
     public void OnSprint(InputValue value)
     {
         float valueAsFloat = value.Get<float>();