Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/embree4/rtcore_geometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ enum RTCCurveFlags
struct RTCBoundsFunctionArguments
{
void* geometryUserPtr;
void* boundsUserPtr;
unsigned int primID;
unsigned int timeStep;
struct RTCBounds* bounds_o;
Expand Down
1 change: 1 addition & 0 deletions include/embree4/rtcore_geometry.isph
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ enum RTCCurveFlags
struct RTCBoundsFunctionArguments
{
void* uniform geometryUserPtr;
void* uniform boundsUserPtr;
uniform unsigned int primID;
uniform unsigned int timeStep;
uniform RTCBounds* uniform bounds_o;
Expand Down
2 changes: 1 addition & 1 deletion kernels/common/accelset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace embree
{
AccelSet::AccelSet (Device* device, Geometry::GType gtype, size_t numItems, size_t numTimeSteps)
: Geometry(device,gtype,(unsigned int)numItems,(unsigned int)numTimeSteps), boundsFunc(nullptr) {}
: Geometry(device,gtype,(unsigned int)numItems,(unsigned int)numTimeSteps), boundsFunc(nullptr), boundsUserPtr(nullptr) {}

AccelSet::IntersectorN::IntersectorN (ErrorFunc error)
: intersect((IntersectFuncN)error), occluded((OccludedFuncN)error), name(nullptr) {}
Expand Down
3 changes: 3 additions & 0 deletions kernels/common/accelset.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ namespace embree
assert(i < size());
RTCBoundsFunctionArguments args;
args.geometryUserPtr = userPtr;
args.boundsUserPtr = boundsUserPtr;
args.primID = (unsigned int)i;
args.timeStep = (unsigned int)itime;
args.bounds_o = (RTCBounds*)&box;
Expand All @@ -91,6 +92,7 @@ namespace embree
assert(i < size());
RTCBoundsFunctionArguments args;
args.geometryUserPtr = userPtr;
args.boundsUserPtr = boundsUserPtr;
args.primID = (unsigned int)i;
args.timeStep = (unsigned int)(itime+0);
args.bounds_o = (RTCBounds*)&box[0];
Expand Down Expand Up @@ -335,6 +337,7 @@ namespace embree

public:
RTCBoundsFunction boundsFunc;
void* boundsUserPtr;
IntersectorN intersectorN;
};

Expand Down
1 change: 1 addition & 0 deletions kernels/common/scene_user_geometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace embree

void UserGeometry::setBoundsFunction (RTCBoundsFunction bounds, void* userPtr) {
this->boundsFunc = bounds;
this->boundsUserPtr = userPtr;
}

void UserGeometry::setIntersectFunctionN (RTCIntersectFunctionN intersect) {
Expand Down
Loading