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

Integrating the functionality to fully create a Reflexion City independently. #819

Merged
merged 173 commits into from
Jan 28, 2025
Merged

Integrating the functionality to fully create a Reflexion City independently. #819

Show file tree
Hide file tree
Changes from 120 commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
85d0a97
Delete an entire city. Currently without an UNDO option.
Cyclone1337 Oct 23, 2024
af9f3c4
Refactoring: Moving mouse interactions from Queries to SEEInput.
Cyclone1337 Oct 23, 2024
583bc09
Adding a component for selecting and adding a city, along with a corr…
Cyclone1337 Oct 23, 2024
5146044
Introduction of a universal table, along with adjustments to the conf…
Cyclone1337 Oct 24, 2024
686f135
Refactored the use of string names to enums to ensure type safety.
Cyclone1337 Oct 24, 2024
1ab1092
Adjustment of the count of cities for the config menu. Due to the uni…
Cyclone1337 Oct 24, 2024
6b8b981
Removes the city and the associated components and activates the city…
Cyclone1337 Oct 24, 2024
81bbec5
Begin by adding a reflexion city.
Cyclone1337 Oct 24, 2024
b1ea723
Load and draw an initial reflexion city. The files of the city still …
Cyclone1337 Oct 25, 2024
4ff0857
Introduce a node type for the architecture and implementation root. S…
Cyclone1337 Oct 25, 2024
b058023
Configuring the inital types of a reflexion city and removing the typ…
Cyclone1337 Oct 25, 2024
0164edb
Always add the Architecture and Implementation Root. Clear the node c…
Cyclone1337 Oct 28, 2024
eb2ef31
Rename init roots
Cyclone1337 Oct 28, 2024
df59b0a
Rename init roots
Cyclone1337 Oct 28, 2024
09cfb86
Adjusting notifications.
Cyclone1337 Oct 28, 2024
f5a91c3
Remove trailing whitespaces.
Cyclone1337 Oct 28, 2024
ca28aab
Prevent attempting to add duplicate entries to the map.
Cyclone1337 Oct 28, 2024
9d1515e
Change the architecture root node color to orange.
Cyclone1337 Oct 28, 2024
d764274
Extract functionality into a async method - will be needed for fit th…
Cyclone1337 Oct 28, 2024
18b22af
Outsource the creation of an initial reflexion city into its own asyn…
Cyclone1337 Oct 29, 2024
a89f1cc
Outsource the management of the additionally settings for the city co…
Cyclone1337 Oct 29, 2024
a1d66a6
Initializing the initial reflexion city so that the architecture root…
Cyclone1337 Oct 29, 2024
a67e5ad
Deactivate the animation of resize and move of the initial roots.
Cyclone1337 Oct 29, 2024
5b00b80
Added a query to verify if the node has the root toggle attribute.
Cyclone1337 Oct 30, 2024
eddc8cc
Change the query, use the correct method HasToogle.
Cyclone1337 Oct 30, 2024
e868806
Rename method.
Cyclone1337 Oct 30, 2024
c0f64a5
Allow nodes with root types to be edited, but prevent their type from…
Cyclone1337 Oct 30, 2024
e9d85c2
Minor adjustment for the initial conf.
Cyclone1337 Oct 30, 2024
d02a97e
Updating the MetricLevel key in MetricMaxima to enable dynamic city c…
Cyclone1337 Nov 1, 2024
53531c1
Integrate 'Load Implementation' in the context menu for the implement…
Cyclone1337 Nov 4, 2024
a13fc39
Introduce a dialog for selecting the implementation GXL and the proje…
Cyclone1337 Nov 4, 2024
3a7434c
Integrate the evaluation of the dialog for selecting the implementati…
Cyclone1337 Nov 4, 2024
ab6ad17
Load the implementation gxl; for that it was necessary to change the …
Cyclone1337 Nov 5, 2024
acd2388
Adjustments so that the loaded implementation graph is drawn. The res…
Cyclone1337 Nov 6, 2024
7cb0bc1
Forget to set the loadReflexionFiles to true. This prevents an additi…
Cyclone1337 Nov 6, 2024
9f5fd90
The nodes of the loaded implementation graph are marked as implementa…
Cyclone1337 Nov 7, 2024
1062323
The children of the loaded graph werde added differently and can now …
Cyclone1337 Nov 8, 2024
cbe687a
The graph is created correctly again. The nodes are assigned the corr…
Cyclone1337 Nov 8, 2024
bc3bce8
Add ROOT as the root type for all cities.
Cyclone1337 Nov 11, 2024
1b2b5b9
Add the missing doc.
Cyclone1337 Nov 11, 2024
f43be35
Exclude the possibility of a city having multiple ROOT node types.
Cyclone1337 Nov 11, 2024
8f8d9eb
New colors for the root types.
Cyclone1337 Nov 11, 2024
744ebcb
Remove unused usings.
Cyclone1337 Nov 11, 2024
6cbe13a
Introducing a query to determine whether a node/game object is an arc…
Cyclone1337 Nov 13, 2024
32e9c1e
Architecture and imlementation root are cleared when deleted (i.e., a…
Cyclone1337 Nov 13, 2024
c3bf8dc
Restoration of network functionality.
Cyclone1337 Nov 13, 2024
512fe83
Add documentation.
Cyclone1337 Nov 13, 2024
5aafffd
Integrate the edges of the loaded implementation graph.
Cyclone1337 Nov 13, 2024
8d94a5e
Enable loading of an implementation after the implementation root nod…
Cyclone1337 Nov 14, 2024
dbfb1ad
Integrate load and draw architecture graph.
Cyclone1337 Nov 14, 2024
c959906
Unifying the commonalities for load implementation and architecture.
Cyclone1337 Nov 14, 2024
8cca917
Adds a list of available game objects to which a city can be attached…
Cyclone1337 Nov 18, 2024
4c676f4
City is created over the network.
Cyclone1337 Nov 18, 2024
1756023
Fix a bug so that the city is added only once over the network.
Cyclone1337 Nov 18, 2024
08541c3
Adjustment to the variable and the documentation.
Cyclone1337 Nov 18, 2024
1269494
Fixing the issue where AbstractCity components are required on all ob…
Cyclone1337 Nov 18, 2024
0dcff56
Add and remove cities from the RuntimeConfigMenu during runtime. To a…
Cyclone1337 Nov 20, 2024
9eaa661
Change the rebuilding of the RuntimeConfigMenu. Now it will only be r…
Cyclone1337 Nov 22, 2024
72d121c
Forget to add the comment.
Cyclone1337 Nov 22, 2024
2be35ce
Adding a getter for the ReflexionGraphProvider of a ReflexionCity and…
Cyclone1337 Nov 28, 2024
e5c2c21
Rebuild the RuntimeConfigMenu when a GXL file is loaded afterwards.
Cyclone1337 Nov 28, 2024
387e826
Refactor attribute
Cyclone1337 Nov 28, 2024
d626451
Initiating a rebuild when a reflexion root is deleted.
Cyclone1337 Nov 28, 2024
a339acb
Node types are removed when clearing a ReflexionRootType. The undo / …
Cyclone1337 Nov 29, 2024
f86cff7
Fix a bug that the action will be executed more times.
Cyclone1337 Nov 29, 2024
710bc4a
WiP: Improvement of the clear function of a reflexion root type
Cyclone1337 Nov 29, 2024
ffc99aa
Remove the node types after the nodes have been fadet out. Otherwise,…
Cyclone1337 Dec 2, 2024
998ee5f
Forgot to remove debug log
Cyclone1337 Dec 2, 2024
379f725
Prevent clearing of a reflexion root node when mapping is already sta…
Cyclone1337 Dec 2, 2024
710e8ed
Add the notification again.
Cyclone1337 Dec 2, 2024
692235b
Extend the CitySelectionProperty to include the input of a city name.…
Cyclone1337 Dec 3, 2024
083ad30
Rename the city game object to the chosen city name of the CitySelect…
Cyclone1337 Dec 3, 2024
1aa354c
Rename reflexion roots for initial graph.
Cyclone1337 Dec 3, 2024
af3a370
Replace the keyword 'initial' in the root nodes of the reflexion city…
Cyclone1337 Dec 3, 2024
a35a1b1
little refactoring
Cyclone1337 Dec 3, 2024
afcb9f0
Remove unused var
Cyclone1337 Dec 4, 2024
8a66fc3
Rename the delete option for the clearing case.
Cyclone1337 Dec 4, 2024
0403189
Outsourcing the context menu functionality - loading a subgraph into …
Cyclone1337 Dec 5, 2024
9ab045a
Forgot to remove debug logs.
Cyclone1337 Dec 5, 2024
ed9eb17
Add documentation of the parameter cityName and remove unused usings.
Cyclone1337 Dec 5, 2024
b89636f
IDE removes to much usings.
Cyclone1337 Dec 5, 2024
4ca3090
Add the network behaviour of load a part of a reflexion city.
Cyclone1337 Dec 5, 2024
39b264c
Add network behaviour for adding and removing node types for the dele…
Cyclone1337 Dec 5, 2024
57d241b
Fix the issue where the ArchitectureRoot and ImplementationRoot are n…
Cyclone1337 Dec 9, 2024
ab32e2d
Add documentation
Cyclone1337 Dec 9, 2024
7e6c064
Refactor assignments
Cyclone1337 Dec 9, 2024
0c39914
Checks and if necessary rebuilds the RuntimeConfigMenu before executi…
Cyclone1337 Dec 9, 2024
cbea438
Adding a validation area capable of displaying a validation error. If…
Cyclone1337 Jan 6, 2025
28c7ca0
Adjustments for coloring based on the validation status.
Cyclone1337 Jan 7, 2025
8d655b2
Additionally, change the color of the input field's background for th…
Cyclone1337 Jan 7, 2025
d57dafe
Remove the validation failed notifications, as they are now directly …
Cyclone1337 Jan 7, 2025
fdc3918
Change the check to see if a city name is already taken - case sensit…
Cyclone1337 Jan 7, 2025
dd9bc67
Add the re-draw functionality to the RuntimeConfigMenu.
Cyclone1337 Jan 7, 2025
b4962e5
Order changed to place load & draw buttons back together.
Cyclone1337 Jan 8, 2025
83886fa
Minor changes to prepare for the pull request.
Cyclone1337 Jan 9, 2025
73309bb
Allow multiple initial reflexion cities. The keyword initial will be …
Cyclone1337 Jan 13, 2025
5be3545
Merge. Adding the CitySelectionManager to the tables to enable the cr…
Cyclone1337 Jan 14, 2025
17e65d0
Fix ContextMenu: It now opens as it should again. The XR merge had br…
Cyclone1337 Jan 14, 2025
82c22ca
Update Assets/SEE/Game/City/CityTypes.cs
Cyclone1337 Jan 14, 2025
872b68a
Update Assets/SEE/GameObjects/CitySelectionManager.cs
Cyclone1337 Jan 14, 2025
20ee45d
Update Assets/SEE/GameObjects/CitiesHolder.cs
Cyclone1337 Jan 14, 2025
3b16404
Update Assets/SEE/GameObjects/Scales/IScale.cs
Cyclone1337 Jan 14, 2025
007f0f9
Update Assets/SEE/Net/Actions/AddCityNetAction.cs
Cyclone1337 Jan 14, 2025
630bf70
Update Assets/SEE/Net/Actions/AddNodeTypeNetAction.cs
Cyclone1337 Jan 14, 2025
1ac243e
Update Assets/SEE/Net/Actions/LoadPartOfReflexionCityNetAction.cs
Cyclone1337 Jan 14, 2025
a452bbe
Update Assets/SEE/Net/Actions/RemoveNodeTypeNetAction.cs
Cyclone1337 Jan 14, 2025
7d5ee4c
Update Assets/SEE/UI/PropertyDialog/CitySelection/CitySelectionProper…
Cyclone1337 Jan 14, 2025
76cce51
Update Assets/SEE/UI/PropertyDialog/CitySelection/LoadReflexionDataPr…
Cyclone1337 Jan 14, 2025
538528c
Remove TODOs
Cyclone1337 Jan 14, 2025
bb28810
Merge branch 'reflexion-table-improvement' of github.com:uni-bremen-a…
Cyclone1337 Jan 14, 2025
9cb3006
Merge remote-tracking branch 'origin/master' into reflexion-table-imp…
koschke Jan 14, 2025
26fe6b2
Fixed minor issues such as typos in identifiers or comments.
koschke Jan 14, 2025
0fb1541
Minor improvements during code review.
koschke Jan 14, 2025
b462ac2
Small notification messages and documentation adjustments for the pul…
Cyclone1337 Jan 15, 2025
c6bc2ff
Avoiding the magic string 'initial'.
Cyclone1337 Jan 15, 2025
296b5ce
Fix executing the awake methode of AbstractSEECity also in the unity …
Cyclone1337 Jan 16, 2025
382693f
Fix typo in documentation.
Cyclone1337 Jan 16, 2025
a21ccaa
Fix documentation
Cyclone1337 Jan 16, 2025
61f4455
Introduce a superclass for the CityNetActions.
Cyclone1337 Jan 16, 2025
fb58dbc
unifying the DeleteNetActions and outsourcing root deletion to the Ga…
Cyclone1337 Jan 16, 2025
3f08fda
Merge remote-tracking branch 'origin/master' into reflexion-table-imp…
koschke Jan 18, 2025
690e974
Fixed typo in RelfexionCity.
koschke Jan 18, 2025
a536ce0
Prefer ArgumentNullException over ArgumentException.
koschke Jan 18, 2025
fa71958
Can use switch expression.
koschke Jan 18, 2025
6964872
Many small changes for the merge, mostly typos.
Cyclone1337 Jan 20, 2025
57dcd51
Second part of small changes.
Cyclone1337 Jan 20, 2025
7649253
Convert the HolisticMetricsDialog into BasePropertyDialog, as it serv…
Cyclone1337 Jan 20, 2025
ebd53ce
IDE removes imports wrong.
Cyclone1337 Jan 20, 2025
6165477
Change the CityHolder list to a map.
Cyclone1337 Jan 20, 2025
a12ede7
Remove unused method.
Cyclone1337 Jan 20, 2025
69d93b3
Merge branch 'master' into reflexion-table-improvement
Cyclone1337 Jan 21, 2025
9d46118
Outsourcing the logic from the delete action into GameElementDeleter.…
Cyclone1337 Jan 21, 2025
e63dac8
Blocking the opening of the RuntimeConfigMenu when a deletion process…
Cyclone1337 Jan 21, 2025
782b3f6
Prohibit clearing in the context menu with multiselection.
Cyclone1337 Jan 21, 2025
0c90ce5
Outsourcing the logic from the undo part of the delete action into Ga…
Cyclone1337 Jan 21, 2025
9d21699
AutoFetch turned off for Branch City.
koschke Jan 21, 2025
0b88f81
Automated updates by Unity.
koschke Jan 21, 2025
032b555
Automated updates by Unity.
koschke Jan 21, 2025
d68a144
LoadingSpinner is activated only if there are any edges.
koschke Jan 22, 2025
65fc726
More fault tolerance.
koschke Jan 22, 2025
abaaeb0
New attributes.
koschke Jan 22, 2025
098bc73
Load the initial reflexion city programmatically instead of loading i…
Cyclone1337 Jan 22, 2025
dfc9cbc
Merge branch 'reflexion-table-improvement' of github.com:uni-bremen-a…
Cyclone1337 Jan 22, 2025
e67dcf8
Update Assets/SEE/Utils/NodeTypesSerializer.cs
Cyclone1337 Jan 22, 2025
8653007
Change the settings for the UNKOWNTYPE node type.
Cyclone1337 Jan 22, 2025
49cd688
Merge branch 'reflexion-table-improvement' of github.com:uni-bremen-a…
Cyclone1337 Jan 22, 2025
0ca8989
Change string path to DataPath.
Cyclone1337 Jan 22, 2025
ca7b08b
Awake should be private.
koschke Jan 27, 2025
5fbbe5c
Use identifier (fixes also the typo).
koschke Jan 27, 2025
dd484bf
Removed unused imports. Shortened lines.
koschke Jan 27, 2025
2822f0d
Removed unused imports. Added full name of exception. Removed Execute…
koschke Jan 27, 2025
978d2d9
Improved error message.
koschke Jan 27, 2025
0fd5600
Fixed namespace. Removed unused import.
koschke Jan 27, 2025
c8b3108
Removed unused import.
koschke Jan 27, 2025
5cb3009
Improved comments.
koschke Jan 27, 2025
935b18d
Fix a few minor issues
Cyclone1337 Jan 28, 2025
6985ac0
Fix a few minor issues.
Cyclone1337 Jan 28, 2025
ec115ff
Removed unused import. Improved documentation.
koschke Jan 28, 2025
cd96e38
Use of TryGetComponent to simplify code.
koschke Jan 28, 2025
ff6706a
Merge remote-tracking branch 'origin/master' into reflexion-table-imp…
koschke Jan 28, 2025
28c2936
Move the city net actions into their own subfolder.
Cyclone1337 Jan 28, 2025
22aa58e
Improve and fix the CitySelectionManager and its network usage.
Cyclone1337 Jan 28, 2025
efc7fcb
Update Assets/SEE/Game/City/CityAdder.cs
Cyclone1337 Jan 28, 2025
1acc07e
Remove accidentally pushed files.
Cyclone1337 Jan 28, 2025
3c566c4
Merge branch 'reflexion-table-improvement' of github.com:uni-bremen-a…
Cyclone1337 Jan 28, 2025
06a1c2c
Change return to break in switch.
Cyclone1337 Jan 28, 2025
05b2f14
Remove unused progress state.
Cyclone1337 Jan 28, 2025
930dc28
Simplified comment.
koschke Jan 28, 2025
97c7338
Merge branch 'reflexion-table-improvement' of github.com:uni-bremen-a…
koschke Jan 28, 2025
25e0f81
Reset progressState to ProgressState.Start if an unhandled state is e…
koschke Jan 28, 2025
ebeebdf
Shortened long line. Improved documentation.
koschke Jan 28, 2025
19550c3
Overridden method that just calls the method it overrides is redundant.
koschke Jan 28, 2025
9fd6315
Renamed field so that the name better explains its meaning.
koschke Jan 28, 2025
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: 14 additions & 0 deletions Assets/Resources/Prefabs/Players/DesktopPlayer.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ GameObject:
- component: {fileID: 7168119662192086395}
- component: {fileID: 6063892005676863901}
- component: {fileID: 2520071789127139648}
- component: {fileID: 5975414927075300186}
m_Layer: 0
m_Name: DesktopPlayer
m_TagString: MainCamera
Expand Down Expand Up @@ -217,6 +218,7 @@ MonoBehaviour:
m_DeselectOnBackgroundClick: 1
m_PointerBehavior: 0
m_CursorLockBehavior: 0
m_ScrollDeltaPerTick: 6
--- !u!114 &9190471872809942182
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -640,3 +642,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a9c4a83fb1addb74a8df719a33b9e954, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &5975414927075300186
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6839967699279661599}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0d5638d3ede5ca0479f34465c368593c, type: 3}
m_Name:
m_EditorClassIdentifier:
Loading
Loading