Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ec8813e
[9.x.x][Yamato] Remove references to trunk and master (#505)
sophiaaar May 15, 2020
d08157e
remove player-connection-ip flag from Android (#509)
tomzig16 May 15, 2020
9f5d188
Changes to get branch to compile
sainarayan-cse May 15, 2020
11a226d
Moved target and subtarget settings to Internal Inspector
sainarayan-cse May 15, 2020
8648bdf
[skip ci] fixing window handling issues with preview and BB, code cle…
sainarayan-cse May 15, 2020
8fc8135
[skip ci] Inspector: Fixed bug 1244134 and property visible in inspec…
sainarayan-cse May 15, 2020
1706ed9
Fixed bug 1244134 with precision settings on nodes
sainarayan-cse May 5, 2020
f1ab205
Added behavior to hide inspector when nothing is selected
sainarayan-cse May 15, 2020
bd5c3f1
removed IHasSettings and moved subgraph/custom node settings to inspe…
sainarayan-cse May 15, 2020
361a628
fixes for node property drawers, selection with undo/redo and inspec…
sainarayan-cse May 15, 2020
cd21477
Changed cog wheel settings to be only on master nodes
sainarayan-cse May 16, 2020
171de39
[9.x.x] Merge Hdrp/staging [Skip CI] (#366) (#521)
sebastienlagarde May 17, 2020
e6e633b
[9.x.x] Disable unstable test on vulkan HDRP
sebastienlagarde May 17, 2020
7e7a097
Auto bumped package versions:
May 17, 2020
b542b64
Update changelog to have the correct version
May 18, 2020
b1d3172
Auto bumped package versions:
May 18, 2020
1b70e45
[9.x.x] [Packages] Fix promotion jobs [skip ci] (#530)
sophiaaar May 18, 2020
bf235b5
removed references to IHasSettings from HDRP master nodes as well
sainarayan-cse May 18, 2020
f53b214
[9.x.x backport] backporting https://github.com/Unity-Technologies/Gr…
oleks-k May 19, 2020
2eaed19
[9.x.x backport] Merge Hdrp/staging [Skip CI] (#544) (#545)
sebastienlagarde May 19, 2020
cb50320
Merge branch '9.x.x/release' into sg/inspector-bugfixes
sainarayan-cse May 19, 2020
4b14d15
Revert "Merge branch '9.x.x/release' into sg/inspector-bugfixes"
sainarayan-cse May 19, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace UnityEditor.Rendering.HighDefinition
[Serializable]
[Title("Master", "Decal (HDRP)")]
[FormerName("UnityEditor.Experimental.Rendering.HDPipeline.DecalMasterNode")]
class DecalMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class DecalMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string PositionSlotName = "Vertex Position";
public const string PositionSlotDisplayName = "Vertex Position";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace UnityEditor.Rendering.HighDefinition
{
[Serializable]
[Title("Master", "Eye (HDRP)(Preview)")]
class EyeMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class EyeMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string PositionSlotName = "Vertex Position";
public const string PositionSlotDisplayName = "Vertex Position";
Expand Down Expand Up @@ -229,7 +229,7 @@ public ToggleData alphaTest
Dirty(ModificationScope.Topological);
}
}

[SerializeField]
bool m_AlphaToMask = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace UnityEditor.Rendering.HighDefinition
[Title("Master", "Fabric (HDRP)")]
[FormerName("UnityEditor.Experimental.Rendering.HDPipeline.FabricMasterNode")]
[FormerName("UnityEditor.ShaderGraph.FabricMasterNode")]
class FabricMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class FabricMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string PositionSlotName = "Vertex Position";
public const string PositionSlotDisplayName = "Vertex Position";
Expand Down Expand Up @@ -234,7 +234,7 @@ public ToggleData alphaTest
Dirty(ModificationScope.Topological);
}
}

[SerializeField]
bool m_AlphaToMask = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace UnityEditor.Rendering.HighDefinition
[Serializable]
[Title("Master", "Hair (HDRP)")]
[FormerName("UnityEditor.Experimental.Rendering.HDPipeline.HairMasterNode")]
class HairMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class HairMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string PositionSlotName = "Vertex Position";
public const string PositionSlotDisplayName = "Vertex Position";
Expand Down Expand Up @@ -259,7 +259,7 @@ public ToggleData alphaTest
Dirty(ModificationScope.Topological);
}
}

[SerializeField]
bool m_AlphaToMask = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace UnityEditor.Rendering.HighDefinition
[Title("Master", "Lit (HDRP)")]
[FormerName("UnityEditor.Experimental.Rendering.HDPipeline.HDLitMasterNode")]
[FormerName("UnityEditor.ShaderGraph.HDLitMasterNode")]
class HDLitMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class HDLitMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string AlbedoSlotName = "Albedo";
public const string AlbedoDisplaySlotName = "BaseColor";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace UnityEditor.Rendering.HighDefinition
[Title("Master", "StackLit (HDRP)")]
[FormerName("UnityEditor.Experimental.Rendering.HDPipeline.StackLitMasterNode")]
[FormerName("UnityEditor.ShaderGraph.StackLitMasterNode")]
class StackLitMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class StackLitMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string PositionSlotName = "Vertex Position";
public const string PositionSlotDisplayName = "Vertex Position";
Expand Down Expand Up @@ -360,7 +360,7 @@ public ToggleData alphaTest
Dirty(ModificationScope.Topological);
}
}

[SerializeField]
bool m_AlphaToMask = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace UnityEditor.Rendering.HighDefinition
[Serializable]
[FormerName("UnityEditor.Experimental.Rendering.HDPipeline.HDUnlitMasterNode")]
[Title("Master", "Unlit (HDRP)")]
class HDUnlitMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class HDUnlitMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string ColorSlotName = "Color";
public const string AlphaSlotName = "Alpha";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace UnityEditor.Experimental.Rendering.Universal
[Serializable]
[Title("Master", "Sprite Lit (Experimental)")]
[FormerName("UnityEditor.Experimental.Rendering.LWRP.SpriteLitMasterNode")]
class SpriteLitMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class SpriteLitMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string PositionName = "Vertex Position";
public const string NormalName = "Vertex Normal";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace UnityEditor.Experimental.Rendering.Universal
[Serializable]
[Title("Master", "Sprite Unlit (Experimental)")]
[FormerName("UnityEditor.Experimental.Rendering.LWRP.SpriteUnlitMasterNode")]
class SpriteUnlitMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class SpriteUnlitMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string PositionName = "Vertex Position";
public const string NormalName = "Vertex Normal";
Expand Down
4 changes: 2 additions & 2 deletions com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ public List<string> BuildPropertyDisplayNameList(AbstractShaderProperty ignorePr
}
}
}

return result;
}

Expand Down Expand Up @@ -901,7 +901,7 @@ void ReplacePropertyNodeWithConcreteNodeNoValidate(PropertyNode propertyNode, bo

var node = property.ToConcreteNode() as AbstractMaterialNode;
if (node == null) // Some nodes have no concrete form
{
{
if (deleteNodeIfNoConcreteFormExists)
RemoveNodeNoValidate(propertyNode);
return;
Expand Down
9 changes: 0 additions & 9 deletions com.unity.shadergraph/Editor/Data/Interfaces/IHasSettings.cs

This file was deleted.

11 changes: 0 additions & 11 deletions com.unity.shadergraph/Editor/Data/Interfaces/IHasSettings.cs.meta

This file was deleted.

48 changes: 23 additions & 25 deletions com.unity.shadergraph/Editor/Data/Interfaces/IInspectable.cs
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
using System;
using System.Reflection;
using Data.Interfaces;
using Drawing.Inspector;
using UnityEngine.UIElements;

namespace UnityEditor.ShaderGraph.Drawing
{
interface IInspectable
{
// Implementors can override this in order to display their desired string when selected and viewed through the inscetor
string inspectorTitle { get; }

// This function should return the underlying data object that user wishes to expose to the Inspector
object GetObjectToInspect();

// This function should return the property information of whatever object has been marked up for metadata gathering by the inspector
// This might be the same as the object returned by GetObjectToInspect(), it might not
PropertyInfo[] GetPropertyInfo();

// Used to provide any data needed by the property drawer from the inspectable
// The inspectorUpdateDelegate is used to trigger an inspector update
void SupplyDataToPropertyDrawer(IPropertyDrawer propertyDrawer, Action inspectorUpdateDelegate);
}
}
using System;
using System.Reflection;
using Data.Interfaces;
using Drawing.Inspector;
using UnityEngine.UIElements;

namespace UnityEditor.ShaderGraph.Drawing
{
interface IInspectable
{
// Implementors can override this in order to display their desired string when selected and viewed through the inspector
string inspectorTitle { get; }

// This function should return the underlying data object that user wishes to expose to the Inspector
// For simple data properties like Integers/Floats this is the object that contains the properties
// For complex types like GraphData this is the GraphData itself, its up to the PropertyDrawer to define what it needs
object GetObjectToInspect();

// Used to provide any data needed by the property drawer from the inspectable
// The inspectorUpdateDelegate is used to trigger an inspector update
void SupplyDataToPropertyDrawer(IPropertyDrawer propertyDrawer, Action inspectorUpdateDelegate);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace UnityEditor.ShaderGraph
{
[Serializable]
[Title("Master", "PBR")]
class PBRMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class PBRMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string AlbedoSlotName = "Albedo";
public const string NormalSlotName = "Normal";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace UnityEditor.ShaderGraph
{
[Serializable]
[Title("Master", "Unlit")]
class UnlitMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
class UnlitMasterNode : AbstractMaterialNode, IMasterNode, ICanChangeShaderGUI, IMayRequirePosition, IMayRequireNormal, IMayRequireTangent
{
public const string ColorSlotName = "Color";
public const string AlphaSlotName = "Alpha";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace UnityEditor.ShaderGraph
{
[Serializable]
[Title("Master", "Visual Effect")]
sealed class VfxMasterNode : AbstractMaterialNode, IMasterNode, IHasSettings, IMayRequirePosition
sealed class VfxMasterNode : AbstractMaterialNode, IMasterNode, IMayRequirePosition
{
const string BaseColorSlotName = "Base Color";
const string MetallicSlotName = "Metallic";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ public virtual bool canSetPrecision

private ConcretePrecision m_ConcretePrecision = ConcretePrecision.Float;

[Inspectable("Precision", ConcretePrecision.Float)]
public ConcretePrecision concretePrecision
{
get => m_ConcretePrecision;
Expand Down
Loading