Merge branch 'tyrav2-develop' into tyrav2-static-dynamic-pipelines

2022-07-21 17:56:17 +02:00
parent 2c72abe081 04e89fd3a2
commit aad634a241
9 changed files with 280 additions and 40 deletions
@@ -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;
 };