Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Visibility panel's check items can now be stored as part of the setti… #17

Merged
merged 1 commit into from
Jun 1, 2020
Merged

Visibility panel's check items can now be stored as part of the setti… #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions BrawlCrate/UI/Collision Editor/CollisionEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public unsafe class CollisionEditor : UserControl
protected SplitContainer mainSplitter;
protected SplitContainer collisionControlSplitter;

protected CheckBox visibilityCheckPanel_ShowAllModels;
protected Panel selectedPlanePropsPanel;
protected Label selectedPlanePropsPanel_MaterialLabel;
protected Label selectedPlanePropsPanel_TypeLabel;
Expand Down Expand Up @@ -144,6 +143,7 @@ public unsafe class CollisionEditor : UserControl
protected ToolStripSeparator modelTreeMenu_Sep1;

protected Panel visibilityCheckPanel;
protected CheckBox visibilityCheckPanel_ShowAllModels;
protected CheckBox visibilityCheckPanel_ShowPolygons;
protected CheckBox visibilityCheckPanel_ShowBones;

Expand Down Expand Up @@ -5883,6 +5883,10 @@ public void DistributeSettings(CollisionEditorSettings_Data settings)
toolsStrip_ShowItems.Checked = settings.ShowStagePosition_Items;
toolsStrip_ShowBoundaries.Checked = settings.ShowStagePosition_Boundaries;

visibilityCheckPanel_ShowAllModels.Checked = settings.VisibilityCheck_ShowAllModels;
visibilityCheckPanel_ShowPolygons.CheckState = (CheckState)settings.VisibilityCheck_ShowPolygons;
visibilityCheckPanel_ShowBones.Checked = settings.VisibilityCheck_ShowBones;

_modelPanel.CurrentViewport.BackgroundColor = (Color)settings.BackgroundColor;
UpdateViewportProjection(settings.CurrentViewportProjection);

Expand Down Expand Up @@ -5928,12 +5932,16 @@ public CollisionEditorSettings_Data CollectSettings()
Paste_UseWorldLinkValues = clipboardPasteOptions_ActualPointsValuesAreUsed.Checked,
Paste_RemoveSelectedCollisionsWhenPasting = clipboardPasteOptions_PasteRemoveSelected.Checked,

BackgroundColor = settingsData.BackgroundColor,

ShowStagePosition_Spawns = toolsStrip_ShowSpawns.Checked,
ShowStagePosition_Items = toolsStrip_ShowItems.Checked,
ShowStagePosition_Boundaries = toolsStrip_ShowBoundaries.Checked,

VisibilityCheck_ShowAllModels = visibilityCheckPanel_ShowAllModels.Checked,
VisibilityCheck_ShowPolygons = (byte)visibilityCheckPanel_ShowPolygons.CheckState,
VisibilityCheck_ShowBones = visibilityCheckPanel_ShowBones.Checked,

BackgroundColor = settingsData.BackgroundColor,

CurrentViewportProjection = _modelPanel.CurrentViewport.ViewType
};
}
Expand Down
Loading