1
0

Merging r6250 through r6254 from trunk to ogl-es branch

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

View File

@@ -3,8 +3,8 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h
// Code for this scene node has been contributed by Anders la Cour-Harbo (alc)
#ifndef __C_SKY_DOME_SCENE_NODE_H_INCLUDED__
#define __C_SKY_DOME_SCENE_NODE_H_INCLUDED__
#ifndef IRR_C_SKY_DOME_SCENE_NODE_H_INCLUDED
#define IRR_C_SKY_DOME_SCENE_NODE_H_INCLUDED
#include "ISceneNode.h"
#include "SMeshBuffer.h"
@@ -21,16 +21,16 @@ class CSkyDomeSceneNode : public ISceneNode
f32 texturePercentage, f32 spherePercentage, f32 radius,
ISceneNode* parent, ISceneManager* smgr, s32 id);
virtual ~CSkyDomeSceneNode();
virtual void OnRegisterSceneNode() _IRR_OVERRIDE_;
virtual void render() _IRR_OVERRIDE_;
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_;
virtual video::SMaterial& getMaterial(u32 i) _IRR_OVERRIDE_;
virtual u32 getMaterialCount() const _IRR_OVERRIDE_;
virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_SKY_DOME; }
virtual void OnRegisterSceneNode() IRR_OVERRIDE;
virtual void render() IRR_OVERRIDE;
virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE;
virtual video::SMaterial& getMaterial(u32 i) IRR_OVERRIDE;
virtual u32 getMaterialCount() const IRR_OVERRIDE;
virtual ESCENE_NODE_TYPE getType() const IRR_OVERRIDE { return ESNT_SKY_DOME; }
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_;
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) _IRR_OVERRIDE_;
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) IRR_OVERRIDE;
private:
@@ -47,4 +47,3 @@ class CSkyDomeSceneNode : public ISceneNode
}
#endif