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

34
source/Irrlicht/CVolumeLightSceneNode.h
View File

@@ -29,43 +29,43 @@ namespace scene
virtual ~CVolumeLightSceneNode();
virtual void OnRegisterSceneNode() _IRR_OVERRIDE_;
virtual void OnRegisterSceneNode() IRR_OVERRIDE;
//! renders the node.
virtual void render() _IRR_OVERRIDE_;
virtual void render() 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 the material based on the zero based index i.
virtual video::SMaterial& getMaterial(u32 i) _IRR_OVERRIDE_;
virtual video::SMaterial& getMaterial(u32 i) IRR_OVERRIDE;
//! returns amount of materials used by this scene node.
virtual u32 getMaterialCount() const _IRR_OVERRIDE_;
virtual u32 getMaterialCount() const IRR_OVERRIDE;
//! Returns type of the scene node
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_VOLUME_LIGHT; }
virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_VOLUME_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;
virtual void setSubDivideU(const u32 inU) _IRR_OVERRIDE_;
virtual void setSubDivideV(const u32 inV) _IRR_OVERRIDE_;
virtual void setSubDivideU(const u32 inU) IRR_OVERRIDE;
virtual void setSubDivideV(const u32 inV) IRR_OVERRIDE;
virtual u32 getSubDivideU() const _IRR_OVERRIDE_ { return SubdivideU; }
virtual u32 getSubDivideV() const _IRR_OVERRIDE_ { return SubdivideV; }
virtual u32 getSubDivideU() const IRR_OVERRIDE { return SubdivideU; }
virtual u32 getSubDivideV() const IRR_OVERRIDE { return SubdivideV; }
virtual void setFootColor(const video::SColor inColor) _IRR_OVERRIDE_;
virtual void setTailColor(const video::SColor inColor) _IRR_OVERRIDE_;
virtual void setFootColor(const video::SColor inColor) IRR_OVERRIDE;
virtual void setTailColor(const video::SColor inColor) IRR_OVERRIDE;
virtual video::SColor getFootColor() const _IRR_OVERRIDE_ { return FootColor; }
virtual video::SColor getTailColor() const _IRR_OVERRIDE_ { return TailColor; }
virtual video::SColor getFootColor() const IRR_OVERRIDE { return FootColor; }
virtual video::SColor getTailColor() const IRR_OVERRIDE { return TailColor; }
private:
void constructLight();