Skip to content
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

Jump to bottom

Fix debug build #7

Merged
merged 4 commits into from Jan 6, 2021
Merged

Fix debug build #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
541a9ce
:beetle: Remove unneccessary global definitions.
JonasGilg Jan 4, 2021
8f385c7
:twisted_rightwards_arrows: Merge master.
JonasGilg Jan 4, 2021
96c6913
:beetle: Fix mysterious merge conflicts.
JonasGilg Jan 4, 2021
36a6557
:beetle: Fix missing letter.
JonasGilg Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions OSGSystem/OSGBSplineBasisFunction.cpp
View file
Open in desktop
Expand Up @@ -43,9 +43,9 @@

OSG_USING_NAMESPACE

const char BSplineBasisFunction::ff_const_1[]="BEGINBSPLINEBASISFUNCTION";
const char BSplineBasisFunction::ff_const_2[]="NUMBEROFKNOTS";
const char BSplineBasisFunction::ff_const_3[]="KNOTS";
const char BSplineBasisFunction::ff_const_1[]="BEGINBSPLINEBASISFUNCTION";
const char BSplineBasisFunction::ff_const_2[]="NUMBEROFKNOTS";
const char BSplineBasisFunction::ff_const_3[]="KNOTS";

BSplineBasisFunction::BSplineBasisFunction()
{
Expand Down
10 changes: 5 additions & 5 deletions OSGSystem/OSGBSplineCurve2D.cpp
View file
Open in desktop
Expand Up @@ -42,11 +42,11 @@

OSG_USING_NAMESPACE

const char BSplineCurve2D::ff_const_1[]="BEGINBSPLINECURVE2D";
const char BSplineCurve2D::ff_const_2[]="DIMENSION";
const char BSplineCurve2D::ff_const_3[]="NUMBEROFCONTROLPOINTS";
const char BSplineCurve2D::ff_const_4[]="BEGINRATIONALBSPLINECURVE2D";
const char BSplineCurve2D::ff_const_1[]="BEGINBSPLINECURVE2D";
const char BSplineCurve2D::ff_const_2[]="DIMENSION";
const char BSplineCurve2D::ff_const_3[]="NUMBEROFCONTROLPOINTS";
const char BSplineCurve2D::ff_const_4[]="BEGINRATIONALBSPLINECURVE2D";

//construction (& destruction, but not here :)
BSplineCurve2D::BSplineCurve2D()
{
Expand Down
10 changes: 5 additions & 5 deletions OSGSystem/OSGBSplineTensorSurface.cpp
View file
Open in desktop
Expand Up @@ -47,11 +47,11 @@ OSG_USING_NAMESPACE
// FIXME: clean up all of the copy'n'paste mess...
// FIXME: double-check that we actually got it correct...

const char BSplineTensorSurface::ff_const_1[]="BEGINBSPLINETENSORSURFACE";
const char BSplineTensorSurface::ff_const_2[]="DIMENSIONU";
const char BSplineTensorSurface::ff_const_3[]="DIMENSIONV";
const char BSplineTensorSurface::ff_const_4[]="NUMBEROFCONTROLPOINTS";
const char BSplineTensorSurface::ff_const_5[]="BEGINRATIONALBSPLINETENSORSURFACE";
const char BSplineTensorSurface::ff_const_1[]="BEGINBSPLINETENSORSURFACE";
const char BSplineTensorSurface::ff_const_2[]="DIMENSIONU";
const char BSplineTensorSurface::ff_const_3[]="DIMENSIONV";
const char BSplineTensorSurface::ff_const_4[]="NUMBEROFCONTROLPOINTS";
const char BSplineTensorSurface::ff_const_5[]="BEGINRATIONALBSPLINETENSORSURFACE";

//construction (& destruction, but not here :)
BSplineTensorSurface::BSplineTensorSurface()
Expand Down
4 changes: 2 additions & 2 deletions OSGSystem/OSGDCTPMesh.cpp
View file
Open in desktop
Expand Up @@ -42,8 +42,8 @@

OSG_USING_NAMESPACE

const char DCTPMesh::ff_const_1[]="BEGINTRIANGLESOUP";
const char DCTPMesh::ff_const_2[]="BEGINQUADSOUP";
const char DCTPMesh::ff_const_1[]="BEGINTRIANGLESOUP";
const char DCTPMesh::ff_const_2[]="BEGINQUADSOUP";

DCTPMesh::DCTPMesh()
{
Expand Down
1 change: 1 addition & 0 deletions OSGSystem/OSGErrorQuadTree.cpp
View file
Open in desktop
Expand Up @@ -1751,6 +1751,7 @@ void CErrorQuadTree::ComputeError( DCTPFace *pclFace )
if( m_sbNormalApproximation )
{
// TODO Vec3f for normals, Pnt3f for points

cl_nbij = pcl_surface->computeNormal( cl_uv, i_err, cl_bij );
d_quad_size = cl_ncij.squareLength( );
if( d_quad_size > DCTP_EPS * DCTP_EPS )
Expand Down
2 changes: 0 additions & 2 deletions OSGSystem/OSGGraphTraverser.cpp
View file
Open in desktop
Expand Up @@ -64,8 +64,6 @@ void GraphTraverser::Initialize( DirectedGraph<Vec2d, unsigned char >& gg, bool
polys.clear();
}



int GraphTraverser::triangulatePolygon( DCTPivector& nodes, bool bConvex ) {
unsigned int i;

Expand Down