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.

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

Improve Workflow for Architecture Reconstruction #784

Merged
merged 180 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from 151 commits
Commits
Show all changes
180 commits
Select commit Hold shift + click to select a range
8ce69ed
overhaul MoveAction
tinxx Aug 20, 2024
4d95195
Add sub menus for popup menu, fix popup moveTo, disables IDE buttons …
Cyclone1337 Aug 20, 2024
6389ca5
MoveAction: use cursor offset
tinxx Aug 20, 2024
5f2f3de
Merge branch 'architecture-city-overhaul' into reflexion-improvement
tinxx Aug 20, 2024
f995e96
Improve the opening of the context menu. The selected object must ram…
Cyclone1337 Aug 20, 2024
1c5978a
dis/allow scale action based on VisualNodeAttributes.AllowManualResize
tinxx Aug 21, 2024
a701c92
Integrate Delete, EditNode, AddNode and AddEge in context menu with u…
Cyclone1337 Aug 21, 2024
92821d4
Reverted the change regarding the player menu update since this metho…
Cyclone1337 Aug 21, 2024
0100f23
further improve MoveAction
tinxx Aug 21, 2024
fe7271f
Merge remote-tracking branch 'refs/remotes/origin/reflexion-improveme…
tinxx Aug 21, 2024
758a513
MoveAction: set state correctly
tinxx Aug 22, 2024
853ce93
Fix AddNode, placed the new node on the correct raycast hit position …
Cyclone1337 Aug 22, 2024
3ccd8b4
Improve the confirm dialog and integrate a method for execute an acti…
Cyclone1337 Aug 22, 2024
aac3298
Add a confirm dialog for the second delete case. I can't test it beca…
Cyclone1337 Aug 22, 2024
0599531
Implement the sorting algorithm for the priority of the popup menu en…
Cyclone1337 Aug 22, 2024
1dbb9f5
Add MoveAction in context menu with undo and redo support.
Cyclone1337 Aug 22, 2024
36da6c2
Removed incorrectly placed abort criterion. As a result, the actions …
Cyclone1337 Aug 23, 2024
afa03fe
Fix move action via context menu. An issue caused an additional compl…
Cyclone1337 Aug 23, 2024
ac87c56
Re-added the abort criterion with a renamed notification. Nodes that …
Cyclone1337 Aug 23, 2024
b99d9b3
MoveAction: fix un/redo reparenting
tinxx Aug 23, 2024
e2685fa
Fix the issue where the move action is unintentionally completed succ…
Cyclone1337 Aug 23, 2024
17bd93f
Filter the context menu options for the TreeView and change notificat…
Cyclone1337 Aug 23, 2024
2a311c4
Assign prorities for the initial entries.
Cyclone1337 Aug 26, 2024
865c708
Add rotate and scale action to the context menu with undo / redo func…
Cyclone1337 Aug 26, 2024
2e6935e
Show Properties title adjusted.
Cyclone1337 Aug 26, 2024
16925b9
Fix closing various windows without causing WindowSpace to crash.
Cyclone1337 Aug 26, 2024
cc7685d
Fix Window crash when attempting to apply 'Show Code' to a node witho…
Cyclone1337 Aug 26, 2024
9a57c88
initial ResizeNodeAction
tinxx Aug 26, 2024
af0429e
Merge remote-tracking branch 'refs/remotes/origin/reflexion-improveme…
tinxx Aug 26, 2024
6e8fb65
ResizeNodeAction: use selection events
tinxx Aug 27, 2024
978df19
propagate ResizeNodeAction
tinxx Aug 27, 2024
31b7058
ResizeNodeAction: prevent negative scale
tinxx Aug 27, 2024
e9e7228
ResizeNodeAction: Prevent scaling child nodes
tinxx Aug 28, 2024
d74c01b
ResizeNodeAction: Bounds correction
tinxx Sep 2, 2024
d4c0af0
ResizeNodeAction: fix edgecases
tinxx Sep 3, 2024
3e67ad1
ResizeNodeAction: Move via NodeOperator
tinxx Sep 3, 2024
042fc73
ResizeNodeAction: Don't affect children
tinxx Sep 3, 2024
f7bdb1a
Update current active entry in PlayerMenu and add last action (Resize…
Cyclone1337 Sep 4, 2024
3e79802
Introduce property window for #666 + include value search
Cyclone1337 Sep 5, 2024
f023739
Split the attributes in attribute groups
Cyclone1337 Sep 5, 2024
3140aa2
Expand/collapse attribute groups for issue #666.
Cyclone1337 Sep 5, 2024
014fedb
Fix drawable manager window group bug with expand and collapse
Cyclone1337 Sep 6, 2024
e8d6d0f
Remove debug logs
Cyclone1337 Sep 6, 2024
49c61d2
Removal of the old properties display and moving of the PropertyWindo…
Cyclone1337 Sep 6, 2024
afce213
Forget to push the property group item and add filter, sort and group…
Cyclone1337 Sep 6, 2024
2ae45c6
Add filter functionality for the property window #666
Cyclone1337 Sep 6, 2024
ccb32d0
Remove trailing whitespaces
Cyclone1337 Sep 9, 2024
adb0ed9
Change the filter event to rebuild and begin with the sorter.
Cyclone1337 Sep 9, 2024
62e26db
Integrate the sort functionality for the property window and rename t…
Cyclone1337 Sep 9, 2024
645e709
Add documentation.
Cyclone1337 Sep 9, 2024
43c0e20
After a rebuild of the property window, the previously expanded items…
Cyclone1337 Sep 9, 2024
c18f22e
Refactor property window sort to be more dynamic.
Cyclone1337 Sep 10, 2024
f8afcae
Restore the original property window appearance when the search strin…
Cyclone1337 Sep 10, 2024
13a2297
Display the group name in the search results.
Cyclone1337 Sep 10, 2024
4647f83
Clean up the source code.
Cyclone1337 Sep 10, 2024
d422699
Retains the search results after a rebuild has been executed and begi…
Cyclone1337 Sep 10, 2024
22d5a53
Grouping prepared, for which groups within groups were implemented. A…
Cyclone1337 Sep 10, 2024
69cb384
Group by metric
Cyclone1337 Sep 11, 2024
ad668cc
The search now works with the metric grouping. But not all parent ele…
Cyclone1337 Sep 12, 2024
2d6249b
Always display the parent groups during a nested search.
Cyclone1337 Sep 12, 2024
f99e97e
Fixed two errors. First, the search query is now retained when showin…
Cyclone1337 Sep 12, 2024
4bb6fe0
Remove debug log's and unused code.
Cyclone1337 Sep 12, 2024
9eb28a2
Fix bug where subgroups are hidden after the search query is cleared,…
Cyclone1337 Sep 12, 2024
0760fd1
When grouping by 'Metrics', the toggle attributes are added to the he…
Cyclone1337 Sep 12, 2024
2e2b10d
Refactor grouping.
Cyclone1337 Sep 12, 2024
d3ff0a8
Rename type of grouping and grouping of the name type sorts attribute…
Cyclone1337 Sep 12, 2024
54b75ca
Change the attribute 'SourceRange' to 'Source.Range', so that it matc…
Cyclone1337 Sep 13, 2024
39a955e
Rename attribute and add a documentation.
Cyclone1337 Sep 13, 2024
a8c9e12
Sort with active grouping 'name type'.
Cyclone1337 Sep 13, 2024
b38a214
Undone renaming of 'SourceRange' + Functionality that adds a dot betw…
Cyclone1337 Sep 13, 2024
0db6cef
Refactor + Resolve #666.
Cyclone1337 Sep 13, 2024
9ebd254
Work on multiple selection for the context menu.
Cyclone1337 Sep 16, 2024
b68280d
reset position on zoom factor 1
tinxx Sep 17, 2024
df697cd
Remove node and edge inspect options from multiselection.
Cyclone1337 Sep 17, 2024
c4636f8
Remove node and edge inspect options from multiselection.
Cyclone1337 Sep 17, 2024
5070fc9
merge ZoomNetAction and ResizeNodeNetAction
tinxx Sep 17, 2024
2e1d527
Merge remote-tracking branch 'refs/remotes/origin/reflexion-improveme…
tinxx Sep 17, 2024
e539bfc
use renderer bounds for MoveAction
tinxx Sep 17, 2024
dc8ccef
fix GetRoof()
tinxx Sep 17, 2024
aacc3db
Add multiselection delete via context menu.
Cyclone1337 Sep 17, 2024
bfce9ad
Add AcceptDivergence with multiselection (Resolve #664 and Resolve #6…
Cyclone1337 Sep 17, 2024
d2f0513
Merge branch 'reflexion-improvement' of github.com:uni-bremen-agst/SE…
Cyclone1337 Sep 17, 2024
e6c84b8
Fix: Multiselection delete ignores root nodes.
Cyclone1337 Sep 17, 2024
05cb2bf
Remove TODO issue comment and set the right priority for accept diver…
Cyclone1337 Sep 17, 2024
8df43fd
use renderer bounds for ResizeNodeAction
tinxx Sep 18, 2024
13cf8f3
Merge master into reflexion-improvement.
Cyclone1337 Sep 18, 2024
9f2d669
The input field for the node type has been replaced with a horizontal…
Cyclone1337 Sep 18, 2024
35ba2c8
Integrate GameEditNode and change the hover and displayed name if a n…
Cyclone1337 Sep 18, 2024
62f0fa7
Change node type color when the type changes.
Cyclone1337 Sep 19, 2024
de7950d
Changes the text label color of a node and hdie the text for node typ…
Cyclone1337 Sep 19, 2024
3c488f9
Add the node text if it does not exist and the node type have an acti…
Cyclone1337 Sep 19, 2024
18f2726
Forbid editing of the root node and remove context menu node options …
Cyclone1337 Sep 19, 2024
18eb9bb
Prevents the display of an empty label.
Cyclone1337 Sep 19, 2024
1b3ad81
visualize direction of selected edges
tinxx Sep 20, 2024
edaf6c4
keep edge flow visualization updated
tinxx Sep 23, 2024
e69facb
Remove TODO 'EditEdge' from context menu.
Cyclone1337 Sep 23, 2024
9a143e4
prevent null reference if event is not subscribed
tinxx Sep 24, 2024
35ee632
improve MoveAction
tinxx Sep 24, 2024
28b0e18
ResizeNodeAction: reuse gizmo
tinxx Sep 24, 2024
bfded8f
fix ArchitectureTable config path
tinxx Sep 24, 2024
704e930
Add a dialog for chose an node name and type.
Cyclone1337 Sep 24, 2024
c1f314e
MoveAction: use context menu coordinate
tinxx Sep 24, 2024
81ade78
Added a memory for the last selected node type for the edit dialog in…
Cyclone1337 Sep 25, 2024
d080830
Merge branch 'reflexion-improvement' of github.com:uni-bremen-agst/SE…
Cyclone1337 Sep 25, 2024
b027c18
MoveAction: use coordinate close to cursor
tinxx Sep 25, 2024
9865956
use safe call for delegate
tinxx Sep 25, 2024
fdcaf70
prevent zombie ResizeNodeActions
tinxx Sep 25, 2024
43cb3cc
modernize actions
tinxx Sep 25, 2024
bc94fdc
Update Assets/SEE/UI/PropertyDialog/NodePropertyDialog.cs
Cyclone1337 Sep 25, 2024
11a2992
Update Assets/SEE/UI/Window/PropertyWindow/PropertyWindowContextMenu.cs
Cyclone1337 Sep 25, 2024
a2815e9
Update Assets/SEE/UI/Window/PropertyWindow/PropertyFilter.cs
Cyclone1337 Sep 25, 2024
499cd04
Update Assets/SEE/UI/PopupMenu/PriorityHolder.cs
Cyclone1337 Sep 25, 2024
6cb38c7
Update Assets/SEE/Game/SceneManipulation/GameEditNode.cs
Cyclone1337 Sep 25, 2024
d35a8fe
satisfy the robot
tinxx Sep 25, 2024
ee3120a
rename flag AllowManualResize -> AllowManualNodeManipulation
tinxx Sep 25, 2024
f58f71b
Merge remote-tracking branch 'origin/master' into reflexion-improvement
koschke Sep 25, 2024
afcd090
Removed unused imports.
koschke Sep 25, 2024
a29d6b1
Fixed minor coding issues.
koschke Sep 25, 2024
447eb39
Renamed class GameEditNode to GameNodeEditor.
koschke Sep 26, 2024
091e7d8
Keyword else should be on a line of its own.
koschke Sep 26, 2024
adafbf7
Removed unused imports. Made documentation more concrete.
koschke Sep 26, 2024
65755ee
Split long parameter list. Removed debugging output code commented out.
koschke Sep 26, 2024
a89ebcf
Removed unused import. Added issue to TODOs.
koschke Sep 26, 2024
d39fcca
Renamed parameter node to go (the former was too narrow or maybe not
koschke Sep 26, 2024
c6df3d2
Better class documentation. Simplified call.
koschke Sep 26, 2024
1a41c24
Removed unused imports.
koschke Sep 26, 2024
c7b56b8
Renamed WorldSpaceSize back to WorldSpaceScale.
koschke Sep 26, 2024
8a6e82b
Fixed comment.
koschke Sep 26, 2024
1262cc8
Removed unused import. Applied a few minor code improvements.
koschke Sep 26, 2024
50adc94
Use of simplified new operator.
koschke Sep 26, 2024
4a1bc78
Fixed comment.
koschke Sep 26, 2024
512a051
Removed unused import. Reformatted long parameter lists.
koschke Sep 26, 2024
5282f58
Added period at the end of a comment. Added default initialization.
koschke Sep 26, 2024
7f1e603
Added default initialization.
koschke Sep 26, 2024
96b266b
Added a comma to a comment.
koschke Sep 26, 2024
e71f232
Reformatted parameter list. Added more details to two method document…
koschke Sep 26, 2024
546511b
More uniform comments.
koschke Sep 26, 2024
feff216
Added an issue number to the TODO.
koschke Sep 26, 2024
bb69fcf
add VSCode configs
tinxx Sep 27, 2024
6201314
fix typo
tinxx Sep 27, 2024
e4166c7
remove FIXME
tinxx Sep 27, 2024
c44904a
add doc comment for inner class ResizeGizmo
tinxx Sep 27, 2024
09dc6cb
remove superfluous method
tinxx Sep 27, 2024
f857bdd
remove debug log
tinxx Sep 27, 2024
f12d2d6
fix merge conflict in meta files
tinxx Sep 27, 2024
5972762
remove commented debug logs
tinxx Sep 27, 2024
1e596b3
Renamed WorldSpaceScale back to WorldSpaceSize
tinxx Sep 27, 2024
fbeabf2
Resolve the requests regarding comments and variable name adjustments.
Cyclone1337 Sep 27, 2024
48b453a
Adjusting the documentation of the remaining ExecuteContextMenu methods.
Cyclone1337 Sep 27, 2024
3aec8ea
Avoid async void method - change to Task and change method name.
Cyclone1337 Sep 27, 2024
0f316cb
Fix IDE warning with asynchronous call. Combine the multi and single …
Cyclone1337 Sep 27, 2024
cd8db19
rename EdgeDataFlowVisualizer -> EdgeDirectionVisualizer
tinxx Sep 30, 2024
ffcf3d9
Merge branch 'master' into reflexion-improvement
Cyclone1337 Sep 30, 2024
980c2e7
minor code optimizations
tinxx Sep 30, 2024
2d47d88
First changes for @falko17's review. Adjustment of comments and remov…
Cyclone1337 Sep 30, 2024
9b2166e
minor code optimizations
tinxx Sep 30, 2024
c424c3b
Merge branch 'reflexion-improvement' of github.com:uni-bremen-agst/SE…
Cyclone1337 Sep 30, 2024
c33572c
Fix: Unite AcceptDivergence
Cyclone1337 Sep 30, 2024
d20afaf
Simplified the GetChangedObjects method of the AcceptDivergenceAction.
Cyclone1337 Sep 30, 2024
8c262ef
Change discard assignment to Forget() call.
Cyclone1337 Sep 30, 2024
222fe43
Simplifies how the divergences list is built.
Cyclone1337 Sep 30, 2024
59225fa
Uniting the provision of the actions of the main popup menu.
Cyclone1337 Sep 30, 2024
1c986e1
Simplifying the wait for the completion of the executed action of the…
Cyclone1337 Sep 30, 2024
663bc26
Simplifying assignment
Cyclone1337 Sep 30, 2024
5230835
Shortening the instruction to wait until the confirm menu is closed.
Cyclone1337 Sep 30, 2024
c6f0348
Shortening the calculation of the height of a popup menu.
Cyclone1337 Sep 30, 2024
5032c68
change comment
tinxx Sep 30, 2024
731c1de
Changes for the property window from Falko's review.
Cyclone1337 Sep 30, 2024
2804626
Merge branch 'reflexion-improvement' of github.com:uni-bremen-agst/SE…
Cyclone1337 Sep 30, 2024
9269b89
minor code optimizations
tinxx Sep 30, 2024
7df7db7
Merge remote-tracking branch 'origin/master' into reflexion-improvement
tinxx Oct 1, 2024
f2b4301
doc comment with explicit numbering
tinxx Oct 1, 2024
98c3676
Disable the VSTHRD110 rule for the two GameElementDeleter.Delete calls.
Cyclone1337 Oct 1, 2024
3616bec
Query shortened.
Cyclone1337 Oct 1, 2024
c76f3eb
move EdgeDirectionVisualizer into separate file
tinxx Oct 1, 2024
b66541b
fix doc comment item numbering
tinxx Oct 1, 2024
292c835
Change the destruction of popup menu entries from immediate to Destro…
Cyclone1337 Oct 1, 2024
013ca8a
fix typo
tinxx Oct 1, 2024
3ea89f1
Change the destruction of property window entries from immediate to D…
Cyclone1337 Oct 1, 2024
f17db7e
Merge branch 'reflexion-improvement' of github.com:uni-bremen-agst/SE…
Cyclone1337 Oct 1, 2024
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ GlobalConnectionShutdownDelegate*.txt
**/._.DS_Store

# VSCode
.vscode
.vsconfig

# Custom entries
Expand Down
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}
10 changes: 10 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
}
61 changes: 61 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.vs": true,
"**/.gitmodules": true,
"**/.vsconfig": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"Logs/": true,
"logs/": true,
"ProjectSettings/": true,
"UserSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "SEE.sln",
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true
}
4 changes: 2 additions & 2 deletions Assets/Plugins/Parser/GenerateLexerCode.bat.meta
Git LFS file not shown
10 changes: 3 additions & 7 deletions Assets/Resources/Prefabs/Charts.meta
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Dependencies.meta
guid: 31815e5d24ab3b84fb9d47cacc562874
=======
guid: fb21df1ff65c7ca479f097c3034c820d
>>>>>>> origin/master:Assets/Prefabs/Charts.meta
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
userData:
assetBundleName:
assetBundleVariant:
Loading
Loading