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

Add "ShouldNodeExport" hook #767

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add "ShouldNodeExport" hook #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0dba6d0
Add plugin hook for ShouldNodeExport
andybak Jun 18, 2024
4776027
Merge remote-tracking branch 'upstream/main' into feature/should-node…
andybak Jul 24, 2024
c94e011
Revert automatic whitespace changes
andybak Aug 29, 2024
8427244
Merge remote-tracking branch 'upstream/dev' into feature/should-node-…
andybak Sep 25, 2024
d98a676
fix: assets with absolute URLs or paths that contain URL encoded info…
hybridherbst Nov 25, 2024
59f0fd8
Merge remote-tracking branch 'upstream/dev' into feature/should-node-…
andybak Dec 8, 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
9 changes: 7 additions & 2 deletions Runtime/Scripts/GLTFSceneExporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,8 @@ private SceneId ExportScene(string name, Transform[] rootObjTransforms)
Debug.LogWarning("GLTFSceneExporter", $"Skipping empty transform in root transforms provided for scene export for {name}", transform);
continue;
}
scene.Nodes.Add(ExportNode(transform));
var node = ExportNode(transform);
if (node != null) scene.Nodes.Add(node);
}

_root.Scenes.Add(scene);
Expand All @@ -1032,6 +1033,9 @@ private NodeId ExportNode(Transform nodeTransform)
if (_exportedTransforms.TryGetValue(nodeTransform.GetInstanceID(), out var existingNodeId))
return new NodeId() { Id = existingNodeId, Root = _root };

foreach (var plugin in _plugins)
if (!(plugin?.ShouldNodeExport(this, _root, nodeTransform) ?? true)) return null;

exportNodeMarker.Begin();

var node = new Node();
Expand Down Expand Up @@ -1172,7 +1176,8 @@ private NodeId ExportNode(Transform nodeTransform)
foreach (var child in nonPrimitives)
{
if (!ShouldExportTransform(child.transform)) continue;
parentOfChilds.Children.Add(ExportNode(child.transform));
var childNode = ExportNode(child.transform);
if (childNode != null) parentOfChilds.Children.Add(childNode);
}
}

Expand Down
7 changes: 6 additions & 1 deletion Runtime/Scripts/Loader/FileLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ public static string CombinePaths(string basePath, string relativePath)
}
public Task<Stream> LoadStreamAsync(string relativeFilePath)
{
if (relativeFilePath.StartsWith("http://") || relativeFilePath.StartsWith("https://"))
{
return new UnityWebRequestLoader("").LoadStreamAsync(relativeFilePath);
}

#if UNITY_EDITOR
string path = CombinePaths(_rootDirectoryPath, relativeFilePath);

Expand Down Expand Up @@ -99,7 +104,7 @@ public Stream LoadStream(string relativeFilePath)
string pathToLoad = Path.Combine(_rootDirectoryPath, relativeFilePath);
if (!File.Exists(pathToLoad))
{
pathToLoad = Path.Combine(_rootDirectoryPath, Uri.UnescapeDataString(relativeFilePath));
pathToLoad = Uri.UnescapeDataString(Path.Combine(_rootDirectoryPath, relativeFilePath));
}

if (!File.Exists(pathToLoad))
Expand Down
1 change: 1 addition & 0 deletions Runtime/Scripts/Plugins/Core/GltfExportPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public abstract class GLTFExportPluginContext
{
public virtual void BeforeSceneExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot) {}
public virtual void AfterSceneExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot) {}
public virtual bool ShouldNodeExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot, Transform transform) => true;
public virtual void BeforeNodeExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot, Transform transform, Node node) {}
public virtual void AfterNodeExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot, Transform transform, Node node) {}
public virtual bool BeforeMaterialExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot, Material material, GLTFMaterial materialNode) => false;
Expand Down
4 changes: 3 additions & 1 deletion Runtime/Scripts/Plugins/LodsExport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ public override void AfterNodeExport(GLTFSceneExporter exporter, GLTFRoot gltfro
return;
}

nodeIds[index] = exporter.ExportNode(lod.renderers[0].gameObject).Id;
var lodNode = exporter.ExportNode(lod.renderers[0].gameObject);
if (lodNode != null) nodeIds[index] = lodNode.Id;

coverages[index] = lod.screenRelativeTransitionHeight;
}
// if (usesCulling) coverages[coverages.Length - 1] = 0;
Expand Down