Skip to content

Commit eac8cc0

Browse files
committed
Remove support for Houdini < 20.0
Signed-off-by: Dan Bailey <danbailey@ilm.com>
1 parent 759482d commit eac8cc0

1 file changed

Lines changed: 5 additions & 21 deletions

File tree

openvdb_houdini/openvdb_houdini/GR_PrimVDBPoints.cc

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
///
88
/// @brief GR Render Hook and Primitive for VDB PointDataGrid
99

10-
#include <UT/UT_Version.h>
11-
1210
#include <openvdb/Grid.h>
1311
#include <openvdb/Platform.h>
1412
#include <openvdb/Types.h>
@@ -39,10 +37,6 @@
3937
#include <utility>
4038
#include <vector>
4139

42-
#if UT_VERSION_INT < 0x14000000 // Below 20.0, there is no RE_RenderContext
43-
#define RE_RenderContext RE_Render *
44-
#endif
45-
4640
////////////////////////////////////////
4741

4842
static RE_ShaderHandle theMarkerDecorShader("decor/GL32/point_marker.prog");
@@ -119,11 +113,8 @@ class GR_PrimVDBPoints : public GR_Primitive
119113

120114
/// return true if the primitive is in or overlaps the view frustum.
121115
/// always returning true will effectively disable frustum culling.
122-
bool inViewFrustum(const UT_Matrix4D &objviewproj
123-
#if (UT_VERSION_INT >= 0x1105014e) // 17.5.334 or later
124-
, const UT_BoundingBoxD *bbox
125-
#endif
126-
) override;
116+
bool inViewFrustum(const UT_Matrix4D &objviewproj,
117+
const UT_BoundingBoxD *bbox) override;
127118

128119
/// Called whenever the primitive is required to render, which may be more
129120
/// than one time per viewport redraw (beauty, shadow passes, wireframe-over)
@@ -589,20 +580,13 @@ GR_PrimVDBPoints::update(RE_RenderContext r,
589580
}
590581

591582
bool
592-
GR_PrimVDBPoints::inViewFrustum(const UT_Matrix4D& objviewproj
593-
#if (UT_VERSION_INT >= 0x1105014e) // 17.5.334 or later
594-
, const UT_BoundingBoxD *passed_bbox
595-
#endif
596-
)
583+
GR_PrimVDBPoints::inViewFrustum(const UT_Matrix4D& objviewproj,
584+
const UT_BoundingBoxD *passed_bbox)
597585
{
598586
const UT_BoundingBoxD bbox( mBbox.min().x(), mBbox.min().y(), mBbox.min().z(),
599587
mBbox.max().x(), mBbox.max().y(), mBbox.max().z());
600-
#if (UT_VERSION_INT >= 0x1105014e) // 17.5.334 or later
601-
return GR_Utils::inViewFrustum(passed_bbox ? *passed_bbox :bbox,
588+
return GR_Utils::inViewFrustum(passed_bbox ? *passed_bbox : bbox,
602589
objviewproj);
603-
#else
604-
return GR_Utils::inViewFrustum(bbox, objviewproj);
605-
#endif
606590
}
607591

608592
bool

0 commit comments

Comments
 (0)