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

41
source/Irrlicht/CLightSceneNode.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_LIGHT_SCENE_NODE_H_INCLUDED__
#define __C_LIGHT_SCENE_NODE_H_INCLUDED__
#ifndef IRR_C_LIGHT_SCENE_NODE_H_INCLUDED
#define IRR_C_LIGHT_SCENE_NODE_H_INCLUDED
#include "ILightSceneNode.h"
@@ -23,40 +23,40 @@ public:
const core::vector3df& position, video::SColorf color, f32 range);
//! pre render event
virtual void OnRegisterSceneNode() _IRR_OVERRIDE_;
virtual void OnRegisterSceneNode() IRR_OVERRIDE;
//! render
virtual void render() _IRR_OVERRIDE_;
virtual void render() IRR_OVERRIDE;
//! set node light data from light info
virtual void setLightData(const video::SLight& light) _IRR_OVERRIDE_;
virtual void setLightData(const video::SLight& light) IRR_OVERRIDE;
//! \return Returns the light data.
virtual const video::SLight& getLightData() const _IRR_OVERRIDE_;
virtual const video::SLight& getLightData() const IRR_OVERRIDE;
//! \return Returns the light data.
virtual video::SLight& getLightData() _IRR_OVERRIDE_;
virtual video::SLight& getLightData() IRR_OVERRIDE;
//! Sets if the node should be visible or not.
/** All children of this node won't be visible either, when set
to true.
\param isVisible If the node shall be visible. */
virtual void setVisible(bool isVisible) _IRR_OVERRIDE_;
virtual void setVisible(bool isVisible) IRR_OVERRIDE;
//! returns the axis aligned bounding box of this node
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_;
virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
//! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_LIGHT; }
virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_LIGHT; }
//! Writes attributes of the scene node.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_;
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the scene node.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
//! Creates a clone of this scene node and its children.
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_;
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE;
//! Sets the light's radius of influence.
/** Outside this radius the light won't lighten geometry and cast no
@@ -64,33 +64,33 @@ public:
it to (0,1/radius,0). If you want to override this behavior, set the
attenuation after the radius.
\param radius The new radius. */
virtual void setRadius(f32 radius) _IRR_OVERRIDE_;
virtual void setRadius(f32 radius) IRR_OVERRIDE;
//! Gets the light's radius of influence.
/** \return The current radius. */
virtual f32 getRadius() const _IRR_OVERRIDE_;
virtual f32 getRadius() const IRR_OVERRIDE;
//! Sets the light type.
/** \param type The new type. */
virtual void setLightType(video::E_LIGHT_TYPE type) _IRR_OVERRIDE_;
virtual void setLightType(video::E_LIGHT_TYPE type) IRR_OVERRIDE;
//! Gets the light type.
/** \return The current light type. */
virtual video::E_LIGHT_TYPE getLightType() const _IRR_OVERRIDE_;
virtual video::E_LIGHT_TYPE getLightType() const IRR_OVERRIDE;
//! Sets whether this light casts shadows.
/** Enabling this flag won't automatically cast shadows, the meshes
will still need shadow scene nodes attached. But one can enable or
disable distinct lights for shadow casting for performance reasons.
\param shadow True if this light shall cast shadows. */
virtual void enableCastShadow(bool shadow=true) _IRR_OVERRIDE_;
virtual void enableCastShadow(bool shadow=true) IRR_OVERRIDE;
//! Check whether this light casts shadows.
/** \return True if light would cast shadows, else false. */
virtual bool getCastShadow() const _IRR_OVERRIDE_;
virtual bool getCastShadow() const IRR_OVERRIDE;
//! Updates the absolute position based on the relative and the parents position
virtual void updateAbsolutePosition() _IRR_OVERRIDE_;
virtual void updateAbsolutePosition() IRR_OVERRIDE;
private:
@@ -106,4 +106,3 @@ private:
} // end namespace irr
#endif