lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-17 14:56:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes from upstream repository

Browse Source 
Co-authored-by: Andrew Le Bihan <andy@mcneel.com>
Co-authored-by: chuck <chuck@mcneel.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: David Eränen <david.eranen@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: John Croudy <john.croudy@mcneel.com>
Co-authored-by: Lowell Walmsley <lowell@mcneel.com>
Co-authored-by: Nathan Letwory <nathan@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: Tim Hemmelman <tim@mcneel.com>
This commit is contained in:
Bozo The Builder
2020-03-12 09:00:26 -07:00
parent acbc998a03
commit 01cdb463e6
50 changed files with 5774 additions and 1857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
opennurbs_subd_copy.cpp
View File

@@ -90,6 +90,7 @@ ON_SubDVertex* ON_SubDArchiveIdMap::CopyVertex(
if ( nullptr == source_vertex )
return ON_SUBD_RETURN_ERROR(nullptr);
ON_SubDVertex* vertex = subdimple.AllocateVertex(
source_vertex->m_id,
source_vertex->m_vertex_tag,
source_vertex->m_level,
source_vertex->m_P,
@@ -137,6 +138,7 @@ ON_SubDEdge* ON_SubDArchiveIdMap::CopyEdge(
if ( nullptr == source_edge )
return ON_SUBD_RETURN_ERROR(nullptr);
ON_SubDEdge* edge = subdimple.AllocateEdge(
source_edge->m_id,
source_edge->m_edge_tag,
source_edge->m_level,
source_edge->m_face_count);
@@ -175,7 +177,7 @@ ON_SubDFace* ON_SubDArchiveIdMap::CopyFace(
{
if ( nullptr == source_face )
return ON_SUBD_RETURN_ERROR(nullptr);
ON_SubDFace* face = subdimple.AllocateFace(source_face->m_level,source_face->m_edge_count);
ON_SubDFace* face = subdimple.AllocateFace( source_face->m_id, source_face->m_level,source_face->m_edge_count);
if ( nullptr == face )
return ON_SUBD_RETURN_ERROR(nullptr);
@@ -643,9 +645,24 @@ ON__UINT64 ON_SubDimple::ContentSerialNumber() const
return m_subd_content_serial_number;
}
ON__UINT64 ON_SubDimple::ChangeContentSerialNumber() const
ON__UINT64 ON_SubDimple::ChangeContentSerialNumber(
bool bChangePreservesSymmetry
) const
{
return (m_subd_content_serial_number = ON_NextContentSerialNumber());
const bool bUpdateSymmetricObjectContentSerialNumber
= bChangePreservesSymmetry
&& m_subd_content_serial_number > 0
&& m_symmetry.IsSet()
&& m_subd_content_serial_number == m_symmetry.SymmetricObjectContentSerialNumber()
;
m_subd_content_serial_number = ON_NextContentSerialNumber();
if (bUpdateSymmetricObjectContentSerialNumber)
m_symmetry.SetSymmetricObjectContentSerialNumber(m_subd_content_serial_number);
else
m_symmetry.ClearSymmetricObjectContentSerialNumber();
return m_subd_content_serial_number;
}
void ON_SubDimple::SetManagedMeshSubDWeakPointers(
@@ -727,19 +744,19 @@ ON_SubDimple::ON_SubDimple(const ON_SubDimple& src)
if ( src.m_active_level == src_level )
m_active_level = level;
}
if (src.m_max_vertex_id > m_max_vertex_id)
m_max_vertex_id = src.m_max_vertex_id;
if (src.m_max_edge_id > m_max_edge_id)
m_max_edge_id = src.m_max_edge_id;
if (src.m_max_face_id > m_max_face_id)
m_max_face_id = src.m_max_face_id;
m_subd_appearance = src.m_subd_appearance;
m_texture_domain_type = src.m_texture_domain_type;
m_texture_mapping_tag = src.m_texture_mapping_tag;
m_symmetry = src.m_symmetry;
ChangeContentSerialNumber();
ChangeContentSerialNumber(false);
if (src.m_subd_content_serial_number == src.m_symmetry.SymmetricObjectContentSerialNumber())
m_symmetry.SetSymmetricObjectContentSerialNumber(ContentSerialNumber());
else
m_symmetry.ClearSymmetricObjectContentSerialNumber();
}
bool ON_SubDLevel::IsEmpty() const
@@ -762,9 +779,6 @@ int ON_SubDComponentBaseLink::CompareId(ON_SubDComponentBaseLink const*const* lh
return 0;
}
void ON_SubDLevelComponentIdIterator::Initialize(
bool bLevelLinkedListIncreasingId,
ON_SubDComponentPtr::Type ctype,