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

19
source/Irrlicht/CSkyBoxSceneNode.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_SKY_BOX_SCENE_NODE_H_INCLUDED__
#define __C_SKY_BOX_SCENE_NODE_H_INCLUDED__
#ifndef IRR_C_SKY_BOX_SCENE_NODE_H_INCLUDED
#define IRR_C_SKY_BOX_SCENE_NODE_H_INCLUDED
#include "ISceneNode.h"
#include "S3DVertex.h"
@@ -23,29 +23,29 @@ namespace scene
video::ITexture* right, video::ITexture* front, video::ITexture* back,
ISceneNode* parent, ISceneManager* mgr, s32 id);
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. To get the amount
//! of materials used by this scene node, use getMaterialCount().
//! This function is needed for inserting the node into the scene hierarchy on a
//! optimal position for minimizing renderstate changes, but can also be used
//! to directly modify the material of a scene node.
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_SKY_BOX; }
virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_SKY_BOX; }
//! 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;
private:
@@ -59,4 +59,3 @@ namespace scene
} // end namespace irr
#endif