luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Irrlicht/CTriangleBBSelector.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_TRIANGLE_BB_SELECTOR_H_INCLUDED__
#define __C_TRIANGLE_BB_SELECTOR_H_INCLUDED__
#ifndef IRR_C_TRIANGLE_BB_SELECTOR_H_INCLUDED
#define IRR_C_TRIANGLE_BB_SELECTOR_H_INCLUDED
#include "CTriangleSelector.h"
@@ -23,18 +23,18 @@ public:
//! Gets all triangles.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::matrix4* transform, bool useNodeTransform,
irr::core::array<SCollisionTriangleRange>* outTriangleInfo) const _IRR_OVERRIDE_;
irr::core::array<SCollisionTriangleRange>* outTriangleInfo) const IRR_OVERRIDE;
//! Gets all triangles which lie within a specific bounding box.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
const core::aabbox3d<f32>& box, const core::matrix4* transform, bool useNodeTransform,
irr::core::array<SCollisionTriangleRange>* outTriangleInfo) const _IRR_OVERRIDE_;
irr::core::array<SCollisionTriangleRange>* outTriangleInfo) const IRR_OVERRIDE;
//! Gets all triangles which have or may have contact with a 3d line.
virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
s32& outTriangleCount, const core::line3d<f32>& line,
const core::matrix4* transform, bool useNodeTransform,
irr::core::array<SCollisionTriangleRange>* outTriangleInfo) const _IRR_OVERRIDE_;
irr::core::array<SCollisionTriangleRange>* outTriangleInfo) const IRR_OVERRIDE;
protected:
void fillTriangles() const;
@@ -44,6 +44,4 @@ protected:
} // end namespace scene
} // end namespace irr
#endif