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

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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
6b6eeb6
imported GLTFUtility and created FileDownloader Script
janves Dec 29, 2022
3a38863
changed a stupid thing
Tschlompf Dec 29, 2022
dd99f7b
Imported Objects get resized
Tschlompf Dec 29, 2022
4d1b83e
imported model synchronization
uwuPyxl Dec 29, 2022
e1b3c37
Fixed FileDownloader Script
Tschlompf Dec 29, 2022
9be4358
added UI graphics
IRoomingI Dec 29, 2022
6f77be0
hotfix
Tschlompf Dec 30, 2022
f1f6d43
Add Owner property on ImportedModel
uwuPyxl Dec 30, 2022
979b723
Added UI searchbar functionality
Tschlompf Dec 30, 2022
0c76360
Implemented Import Button on Items in Search Browser
Tschlompf Dec 30, 2022
2ef8f13
Hotfix for wrong links
Tschlompf Dec 31, 2022
7c5bf17
Add Import Model Menu to Window Manager
IRoomingI Dec 31, 2022
9fc259c
Integrated 3DModelManager in Prefab
Tschlompf Dec 31, 2022
427d034
Added functionality to the session browser
Tschlompf Jan 1, 2023
dc24f33
resized menu
IRoomingI Jan 2, 2023
0a6f5d9
fix for movable windows and tabs
Tschlompf Jan 2, 2023
7b8709e
Added Import Button functionality in session browser
Tschlompf Jan 2, 2023
75bb00a
resize button text
IRoomingI Jan 2, 2023
36eafc2
Merge branch 'OptiCoffee/direct-link' of github.com:rwth-acis/VIAProM…
IRoomingI Jan 2, 2023
f5366f5
Added Delete and Highlight Functionality
Tschlompf Jan 3, 2023
d474f6f
Merge branch 'OptiCoffee/direct-link' of https://github.com/rwth-acis…
Tschlompf Jan 3, 2023
a46706a
implemented thumbnail generator
IRoomingI Jan 3, 2023
59829ab
Merge branch 'OptiCoffee/synchronization' into OptiCoffee/direct-link
uwuPyxl Jan 3, 2023
ab89ab3
add ImportedModelSerializer
uwuPyxl Jan 3, 2023
ccbbc89
Implemented many functions, like Thumbnails and session browser browsing
Tschlompf Jan 4, 2023
6709cbe
Merge branch 'OptiCoffee/direct-link' of https://github.com/rwth-acis…
Tschlompf Jan 4, 2023
3f5f981
adjusted thumbnail camera
IRoomingI Jan 4, 2023
915b15a
Fixed Object Position
Tschlompf Jan 4, 2023
dde6fa9
File Browser + corrupt glbs implemented
Tschlompf Jan 7, 2023
c9bfb7a
Hotfix for aborted downloads
Tschlompf Jan 7, 2023
fa0f94a
Hotfix for aborted downloads
Tschlompf Jan 7, 2023
6f40e77
Experimenting with Highlights
Tschlompf Jan 8, 2023
11bd8c2
add 3DImport shaders
uwuPyxl Jan 8, 2023
417e94d
Hotfix for keyboard size (was too big)
Tschlompf Jan 8, 2023
e7d9bc1
Merge branch 'OptiCoffee/direct-link' of https://github.com/rwth-acis…
Tschlompf Jan 8, 2023
0637864
Fixed Highlighting (better use of emission)
Tschlompf Jan 8, 2023
173f759
better cutted links and paths + fix for stupid links
Tschlompf Jan 8, 2023
475f334
close import menu when leaving the room
IRoomingI Jan 8, 2023
21b589b
Merge branch 'OptiCoffee/direct-link' of github.com:rwth-acis/VIAProM…
IRoomingI Jan 8, 2023
4b89ee5
RoomClosing/UIAdding: Fixed Refreshable Stuff
Tschlompf Jan 8, 2023
2773b18
Merge pull request #540 from rwth-acis/OptiCoffee/direct-link
Tschlompf Jan 20, 2023
1f3fa1d
GET from sketchfab api
IRoomingI Jan 20, 2023
65c57fa
Searchbrowser - Sketchfab - Part 1
Tschlompf Jan 27, 2023
f610b79
added new sketchfabItem + download link getter
IRoomingI Jan 27, 2023
8177699
Sketchfab part 3
Tschlompf Jan 27, 2023
ea07d07
get sketchfab download link
IRoomingI Jan 27, 2023
7d08323
Sketchfab part 4
Tschlompf Jan 27, 2023
6180fd4
Some added Documentation
Tschlompf Jan 27, 2023
91f9e2c
Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI…
IRoomingI Jan 27, 2023
3a7a01f
Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI…
IRoomingI Jan 27, 2023
96625e4
Push for testing
Tschlompf Jan 27, 2023
7c8a56f
Added garbage collection for sketchfabThumbs
Tschlompf Jan 27, 2023
bc7290e
More Sketchfab
Tschlompf Jan 27, 2023
5684b94
sketchfab thumbnail downloader
IRoomingI Jan 27, 2023
4fce727
Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI…
IRoomingI Jan 27, 2023
a472a38
Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI…
IRoomingI Jan 27, 2023
03e560d
search items
IRoomingI Jan 28, 2023
4de4755
Sketchfab Completed
Tschlompf Jan 28, 2023
a5a5699
Licence part 1
Tschlompf Jan 28, 2023
ae14483
receive file size from sketchfab
IRoomingI Jan 28, 2023
2b6f3f5
Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI…
IRoomingI Jan 28, 2023
87e54d6
More Licence/Network
Tschlompf Jan 28, 2023
d1d333a
Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI…
IRoomingI Jan 28, 2023
838b389
Licence Web Request implemented
IRoomingI Jan 28, 2023
a1adf08
Sketchfab Final + more Network
Tschlompf Jan 28, 2023
e6ad67e
Testing network
Tschlompf Jan 28, 2023
b1a5164
Something fixed
Tschlompf Jan 28, 2023
5e55210
Deleted unused Network Script
Tschlompf Jan 28, 2023
7823554
Testing!!!
Tschlompf Jan 28, 2023
4fb3ab4
Testing
Tschlompf Jan 28, 2023
68e441f
instantiate model menu as network scene object
IRoomingI Jan 28, 2023
b53c7e5
Merge branch 'OptiCoffee/sketchfab-search' of github.com:rwth-acis/VI…
IRoomingI Jan 28, 2023
d1c6f17
Test
Tschlompf Jan 28, 2023
af2eba0
Test
Tschlompf Jan 28, 2023
8eac58a
Test
Tschlompf Jan 28, 2023
ae735c2
Neuer Test
Tschlompf Jan 28, 2023
97fdd68
Test
Tschlompf Jan 28, 2023
76aaf44
Test
Tschlompf Jan 28, 2023
22dfc57
Test
Tschlompf Jan 28, 2023
397846e
Test
Tschlompf Jan 28, 2023
36fe85c
Fixes
Tschlompf Jan 28, 2023
29b486b
Test
Tschlompf Jan 28, 2023
3d3cc96
Test
Tschlompf Jan 29, 2023
d36f037
Test
Tschlompf Jan 29, 2023
01d4a23
Merge branch 'OptiCoffee/sketchfab-search' into OptiCoffee/development
Tschlompf Jan 29, 2023
d033615
Save/Load Implemented
Tschlompf Jan 29, 2023
0c1b22d
Test
Tschlompf Jan 29, 2023
c9ffc3f
fix for loaded models, that are synced
Tschlompf Jan 29, 2023
ef142b4
Testing
Tschlompf Jan 29, 2023
49a9dd5
Fix
Tschlompf Jan 29, 2023
938d29b
Fix
Tschlompf Jan 29, 2023
54e67d3
changed main scene (i guess)
IRoomingI Jan 29, 2023
1d1dc68
Test
Tschlompf Jan 29, 2023
67c9692
Merge pull request #567 from rwth-acis/OptiCoffee/sketchfab-search
Tschlompf Jan 29, 2023
da53271
Deleted old sync test
Tschlompf Jan 29, 2023
1421624
Cleaned up comments and added XML
Tschlompf Jan 29, 2023
4309493
Fixes for build
Tschlompf Jan 29, 2023
bdb3159
Fixed error with redownloading sessionModels
Tschlompf Jan 29, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

Frontend/VIAProMa/UserSettings/Layouts/default-2021.dwlt
33 changes: 29 additions & 4 deletions Frontend/VIAProMa/Assets/Materials/InputFieldBackground.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: InputFieldBackground
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_ShaderKeywords: _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP _HOVER_LIGHT _REFLECTIONS
_SPECULAR_HIGHLIGHTS
m_ValidKeywords:
- _DIRECTIONAL_LIGHT
- _DISABLE_ALBEDO_MAP
- _HOVER_LIGHT
- _REFLECTIONS
- _SPECULAR_HIGHLIGHTS
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -69,10 +74,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
- _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
Expand All @@ -99,16 +106,22 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
- _EnableProximityLightColorOverride: 0
- _EnableSSAA: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
- _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
- _IgnoreZScale: 0
- _IndependentCorners: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
Expand All @@ -117,13 +130,15 @@ Material:
- _IridescenceIntensity: 0.5
- _IridescenceThreshold: 0.05
- _Metallic: 0
- _MipmapBias: -2
- _Mode: 0
- _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
- _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 1
- _Refraction: 0
Expand All @@ -146,16 +161,26 @@ Material:
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
- _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _Color: {r: 0.95, g: 0.95, b: 0.95, a: 1}
- _Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ MonoBehaviour:
- _MixedRealityToolkit_Editor_LockProfiles
- _MixedRealityToolkit_Editor_AutoEnableUWPCapabilities
- MixedRealityToolkit_Editor_NullDataProviders
values: 0001010100
values: 0101010100
intPreferences:
keys:
- MixedRealityToolkit_Editor_AudioSpatializerCount
- _MixedRealityToolkit_Editor_ConfiguratorState
values: 0000000096000000
values: 00000000f4010000
floatPreferences:
keys: []
values: []
Expand Down
8 changes: 8 additions & 0 deletions Frontend/VIAProMa/Assets/Prefabs/3DImport.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading