merging

FreeCam/Assets/BlockSpawner.cs

@@ -6,6 +6,13 @@ using UnityEngine.InputSystem;
 public class BlockSpawner : MonoBehaviour
 {
 
+<<<<<<< HEAD
+=======
+    private void Start()
+    {
+        _playerInput = GetComponent<PlayerInput>();
+    }
+>>>>>>> shader
     [SerializeField]
     private GameObject _blockToPlace;
     public GameObject BlockToPlace
@@ -20,6 +27,7 @@ public class BlockSpawner : MonoBehaviour
             _blockToPlace = value;
         }
     }
+    PlayerInput _playerInput;
 
     public float spawnDistance = 3f;
 
@@ -30,6 +38,11 @@ public class BlockSpawner : MonoBehaviour
     private bool _isPreview = false;
     private Shader _initialShader;
 
+    public bool _blockRotating = false;
+    private Quaternion _lastRotationState;
+
+    private Shader _initialShader;
+
     public void OnPlaceBlock()
     {
         if (!_isPreview) return;
@@ -43,8 +56,44 @@ public class BlockSpawner : MonoBehaviour
     {
         float valueAsFloat = value.Get<float>();
 
-        if (valueAsFloat == 1f) EnablePreviewMode();
-        else DisablePreviewMode();
+        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()
@@ -52,8 +101,10 @@ public class BlockSpawner : MonoBehaviour
         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();
     }
@@ -78,4 +129,9 @@ public class BlockSpawner : MonoBehaviour
         Material vMaterial = vRenderer.material;
         vMaterial.shader = _initialShader;
     }
+<<<<<<< HEAD
+=======
+
+    
+>>>>>>> shader
 }

FreeCam/Assets/Controls.inputactions

@@ -44,6 +44,30 @@
                     "expectedControlType": "Button",
                     "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": [
@@ -214,7 +238,7 @@
                 },
                 {
                     "name": "",
-                    "id": "b00386e1-8b81-4b23-add0-14dfd7c1fc48",
+                    "id": "a13b0893-b67b-4b60-819c-a2a88e0a551c",
                     "path": "<Mouse>/delta",
                     "interactions": "",
                     "processors": "",
@@ -343,6 +367,39 @@
                     "action": "Sprint",
                     "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
                 }
             ]
         }

FreeCam/Assets/Effects/wMaillageShader.shader

@@ -1,5 +1,6 @@
 Shader "Custom/wMaillageShader"
 {
+<<<<<<< HEAD
     Properties
     {
 		_MainTex("Texture", 2D) = "white" {}
@@ -131,4 +132,39 @@
 			ENDCG
 		}
     }
+=======
+	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"
+>>>>>>> shader
 }

FreeCam/Assets/Effects/wMaillageShader.shader.meta

@@ -3,7 +3,11 @@ 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,7 +8,11 @@ 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
@@ -40,7 +44,7 @@ Material:
         m_Scale: {x: 0.85, y: 0.85}
         m_Offset: {x: 0.075, y: 0.075}
     - _MainTex:
-        m_Texture: {fileID: 10906, guid: 0000000000000000f000000000000000, type: 0}
+        m_Texture: {fileID: 10305, guid: 0000000000000000f000000000000000, type: 0}
         m_Scale: {x: 0.85, y: 0.85}
         m_Offset: {x: 0.075, y: 0.075}
     - _MetallicGlossMap:
@@ -67,12 +71,18 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _RimPower: 0.91
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _Threshold: 0.01
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 0.42955682, g: 0.4301132, b: 0.46226418, a: 1}
+    - _EdgeColor: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InnerColor: {r: 0, g: 0, b: 0, a: 1}
+    - _MainTex: {r: 0.5, g: 0.5, b: 1, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []

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>();