Skip to content

Commit 715867a

Browse files
committed
Removed ability to add or remove fields from entities in NuEdit.
Former-commit-id: 29bb70a
1 parent 8a4c99c commit 715867a

2 files changed

Lines changed: 19 additions & 160 deletions

File tree

Nu/Nu/NuEdit/Program.fs

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -646,64 +646,6 @@ module Program =
646646
ignore <| worldChangers.Add (fun world ->
647647
World.updateCamera (fun camera -> { camera with EyeCenter = Vector2.Zero }) world)
648648

649-
let handleFormAddXField (form : NuEditForm) (worldChangers : WorldChangers) (_ : EventArgs) =
650-
ignore <| worldChangers.Add (fun world ->
651-
match (form.xFieldNameTextBox.Text, form.typeNameTextBox.Text) with
652-
| ("", _) -> ignore <| MessageBox.Show "Enter an XField name."; world
653-
| (_, "") -> ignore <| MessageBox.Show "Enter a type name."; world
654-
| (xFieldName, typeName) ->
655-
match Type.TryGetTypeUnqualified typeName with
656-
| Some aType ->
657-
let selectedObject = form.propertyGrid.SelectedObject
658-
match selectedObject with
659-
| :? EntityTypeDescriptorSource as entityTds ->
660-
let world = pushPastWorld world world
661-
let entity = World.getEntity entityTds.Address world
662-
let xFieldValue = if aType = typeof<string> then String.Empty :> obj else Activator.CreateInstance aType
663-
let xField = { FieldValue = xFieldValue; FieldType = aType }
664-
let xFields = Map.add xFieldName xField entity.Xtension.XFields
665-
let entity = { entity with Xtension = { entity.Xtension with XFields = xFields }}
666-
let world = World.setEntity entity entityTds.Address world
667-
entityTds.RefWorld := world // must be set for property grid
668-
form.propertyGrid.Refresh ()
669-
form.propertyGrid.Select ()
670-
form.propertyGrid.SelectedGridItem <- form.propertyGrid.SelectedGridItem.Parent.GridItems.[xFieldName]
671-
world
672-
| _ -> ignore <| MessageBox.Show "Select an entity to add the XField to."; world
673-
| None -> ignore <| MessageBox.Show "Enter a valid type name."; world)
674-
675-
let handleFormRemoveSelectedXField (form : NuEditForm) (worldChangers : WorldChangers) (_ : EventArgs) =
676-
ignore <| worldChangers.Add (fun world ->
677-
let selectedObject = form.propertyGrid.SelectedObject
678-
match selectedObject with
679-
| :? EntityTypeDescriptorSource as entityTds ->
680-
match form.propertyGrid.SelectedGridItem.Label with
681-
| "" -> ignore <| MessageBox.Show "Select an XField."; world
682-
| xFieldName ->
683-
let world = pushPastWorld world world
684-
let entity = World.getEntity entityTds.Address world
685-
let xFields = Map.remove xFieldName entity.Xtension.XFields
686-
let entity = { entity with Xtension = { entity.Xtension with XFields = xFields }}
687-
let world = World.setEntity entity entityTds.Address world
688-
entityTds.RefWorld := world // must be set for property grid
689-
form.propertyGrid.Refresh ()
690-
world
691-
| _ -> ignore <| MessageBox.Show "Select an entity to remove an XField from."; world)
692-
693-
let handleClearAllXFields (form : NuEditForm) (worldChangers : WorldChangers) (_ : EventArgs) =
694-
ignore <| worldChangers.Add (fun world ->
695-
let selectedObject = form.propertyGrid.SelectedObject
696-
match selectedObject with
697-
| :? EntityTypeDescriptorSource as entityTds ->
698-
let world = pushPastWorld world world
699-
let entity = World.getEntity entityTds.Address world
700-
let entity = { entity with Xtension = { entity.Xtension with XFields = Map.empty }}
701-
let world = World.setEntity entity entityTds.Address world
702-
entityTds.RefWorld := world // must be set for property grid
703-
form.propertyGrid.Refresh ()
704-
world
705-
| _ -> ignore <| MessageBox.Show "Select an entity to clear all XFields from."; world)
706-
707649
let handleFormReloadAssets (_ : NuEditForm) (worldChangers : WorldChangers) (_ : EventArgs) =
708650
ignore <| worldChangers.Add (fun world ->
709651
let editorState = world.State.UserState :?> EditorState
@@ -858,8 +800,6 @@ module Program =
858800
form.pasteContextMenuItem.Click.Add (handleFormPaste true form worldChangers refWorld)
859801
form.quickSizeToolStripButton.Click.Add (handleFormQuickSize form worldChangers)
860802
form.resetCameraButton.Click.Add (handleFormResetCamera form worldChangers)
861-
form.addXFieldButton.Click.Add (handleFormAddXField form worldChangers)
862-
form.removeSelectedXFieldButton.Click.Add (handleFormRemoveSelectedXField form worldChangers)
863803
form.reloadAssetsButton.Click.Add (handleFormReloadAssets form worldChangers)
864804
form.reloadOverlaysButton.Click.Add (handleFormReloadOverlays form worldChangers)
865805
form.Show ()

Nu/Nu/NuEditDesign/NuEditForm.Designer.cs

Lines changed: 19 additions & 100 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)