Merge branch 'fishbones' into pre-proto

This commit is contained in:
Magne Sjaastad
2017-05-23 10:28:42 +02:00
3995 changed files with 17802 additions and 174762 deletions
@@ -22,6 +22,7 @@
#include "cvfBase.h"
#include "cvfArray.h"
#include "cvfPart.h"
#include "cvfColor3.h"
#include "cvfVector3.h"
@@ -32,6 +33,8 @@ namespace cvf {
class ScalarMapper;
}
class RivObjectSourceInfo;
class RivPipeGeometryGenerator : public cvf::Object
{
public:
@@ -63,6 +66,7 @@ public:
size_t segmentIndexFromTriangleIndex(size_t triangleIndex) const;
size_t pipeResultIndexFromTriangleIndex(size_t triangleIndex) const;
void cylinderWithCenterLineParts(cvf::Collection<cvf::Part>* destinationParts, const std::vector<cvf::Vec3d>& centerCoords, const cvf::Color3f& color, double radius);
private:
void clearComputedData();
void updateFilteredPipeCenterCoords();