Commit a6678db5 authored by David Doria's avatar David Doria
Browse files

BUG: Moved SurfacePlusEdges.cxx and TestLabelPlacementMapper.cxx from

IF(VTK_USE_DISPLAY)
to
IF(VTK_DATA_ROOT)

in
VTK/Rendering/Testing/Cxx/CMakeLists.txt
because they would fail if DATA_ROOT was not specified.

STYLE: added description for ComputeArea in vtkTriangle.h and vtkPolygon.h
parent c5723667
......@@ -70,6 +70,11 @@ public:
int dim, double *derivs);
int IsPrimaryCell() {return 0;}
// Description:
// Compute the area of a polygon. This is a convenience function
// which simply calls static double ComputeArea(vtkPoints *p,
// vtkIdType numPts, vtkIdType *pts, double normal[3]);
// with the appropriate parameters from the instantiated vtkPolygon.
double ComputeArea();
// Description:
......@@ -104,6 +109,8 @@ public:
// Compute the area of a polygon in 3D. The area is returned, as well as
// the normal (a side effect of using this method). If you desire to
// compute the area of a triangle, use vtkTriangleArea which is faster.
// If you already have a vtkPolygon instantiated, a convenience function,
// ComputeArea() is provided.
static double ComputeArea(vtkPoints *p, vtkIdType numPts, vtkIdType *pts,
double normal[3]);
......
......@@ -63,6 +63,11 @@ public:
int dim, double *derivs);
virtual double *GetParametricCoords();
// Description:
// A convenience function to compute the area of a triangle.
// This function simply calls the static function:
// vtkTriangle::TriangleArea(double p1[3], double p2[3], double p3[3])
// with the appropriate parameters from the instantiated vtkTriangle.
double ComputeArea();
// Description:
......@@ -117,7 +122,9 @@ public:
double center[3]);
// Description:
// Compute the area of a triangle in 3D.
// Compute the area of a triangle in 3D. Since this is a static function,
// it can be called without instantiating a vtkTriangle. ComputeArea()
// is provided to compute the area of an already instantiated triangle.
static double TriangleArea(double p1[3], double p2[3], double p3[3]);
// Description:
......
......@@ -17,7 +17,6 @@ IF(VTK_USE_DISPLAY)
SET(RenderingTestsWithArguments
${RenderingTestsWithArguments}
LoadOpenGLExtension.cxx
SurfacePlusEdges.cxx
TestActorLightingFlag.cxx
TestAnimationScene.cxx
TestBlurAndSobelPasses.cxx
......@@ -29,7 +28,6 @@ IF(VTK_USE_DISPLAY)
TestLabelPlacer.cxx
TestLabelPlacer2D.cxx
TestLabelPlacerCoincidentPoints.cxx
TestLabelPlacementMapper.cxx
TestLabelPlacementMapper2D.cxx
TestLabelPlacementMapperCoincidentPoints.cxx
TestLightActor.cxx
......@@ -59,7 +57,9 @@ IF(VTK_USE_DISPLAY)
IF(VTK_DATA_ROOT)
SET(RenderingTestsWithArguments
${RenderingTestsWithArguments}
SurfacePlusEdges.cxx
TestAreaSelections.cxx
TestLabelPlacementMapper.cxx
TestMultiTexturing.cxx
TestMultiTexturingTransform.cxx
TestScenePicker.cxx
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment