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

Import/export improvements #573

Merged
merged 127 commits into from
May 2, 2024
Merged

Import/export improvements #573

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
dc7273a
Export an additional GLB file using UnityGLTF (default settings for now)
andybak Nov 26, 2023
6430417
scripting define to stop the gltf importers clashing
andybak Nov 27, 2023
903e97a
Merge branch 'main' into feature/unity-gltf-export
andybak Nov 29, 2023
89a73c3
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Dec 7, 2023
dbefc95
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Dec 7, 2023
496ed89
Remove editor-only property ref
andybak Dec 8, 2023
5ca28f1
Experimental Export Config replaced
Seth-Rough Dec 11, 2023
21261ac
Updated Export
Seth-Rough Dec 13, 2023
bf4e7fe
Set minimal defaults
andybak Dec 18, 2023
d14d9e5
Remove LATK compiler flag as we're using UserConfig now. Formatting.
andybak Dec 18, 2023
5d8efd2
Remove another check for the latk flag
andybak Dec 18, 2023
de2651c
Cleanups for the new glb export logic. Make a separate directory.
andybak Dec 18, 2023
a427f47
Merge branch 'main' into feature/unity-gltf-export
andybak Dec 18, 2023
95294c0
Small refactor. Formatting
andybak Dec 18, 2023
a71a41b
Small refactor and simplification. Mainly cosmetic
andybak Dec 18, 2023
08d5faa
dotnet-format and other cosmetic changes
andybak Dec 18, 2023
914c050
More formatting changes. Latk doesn't need to be in platform config
andybak Dec 18, 2023
39cf6e6
Fix reading defaults from open brush config file
andybak Dec 18, 2023
b951e5d
Convert node names to use brush DurableName instead of guid
andybak Dec 18, 2023
5fed57a
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Dec 20, 2023
e84cb9d
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Jan 1, 2024
18b1361
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Jan 11, 2024
861981f
Fix post-merge issues
andybak Jan 11, 2024
2b5d1bb
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Jan 18, 2024
8bae26e
Update packages-lock.json
andybak Jan 18, 2024
607081d
Update UnityGLTF version
andybak Jan 22, 2024
b86fd18
WIP Export plugin
andybak Jan 23, 2024
b216235
Fix NRE. Cleanup unused code.
andybak Jan 23, 2024
963ae53
dotnet-format
andybak Jan 23, 2024
46e8351
fix extension usage
andybak Jan 23, 2024
5af38ed
Naming and dotnet-format
andybak Jan 23, 2024
e11dbe9
Consistent case for metadata keys
andybak Jan 23, 2024
7bd42f1
Refactor batch to stroke logic. Initial WIP version of brush mesh baking
andybak Jan 25, 2024
56c5c71
Catch a couple of NREs when exporting allbrushes.tilt
andybak Jan 25, 2024
588b9a8
Enable animations and blend shape export in UnityGltf
andybak Jan 26, 2024
2820e0a
dotnet-format
andybak Jan 26, 2024
c06e79f
Initial support for selecting parts of an imported model
andybak Jan 30, 2024
5efcc98
Import SVG as 3d model
andybak Jan 30, 2024
efa71c1
Normalize slashes for loaded models
andybak Feb 1, 2024
917ce6b
Fix issue where sketchbook panel appears when loading a sketch from t…
andybak Feb 1, 2024
39a4a57
Catch an occasional NRE
andybak Feb 1, 2024
a9c0d76
Refactor the model subtree so it lives on ModelWidget instead of Model
andybak Feb 2, 2024
64dc917
Fix an NRE
andybak Feb 2, 2024
4827838
Slightly better logic for extracting subtrees
andybak Feb 2, 2024
e096b1b
Fix undo
andybak Feb 2, 2024
9f39ef6
Fix bounding box for broken apart models
andybak Feb 2, 2024
bc0a921
Correctly Configure single and double sided materials
NicholasLiang Feb 8, 2024
5c08136
Update packages-lock.json
andybak Feb 9, 2024
1ae8ab1
Fix cloning and ungrouping for broken apart models. Initial work on S…
andybak Feb 22, 2024
84eead5
Merge remote-tracking branch 'upstream/main' into feature/model-struc…
andybak Feb 22, 2024
ce2f391
dotnet format
andybak Feb 22, 2024
c4ea16d
Subtree bug fixes. Update vector graphics package version
andybak Feb 23, 2024
dc0f2e6
Fix the case where a node is both a mesh and a parent to other meshes
andybak Feb 27, 2024
27e71b6
Merge branch 'main' into feature/model-structure
andybak Feb 27, 2024
fe0e724
dotnet format
andybak Feb 27, 2024
39d8a7a
Remove unused imports
andybak Feb 27, 2024
5443298
Fix broken webimport api endpoint
andybak Feb 28, 2024
01996fe
Merge remote-tracking branch 'upstream/main' into feature/model-struc…
andybak Feb 28, 2024
ecde996
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Feb 28, 2024
68ec9ea
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Mar 5, 2024
83c3ee2
Allow config switch to use UnityGLTF instead of GLTFast for import
andybak Mar 11, 2024
a5d9a4f
Merge branch 'main' into feature/unity-gltf-export
andybak Mar 11, 2024
a2a57b3
Update UnityGltf
andybak Mar 12, 2024
b5caa06
Code cleanup
andybak Mar 12, 2024
2ff35d3
Editor script and converted maps
andybak Mar 12, 2024
184db3c
Revert "Update UnityGltf"
andybak Mar 12, 2024
41c3214
Update UnityGltf (without including extraneous changes this time)
andybak Mar 12, 2024
818b09a
Update GLTFast
andybak Mar 12, 2024
bfa711f
Disable lights when in the panel
andybak Mar 12, 2024
41498b5
Fix light range and intensity. Fix incorrect bool check. Code cleanup
andybak Mar 12, 2024
b85c6f1
Why not generate material collector here?
andybak Mar 12, 2024
a461efe
Light Gizmos
andybak Mar 13, 2024
4764c9d
Merge remote-tracking branch 'origin/feature/model-structure' into fe…
andybak Mar 13, 2024
f4d47c1
Rewrite "break apart model" logic to be less brittle and confusing
andybak Mar 15, 2024
7dc063c
Remove debug logs and factor out a local function that didn't do much
andybak Mar 15, 2024
374c291
Merge branch 'feature/unity-gltf-export' of https://github.com/icosa-…
NicholasLiang Mar 17, 2024
fc73308
Dots and Double Tapered X added
NicholasLiang Mar 17, 2024
75c67a5
Merge branch 'main' into feature/unity-gltf-export
andybak Mar 17, 2024
3c92e1b
Take light gizmo bounds into account
andybak Mar 17, 2024
7d16aec
Merge branch 'main' into fix/bump-maps-to-normal-maps
andybak Mar 17, 2024
52fead6
Revert "Editor script and converted maps"
andybak Mar 17, 2024
1746d2e
Fix normal map format
andybak Mar 17, 2024
35ac9b8
Log error when we fall back to legacy importer
andybak Mar 17, 2024
b2fdbf6
Handle the fact UnityGLTF shaders dont't set a main color.
andybak Mar 17, 2024
0e68605
[CI BUILD]
andybak Mar 19, 2024
5c6c86c
Handle missing compute shaders
andybak Mar 20, 2024
997c448
Fix light range
andybak Mar 21, 2024
6744e82
I goofed when refactoring this previously.
andybak Mar 21, 2024
b50e561
This seems to mostly fix issues with the material collector.
andybak Mar 21, 2024
d7651e7
Fix importing via API
andybak Mar 22, 2024
c2b5662
Slightly more robust main color detector
andybak Mar 22, 2024
981569c
Merge branch 'main' into feature/unity-gltf-export
andybak Mar 22, 2024
396c443
[CI BUILD]
andybak Mar 27, 2024
d95b5de
Merge branch 'main' into fix/bump-maps-to-normal-maps
andybak Mar 27, 2024
c6b9217
Merge branch 'main' into feature/unity-gltf-export
andybak Mar 27, 2024
8b299fb
Merge branch 'fix/bump-maps-to-normal-maps' into feature/unity-gltf-e…
andybak Mar 27, 2024
f8f19a1
Initial implementation of LightWidgets (WIP)
andybak Mar 31, 2024
029a137
Finish all particles compute shaders
NicholasLiang Apr 1, 2024
5ae8e79
Finish all needed compute shader
NicholasLiang Apr 1, 2024
715fa37
Fix KeijiroTube's Bug
NicholasLiang Apr 1, 2024
f292e43
This texture was a pallettized image
andybak Apr 1, 2024
6d4fbd6
Fix a NRE
andybak Apr 1, 2024
cf95379
bounds calc should include inactive lights
andybak Apr 1, 2024
61dc754
Fix for when the Unity project has spaces in the path
andybak Apr 1, 2024
0f5bbf3
Handle a few edge cases with editor texture export for toolkit
andybak Apr 1, 2024
00a3c0d
Merge branch 'feature/unity-gltf-export' of https://github.com/icosa-…
andybak Apr 1, 2024
32c1ab5
Improved handling of imported lights
andybak Apr 1, 2024
deee52a
Encapsulate HighlightMeshXfs and ensure mesh filters are kept in sync
andybak Apr 2, 2024
19a0ad1
Merge branch 'main' into feature/unity-gltf-export
andybak Apr 2, 2024
05c9704
The rest of the scaffolding needed for light save/load
andybak Apr 2, 2024
091fb2e
Merge branch 'main' into feature/unity-gltf-export
andybak Apr 5, 2024
423919d
Fleshing out LightWidget some more
andybak Apr 5, 2024
25f0949
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Apr 7, 2024
a1b77bc
[CI BUILD]
andybak Apr 8, 2024
6ac9d13
Add some missing API methods plus a small fix/refactor
andybak Apr 12, 2024
2fe8f58
Fix grabbing of broken apart models
andybak Apr 12, 2024
4e39ab6
Merge remote-tracking branch 'origin/main' into feature/unity-gltf-ex…
andybak Apr 12, 2024
335149c
UnityGLTF light import intensity tweak
andybak Apr 12, 2024
7187bec
Keep pylint happy
andybak Apr 12, 2024
4d14f2f
Update GLTFast to latest and add optional dependencies
andybak Apr 27, 2024
7bb5797
Merge remote-tracking branch 'upstream/main' into feature/unity-gltf-…
andybak Apr 27, 2024
a3e1caa
Merge remote-tracking branch 'origin/main' into feature/unity-gltf-ex…
andybak May 1, 2024
3e56307
Merge remote-tracking branch 'origin/main' into feature/unity-gltf-ex…
andybak May 2, 2024
19203ab
dotnet-format
andybak May 2, 2024
5b09e16
Fix bad auto-merge
andybak May 2, 2024
865a49a
I'm awake this time
andybak May 2, 2024
f0f63a6
Update UnityGltf to latest (2.11.0-rc)
andybak May 2, 2024
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: 1 addition & 1 deletion Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"com.unity.xr.oculus": "3.3.0",
"com.unity.xr.openxr": "1.8.2",
"com.zappar.xr.zapbox": "https://github.com/zappar-xr/zapbox-xr-sdk.git#3296cbf5046369801027a821fe9ff6082431a605",
"org.khronos.unitygltf": "https://github.com/icosa-mirror/UnityGLTF.git#dev",
"org.khronos.unitygltf": "https://github.com/icosa-mirror/UnityGLTF.git",
andybak marked this conversation as resolved.
Show resolved Hide resolved
"org.nuget.google.apis": "1.64.0",
"org.nuget.google.apis.auth": "1.64.0",
"org.nuget.google.apis.core": "https://github.com/icosa-mirror/org.nuget.google.apis.core.git#1.64.0-openbrush",
Expand Down
4 changes: 2 additions & 2 deletions Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
"hash": "3296cbf5046369801027a821fe9ff6082431a605"
},
"org.khronos.unitygltf": {
"version": "https://github.com/icosa-mirror/UnityGLTF.git#dev",
"version": "https://github.com/icosa-mirror/UnityGLTF.git",
"depth": 0,
"source": "git",
"dependencies": {
Expand All @@ -366,7 +366,7 @@
"com.unity.shadergraph": "10.0.0",
"com.unity.mathematics": "1.0.0"
},
"hash": "7fd695109fecf370b2e1602ea1d7ba9817fda326"
"hash": "99c96d9029d4ce02e5f729a5e069a44aef6faa99"
},
"org.nuget.google.apis": {
"version": "1.64.0",
Expand Down
Loading