improve entity default handle references

ixmilia · Dec 4, 2022 · 8102b6a · 8102b6a
1 parent bf9b8f6
commit 8102b6a
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/src/IxMilia.Dwg/Objects/DwgEntity.cs b/src/IxMilia.Dwg/Objects/DwgEntity.cs
@@ -23,8 +23,8 @@ public abstract class DwgEntity : DwgObject
         internal DwgHandleReference LayerHandleReference { get; set; }
         public DwgLineType LineType { get; set; }
         internal DwgHandleReference LineTypeHandleReference { get; set; }
-        internal DwgHandleReference PreviousEntityHandle { get; set; } = new DwgHandleReference(DwgHandleReferenceCode.HandleMinus1, 0);
-        internal DwgHandleReference NextEntityHandle { get; set; } = new DwgHandleReference(DwgHandleReferenceCode.HandlePlus1, 0);
+        internal DwgHandleReference PreviousEntityHandle { get; set; } = new DwgHandleReference(DwgHandleReferenceCode.HardPointer, 0);
+        internal DwgHandleReference NextEntityHandle { get; set; } = new DwgHandleReference(DwgHandleReferenceCode.HardPointer, 0);
 
         internal virtual void OnBeforeEntityWrite(DwgVersionId version)
         {
@@ -74,7 +74,12 @@ internal override void ReadCommonDataEnd(BitReader reader)
                 LineTypeHandleReference = reader.Read_H();
             }
 
-            if (!_noLinks)
+            if (_noLinks)
+            {
+                PreviousEntityHandle = new DwgHandleReference(DwgHandleReferenceCode.HandleMinus1, 0);
+                NextEntityHandle = new DwgHandleReference(DwgHandleReferenceCode.HandlePlus1, 0);
+            }
+            else
             {
                 PreviousEntityHandle = reader.Read_H();
                 NextEntityHandle = reader.Read_H();
@@ -187,5 +192,13 @@ internal override void OnAfterObjectRead(BitReader reader, DwgObjectCache object
 
             OnAfterEntityRead(reader, objectCache, version);
         }
+
+        internal void AssignSubentityReference(DwgHandle ownerHandle)
+        {
+            if (_entityMode == 0)
+            {
+                _subentityRef = ownerHandle.MakeHandleReference(DwgHandleReferenceCode.HardPointer);
+            }
+        }
     }
 }