Skip to content

small fixes #5

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

Merged
merged 2 commits into from
May 25, 2025
Merged

small fixes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c77de48
fix setting element props using an element derived value
Angel-foxxo May 25, 2025
fc535df
fix constructor order
Angel-foxxo May 25, 2025
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
4 changes: 2 additions & 2 deletions AttributeList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ public virtual object? this[string name]
{
var valueType = value.GetType();

// type must be equal, or a superclass
if (prop.PropertyType != valueType && valueType.IsSubclassOf(prop.PropertyType))
// types must be equal, or a superclass
if (prop.PropertyType != typeof(Element) && valueType.IsSubclassOf(prop.PropertyType))
{
throw new InvalidDataException($"class property '{prop.Name}' with type '{prop.PropertyType}' does not match the type '{valueType}' of the value being set, this is likely a mismatch between the real class and the class from the datamodel");
}
Expand Down
3 changes: 1 addition & 2 deletions ICodec.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,11 @@ public static bool TryConstructCustomElement(Dictionary<string, Type> types, Dat

object uninitializedObject = RuntimeHelpers.GetUninitializedObject(derivedType);

elementConstructor.Invoke(uninitializedObject, [dataModel, elem_name, elem_id, elem_class]);

// this will initialize values such as
// public Datamodel.ElementArray Children { get; } = [];
customClassInitializer.Invoke(uninitializedObject, []);

elementConstructor.Invoke(uninitializedObject, [dataModel, elem_name, elem_id, elem_class]);

elem = (Element?)uninitializedObject;
return true;
Expand Down
8 changes: 7 additions & 1 deletion Tests/ValveMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ internal class CMapSelectionSet : DMElement
{
public Datamodel.ElementArray Children { get; } = [];
public string SelectionSetName { get; set; } = string.Empty;
public CObjectSelectionSetDataElement SelectionSetData { get; set; } = [];
public DMElement SelectionSetData { get; set; } = [];

public CMapSelectionSet() { }
public CMapSelectionSet(string name)
Expand All @@ -195,6 +195,12 @@ internal class CObjectSelectionSetDataElement : DMElement
public Datamodel.ElementArray selectedObjects { get; set; } = [];
}

internal class CFaceSelectionSetDataElement : DMElement
{
public Datamodel.IntArray faces { get; set; } = [];
public Datamodel.ElementArray meshes { get; set; } = [];
}


internal class CMapEntity : BaseEntity
{
Expand Down