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

Culmination of two years of fixes, especially for export #644

Merged
merged 1,206 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1206 commits
Select commit Hold shift + click to select a range
052de7a
added stream size check to prevent endless loop + fixed bone joins im…
Aug 4, 2023
69d991d
added check when meshopt is missing but required
Aug 4, 2023
f092e7e
code style cleanup
Aug 4, 2023
89f0a9f
removed space in const string
Aug 4, 2023
a07334b
added null checks for textures
Aug 4, 2023
dbd5666
clean up and renaming
Aug 7, 2023
0141e46
rough refraction 2023 fix
hybridherbst Aug 7, 2023
97dbe3c
fix ifdef
hybridherbst Aug 7, 2023
2647bbb
fix converter fallback when shader doesn't have glossiness
hybridherbst Aug 7, 2023
a6db66b
Merge branch 'feature/mesh-opt-import' into version/2.x
hybridherbst Aug 7, 2023
68f89da
Merge remote-tracking branch 'origin/Material-creation-fixes' into ve…
hybridherbst Aug 7, 2023
043b559
fixed too early closed stream
Aug 7, 2023
89b960c
added asset path check if it's empty
Aug 7, 2023
244d5b1
ensure that textures always have a name
Aug 7, 2023
e0aff5d
added missing clear coat texture import
Aug 7, 2023
4983282
added recalculatetangents when tangents are missing in mesh
Aug 7, 2023
afaa6ce
added missing specGlossinessTexCoord to importmaterials
Aug 8, 2023
510b8a3
changed ExtTextureTransform.texCoord to nullable type. In some cases …
Aug 8, 2023
a85f94e
added import settings to runtime importer (Normals, Tangents, SwapUVs)
Aug 8, 2023
36991a2
fixed interpolation animation import (InterpolationTest)
Aug 8, 2023
b3dadcf
code cleanup, some reverts from last commit, refactoring
Aug 9, 2023
b38e194
fixed wrong placed #endif
Aug 9, 2023
aa4e433
export: ignore submeshes with 0 vertices
Aug 9, 2023
5f8e49b
fixes compiler warnings in 2023+
Aug 9, 2023
7b33824
code clean up
Aug 9, 2023
fe89b74
code formating
Aug 9, 2023
53cac07
fixed not deserialized ExtTextureTransform inside material extensions
Aug 10, 2023
c994bcd
added support for clearcoat roughness map and normal map (not support…
Aug 10, 2023
80fe9ec
make sure an emty texture name will get an empty name on export
Aug 10, 2023
2751037
added "Texture_[index]" plus magic suffix with \0 to empty texture na…
Aug 10, 2023
a841b57
added null check
Aug 10, 2023
a15bdb7
added uv channel export
Aug 10, 2023
06077d4
fixed typo
pfcDorn Aug 11, 2023
95c1007
fixed missing extexturetransform on textures within extensions
pfcDorn Aug 11, 2023
98803ad
added error log when trying to load an EXR texture
pfcDorn Aug 11, 2023
adcae58
import unreferenced materials and textures
pfcDorn Aug 11, 2023
2863a47
added null checks for importing non referenced textures
Aug 14, 2023
0843fc8
revert broken changes
Aug 14, 2023
16d0753
add gltf images to import dependencies (was conflicting with ktx impo…
Aug 14, 2023
79bf3a5
updated changelog
Aug 14, 2023
b793025
changelog formating
Aug 14, 2023
4134bf9
fixed default material import
Aug 15, 2023
3fe210c
correct version check for KTX dependency
hybridherbst Aug 16, 2023
5d3e075
fix compile error in Stream.Write on 2020.3.43f1
hybridherbst Aug 16, 2023
6711c05
added custom path combine method for relative paths
Aug 16, 2023
58ca107
fixes in case the same texture is used in many images
Aug 16, 2023
7101167
fix: when sampling humanoid animation with KHR_animation_pointer enab…
hybridherbst Aug 16, 2023
fce763b
Merge branch 'debug/export-blendshapes-with-sampled-clips' into gener…
hybridherbst Aug 16, 2023
92a04a5
add LICENSE
hybridherbst Aug 16, 2023
9d0b8a1
changelog/version/meta
hybridherbst Aug 16, 2023
6a06f3a
added output which gtlf file, in case a texture can't be imported
Aug 18, 2023
403245f
remove smoothness input from shader
Aug 18, 2023
13f4078
fixed wrong file extension when extracting textures (Importer)
Aug 21, 2023
35a0216
added default gltf sampling to new loaded textures
pfcDorn Aug 24, 2023
5ce70f9
updated changelog
Aug 25, 2023
dfdee04
warn when importing legacy material KHR_materials_pbrSpecularGlossiness
hybridherbst Aug 26, 2023
7a2bb5a
log gather dependencies exceptions and use correct GLTFParser API
hybridherbst Aug 26, 2023
8d0c09c
assign default values for texture only when a texture actually exists
hybridherbst Aug 26, 2023
8997f05
unify and improve extension warning messages
hybridherbst Aug 26, 2023
c5b6f80
remove obsolete constructors
hybridherbst Aug 26, 2023
43c814c
cleanup
hybridherbst Aug 26, 2023
2b43c72
make sure _gltfFileName is set in an import context in the editor whe…
hybridherbst Aug 26, 2023
a4b6346
changelog and version
hybridherbst Aug 26, 2023
11869a7
move UnityGltf folder to toplevel directory
hybridherbst Aug 26, 2023
865babc
remove legacy folders and test projects
hybridherbst Aug 26, 2023
b6291cb
remove legacy CI files that haven't been working in a long time
hybridherbst Aug 26, 2023
9a00839
remove legacy files
hybridherbst Aug 26, 2023
64699bc
license
hybridherbst Aug 26, 2023
b08489a
clean up .npmignore for package releases
hybridherbst Aug 26, 2023
755c7f9
moved legacy tests to hidden legacy~ folder
hybridherbst Aug 26, 2023
f08ead2
rm legacy sample scenes that were used for old tests, not for samples
hybridherbst Aug 26, 2023
1538df7
adjust changelog and version
hybridherbst Aug 26, 2023
383bf55
adjust readme
hybridherbst Aug 26, 2023
077968c
fix: re-enable check for ShouldExportTransform with the exception of …
hybridherbst Aug 26, 2023
992e24e
changelog/version
hybridherbst Aug 26, 2023
b14bb02
add material creation menu and note about glTF editing being experime…
hybridherbst Aug 26, 2023
cacb3ec
Hide experimental texture remapping by default
hybridherbst Aug 26, 2023
0fdc0e4
handle emissive color conversions in gamma space and with specific Un…
hybridherbst Sep 5, 2023
e6e5270
fix: improvements to light color and value export
hybridherbst Sep 5, 2023
3640b03
fix light import color space
hybridherbst Sep 5, 2023
4bea36b
sanitize alpha cutoff value before writing
hybridherbst Sep 5, 2023
5f581a7
fix spot light import intensity
hybridherbst Sep 5, 2023
a60acbd
revert change: fix point light intensities for three and babylon
hybridherbst Sep 5, 2023
1c144da
feat: allow choice between implicit and explicit queue and surface ty…
hybridherbst Sep 7, 2023
5fd433b
experiment: better sampling for rough refraction
hybridherbst Sep 7, 2023
906bb09
convert light and material color spaces when exporting for animation
hybridherbst Sep 8, 2023
0c61ee5
GltfRecorder color spaces
hybridherbst Sep 8, 2023
6c8f0e8
changelog/version
hybridherbst Sep 8, 2023
4fab674
feat: per-material opt-in for glTF material editing
hybridherbst Sep 11, 2023
5147394
fix: indent level in the wrong place
hybridherbst Sep 11, 2023
c93f68c
fix 2020.3 compilation error
hybridherbst Sep 11, 2023
a7b4e2c
Prevent ArgumentException when animating same property name on multip…
marwie Sep 11, 2023
7f859e8
bring instancing option back in PBRGraph
hybridherbst Sep 11, 2023
877b73b
compress textures on import to platform-specific default format
hybridherbst Sep 10, 2023
c72f3ac
add texture compression option
hybridherbst Sep 11, 2023
849aaa1
add tooltip, hide compression options when no textures are present
hybridherbst Sep 11, 2023
d8e9909
comments, changelog, version
hybridherbst Sep 11, 2023
1d78e17
added import options: import BlendShape Names
Sep 12, 2023
cd36b8a
change: always export root level objects (even if disabled or set to …
marwie Sep 28, 2023
7fcc512
version
marwie Sep 28, 2023
99a35dd
create default GLTFImportContext in runtime
pfcDorn Sep 28, 2023
460edb1
added ifdef for animationClip.SetCurve at runtime (only works with le…
pfcDorn Sep 28, 2023
e41aa81
fixing importing warning of duplicated names
Sep 29, 2023
4103f0a
fixed missing "blendshape." in animation import
Oct 4, 2023
5723e55
added UnityWebRequestLoader as default dataloader
Oct 5, 2023
f550189
refactoring dataloader verify in sceneimporter
Oct 5, 2023
f711012
removed unwanted #if Unity_editor
Oct 5, 2023
b8f32c6
Merge remote-tracking branch 'pfc/blendshape-name-import-option' into…
hybridherbst Oct 6, 2023
3de4b0f
expose ExportAccessor(byte[]) and configurable overload for easier ar…
hybridherbst Oct 10, 2023
30743f0
fix: meshes without submeshes and multiple materials behave the same …
hybridherbst Oct 11, 2023
df71068
add callback to GLTFRecorder with calculated translation bounds
hybridherbst Oct 16, 2023
ce8f2e8
fix: calling ExportAnimationClip with a humanoid clip but no Animator…
hybridherbst Oct 16, 2023
f5d1312
changelog/version
hybridherbst Oct 20, 2023
3b0ea35
changed the OnBeforeAddAnimationData callback for a non destructive m…
Sep 19, 2023
5d980b1
fix importer context root not being set
hybridherbst Oct 23, 2023
972221a
fixed wrong flipped triangles when it's required to generate them ("F…
Oct 24, 2023
f6634ad
removed old commented legacy code
Oct 24, 2023
660161e
fixed draco ifdef compiler error + nullref fix
Oct 24, 2023
02f8558
reuse joints and weights on import for submeshes
Oct 24, 2023
b707850
import normals when tangents are required
Oct 26, 2023
13037f4
expose NodeCache
hybridherbst Nov 1, 2023
3571f02
expose NodeCache
hybridherbst Nov 1, 2023
6e751b7
expose mesh cache and GetMeshId
hybridherbst Nov 1, 2023
7d1817e
Merge branch 'import-export-fixes' into dev
hybridherbst Nov 1, 2023
5e6aa21
Prevent animationclip being exported if referenced on animator + scri…
marwie Nov 7, 2023
ccaa589
Add support for exr texture export in correct format
marwie Nov 8, 2023
2f1f8df
minor rename
hybridherbst Nov 8, 2023
ae7fdda
move exr const to better place
hybridherbst Nov 8, 2023
4cf7734
fix humanoid importer inspector not being shown when model doesn't ha…
hybridherbst Nov 8, 2023
95a94b9
Merge branch 'prevent-multiple-animationclip-export' into dev
hybridherbst Nov 8, 2023
d41076a
Merge branch 'gltf-exr-image-export' into dev
hybridherbst Nov 8, 2023
72c1720
cleanup: move identical clip+node animation check into GetOrCreateAni…
hybridherbst Nov 8, 2023
a2f831d
use the cache that also respects clip speed for GetAnimationId
hybridherbst Nov 8, 2023
5e1fadc
version
marwie Nov 8, 2023
af438cb
export background color animation in KHR ptr
marwie Nov 9, 2023
982a341
camera backgroundcolor animation target should be the component
marwie Nov 10, 2023
8cfe314
fix: curve sorting has to happen before checking r,g,b,a existance
hybridherbst Nov 13, 2023
547fba4
fix: animated colors on arbitrary components, and camera background c…
hybridherbst Nov 13, 2023
dbd92ee
version
marwie Nov 13, 2023
291158e
added tangent.w value validation on export > Meta Avatar tangents ca…
Nov 14, 2023
8160277
fixed wrong settings assignment > recording anim. pointer was used fo…
Nov 20, 2023
b2eecf7
custom EnsureQuaterionContinuity for linear interpolation
Nov 20, 2023
ab555d1
added missing line
Nov 20, 2023
2870ebb
fix: recalculate mesh bounds after applying import scale
hybridherbst Dec 13, 2023
803511e
Merge remote-tracking branch 'origin/timeline-fix' into dev
hybridherbst Dec 13, 2023
2df4247
Add ability to export files and buffer views
robertlong Jan 30, 2023
8ef4958
feat: allow enabling GPU instancing directly from the material importer
hybridherbst Dec 13, 2023
5624176
fix: sanitize animator state name on import
hybridherbst Dec 13, 2023
52c41a1
Merge branch 'feature/export-files' into dev
hybridherbst Dec 13, 2023
5777810
changelog/version
hybridherbst Dec 13, 2023
6eaad40
import skinnedmesh scale fix
Dec 19, 2023
9c29d96
import animation position scale fix
Dec 19, 2023
db6bd69
wip showing extensions
hybridherbst Dec 29, 2023
595b5f1
start switching to export plugin callbacks
hybridherbst Dec 29, 2023
437d176
add description, move plugin toggle to the left
hybridherbst Dec 29, 2023
34347b3
renamings
hybridherbst Dec 29, 2023
fc95c7f
add MSFT_lods export extension (wip)
hybridherbst Feb 9, 2023
286a765
refactor MSFT_lods export to use plugin structure
hybridherbst Dec 29, 2023
d7e5be6
add plugins to show in UI with supported import/export features
hybridherbst Dec 29, 2023
b81d3da
settings cleanup
hybridherbst Dec 29, 2023
8ce0ab4
add warning icon and text when plugin can't function for some reason …
hybridherbst Dec 30, 2023
9a1d186
cleanup
hybridherbst Dec 30, 2023
122f991
legacy API
hybridherbst Dec 30, 2023
7b79289
move more internal settings to plugin/plugincontext
hybridherbst Dec 30, 2023
8a7340d
move animationpointer to plugin context
hybridherbst Dec 30, 2023
79bd7dd
bring "UseAnimationPointer" API back with Obsolete attribute
hybridherbst Dec 30, 2023
d944db5
better place to initialize plugins on import
hybridherbst Dec 30, 2023
13b8963
add EnabledByDefault for plugins
hybridherbst Dec 30, 2023
6d04906
move files
hybridherbst Dec 30, 2023
7453152
more renames
hybridherbst Dec 30, 2023
b44ff5b
mark pbrSpecGloss as legacy
hybridherbst Dec 30, 2023
195927f
text clarification
hybridherbst Dec 30, 2023
66bee81
fix using
hybridherbst Dec 30, 2023
20d5a38
feat: add BeforeNodeExport callback that allows for hierarchy and mes…
hybridherbst Dec 31, 2023
16c83c3
give settings instances names and add them to the settings asset if p…
hybridherbst Dec 31, 2023
377c1ce
make sure to use default import settings for GLTFImporter instead of …
hybridherbst Jan 2, 2024
926d9ee
move settings inspector to editor folder
hybridherbst Jan 2, 2024
9bd7e71
Merge branch 'feature/configurable-extensions' of https://github.com/…
hybridherbst Jan 2, 2024
cfd183e
cleanup
hybridherbst Jan 2, 2024
54d1eb3
apply importer settings overrides - no per-plugin settings yet
hybridherbst Jan 2, 2024
03df41b
Merge branch 'feature/configurable-extensions' of https://github.com/…
hybridherbst Jan 2, 2024
676c059
rm old packages.config
hybridherbst Jan 2, 2024
b14b666
move bake plugins into core
hybridherbst Jan 2, 2024
b34d84e
ensure plugin registering happening
hybridherbst Jan 2, 2024
73d1057
show assembly name as header for plugins, allow pinging/opening plugi…
hybridherbst Jan 2, 2024
b19712b
Merge branch 'feature/configurable-extensions' of https://github.com/…
hybridherbst Jan 2, 2024
82c5748
move comments
hybridherbst Jan 2, 2024
ce83c1b
changelog/version
hybridherbst Jan 2, 2024
a73034c
Merge remote-tracking branch 'origin/import-scale-fix' into dev
hybridherbst Jan 2, 2024
958d697
Merge branch 'feature/configurable-extensions' into dev
hybridherbst Jan 2, 2024
5db2486
rename import/export plugins to match UnityGLTF naming (GLTF instead …
hybridherbst Jan 3, 2024
8695598
readme adjustments
hybridherbst Jan 3, 2024
abc8762
code upgraders
hybridherbst Jan 3, 2024
71bc548
move import scale factor into the import context
hybridherbst Jan 3, 2024
0914d8e
fix settings creation at runtime, fix compiler warnings at build time
hybridherbst Jan 3, 2024
3a04cdd
sanitize animator state name
hybridherbst Jan 3, 2024
82c506c
changelog/readme
hybridherbst Jan 3, 2024
e13847b
add KHR_audio sample
hybridherbst Jan 3, 2024
05b1671
fix: default property deserializer was missing for nested extras obje…
hybridherbst Jan 6, 2024
f949b45
fix ImportContext nullref
hybridherbst Jan 6, 2024
49b433f
fix missing extras property deserialization in MeshPrimitive deserial…
hybridherbst Jan 6, 2024
99e66cc
use similar implementation pattern than GLTFMesh for clarity (avoids …
hybridherbst Jan 6, 2024
205bd9a
move blendshape target names to mesh, according to https://github.com…
hybridherbst Jan 6, 2024
a70e129
export menu cleanup, add selection export options to GameObject menu …
hybridherbst Jan 6, 2024
caa3f4c
changelog/version
hybridherbst Jan 8, 2024
216c03d
cache active colorspace because it can only be read from the main thread
Jan 10, 2024
4956921
added missing using
Jan 10, 2024
96a8b57
added IMultiThreadingSupported interface for IDataLoaders
Jan 10, 2024
562ab27
fixed bone weights issue with multiple sub meshes when using draco > …
pfcDorn Jan 11, 2024
632167d
removed Task.Run > to ensure the DataLoader (UnityWebRequest) is runn…
pfcDorn Jan 11, 2024
04c2778
Revert "added IMultiThreadingSupported interface for IDataLoaders"
pfcDorn Jan 11, 2024
44cf797
added asm define HAVE_GLTFAST for new com.unity.cloud.glfast
pfcDorn Jan 11, 2024
029faac
fix when no tmpro is installed
pfcDorn Jan 11, 2024
c9e4592
added asm define HAVE_TMPRO for com.unity.ugui v 2.0.0 which includes…
pfcDorn Jan 11, 2024
dae24c7
for editor import: convert normal maps to dxt5nm when its enabled in …
Jan 12, 2024
f87fda5
added IsNormal to TextureCacheData
Jan 12, 2024
cd4975e
fixed wrong placed variable declaration
Jan 12, 2024
c5bbd35
Normal encoding dependency
Jan 16, 2024
a7e335a
Corrent normal encoding for runtime imported normals maps
Jan 16, 2024
0af4c96
fixed normal map encoding conversion on asset import > ensure a RGBA …
Jan 16, 2024
d2031e6
add unity registry defines
hybridherbst Jan 16, 2024
d465057
fix: GLTFRecorder should respect existing settings for animation poin…
hybridherbst Jan 16, 2024
2cabc0f
fix wrong string for RegisterCustomDependency and add AssetPostProces…
hybridherbst Jan 16, 2024
984bc55
changelog and version
hybridherbst Jan 16, 2024
b77803d
looks like custom dependencies can only be set in an assetPostProcess…
hybridherbst Jan 16, 2024
fe9c2b4
ignore normal map conversion on export for runtime imported normal maps
Jan 17, 2024
01b5e4c
added missing material.getfloat("_RuntimeCreatedNormalMap" == 1)
Jan 17, 2024
15babdb
refactored ifdef
Jan 17, 2024
b87eb9f
renamed RuntimeCreatedNormalMap to NormalMapFormatXYZ in shader
Jan 17, 2024
c64426c
added unity version ifdef for hasFloat etc
Jan 17, 2024
5edbe46
better inspector to show mode overrides, rename _AutoSurfaceMode to c…
hybridherbst Jan 17, 2024
d2ac85e
fix variable name inside ifdef
hybridherbst Jan 17, 2024
ab00843
changelog
hybridherbst Jan 17, 2024
0cabee6
move texture warnings GUI above tabbed inspector, log warning after e…
hybridherbst Jan 17, 2024
ab03072
changelog/version
hybridherbst Jan 17, 2024
b9b987c
fixes correct tangent import for draco meshes
Jan 17, 2024
20b1c5f
fixes for non-readable normal textures when converting to dxt5nm format
Jan 17, 2024
1b840bf
support for draco v5
pfcDorn Jan 18, 2024
a1ece43
fixed linear color space when loading ktx textures
pfcDorn Jan 18, 2024
14e4887
draco ifdef fixes
pfcDorn Jan 18, 2024
df6c6db
bone import fix
pfcDorn Jan 18, 2024
2394734
set normalmapencodingconverter to internal + set texture name to repl…
pfcDorn Jan 18, 2024
74c971e
add asm define draco v5
pfcDorn Jan 18, 2024
4581201
fix tiling and offset properties being displayed despite _TEXTURE_TRA…
hybridherbst Jan 18, 2024
a4a9902
fix nullref in texture fix checks when texture is null (e.g. specific…
hybridherbst Jan 18, 2024
3f20fc1
changelog/version
hybridherbst Jan 18, 2024
33b51b1
change plugin package note to info instead of warning to avoid confusion
hybridherbst Jan 18, 2024
e522ffb
rename GLTFPluginEditor and add package installation UI for optional …
hybridherbst Jan 18, 2024
ea41092
reword some of the package messaging
hybridherbst Jan 18, 2024
c82fd3b
changelog
hybridherbst Jan 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 0 additions & 6 deletions .editorconfig

This file was deleted.

71 changes: 69 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ artifacts/
*.pidb
*.svclog
*.scc
*.dll*
*.pdb*
*.pri*

Expand Down Expand Up @@ -152,4 +151,72 @@ _pkginfo.txt
*.orig

# Current_Package folder
current-package/
current-package/
**/Plugins/uap10.0.10586
**/Plugins/uap10.0.10586.meta
TestProjects/*/Library/
TestProjects/*/Temp/
.vscode/
TestProjects/*/*.sln
TestProjects/*/*.csproj
**/GLTFSerialization/.idea
**/GLTFSerialization/bin~
**/GLTFSerialization/obj~
TestProjects/*/.idea
TestProjects/*/Logs
TestProjects/*/UserSettings
TestProjects/*/.vsconfig
TestProjects/*/Builds
TestProjects/*/Assets/WSATestCertificate.pfx*

# MacOS Metadata
.DS_Store


### Merged with UnityGltf subfolder
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
/Assets/ShaderForge*
/Assets/VSCode*
/UnityPackageManager/

# Visual Studio 2015 cache directory
/.vs/
# Visual Studio Code directory
/.vscode/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.pfx*

!*-dll.csproj
!*-dll.sln

# Unity3D generated meta files
*.pidb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

# Builds
*.apk
*.unitypackage

/www/node_modules/

.idea
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Tests/**
Tests.meta
45 changes: 0 additions & 45 deletions .travis.yml

This file was deleted.

Loading