Merge branch 'tyrav2-develop' into tyrav2-static-dynamic-pipelines
This commit is contained in:
@@ -41,6 +41,17 @@ class BBox : public CoreBBox {
|
||||
/** @returns the bottom face (nearer on y-axis) */
|
||||
const BBoxFace& getBottomFace() { return _bottomFace; }
|
||||
|
||||
/** @returns the lower (x, y, z) boundary of the box. */
|
||||
Vec4 min();
|
||||
/** @returns the upper (x, y, z) boundary of the box. */
|
||||
Vec4 max();
|
||||
/**
|
||||
* @param res_min Vec4 to store the min result
|
||||
* @param res_max Vec4 to store the min result
|
||||
* @brief Calc and stores the min and max points of box at a single loop
|
||||
* */
|
||||
void getMinMax(Vec4* res_min, Vec4* res_max);
|
||||
|
||||
protected:
|
||||
float _height, _depth, _width;
|
||||
Vec4 _centerVector;
|
||||
|
||||
@@ -37,6 +37,9 @@ class CoreBBox {
|
||||
void print(const std::string& name) const { print(name.c_str()); }
|
||||
std::string getPrint(const char* name = nullptr) const;
|
||||
|
||||
CoreBBoxFrustum isInFrustum(const Plane* frustumPlanes, const M4x4& model,
|
||||
const float* margins = nullptr) const;
|
||||
|
||||
protected:
|
||||
Vec4 _vertices[8];
|
||||
};
|
||||
|
||||
@@ -25,9 +25,6 @@ class RenderBBox : public CoreBBox {
|
||||
explicit RenderBBox(const std::vector<CoreBBox>& t_bboxes,
|
||||
const u32& startIndex, const u32& stopIndex);
|
||||
|
||||
CoreBBoxFrustum isInFrustum(const Plane* frustumPlanes, const M4x4& model,
|
||||
const float* margins = nullptr) const;
|
||||
|
||||
CoreBBoxFrustum clipIsInFrustum(const Plane* frustumPlanes,
|
||||
const M4x4& model) const;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user