Skip to content

Commit

Permalink
Merge pull request #15 from AllPoland/dev
Browse files Browse the repository at this point in the history 
0.3.1 push
  • Loading branch information
@AllPoland
AllPoland authored May 15, 2023
2 parents 940c4fd + 817b7b4 commit 132e0cc
Show file tree
Hide file tree
Showing 35 changed files with 1,427 additions and 569 deletions.
817 changes: 774 additions & 43 deletions Assets/Scenes/Previewer.unity
View file

Large diffs are not rendered by default.

229 changes: 227 additions & 2 deletions Assets/Shaders/Objects/ArcShader.shadergraph
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,18 @@
},
{
"m_Id": "4d737e52749744eeb77be43e6a4b2ddd"
},
{
"m_Id": "af0c62685c584374b7325a325265e381"
},
{
"m_Id": "378cd6e559414544be7278d56cb8d569"
},
{
"m_Id": "5d708b789e7c4e93ac00d373a64a423d"
},
{
"m_Id": "69762896d21b4337bcfb3f63c5c25a2e"
}
],
"m_GroupDatas": [],
Expand Down Expand Up @@ -1722,6 +1734,18 @@
},
{
"m_Id": "6f06abf75e1741dcbe5617be5f5d0042"
},
{
"m_Id": "af0c62685c584374b7325a325265e381"
},
{
"m_Id": "378cd6e559414544be7278d56cb8d569"
},
{
"m_Id": "5d708b789e7c4e93ac00d373a64a423d"
},
{
"m_Id": "69762896d21b4337bcfb3f63c5c25a2e"
}
]
},
Expand Down Expand Up @@ -2000,6 +2024,30 @@
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
"m_ObjectId": "0936387b691e466c92fb3305fd26332b",
"m_Id": 0,
"m_DisplayName": "Normal (Tangent Space)",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "NormalTS",
"m_StageCapability": 2,
"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": 3
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
Expand Down Expand Up @@ -3417,8 +3465,8 @@
"m_AlphaMode": 0,
"m_RenderFace": 2,
"m_AlphaClip": false,
"m_CastShadows": true,
"m_ReceiveShadows": true,
"m_CastShadows": false,
"m_ReceiveShadows": false,
"m_CustomEditorGUI": "",
"m_SupportVFX": false
}
Expand Down Expand Up @@ -4037,6 +4085,39 @@
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "378cd6e559414544be7278d56cb8d569",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.NormalTS",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "0936387b691e466c92fb3305fd26332b"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.NormalTS"
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
Expand Down Expand Up @@ -5694,6 +5775,39 @@
"m_Labels": []
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "5d708b789e7c4e93ac00d373a64a423d",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Occlusion",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "e9b595159fdc492096c2f302779e43d2"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Occlusion"
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
Expand Down Expand Up @@ -6047,6 +6161,39 @@
"m_Labels": []
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "69762896d21b4337bcfb3f63c5c25a2e",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Metallic",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "8280c5e1761e45c4888fc204a3b3460e"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Metallic"
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
Expand Down Expand Up @@ -6837,6 +6984,21 @@
"m_Labels": []
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "8280c5e1761e45c4888fc204a3b3460e",
"m_Id": 0,
"m_DisplayName": "Metallic",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Metallic",
"m_StageCapability": 2,
"m_Value": 0.0,
"m_DefaultValue": 0.0,
"m_Labels": []
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
Expand Down Expand Up @@ -7763,6 +7925,21 @@
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "94240524621d48e0b9cb66663ae3d2aa",
"m_Id": 0,
"m_DisplayName": "Smoothness",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Smoothness",
"m_StageCapability": 2,
"m_Value": 0.5,
"m_DefaultValue": 0.5,
"m_Labels": []
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
Expand Down Expand Up @@ -8914,6 +9091,39 @@
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "af0c62685c584374b7325a325265e381",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Smoothness",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "94240524621d48e0b9cb66663ae3d2aa"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Smoothness"
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.AddNode",
Expand Down Expand Up @@ -11164,6 +11374,21 @@
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "e9b595159fdc492096c2f302779e43d2",
"m_Id": 0,
"m_DisplayName": "Ambient Occlusion",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Occlusion",
"m_StageCapability": 2,
"m_Value": 1.0,
"m_DefaultValue": 1.0,
"m_Labels": []
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
Expand Down
Loading

0 comments on commit 132e0cc

Please sign in to comment.