massive number of fixes, removed compilation error, logs, negative scale issues, serialization issues ETC

This commit is contained in:
2024-11-25 15:15:55 +01:00
parent 48d565f77e
commit 8d766ed470
48 changed files with 1442 additions and 2434 deletions

View File

@@ -261,6 +261,15 @@
},
{
"m_Id": "c9b079fd494f4c8a99822b4a52a259b8"
},
{
"m_Id": "ab1a481cdf564504b837ed7877f6663f"
},
{
"m_Id": "30d04585da65453cbe3485a7156cd296"
},
{
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
}
],
"m_GroupDatas": [
@@ -332,20 +341,6 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "2a5ca6696c530e8c874719b853083a48"
},
"m_SlotId": 1
},
"m_InputSlot": {
"m_Node": {
"m_Id": "8eb325963471496fa92ad14e027cf020"
},
"m_SlotId": 2
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -360,6 +355,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "30d04585da65453cbe3485a7156cd296"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
},
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -402,6 +411,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
},
"m_SlotId": 2
},
"m_InputSlot": {
"m_Node": {
"m_Id": "8eb325963471496fa92ad14e027cf020"
},
"m_SlotId": 2
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -696,6 +719,20 @@
"m_SlotId": 4
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "ab1a481cdf564504b837ed7877f6663f"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -1929,6 +1966,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "1c8a8ac7ae0941b3991c2fe6a11379a2",
"m_Id": 0,
"m_DisplayName": "A",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "A",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
}
}
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.ShaderKeyword",
@@ -2224,6 +2285,44 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ViewVectorNode",
"m_ObjectId": "30d04585da65453cbe3485a7156cd296",
"m_Group": {
"m_Id": ""
},
"m_Name": "View Vector",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -2002.999755859375,
"y": 33.00000762939453,
"width": 206.0,
"height": 131.0
}
},
"m_Slots": [
{
"m_Id": "5df6c952da824e288e634fe81979c48a"
},
{
"m_Id": "81dcfd920a3d46c8b29dceb767fd69d0"
}
],
"synonyms": [
"eye vector"
],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Space": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
@@ -2818,6 +2917,48 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.AddNode",
"m_ObjectId": "4fad8de703eb41b583e500027c9bdfb6",
"m_Group": {
"m_Id": ""
},
"m_Name": "Add",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -1630.0,
"y": -82.00000762939453,
"width": 130.0,
"height": 118.00001525878906
}
},
"m_Slots": [
{
"m_Id": "1c8a8ac7ae0941b3991c2fe6a11379a2"
},
{
"m_Id": "5e65d8acebf044e08eda4eaaab4c9668"
},
{
"m_Id": "de9e74eaad8f4bfbbfc9d0352a617b94"
}
],
"synonyms": [
"addition",
"sum",
"plus"
],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -3176,6 +3317,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
"m_ObjectId": "5df6c952da824e288e634fe81979c48a",
"m_Id": 3,
"m_DisplayName": "World Space Position",
"m_SlotType": 0,
"m_Hidden": true,
"m_ShaderOutputName": "WorldSpacePosition",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_Space": 2
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@@ -3218,6 +3383,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "5e65d8acebf044e08eda4eaaab4c9668",
"m_Id": 1,
"m_DisplayName": "B",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "B",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -3469,6 +3658,29 @@
]
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
"m_ObjectId": "72e0664908974c2cb8f362df4ed9648b",
"m_Id": 0,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -3977,6 +4189,29 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
"m_ObjectId": "81dcfd920a3d46c8b29dceb767fd69d0",
"m_Id": 0,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -5161,6 +5396,42 @@
}
}
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.PositionNode",
"m_ObjectId": "ab1a481cdf564504b837ed7877f6663f",
"m_Group": {
"m_Id": ""
},
"m_Name": "Position",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -2003.0,
"y": -117.0,
"width": 206.0,
"height": 131.00001525878907
}
},
"m_Slots": [
{
"m_Id": "72e0664908974c2cb8f362df4ed9648b"
}
],
"synonyms": [
"location"
],
"m_Precision": 1,
"m_PreviewExpanded": false,
"m_PreviewMode": 2,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Space": 0,
"m_PositionSource": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -6767,6 +7038,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "de9e74eaad8f4bfbbfc9d0352a617b94",
"m_Id": 2,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",