2.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 7ed86da9 authored by Oliver Zettinig's avatar Oliver Zettinig
Browse files

Jenkins warnings fixed (hopefully!?)

parent fc66bbce
......@@ -233,7 +233,8 @@ namespace campvis {
MultiIndexedGeometry* GeometryDataFactory::createArrow(uint16_t numSlices, float tipLen, float cylRadius, float tipRadius) {
tgtAssert(numSlices > 2, "Arrow shaft must have minimum 3 slices!");
tgtAssert(tipRadius > cylRadius, "Tip radius must exceed cyclinder radius (for correct normals)!");
tgtAssert(tipLen > 0 && tipLen < 1, "Tip length must be between 0 and 1!");
tgtAssert(tipLen > 0, "Tip length must be between 0 and 1!");
tgtAssert(tipLen < 1, "Tip length must be between 0 and 1!");
std::vector<tgt::vec3> vertices;
std::vector<tgt::vec3> normals;
......
......@@ -47,19 +47,19 @@ namespace campvis {
VectorFieldRenderer::VectorFieldRenderer(IVec2Property* viewportSizeProp)
: VisualizationProcessor(viewportSizeProp)
, p_renderOutput("RenderOutput", "Output Image", "VectorFieldRenderer.output", DataNameProperty::WRITE)
, p_inputVectors("InputImage", "Input Image Vectors", "vectors", DataNameProperty::READ, INVALID_RESULT | INVALID_PROPERTIES)
, p_renderOutput("RenderOutput", "Output Image", "VectorFieldRenderer.output", DataNameProperty::WRITE)
, p_arrowSize("ArrowSize", "Arrow Size", 1.f, .001f, 5.f)
, p_lenThresholdMin("LenThresholdMin", "Length Threshold Min", .001f, 0.f, 1000.f, 0.005f)
, p_lenThresholdMax("LenThresholdMax", "Length Threshold Max", 10.f, 0.f, 10000.f, 10.f)
, p_camera("Camera", "Camera", tgt::Camera())
, p_sliceOrientation("SliceOrientation", "Slice Orientation", sliceOrientationOptions, 4, INVALID_RESULT | INVALID_PROPERTIES)
, p_sliceNumber("SliceNumber", "Slice Number", 0, 0, 0)
, p_Time("time", "Time", 0, 0, 100)
, p_flowProfile1("FlowSpline1", "Flow Profile - Spline 1", 1.f, .0f, 2.f)
, p_flowProfile2("FlowSpline2", "Flow Profile - Spline 2", 1.f, .0f, 2.f)
, p_flowProfile3("FlowSpline3", "Flow Profile - Spline 3", 1.f, .0f, 2.f)
, p_flowProfile4("FlowSpline4", "Flow Profile - Spline 4", 1.f, .0f, 2.f)
, p_Time("time", "Time", 0, 0, 100)
, p_camera("Camera", "Camera", tgt::Camera())
, p_sliceOrientation("SliceOrientation", "Slice Orientation", sliceOrientationOptions, 4, INVALID_RESULT | INVALID_PROPERTIES)
, p_sliceNumber("SliceNumber", "Slice Number", 0, 0, 0)
, _arrowGeometry(0)
{
addDecorator(new ProcessorDecoratorShading());
......@@ -159,7 +159,6 @@ namespace campvis {
case XYZ_VOLUME:
for (size_t x = 0; x < imgSize.x; ++x) {
for (size_t y = 0; y < imgSize.y; ++y) {
if(y < sliceNumber) continue;
for (size_t z = 0; z < imgSize.z; ++z) {
renderVectorArrow(vectors, tgt::ivec3(static_cast<int>(x), static_cast<int>(y), static_cast<int>(z)), scale);
}
......@@ -220,9 +219,6 @@ namespace campvis {
void VectorFieldRenderer::renderVectorArrow(const GenericImageRepresentationLocal<float, 3>* vectors, const tgt::vec3& position, float scale) {
/// minimum scale factor
const float EPS = .1f;
// avoid overflows
if(position.x >= vectors->getSize().x || position.x < 0 ||
position.y >= vectors->getSize().y || position.y < 0 ||
......
......@@ -122,9 +122,9 @@ namespace campvis {
*/
void renderVectorArrow(const GenericImageRepresentationLocal<float, 3>* vectors, const tgt::vec3& position, float scale);
GeometryData* _arrowGeometry; ///< Geometry for arrow rendering
tgt::Shader* _shader; ///< Shader for arrow rendering
GeometryData* _arrowGeometry; ///< Geometry for arrow rendering
static const std::string loggerCat_;
};
......
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