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

39
source/Irrlicht/CSceneNodeAnimatorCameraMaya.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_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED__
#define __C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED__
#ifndef IRR_C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED
#define IRR_C_SCENE_NODE_ANIMATOR_CAMERA_MAYA_H_INCLUDED
#include "ISceneNodeAnimatorCameraMaya.h"
#include "ICameraSceneNode.h"
@@ -35,49 +35,49 @@ namespace scene
virtual ~CSceneNodeAnimatorCameraMaya();
//! Animates the scene node, currently only works on cameras
virtual void animateNode(ISceneNode* node, u32 timeMs) _IRR_OVERRIDE_;
virtual void animateNode(ISceneNode* node, u32 timeMs) IRR_OVERRIDE;
//! Event receiver
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_;
virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! Returns the speed of movement in units per millisecond
virtual f32 getMoveSpeed() const _IRR_OVERRIDE_;
virtual f32 getMoveSpeed() const IRR_OVERRIDE;
//! Sets the speed of movement in units per millisecond
virtual void setMoveSpeed(f32 moveSpeed) _IRR_OVERRIDE_;
virtual void setMoveSpeed(f32 moveSpeed) IRR_OVERRIDE;
//! Returns the rotation speed
virtual f32 getRotateSpeed() const _IRR_OVERRIDE_;
virtual f32 getRotateSpeed() const IRR_OVERRIDE;
//! Set the rotation speed
virtual void setRotateSpeed(f32 rotateSpeed) _IRR_OVERRIDE_;
virtual void setRotateSpeed(f32 rotateSpeed) IRR_OVERRIDE;
//! Returns the zoom speed
virtual f32 getZoomSpeed() const _IRR_OVERRIDE_;
virtual f32 getZoomSpeed() const IRR_OVERRIDE;
//! Set the zoom speed
virtual void setZoomSpeed(f32 zoomSpeed) _IRR_OVERRIDE_;
virtual void setZoomSpeed(f32 zoomSpeed) IRR_OVERRIDE;
//! Returns the current distance, i.e. orbit radius
virtual f32 getDistance() const _IRR_OVERRIDE_;
virtual f32 getDistance() const IRR_OVERRIDE;
//! Set the distance
virtual void setDistance(f32 distance) _IRR_OVERRIDE_;
virtual void setDistance(f32 distance) IRR_OVERRIDE;
//! Set the minimal distance to the camera target for zoom
virtual void setTargetMinDistance(f32 minDistance) _IRR_OVERRIDE_;
virtual void setTargetMinDistance(f32 minDistance) IRR_OVERRIDE;
//! Returns the minimal distance to the camera target for zoom
virtual f32 getTargetMinDistance() const _IRR_OVERRIDE_;
virtual f32 getTargetMinDistance() const IRR_OVERRIDE;
//! This animator will receive events when attached to the active camera
virtual bool isEventReceiverEnabled() const _IRR_OVERRIDE_
virtual bool isEventReceiverEnabled() const IRR_OVERRIDE
{
return true;
}
//! Returns type of the scene node
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_
virtual ESCENE_NODE_ANIMATOR_TYPE getType() const IRR_OVERRIDE
{
return ESNAT_CAMERA_MAYA;
}
@@ -86,13 +86,13 @@ namespace scene
/** Please note that you will have to drop
(IReferenceCounted::drop()) the returned pointer after calling
this. */
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) _IRR_OVERRIDE_;
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) IRR_OVERRIDE;
//! Writes attributes of the scene node animator.
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 animator.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
private:
@@ -127,4 +127,3 @@ namespace scene
} // end namespace irr
#endif