Commit 95d92363 authored by hybrid's avatar hybrid

Merge from 1-7 branch, releases 3927-3942. Just documentation fixes.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3943 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 86c043ea
...@@ -173,7 +173,6 @@ namespace scene ...@@ -173,7 +173,6 @@ namespace scene
//! append the meshbuffer to the current buffer //! append the meshbuffer to the current buffer
virtual void append(const IMeshBuffer* const other) {} virtual void append(const IMeshBuffer* const other) {}
//! get the current hardware mapping hint //! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const
{ {
...@@ -195,7 +194,6 @@ namespace scene ...@@ -195,7 +194,6 @@ namespace scene
MappingHintIndex=NewMappingHint; MappingHintIndex=NewMappingHint;
} }
//! flags the mesh as changed, reloads hardware buffers //! flags the mesh as changed, reloads hardware buffers
virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX)
{ {
...@@ -234,7 +232,6 @@ namespace scene ...@@ -234,7 +232,6 @@ namespace scene
//! hardware mapping hint //! hardware mapping hint
E_HARDWARE_MAPPING MappingHintVertex; E_HARDWARE_MAPPING MappingHintVertex;
E_HARDWARE_MAPPING MappingHintIndex; E_HARDWARE_MAPPING MappingHintIndex;
}; };
......
...@@ -19,7 +19,7 @@ namespace scene ...@@ -19,7 +19,7 @@ namespace scene
//! Defines the view frustum. That's the space visible by the camera. //! Defines the view frustum. That's the space visible by the camera.
/** The view frustum is enclosed by 6 planes. These six planes share /** The view frustum is enclosed by 6 planes. These six planes share
four points. A bounding box around these four points is also stored in eight points. A bounding box around these eight points is also stored in
this structure. this structure.
*/ */
struct SViewFrustum struct SViewFrustum
......
...@@ -24,6 +24,11 @@ enum EIntersectionRelation3D ...@@ -24,6 +24,11 @@ enum EIntersectionRelation3D
}; };
//! Template plane class with some intersection testing methods. //! Template plane class with some intersection testing methods.
/** It has to be ensured, that the normal is always normalized. The constructors
and setters of this class will not ensure this automatically. So any normal
passed in has to be normalized in advance. No change to the normal will be
made by any of the class methods.
*/
template <class T> template <class T>
class plane3d class plane3d
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment