Files
Marc Schier c84c168585 Merge OpenUSD scene packages (#4384)
# Description

Merge the draft OpenUSD Scene Materialization projects into the existing
OpenUSD core and server
packages:

- move the scene companion model, document/value model, and `.usda`
conversion APIs into
  `Opc.Ua.OpenUsd`;
- move discovery, materialization, export, and Part 1 interop into
`Opc.Ua.OpenUsd.Server`;
- rename the CLR APIs to `Opc.Ua.OpenUsd.Scene`,
`Opc.Ua.OpenUsd.Scene.Conversion`, and
  `Opc.Ua.OpenUsd.Server.Scene`;
- remove the `Opc.Ua.OpenUsdScene` and `Opc.Ua.OpenUsdScene.Server`
projects and NuGet package IDs;
- update the connector, the consolidated OpenUSD test project, package
READMEs, and developer docs.

This is an intentional source- and binary-breaking cleanup for the draft
Scene packages. The OPC UA
Scene model URI, version, NodeIds, and wire behavior remain unchanged.

## Related Issues

- Fixes #4383

## Validation

- `UA.slnx` Release builds completed for `CustomTestTarget=net10.0` and
`CustomTestTarget=net48`.
- OpenUSD tests passed on net10.0 (915) and net48 (879), excluding the
existing host-culture
assertion; the isolated assertion passed under invariant globalization.
- The generated Release pack contains the expected 75 packages, emits
neither retired Scene
package, and passes
`.azurepipelines\validate-source-generator-packages.ps1`.
- The two surviving packages expose the new nested namespaces and
contain no retired package
  dependencies.

## Checklist

- [ ] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf)
and read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [ ] I have added tests that prove my fix is effective or that my
feature works and increased code coverage.
- [x] I have added all necessary documentation.
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings.
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed.
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-09-02 12:06:52 +00:00

155 lines
5.9 KiB
C#

/* ========================================================================
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
*
* OPC Foundation MIT License 1.00
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* The complete license agreement can be found here:
* http://opcfoundation.org/License/MIT/1.00/
* ======================================================================*/
using System.Collections.Generic;
using Opc.Ua.OpenUsd.Scene;
namespace Opc.Ua.OpenUsd.Tests
{
/// <summary>
/// Small query helpers over a <see cref="MaterializedScene"/>, so the assertions in the
/// server test fixtures read close to the address-space concepts they check.
/// </summary>
internal static class SceneQuery
{
/// <summary>
/// The materialized prim at an absolute SdfPath (for example <c>/Plant</c>).
/// </summary>
public static UsdPrimState Prim(this MaterializedScene ms, string path)
{
return ms.Result.PrimsByPath[path];
}
/// <summary>
/// The materialized attribute keyed <c>&lt;primPath&gt;.&lt;name&gt;</c>.
/// </summary>
public static UsdAttributeState Attr(this MaterializedScene ms, string key)
{
return ms.Result.AttributesByPath[key];
}
/// <summary>
/// The attribute's ArrayDimensions as a plain array, or <c>null</c> for a scalar — the
/// <c>ArrayOf&lt;uint&gt;</c> a materialized Variable carries unwraps to a
/// <c>uint[]?</c> that NUnit compares element-wise.
/// </summary>
public static uint[]? Dims(this UsdAttributeState attribute)
{
return attribute.ArrayDimensions.ToArray();
}
/// <summary>
/// The boxed value of a materialized attribute, or <c>null</c> when unset.
/// </summary>
public static object? BoxedValue(this UsdAttributeState attribute)
{
return attribute.Value.AsBoxedObject();
}
/// <summary>
/// The materialized AddIns of type <typeparamref name="T"/> under a prim's
/// <c>AppliedSchemas</c> folder, in address-space order.
/// </summary>
public static List<T> AppliedSchemas<T>(this MaterializedScene ms, string primPath)
where T : NodeState
{
FolderState? folder = ms.Prim(primPath).AppliedSchemas;
if (folder == null)
{
return new List<T>();
}
return MaterializationHarness.ChildrenOfType<T>(ms.Context, folder);
}
/// <summary>
/// The materialized composition arcs under a prim's <c>Composition</c> folder, in
/// address-space order.
/// </summary>
public static List<UsdCompositionArcState> CompositionArcs(
this MaterializedScene ms, string primPath)
{
FolderState? folder = ms.Prim(primPath).Composition;
if (folder == null)
{
return new List<UsdCompositionArcState>();
}
return MaterializationHarness.ChildrenOfType<UsdCompositionArcState>(ms.Context, folder);
}
/// <summary>
/// The absolute SdfPath of a parsed prim, walked from its parent chain.
/// </summary>
public static string PathOf(this Scene.UsdPrim prim)
{
var parts = new List<string>();
Scene.UsdPrim? current = prim;
while (current != null)
{
parts.Insert(0, current.Name);
current = current.Parent;
}
return "/" + string.Join("/", parts);
}
/// <summary>
/// The total number of authored attribute connections across a whole scene.
/// </summary>
public static int TotalConnections(this Scene.UsdStage stage)
{
int total = 0;
foreach (Scene.UsdPrim prim in stage.AllPrims())
{
foreach (Scene.UsdAttribute attribute in prim.Attributes)
{
total += attribute.Connections.Count;
}
}
return total;
}
/// <summary>
/// Nulls every attribute value and clears every attribute connection across a scene, so
/// two scenes can be compared on structure and provenance alone. This is the workaround
/// for the two exporter round-trip defects the fixtures pin separately.
/// </summary>
public static Scene.UsdStage NormalizeValuesAndConnections(this Scene.UsdStage stage)
{
foreach (Scene.UsdPrim prim in stage.AllPrims())
{
foreach (Scene.UsdAttribute attribute in prim.Attributes)
{
attribute.Value = Scene.UsdValue.Null;
attribute.Connections.Clear();
}
}
return stage;
}
}
}