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

27
source/Irrlicht/CMetaTriangleSelector.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_META_TRIANGLE_SELECTOR_H_INCLUDED__
#define __C_META_TRIANGLE_SELECTOR_H_INCLUDED__
#ifndef IRR_C_META_TRIANGLE_SELECTOR_H_INCLUDED
#define IRR_C_META_TRIANGLE_SELECTOR_H_INCLUDED
#include "IMetaTriangleSelector.h"
#include "irrArray.h"
@@ -25,46 +25,46 @@ public:
virtual ~CMetaTriangleSelector();
//! Get amount of all available triangles in this selector
virtual s32 getTriangleCount() const _IRR_OVERRIDE_;
virtual s32 getTriangleCount() const IRR_OVERRIDE;
//! 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;
//! Adds a triangle selector to the collection of triangle selectors
//! in this metaTriangleSelector.
virtual void addTriangleSelector(ITriangleSelector* toAdd) _IRR_OVERRIDE_;
virtual void addTriangleSelector(ITriangleSelector* toAdd) IRR_OVERRIDE;
//! Removes a specific triangle selector which was added before from the collection.
virtual bool removeTriangleSelector(ITriangleSelector* toRemove) _IRR_OVERRIDE_;
virtual bool removeTriangleSelector(ITriangleSelector* toRemove) IRR_OVERRIDE;
//! Removes all triangle selectors from the collection.
virtual void removeAllTriangleSelectors() _IRR_OVERRIDE_;
virtual void removeAllTriangleSelectors() IRR_OVERRIDE;
//! Get the scene node associated with a given triangle.
virtual ISceneNode* getSceneNodeForTriangle(u32 triangleIndex) const _IRR_OVERRIDE_;
virtual ISceneNode* getSceneNodeForTriangle(u32 triangleIndex) const IRR_OVERRIDE;
// Get the number of TriangleSelectors that are part of this one
virtual u32 getSelectorCount() const _IRR_OVERRIDE_;
virtual u32 getSelectorCount() const IRR_OVERRIDE;
// Get the TriangleSelector based on index based on getSelectorCount
virtual ITriangleSelector* getSelector(u32 index) _IRR_OVERRIDE_;
virtual ITriangleSelector* getSelector(u32 index) IRR_OVERRIDE;
// Get the TriangleSelector based on index based on getSelectorCount
virtual const ITriangleSelector* getSelector(u32 index) const _IRR_OVERRIDE_;
virtual const ITriangleSelector* getSelector(u32 index) const IRR_OVERRIDE;
private:
@@ -76,4 +76,3 @@ private:
#endif