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

Jump to bottom

Fully implemented 3D Model Import (Mixed Reality Lab 2022/23) #571

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

Fully implemented 3D Model Import (Mixed Reality Lab 2022/23) #571

wants to merge 98 commits into from

Commits on Dec 29, 2022

  1. imported GLTFUtility and created FileDownloader Script

    @janves
    janves committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    6b6eeb6 View commit details
    Browse the repository at this point in the history

  2. changed a stupid thing 

    Changed a local reference to janves folder to the correct github folder
    @Tschlompf
    Tschlompf committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    3a38863 View commit details
    Browse the repository at this point in the history

  3. Imported Objects get resized

    @Tschlompf
    Tschlompf committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    dd99f7b View commit details
    Browse the repository at this point in the history

  4. imported model synchronization

    @uwuPyxl
    uwuPyxl committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    4d1b83e View commit details
    Browse the repository at this point in the history

  5. Fixed FileDownloader Script

    @Tschlompf
    Tschlompf committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    e1b3c37 View commit details
    Browse the repository at this point in the history

  6. added UI graphics

    @IRoomingI
    IRoomingI committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    9be4358 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2022

  1. hotfix

    @Tschlompf
    Tschlompf committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    6f77be0 View commit details
    Browse the repository at this point in the history

  2. Add Owner property on ImportedModel

    @uwuPyxl
    uwuPyxl committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    f1f6d43 View commit details
    Browse the repository at this point in the history

  3. Added UI searchbar functionality

    @Tschlompf
    Tschlompf committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    979b723 View commit details
    Browse the repository at this point in the history

  4. Implemented Import Button on Items in Search Browser

    @Tschlompf
    Tschlompf committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    0c76360 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2022

  1. Hotfix for wrong links

    @Tschlompf
    Tschlompf committed Dec 31, 2022
    Configuration menu
    Copy the full SHA
    2ef8f13 View commit details
    Browse the repository at this point in the history

  2. Add Import Model Menu to Window Manager

    @IRoomingI
    IRoomingI committed Dec 31, 2022
    Configuration menu
    Copy the full SHA
    7c5bf17 View commit details
    Browse the repository at this point in the history

  3. Integrated 3DModelManager in Prefab

    @Tschlompf
    Tschlompf committed Dec 31, 2022
    Configuration menu
    Copy the full SHA
    9fc259c View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2023

  1. Added functionality to the session browser

    @Tschlompf
    Tschlompf committed Jan 1, 2023
    Configuration menu
    Copy the full SHA
    427d034 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2023

  1. resized menu

    @IRoomingI
    IRoomingI committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    dc24f33 View commit details
    Browse the repository at this point in the history

  2. fix for movable windows and tabs

    @Tschlompf
    Tschlompf committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    0a6f5d9 View commit details
    Browse the repository at this point in the history

  3. Added Import Button functionality in session browser

    @Tschlompf
    Tschlompf committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    7b8709e View commit details
    Browse the repository at this point in the history

  4. resize button text

    @IRoomingI
    IRoomingI committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    75bb00a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'OptiCoffee/direct-link' of github.com:rwth-acis/VIAProM… 

    …a into OptiCoffee/direct-link
    @IRoomingI
    IRoomingI committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    36eafc2 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2023

  1. Added Delete and Highlight Functionality

    @Tschlompf
    Tschlompf committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    f5366f5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'OptiCoffee/direct-link' of https://github.com/rwth-acis… 

    …/VIAProMa into OptiCoffee/direct-link
    @Tschlompf
    Tschlompf committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    d474f6f View commit details
    Browse the repository at this point in the history

  3. implemented thumbnail generator

    @IRoomingI
    IRoomingI committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    a46706a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'OptiCoffee/synchronization' into OptiCoffee/direct-link

    @uwuPyxl
    uwuPyxl committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    59829ab View commit details
    Browse the repository at this point in the history

  5. add ImportedModelSerializer

    @uwuPyxl
    uwuPyxl committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    ab89ab3 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. Implemented many functions, like Thumbnails and session browser browsing

    @Tschlompf
    Tschlompf committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    ccbbc89 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'OptiCoffee/direct-link' of https://github.com/rwth-acis… 

    …/VIAProMa into OptiCoffee/direct-link
    @Tschlompf
    Tschlompf committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    6709cbe View commit details
    Browse the repository at this point in the history

  3. adjusted thumbnail camera 

    The camera should now keep the object in frame more reliably.
    @IRoomingI
    IRoomingI committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    3f5f981 View commit details
    Browse the repository at this point in the history

  4. Fixed Object Position 

    And subsequent thumbnail position
    @Tschlompf
    Tschlompf committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    915b15a View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2023

  1. File Browser + corrupt glbs implemented 

    Implemented a WHOLE lot of stuff. File Browser works now and allows to delete files. When this is done, the session and search browser don't refresh - they only refresh, when the deleted item is downloaded or reimported again, and then refresh all other items from the same source. To do this was completely bonkers and also required to add a txt for every glb that saves the according webLink.

IMPORTANT NOTE: we have to implement, that when leaving a session or entering one, lonesome pngs without GLBs are deleted. These are not deleted when a file is deleted, as they can be used within the session browser for objects, that are in the session, but have been recently deleted from the file browser.
    @Tschlompf
    Tschlompf committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    dde6fa9 View commit details
    Browse the repository at this point in the history

  2. Hotfix for aborted downloads 

    Hotfix for aborted downloads, sessionbrowser is now refreshed correctly
    @Tschlompf
    Tschlompf committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    c9bfb7a View commit details
    Browse the repository at this point in the history

  3. Hotfix for aborted downloads 

    When a download is aborted, it sometimes still stays in the files. Now it can be deleted from the file browser completely.
    @Tschlompf
    Tschlompf committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    fa0f94a View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. Experimenting with Highlights

    @Tschlompf
    Tschlompf committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    6f40e77 View commit details
    Browse the repository at this point in the history

  2. add 3DImport shaders

    @uwuPyxl
    uwuPyxl committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    11bd8c2 View commit details
    Browse the repository at this point in the history

  3. Hotfix for keyboard size (was too big)

    @Tschlompf
    Tschlompf committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    417e94d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'OptiCoffee/direct-link' of https://github.com/rwth-acis… 

    …/VIAProMa into OptiCoffee/direct-link
    @Tschlompf
    Tschlompf committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    e7d9bc1 View commit details
    Browse the repository at this point in the history

  5. Fixed Highlighting (better use of emission) 

    + added an error object, that gets loaded in instead of the object, where the import failed
    @Tschlompf
    Tschlompf committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    0637864 View commit details
    Browse the repository at this point in the history

  6. better cutted links and paths + fix for stupid links 

    WebLinks and paths are now cut in half; also, stupid links like http://object.glb that lead to nowhere, but where the object name is already on the harddrive, are now handled correctly, as the appropriate webLink is now always drawn from the .txt file when trying to "download" an already downloaded file from the search browser.
    @Tschlompf
    Tschlompf committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    173f759 View commit details
    Browse the repository at this point in the history

  7. close import menu when leaving the room

    @IRoomingI
    IRoomingI committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    475f334 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'OptiCoffee/direct-link' of github.com:rwth-acis/VIAProM… 

    …a into OptiCoffee/direct-link
    @IRoomingI
    IRoomingI committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    21b589b View commit details
    Browse the repository at this point in the history

  9. RoomClosing/UIAdding: Fixed Refreshable Stuff 

    Stuff, that has to be refreshed, like 3Dmodels and lone .pngs, now get refreshed correctly when adding the ImportManager UI for the first time, and when leaving the room.
    @Tschlompf
    Tschlompf committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    4b89ee5 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. Merge pull request #540 from rwth-acis/OptiCoffee/direct-link 

    Download via direct link (and more) is done
    @Tschlompf
    Tschlompf authored Jan 20, 2023
    Configuration menu
    Copy the full SHA
    2773b18 View commit details
    Browse the repository at this point in the history

  2. GET from sketchfab api 

    implemented basic GET WebRequest to receive search result from the sketchfab data api
    @IRoomingI
    IRoomingI committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    1f3fa1d View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. Searchbrowser - Sketchfab - Part 1

    @Tschlompf
    Tschlompf committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    65c57fa View commit details
    Browse the repository at this point in the history

  2. added new sketchfabItem + download link getter

    @IRoomingI
    IRoomingI committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    f610b79 View commit details
    Browse the repository at this point in the history

  3. Sketchfab part 3

    @Tschlompf
    Tschlompf committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    8177699 View commit details
    Browse the repository at this point in the history

  4. get sketchfab download link

    @IRoomingI
    IRoomingI committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    ea07d07 View commit details
    Browse the repository at this point in the history

  5. Sketchfab part 4

    @Tschlompf
    Tschlompf committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    7d08323 View commit details
    Browse the repository at this point in the history

  6. Some added Documentation

    @Tschlompf
    Tschlompf committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    6180fd4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI… 

    …AProMa into OptiCoffee/sketchfab-search
    @IRoomingI
    IRoomingI committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    91f9e2c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI… 

    …AProMa into OptiCoffee/sketchfab-search
    @IRoomingI
    IRoomingI committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    3a7a01f View commit details
    Browse the repository at this point in the history

  9. Push for testing

    @Tschlompf
    Tschlompf committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    96625e4 View commit details
    Browse the repository at this point in the history

  10. Added garbage collection for sketchfabThumbs

    @Tschlompf
    Tschlompf committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    7c8a56f View commit details
    Browse the repository at this point in the history

  11. More Sketchfab

    @Tschlompf
    Tschlompf committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    bc7290e View commit details
    Browse the repository at this point in the history

  12. sketchfab thumbnail downloader

    @IRoomingI
    IRoomingI committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    5684b94 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI… 

    …AProMa into OptiCoffee/sketchfab-search
    @IRoomingI
    IRoomingI committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    4fce727 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI… 

    …AProMa into OptiCoffee/sketchfab-search
    @IRoomingI
    IRoomingI committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    a472a38 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. search items

    @IRoomingI
    IRoomingI committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    03e560d View commit details
    Browse the repository at this point in the history

  2. Sketchfab Completed

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    4de4755 View commit details
    Browse the repository at this point in the history

  3. Licence part 1

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

  4. receive file size from sketchfab

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

  5. Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI… 

    …AProMa into OptiCoffee/sketchfab-search
    @IRoomingI
    IRoomingI committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    2b6f3f5 View commit details
    Browse the repository at this point in the history

  6. More Licence/Network

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    87e54d6 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI… 

    …AProMa into OptiCoffee/sketchfab-search
    @IRoomingI
    IRoomingI committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    d1d333a View commit details
    Browse the repository at this point in the history

  8. Licence Web Request implemented

    @IRoomingI
    IRoomingI committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    838b389 View commit details
    Browse the repository at this point in the history

  9. Sketchfab Final + more Network

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

  10. Testing network

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

  11. Something fixed

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

  12. Deleted unused Network Script

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    5e55210 View commit details
    Browse the repository at this point in the history

  13. Testing!!!

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

  14. Testing

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    4fb3ab4 View commit details
    Browse the repository at this point in the history

  15. instantiate model menu as network scene object

    @IRoomingI
    IRoomingI committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    68e441f View commit details
    Browse the repository at this point in the history

  16. Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI… 

    …AProMa into OptiCoffee/sketchfab-search
    @IRoomingI
    IRoomingI committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    b53c7e5 View commit details
    Browse the repository at this point in the history

  17. Test

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

  18. Test

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

  19. Test

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    8eac58a View commit details
    Browse the repository at this point in the history

  20. Neuer Test

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

  21. Test

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    97fdd68 View commit details
    Browse the repository at this point in the history

  22. Test

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    76aaf44 View commit details
    Browse the repository at this point in the history

  23. Test

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    22dfc57 View commit details
    Browse the repository at this point in the history

  24. Test

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    397846e View commit details
    Browse the repository at this point in the history

  25. Fixes

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    36fe85c View commit details
    Browse the repository at this point in the history

  26. Test

    @Tschlompf
    Tschlompf committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    29b486b View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. Test

    @Tschlompf
    Tschlompf committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    3d3cc96 View commit details
    Browse the repository at this point in the history

  2. Test

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

  3. Merge branch 'OptiCoffee/sketchfab-search' into OptiCoffee/development

    @Tschlompf
    Tschlompf committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    01d4a23 View commit details
    Browse the repository at this point in the history

  4. Save/Load Implemented

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

  5. Test

    @Tschlompf
    Tschlompf committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    0c1b22d View commit details
    Browse the repository at this point in the history

  6. fix for loaded models, that are synced

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

  7. Testing

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

  8. Fix

    @Tschlompf
    Tschlompf committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    49a9dd5 View commit details
    Browse the repository at this point in the history

  9. Fix

    @Tschlompf
    Tschlompf committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    938d29b View commit details
    Browse the repository at this point in the history

  10. changed main scene (i guess)

    @IRoomingI
    IRoomingI committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    54e67d3 View commit details
    Browse the repository at this point in the history

  11. Test

    @Tschlompf
    Tschlompf committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    1d1dc68 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #567 from rwth-acis/OptiCoffee/sketchfab-search 

    Fully implemented browser with sketchfab funtionality and sync + save
    @Tschlompf
    Tschlompf authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    67c9692 View commit details
    Browse the repository at this point in the history

  13. Deleted old sync test

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

  14. Cleaned up comments and added XML

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

  15. Fixes for build

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

  16. Fixed error with redownloading sessionModels 

    Redownloaded items from the session browser now don't update all other objects in the session that have the same webLink anymore, as this function is currently broken. However, this function isn't needed ever anyways.
    @Tschlompf
    Tschlompf committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    bdb3159 View commit details
    Browse the repository at this point in the history