Skip to content

Internal Inspector #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9b394e6
Initial implementation
Kink3d Nov 7, 2019
b1bc7a6
Remove Master Preview
Kink3d Nov 7, 2019
a1da944
Migrate blackboard field views
Kink3d Nov 8, 2019
e39f40f
Migrate graph options
Kink3d Nov 8, 2019
e8458a8
Inspectable StickyNotes
Kink3d Nov 8, 2019
9bf669f
Handle other selectables
Kink3d Nov 8, 2019
6940b26
Fix for shader graph nodes not pasting at the cursor location
sainarayan-cse Feb 18, 2020
a817799
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Feb 18, 2020
bb72709
Revert "Fix for shader graph nodes not pasting at the cursor location"
Nightmask3 Feb 18, 2020
847d7ab
Added comments
Nightmask3 Feb 20, 2020
c5e482d
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Feb 24, 2020
2195af3
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Feb 26, 2020
73249d3
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Feb 28, 2020
46551c4
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Mar 3, 2020
6bcec64
Reflection based data gathering for the inspector
Nightmask3 Mar 4, 2020
e0080cf
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Mar 4, 2020
1e808db
Added property drawers and drawer registration with view to handle ce…
Nightmask3 Mar 5, 2020
85c8ae0
Added GraphSubWindow class and switched inspector over to it
Nightmask3 Mar 10, 2020
7d37d2d
fixed scrolling issues and single object selection
Nightmask3 Mar 10, 2020
29a6520
Added GetUnderlyingObject() to IInspectable
Nightmask3 Mar 11, 2020
490881f
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Mar 11, 2020
a49ac71
Moved property drawer stuff to its own class file
Nightmask3 Mar 12, 2020
ad9543f
Added float/slider property drawers
Nightmask3 Mar 17, 2020
a30ad23
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Mar 17, 2020
4b86947
Removed ugly callback mess, running into issues with UI updating
Nightmask3 Mar 17, 2020
696b8b1
Finished vector1 property drawer support
Nightmask3 Mar 18, 2020
c53758a
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Mar 18, 2020
d5de054
Finished porting blackboard to property drawer system
Nightmask3 Mar 23, 2020
618261d
Removing exception for MaterialNodeView
Nightmask3 Mar 24, 2020
56ebea6
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Mar 24, 2020
718ed66
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Mar 24, 2020
7a735e1
Merge branch 'master' into sg/inspectorview-v2
Nightmask3 Mar 26, 2020
3af7441
Fixed compilation issues with merge
Nightmask3 Mar 26, 2020
42d25b7
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
Nightmask3 Mar 26, 2020
79cb5ba
Merge branch 'master' into sg/inspectorview-v2
Nightmask3 Mar 26, 2020
f8f9715
Added missing files from master
Nightmask3 Mar 26, 2020
0f421d6
Fixed issue with undo/redo killing the blackboard property selection
Nightmask3 Mar 27, 2020
9f52081
Fixed issues with updating inspector
Nightmask3 Mar 30, 2020
8213926
Added support for HDRP and removed old settings views for master nodes
sainarayan-cse Apr 16, 2020
1f9c796
updated changelog
sainarayan-cse Apr 16, 2020
3d29416
Fixed softlock bug when connecting master nodes and making keywords
sainarayan-cse Apr 16, 2020
3a63294
Converted unsafe cast to safe cast
sainarayan-cse Apr 16, 2020
16075a4
converted is to equality check
sainarayan-cse Apr 16, 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
8 changes: 8 additions & 0 deletions com.unity.render-pipelines.core/Editor/Drawing.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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 Expand Up @@ -112,6 +112,18 @@ bool MaterialTypeUsesSlotMask(SlotMask mask)
return (activeMask & mask) != 0;
}

// This property exists to expose shaderGUI Override info. to the inspector
[Inspectable("ShaderGUI", null)]
public ShaderGUIOverrideInfo ShaderGUIInfo
{
get => new ShaderGUIOverrideInfo(this.OverrideEnabled, this.ShaderGUIOverride);
set
{
this.ShaderGUIOverride = value.ShaderGUIOverride;
this.OverrideEnabled = value.OverrideEnabled;
}
}

[SerializeField] private string m_ShaderGUIOverride;
public string ShaderGUIOverride
{
Expand Down Expand Up @@ -231,11 +243,6 @@ public sealed override void UpdateNodeAfterDeserialization()
RemoveSlotsNameNotMatching(validSlots, true);
}

public VisualElement CreateSettingsElement()
{
return new DecalSettingsView(this);
}

public string renderQueueTag
{
get
Expand Down Expand Up @@ -347,13 +354,15 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
[SerializeField]
bool m_AffectsMetal = true;

[Inspectable("Affects Metal", true)]
public ToggleData affectsMetal
{
get { return new ToggleData(m_AffectsMetal); }
set
{
if (m_AffectsMetal == value.isOn)
return;
this.owner.owner.RegisterCompleteObjectUndo("Affects Metal Change");
m_AffectsMetal = value.isOn;
Dirty(ModificationScope.Graph);
}
Expand All @@ -362,13 +371,15 @@ public ToggleData affectsMetal
[SerializeField]
bool m_AffectsAO = true;

[Inspectable("Affects AO", true)]
public ToggleData affectsAO
{
get { return new ToggleData(m_AffectsAO); }
set
{
if (m_AffectsAO == value.isOn)
return;
this.owner.owner.RegisterCompleteObjectUndo("Affects AO Change");
m_AffectsAO = value.isOn;
Dirty(ModificationScope.Graph);
}
Expand All @@ -377,13 +388,15 @@ public ToggleData affectsAO
[SerializeField]
bool m_AffectsSmoothness = true;

[Inspectable("Affects Smoothness", true)]
public ToggleData affectsSmoothness
{
get { return new ToggleData(m_AffectsSmoothness); }
set
{
if (m_AffectsSmoothness == value.isOn)
return;
this.owner.owner.RegisterCompleteObjectUndo("Affects Smoothness Change");
m_AffectsSmoothness = value.isOn;
Dirty(ModificationScope.Graph);
}
Expand All @@ -392,13 +405,15 @@ public ToggleData affectsSmoothness
[SerializeField]
bool m_AffectsAlbedo = true;

[Inspectable("Affects BaseColor", true)]
public ToggleData affectsAlbedo
{
get { return new ToggleData(m_AffectsAlbedo); }
set
{
if (m_AffectsAlbedo == value.isOn)
return;
this.owner.owner.RegisterCompleteObjectUndo("Affects Albedo Change");
m_AffectsAlbedo = value.isOn;
Dirty(ModificationScope.Graph);
}
Expand All @@ -407,13 +422,15 @@ public ToggleData affectsAlbedo
[SerializeField]
bool m_AffectsNormal = true;

[Inspectable("Affects Normal", true)]
public ToggleData affectsNormal
{
get { return new ToggleData(m_AffectsNormal); }
set
{
if (m_AffectsNormal == value.isOn)
return;
this.owner.owner.RegisterCompleteObjectUndo("Affects Normal Change");
m_AffectsNormal = value.isOn;
Dirty(ModificationScope.Graph);
}
Expand All @@ -422,13 +439,15 @@ public ToggleData affectsNormal
[SerializeField]
bool m_AffectsEmission = true;

[Inspectable("Affects Emission", true)]
public ToggleData affectsEmission
{
get { return new ToggleData(m_AffectsEmission); }
set
{
if (m_AffectsEmission == value.isOn)
return;
this.owner.owner.RegisterCompleteObjectUndo("Affects Emission Change");
m_AffectsEmission = value.isOn;
Dirty(ModificationScope.Graph);
}
Expand Down

This file was deleted.

Loading