Created menu #546
Merged
Created menu #546
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Inside of the Main Menu on the left side a third button called "Undo-Redo Menu" is created.
Created a Prefab Menu called UndoRedoMenu, which contains a bar at the top and 4 buttons, "Follow Me", "Close", "Undo" and "Redo".
Upon pressing the UndoRedoButton the corresponding Menu appears. Added both the menu and button to the MainMenu Script
The UndoRedoMenu Prefab is integrated into WindowMangager.cs by creating a script UndoRedoMenu, which inherits from IWindow. Additionally, the close button now works by calling the Close() function defined by IWindow.
- Added Rotation Axis, Apparent Size and FollowMeToggle Constraints to the UndoRedoMenu - The FollowMe Button now activates/disables the FollowMeToggle Constraint, but starts disabled
The [SerializeField] reference to the UndoRedoMenu Prefab from the WindowManager got reset. This was fixed.
jonast2
added a commit
that referenced
this pull request
Jan 29, 2023
commit f76271c Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sun Jan 29 15:05:18 2023 +0100 Removed duplicate method from merge commit 121a0de Merge: a753eb5 530246b Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sun Jan 29 15:00:01 2023 +0100 Merge branch 'MinusEins/feature/UIHistory' into MinusEins/development commit 530246b Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sun Jan 29 14:44:45 2023 +0100 console outputs removed commit 012f523 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sun Jan 29 14:34:33 2023 +0100 Added description of commands + jumping between * the executed commands will now have an description * jumping between commands now possible * Changed formatting * Changed negative scale of SelectionCubes to positive commit a753eb5 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sun Jan 29 02:26:29 2023 +0100 commented and console outputs removed. commit 89bd95e Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sun Jan 29 01:48:36 2023 +0100 comments added commit 10d3b91 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sun Jan 29 01:21:50 2023 +0100 Currently selected command will be colored red The text color of the TextMeshPro containing the current command will be set to red. commit e044cf4 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 23:48:53 2023 +0100 commented code commit 6e96aee Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 23:40:29 2023 +0100 changed text sizes of TMP, added select method for undoing multiple steps (buggy) commit 2dd91a7 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 22:38:51 2023 +0100 restarted UIHistory Script: implemented scroll mechanism that works commit 96bd0d3 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 20:59:57 2023 +0100 scrolling (almost) fixed commit 0679bde Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 18:51:18 2023 +0100 fixed missing menu commit 18360c8 Merge: cec0b1f 02df06e Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sat Jan 28 18:48:56 2023 +0100 Merge pull request #560 from rwth-acis/MinusEins/feature/FurtherUndoRedoCommands Further undo redo commands are now possible commit 02df06e Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sat Jan 28 18:48:19 2023 +0100 Update ProjectPreferences.asset commit c657eae Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Sat Jan 28 18:45:27 2023 +0100 Update ProjectPreferences.asset commit cec0b1f Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 18:19:52 2023 +0100 Testscene added and Object path of undo and redo-buttons chnage based on sctiveScene (testscne vs mainscene) commit de55f19 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Sat Jan 28 17:49:57 2023 +0100 Added the Undo Redo Function to the IssueShelf and ProjectLoadShelf commit 21fc2d0 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 17:31:32 2023 +0100 Testscene added and project preferences changed commit 76dd5f6 Merge: 9b2c628 d383f42 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sat Jan 28 17:17:40 2023 +0100 Merge branch 'MinusEins/feature/Testszene' into MinusEins/development commit d383f42 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 16:49:35 2023 +0100 merge conflict commit 207acf4 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 16:33:15 2023 +0100 merge conflict fix commit 9e6e563 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 16:23:56 2023 +0100 merge conflict fix commit 72b9dac Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 16:16:32 2023 +0100 Select method Zwischenstand commit c61647f Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Sat Jan 28 13:11:38 2023 +0100 Further Undo Redo Actions are now possible It is now possible to use the close Button on Objects and open them again with the Undo Button. Furthermore the initiation of objects by dragging them out of the shelf can be made "undone" and moving the shelf itself can be made "undone". commit da5384d Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 28 01:01:39 2023 +0100 zurückspringen in history buggy implementiert (funktioniert noch nicht korrekt) commit 2e1d658 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Fri Jan 27 23:44:42 2023 +0100 scrollen für die UI implementiert commit fb39927 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Fri Jan 27 19:00:14 2023 +0100 Methoden für die Anzeige der Commands in der UI (funktioniert noch nicht) commit bc9e24f Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Fri Jan 27 14:13:42 2023 +0100 Aussehen an Theme angepasst commit 7fa02a9 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Fri Jan 27 01:07:37 2023 +0100 Logik zum Anzeigen und Ändern von Textinhalten für die Commandlist der Historie erstellt (Semantik noch nicht), UIHistory als Menu an das UndoRedoSystem angebunden commit f2f0861 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Thu Jan 26 17:42:08 2023 +0100 fixed follow me in menu commit a207d05 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Thu Jan 26 14:35:58 2023 +0100 Restored Unity version + ProjectPreferences commit 9b2c628 Merge: 94abe36 9fe2c72 Author: zeynebGueven <115874402+zeynebGueven@users.noreply.github.com> Date: Thu Jan 26 14:29:04 2023 +0100 Merge pull request #553 from rwth-acis/MinusEins/feature/menu2 Removal of Redo() and menu adjustments commit a657642 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Thu Jan 26 14:27:34 2023 +0100 UIHistory button und menü erstellt (noch nicht ganz fertig designt) commit 9fe2c72 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Wed Jan 25 18:39:36 2023 +0100 Added back to UndoRedoMenu The backside of the UndoRedoMenuPrefab was transparent. This is fixed by duplicating and rotating the front by 180 degrees and removing the unnecessary components. commit f413c24 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Wed Jan 25 17:55:38 2023 +0100 Undo button now greys out if undo not possible - The undo button now becomes grey when it is not possible to undo, similar to the redo button - the changing of Color has now been generalised - the opening of the UndoRedoMenu has been removed from the UndoRedo System, so that previous commands can be accessed commit 69d3bcc Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Wed Jan 25 13:49:42 2023 +0100 Fixed Redo of ProgressBarHandleCommand commit b1c4ac5 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Wed Jan 25 10:13:08 2023 +0100 Fixed AppBarTransformCommand Fixed AppBarTransformCommand The Redo of AppBarTransformCommand was fixed. As the endValues were not initialized the AppBar was moved to the origin when activating it. Now the values are initialized upon creation. commit c8cb8ba Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Tue Jan 24 21:37:49 2023 +0100 Removed Redo method from ICommand Removed redo() in most cases except in the CommandProcessor, as it was redundant. commit 94abe36 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Tue Jan 24 19:35:55 2023 +0100 Renamed CommandController to UndoRedoManager To further integrate the UndoRedo Menu into VIAProMa the CommandController is renamed to UndoRedoManager and is added to the Manager Prefab. Additionally a few modifications, which were only present in the Main Scene were now instead added to the Main Menu Prefab. commit a4cda82 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Tue Jan 24 16:32:12 2023 +0100 Restored original settings + refactoring - restored version 2021.3.10f1 instead of 2021.3.11f1 - removed accidentally created .lighting files - removed empty folder Assets/Tests/UI Tests/Undo-Redo-Menu - refactoring (cleaned up comments, Debug.Logs and layout) - deleted unused and empty MoveCommand.cs - changed location of UndoRedoMenu.cs to be coherent with other menus - restored unmodified MixedRealityToolkit settings commit 86b57b3 Merge: 0dcaf78 58ffc97 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Tue Jan 24 11:36:36 2023 +0100 Merge pull request #550 from rwth-acis/MinusEins/feature/UndoRedoProgressBar ProgressBarHandleCommand has been created commit 58ffc97 Merge: 7beab16 0dcaf78 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Tue Jan 24 11:34:32 2023 +0100 Merge branch 'MinusEins/development' into MinusEins/feature/UndoRedoProgressBar commit 7beab16 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Tue Jan 24 11:27:14 2023 +0100 Undo and Redo works now with ProgressBarHandles, fixed Bug on CommandProcessor commit 0dcaf78 Merge: e25c715 266a9c8 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Tue Jan 24 11:04:17 2023 +0100 Merge pull request #549 from rwth-acis/MinusEins/feature/UndoRedoAppBar Included AppBar in Undo Redo System commit e25c715 Merge: d665ecb 00ecf9c Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Tue Jan 24 11:04:04 2023 +0100 Merge pull request #548 from rwth-acis/MinusEins/feature/MenueAusgrauen Changing menu colors commit d665ecb Merge: 36ec016 b4a51f0 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Tue Jan 24 11:03:49 2023 +0100 Merge pull request #547 from rwth-acis/MinusEins/feature/UndoRedoKanban Created Command Pattern and integrated Menus + Kanban Board commit 36ec016 Merge: f14c7c3 72eb183 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Tue Jan 24 10:36:25 2023 +0100 Merge pull request #546 from rwth-acis/MinusEins/feature/menu Created menu commit b18d8bb Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Mon Jan 23 22:35:29 2023 +0100 Testszene funktioniert mit Undo und Redo. commit 266a9c8 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Mon Jan 23 17:34:54 2023 +0100 Undo Redo für alle Objekte, die die AppBar nutzen funktioniert jetzt. Command zusammengefasst als AppBarTransfrom commit bd28428 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Mon Jan 23 17:06:57 2023 +0100 Kleiner Bugfix commit 8857205 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Mon Jan 23 16:28:26 2023 +0100 Testszene organisiert, funktioniert immernoch nicht ganz commit aa80b0a Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Mon Jan 23 16:03:40 2023 +0100 Testszene erstellt, Redo funktioniert in dieser Szene noch nicht commit 5e7ccb4 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Mon Jan 23 09:47:18 2023 +0100 ProgressBar Undo funktioniert noch nicht commit de759b3 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sat Jan 21 16:50:46 2023 +0100 ICommands für AppBar zum skalieren, rotieren, positionieren erstellt + implementiert. Funktioniert noch nicht commit 00ecf9c Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Fri Jan 20 15:11:10 2023 +0100 Menü Ausgrauen funktioniert jetzt auch mit Redo commit 5c1be41 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Thu Jan 19 09:27:26 2023 +0100 Farbe ändern funktioniert, aber irgendwie treten nun Probleme mit der Redo Funktion auf commit 5c2b2de Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Wed Jan 18 12:45:06 2023 +0100 Farbe ändern generell funktioniert schon, Zugriff auf das Button Background Material noch nicht und Logik fehlt noch (wann grau wann blau). Arbeite später weiter commit d0543ce Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Wed Jan 11 22:16:48 2023 +0100 Materialien an restlichen Menüs angepast, changecolor Methode geschrieben (funktioniert noch nicht) commit b4a51f0 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Mon Jan 9 01:41:45 2023 +0100 Added Undo/Redo functionality to menus of WindowManager commit 570f62d Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Sun Jan 8 20:30:54 2023 +0100 Kleine Korrektur commit cb3a84f Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Sun Jan 8 20:27:47 2023 +0100 Beginn Undo für ProgressBar Undo für Progressbar ist in Arbeit commit c569821 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sun Jan 8 19:58:10 2023 +0100 KanBan Redo implemented commit 64545dd Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Sun Jan 8 17:39:01 2023 +0100 Undo funktioniert nun auch mit mehreren Befehlen wie gewünscht commit 6a88bd9 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Sun Jan 8 15:56:07 2023 +0100 Kleine Veränderung commit 278ece2 Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Sun Jan 8 11:10:18 2023 +0100 Undo gefixt Es funktioniert nun Undo, also, dass sich das Kanban Board zurückskaliert und positioniert :) commit 7b90871 Author: zeynebGueven <zeyno.gvn01@gmail.com> Date: Sun Jan 8 01:33:58 2023 +0100 Fixed scaling of Kanban Board via Execute Command commit a9d286d Author: esthikalt <116064253+esthikalt@users.noreply.github.com> Date: Sat Jan 7 21:43:29 2023 +0100 Kanban Handles Undo Redo Feature Ich habe begonnen, das Undo Feature auf die Kanban Griffe anzuwenden (beim Skalieren). Momentan gibt es da noch einen Fehler. commit 00b91d2 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sat Jan 7 19:53:06 2023 +0100 Fixed wrong position of UndoRedoMenu commit dba5f89 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sat Jan 7 19:41:03 2023 +0100 Small correction commit 2cd6421 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Sat Jan 7 18:26:53 2023 +0100 Created CreateMenuCommand and CommandController The CommandController is used to manage an instance of the CommandProcessor. The new CreateMenuCommand will Open/Close menus, although for now it is limited to the UndoRedoMenu commit c6a7398 Merge: fef894f 72eb183 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Fri Jan 6 17:32:09 2023 +0100 Merge branch 'MinusEins/feature/menu' into MinusEins/feature/UndoRedo commit 72eb183 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Fri Jan 6 15:46:37 2023 +0100 Fixed missing reference to prefab menu The [SerializeField] reference to the UndoRedoMenu Prefab from the WindowManager got reset. This was fixed. commit fef894f Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Fri Jan 6 01:03:05 2023 +0100 Created Command Interface and Command Processor The Command/Command Processor was implemented. The Interface ICommand represents various commands and can only be Executed/Reversed. The CommandProcessor keeps track of the commands in a list and can Execute/Undo/Redo them. commit d02964e Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Fri Jan 6 00:21:46 2023 +0100 Added Constraints to UndoRedoMenu + FollowMe Button - Added Rotation Axis, Apparent Size and FollowMeToggle Constraints to the UndoRedoMenu - The FollowMe Button now activates/disables the FollowMeToggle Constraint, but starts disabled commit 7ff848c Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Thu Jan 5 20:42:04 2023 +0100 Integrated UndoRedoMenu into WindowManager The UndoRedoMenu Prefab is integrated into WindowMangager.cs by creating a script UndoRedoMenu, which inherits from IWindow. Additionally, the close button now works by calling the Close() function defined by IWindow. commit 488bc8d Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Wed Jan 4 23:18:50 2023 +0100 Connected UndoRedoButton to UndoRedoMenu Upon pressing the UndoRedoButton the corresponding Menu appears. Added both the menu and button to the MainMenu Script commit 42f3979 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Wed Jan 4 19:14:46 2023 +0100 Created UndoRedoMenu Created a Prefab Menu called UndoRedoMenu, which contains a bar at the top and 4 buttons, "Follow Me", "Close", "Undo" and "Redo". commit b97e9c8 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Wed Jan 4 18:16:18 2023 +0100 Created "Undo-Redo Menu" button Inside of the Main Menu on the left side a third button called "Undo-Redo Menu" is created. commit f14c7c3 Author: Jona Steffen <69996027+jonast2@users.noreply.github.com> Date: Wed Jan 4 17:04:03 2023 +0100 Deletion of UserSettings The Unity UserSettings should not be tracked by git, as they are personalized for each user. Because of that, the files themselves, as well as their tracking in the .gitignore file, have been removed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The menu to control the Undo Redo System was created.
This menu can be opened by pressing a button on the left side of the Main Cube, which lets a menu pop up to the left of it.
The menu contains a Undo button on the bottom left and a Redo button on the bottom right. At the top right the menu has a close button, and at the top left a "Follow Me" button.
The "Follow Me" Button activates constraints, which keep the menu in the field of view of the user.