lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-27 21:39: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

54
opennurbs_sumsurface.cpp
View File

@@ -48,11 +48,11 @@ ON_SumSurface* ON_SumSurface::New( const ON_SumSurface& rev_surface )
return new ON_SumSurface(rev_surface);
}
ON_SumSurface::ON_SumSurface() : m_basepoint(0.0,0.0,0.0)
ON_SumSurface::ON_SumSurface()
{
ON__SET__THIS__PTR(m_s_ON_SumSurface_ptr);
m_curve[0] = 0;
m_curve[1] = 0;
m_curve[0] = nullptr;
m_curve[1] = nullptr;
}
ON_SumSurface::~ON_SumSurface()
@@ -68,25 +68,41 @@ void ON_SumSurface::Destroy()
{
if ( m_curve[i] ) {
delete m_curve[i];
m_curve[i] = 0;
m_curve[i] = nullptr;
}
}
m_bbox.Destroy();
m_basepoint.Set(0.0,0.0,0.0);
m_bbox = ON_BoundingBox::EmptyBoundingBox;
m_basepoint = ON_3dPoint::Origin;
}
void ON_SumSurface::EmergencyDestroy()
{
m_curve[0] = 0;
m_curve[1] = 0;
m_curve[0] = nullptr;
m_curve[1] = nullptr;
m_bbox = ON_BoundingBox::EmptyBoundingBox;
m_basepoint = ON_3dPoint::Origin;
}
ON_SumSurface::ON_SumSurface( const ON_SumSurface& src )
void ON_SumSurface::Internal_CopyFrom(const ON_SumSurface& src)
{
m_curve[0] = nullptr;
m_curve[1] = nullptr;
for ( int i = 0; i < 2; i++ )
{
if ( nullptr != src.m_curve[i] )
m_curve[i] = src.m_curve[i]->DuplicateCurve();
}
m_basepoint = src.m_basepoint;
m_bbox = src.m_bbox;
}
ON_SumSurface::ON_SumSurface( const ON_SumSurface& src )
: ON_Surface(src)
{
ON__SET__THIS__PTR(m_s_ON_SumSurface_ptr);
m_curve[0] = 0;
m_curve[1] = 0;
*this = src;
m_curve[0] = nullptr;
m_curve[1] = nullptr;
Internal_CopyFrom(src);
}
unsigned int ON_SumSurface::SizeOf() const
@@ -113,18 +129,8 @@ ON_SumSurface& ON_SumSurface::operator=(const ON_SumSurface& src )
if ( this != &src )
{
Destroy();
for ( int i = 0; i < 2; i++ )
{
if ( src.m_curve[i] )
{
ON_Object* obj = src.m_curve[i]->DuplicateCurve();
m_curve[i] = ON_Curve::Cast(obj);
if ( !m_curve[i] )
delete obj;
}
}
m_basepoint = src.m_basepoint;
m_bbox = src.m_bbox;
ON_Surface::operator=(src);
Internal_CopyFrom(src);
}
return *this;
}