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

Undo-Redo System #576

Open
wants to merge 96 commits into
base: develop
Choose a base branch
from
Open

Undo-Redo System #576

wants to merge 96 commits into from

Commits on Jan 4, 2023

  1. 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.
    jonast2 committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    f14c7c3 View commit details
    Browse the repository at this point in the history
  2. Created "Undo-Redo Menu" button

    Inside of the Main Menu on the left side a third button called "Undo-Redo Menu" is created.
    jonast2 committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    b97e9c8 View commit details
    Browse the repository at this point in the history
  3. Created UndoRedoMenu

    Created a Prefab Menu called UndoRedoMenu, which contains a bar at the top and 4 buttons, "Follow Me", "Close", "Undo" and "Redo".
    jonast2 committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    42f3979 View commit details
    Browse the repository at this point in the history
  4. Connected UndoRedoButton to UndoRedoMenu

    Upon pressing the UndoRedoButton the corresponding Menu appears.
    Added both the menu and button to the MainMenu Script
    jonast2 committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    488bc8d View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. 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.
    jonast2 committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    7ff848c View commit details
    Browse the repository at this point in the history
  2. 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
    jonast2 committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    d02964e View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. 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.
    jonast2 committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    fef894f View commit details
    Browse the repository at this point in the history
  2. Fixed missing reference to prefab menu

    The [SerializeField] reference to the UndoRedoMenu Prefab from the WindowManager got reset. This was fixed.
    jonast2 committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    72eb183 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c6a7398 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2023

  1. 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
    jonast2 committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    2cd6421 View commit details
    Browse the repository at this point in the history
  2. Small correction

    jonast2 committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    dba5f89 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    00b91d2 View commit details
    Browse the repository at this point in the history
  4. 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.
    esthikalt committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    a9d286d View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. Configuration menu
    Copy the full SHA
    7b90871 View commit details
    Browse the repository at this point in the history
  2. Undo gefixt

    Es funktioniert nun Undo, also, dass sich das Kanban Board zurückskaliert und positioniert :)
    esthikalt committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    278ece2 View commit details
    Browse the repository at this point in the history
  3. Kleine Veränderung

    esthikalt committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    6a88bd9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    64545dd View commit details
    Browse the repository at this point in the history
  5. KanBan Redo implemented

    zeynebGueven committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    c569821 View commit details
    Browse the repository at this point in the history
  6. Beginn Undo für ProgressBar

    Undo für Progressbar ist in Arbeit
    esthikalt committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    cb3a84f View commit details
    Browse the repository at this point in the history
  7. Kleine Korrektur

    esthikalt committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    570f62d View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Configuration menu
    Copy the full SHA
    b4a51f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. Materialien an restlichen Menüs angepast, changecolor Methode geschri…

    …eben (funktioniert noch nicht)
    zeynebGueven committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    d0543ce View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. Farbe ändern generell funktioniert schon, Zugriff auf das Button Back…

    …ground Material noch nicht und Logik fehlt noch (wann grau wann blau). Arbeite später weiter
    esthikalt committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    5c2b2de View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. Configuration menu
    Copy the full SHA
    5c1be41 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. Configuration menu
    Copy the full SHA
    00ecf9c View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2023

  1. ICommands für AppBar zum skalieren, rotieren, positionieren erstellt …

    …+ implementiert. Funktioniert noch nicht
    zeynebGueven committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    de759b3 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. Configuration menu
    Copy the full SHA
    5e7ccb4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa80b0a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8857205 View commit details
    Browse the repository at this point in the history
  4. Kleiner Bugfix

    esthikalt committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    bd28428 View commit details
    Browse the repository at this point in the history
  5. Undo Redo für alle Objekte, die die AppBar nutzen funktioniert jetzt.…

    … Command zusammengefasst als AppBarTransfrom
    zeynebGueven committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    266a9c8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b18d8bb View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. Configuration menu
    Copy the full SHA
    36ec016 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #547 from rwth-acis/MinusEins/feature/UndoRedoKanban

    Created Command Pattern and integrated Menus + Kanban Board
    esthikalt authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    d665ecb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e25c715 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #549 from rwth-acis/MinusEins/feature/UndoRedoAppBar

    Included AppBar in Undo Redo System
    esthikalt authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    0dcaf78 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7beab16 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    58ffc97 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #550 from rwth-acis/MinusEins/feature/UndoRedoProg…

    …ressBar
    
    ProgressBarHandleCommand has been created
    jonast2 authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    86b57b3 View commit details
    Browse the repository at this point in the history
  8. 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
    jonast2 committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    a4cda82 View commit details
    Browse the repository at this point in the history
  9. 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.
    jonast2 committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    94abe36 View commit details
    Browse the repository at this point in the history
  10. Removed Redo method from ICommand

    Removed redo() in most cases except in the CommandProcessor, as it was redundant.
    jonast2 committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    c8cb8ba View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. 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.
    jonast2 committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    b1c4ac5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    69d3bcc View commit details
    Browse the repository at this point in the history
  3. 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
    jonast2 committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    f413c24 View commit details
    Browse the repository at this point in the history
  4. 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.
    jonast2 committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    9fe2c72 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. Configuration menu
    Copy the full SHA
    a657642 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #553 from rwth-acis/MinusEins/feature/menu2

    Removal of Redo() and menu adjustments
    zeynebGueven authored Jan 26, 2023
    Configuration menu
    Copy the full SHA
    9b2c628 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a207d05 View commit details
    Browse the repository at this point in the history
  4. fixed follow me in menu

    zeynebGueven committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    f2f0861 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. Logik zum Anzeigen und Ändern von Textinhalten für die Commandlist de…

    …r Historie erstellt (Semantik noch nicht), UIHistory als Menu an das UndoRedoSystem angebunden
    zeynebGueven committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    7fa02a9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bc9e24f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fb39927 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2e1d658 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Configuration menu
    Copy the full SHA
    da5384d View commit details
    Browse the repository at this point in the history
  2. 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".
    esthikalt committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    c61647f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    72b9dac View commit details
    Browse the repository at this point in the history
  4. merge conflict fix

    zeynebGueven committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    9e6e563 View commit details
    Browse the repository at this point in the history
  5. merge conflict fix

    zeynebGueven committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    207acf4 View commit details
    Browse the repository at this point in the history
  6. merge conflict

    zeynebGueven committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    d383f42 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    76dd5f6 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    21fc2d0 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    de55f19 View commit details
    Browse the repository at this point in the history
  10. Testscene added and Object path of undo and redo-buttons chnage based…

    … on sctiveScene (testscne vs mainscene)
    zeynebGueven committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    cec0b1f View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    c657eae View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    02df06e View commit details
    Browse the repository at this point in the history
  13. Merge pull request #560 from rwth-acis/MinusEins/feature/FurtherUndoR…

    …edoCommands
    
    Further undo redo commands are now possible
    jonast2 authored Jan 28, 2023
    Configuration menu
    Copy the full SHA
    18360c8 View commit details
    Browse the repository at this point in the history
  14. fixed missing menu

    zeynebGueven committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    0679bde View commit details
    Browse the repository at this point in the history
  15. scrolling (almost) fixed

    zeynebGueven committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    96bd0d3 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    2dd91a7 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    6e96aee View commit details
    Browse the repository at this point in the history
  18. commented code

    zeynebGueven committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    e044cf4 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. Currently selected command will be colored red

    The text color of the TextMeshPro containing the current command will be set to red.
    jonast2 committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    10d3b91 View commit details
    Browse the repository at this point in the history
  2. comments added

    zeynebGueven committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    89bd95e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a753eb5 View commit details
    Browse the repository at this point in the history
  4. 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
    jonast2 committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    012f523 View commit details
    Browse the repository at this point in the history
  5. console outputs removed

    zeynebGueven committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    530246b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    121a0de View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f76271c View commit details
    Browse the repository at this point in the history
  8. missing uihistory prefab error in testscene fixed. Developer comment …

    …for adding actions to undo-redo-system.
    zeynebGueven committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    6f02d4f View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5c6c506 View commit details
    Browse the repository at this point in the history
  10. Formatting + comment changes

    * removed unnesescary directives
    * refactored files
    * added summaries
    * reset ProjectPreferences
    jonast2 committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    67f9cc9 View commit details
    Browse the repository at this point in the history
  11. Removed leftover comments

    jonast2 committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    f977f88 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    7cb2fe4 View commit details
    Browse the repository at this point in the history
  13. Fixed spelling error

    jonast2 committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    aa93ef1 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    857df57 View commit details
    Browse the repository at this point in the history
  15. Added missing new line

    jonast2 committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    8686b9c View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    a1ec6f5 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    117e436 View commit details
    Browse the repository at this point in the history
  18. Dealing with Bug of AppBar

    esthikalt committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    6a89f22 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    84f1635 View commit details
    Browse the repository at this point in the history
  20. Restored original files

    jonast2 committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    c563459 View commit details
    Browse the repository at this point in the history
  21. Merge pull request #573 from rwth-acis/MinusEins/BugFix

    Changed Undo Button design, added Command to Avatar Controller
    jonast2 authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    c7b8d82 View commit details
    Browse the repository at this point in the history
  22. Bug Fix

    esthikalt committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    c9f8fd7 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    bf3206b View commit details
    Browse the repository at this point in the history
  24. Fixed spelling error

    jonast2 committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    c3a2c0e View commit details
    Browse the repository at this point in the history