OctahedronPolygon.cpp   OctahedronPolygon.cpp 
skipping to change at line 524 skipping to change at line 524
userData->result.append(*vertexData); userData->result.append(*vertexData);
else else
userData->result.last().edgeFlag = userData->result.last().e dgeFlag && vertexData->edgeFlag; userData->result.last().edgeFlag = userData->result.last().e dgeFlag && vertexData->edgeFlag;
} }
void combineLineLoopCallback(double coords[3], EdgeVertex* vertex_data[4], GLfloat[4], EdgeVertex** outData, OctTessLineLoopCallbackData* userData) void combineLineLoopCallback(double coords[3], EdgeVertex* vertex_data[4], GLfloat[4], EdgeVertex** outData, OctTessLineLoopCallbackData* userData)
{ {
bool newFlag=false; bool newFlag=false;
for (int i=0;i<4;++i) for (int i=0;i<4;++i)
{ {
if (vertex_data[i]==NULL) if (vertex_data[i]==Q_NULLPTR)
break; break;
newFlag = newFlag || vertex_data[i]->edgeFlag; newFlag = newFlag || vertex_data[i]->edgeFlag;
} }
// Check that the new coordinate lay on the octahedron plane // Check that the new coordinate lay on the octahedron plane
// Q_ASSERT(fabs(fabs(coords[0])+fabs(coords[1])+fabs(coords[2])-1.)<0. 000001); // Q_ASSERT(fabs(fabs(coords[0])+fabs(coords[1])+fabs(coords[2])-1.)<0. 000001);
Q_ASSERT(coords[2]<0.000001); Q_ASSERT(coords[2]<0.000001);
userData->tempVertices.append(EdgeVertex(Vec3d(coords[0], coords[1], coords[2]),newFlag)); userData->tempVertices.append(EdgeVertex(Vec3d(coords[0], coords[1], coords[2]),newFlag));
*outData = &(userData->tempVertices.last()); *outData = &(userData->tempVertices.last());
} }
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/