mirror of
https://github.com/minetest/irrlicht.git
synced 2024-11-14 03:33:49 +01:00
reduce warning.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6208 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
451134322d
commit
1766fc7060
@ -74,13 +74,13 @@ namespace scene
|
|||||||
virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0;
|
virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0;
|
||||||
|
|
||||||
//! Get the axis aligned bounding box of this node
|
//! Get the axis aligned bounding box of this node
|
||||||
virtual const core::aabbox3d<f32>& getBoundingBox() const = 0;
|
virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_ = 0;
|
||||||
|
|
||||||
//! Returns the relative transformation of the scene node.
|
//! Returns the relative transformation of the scene node.
|
||||||
//virtual core::matrix4 getRelativeTransformation() const = 0;
|
//virtual core::matrix4 getRelativeTransformation() const = 0;
|
||||||
|
|
||||||
//! The animation method.
|
//! The animation method.
|
||||||
virtual void OnAnimate(u32 timeMs) =0;
|
virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_ =0;
|
||||||
|
|
||||||
//! The render method.
|
//! The render method.
|
||||||
/** Does nothing as bones are not visible. */
|
/** Does nothing as bones are not visible. */
|
||||||
|
@ -90,7 +90,7 @@ namespace scene
|
|||||||
bindTargetAndRotation() ) then calling this will also change
|
bindTargetAndRotation() ) then calling this will also change
|
||||||
the camera's target to match the rotation.
|
the camera's target to match the rotation.
|
||||||
\param rotation New rotation of the node in degrees. */
|
\param rotation New rotation of the node in degrees. */
|
||||||
virtual void setRotation(const core::vector3df& rotation) =0;
|
virtual void setRotation(const core::vector3df& rotation) _IRR_OVERRIDE_ =0;
|
||||||
|
|
||||||
//! Gets the current look at target of the camera
|
//! Gets the current look at target of the camera
|
||||||
/** \return The current look at target of the camera, in world co-ordinates */
|
/** \return The current look at target of the camera, in world co-ordinates */
|
||||||
|
@ -36,7 +36,7 @@ public:
|
|||||||
kerning value. For example, EGFT_BITMAP will add the right kerning value of previousLetter to the
|
kerning value. For example, EGFT_BITMAP will add the right kerning value of previousLetter to the
|
||||||
left side kerning value of thisLetter, then add the global value.
|
left side kerning value of thisLetter, then add the global value.
|
||||||
*/
|
*/
|
||||||
virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const = 0;
|
virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_ = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // end namespace gui
|
} // end namespace gui
|
||||||
|
@ -31,22 +31,22 @@ namespace video
|
|||||||
~CNSOGLManager();
|
~CNSOGLManager();
|
||||||
|
|
||||||
// Initialize
|
// Initialize
|
||||||
bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data);
|
bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_;
|
||||||
|
|
||||||
// Terminate
|
// Terminate
|
||||||
void terminate();
|
void terminate() _IRR_OVERRIDE_;
|
||||||
|
|
||||||
// Create surface.
|
// Create surface.
|
||||||
bool generateSurface();
|
bool generateSurface() _IRR_OVERRIDE_;
|
||||||
|
|
||||||
// Destroy surface.
|
// Destroy surface.
|
||||||
void destroySurface();
|
void destroySurface() _IRR_OVERRIDE_;
|
||||||
|
|
||||||
// Create context.
|
// Create context.
|
||||||
bool generateContext();
|
bool generateContext() _IRR_OVERRIDE_;
|
||||||
|
|
||||||
// Destroy EGL context.
|
// Destroy EGL context.
|
||||||
void destroyContext();
|
void destroyContext() _IRR_OVERRIDE_;
|
||||||
|
|
||||||
//! Get current context
|
//! Get current context
|
||||||
const SExposedVideoData& getContext() const;
|
const SExposedVideoData& getContext() const;
|
||||||
@ -55,7 +55,7 @@ namespace video
|
|||||||
bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_;
|
bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_;
|
||||||
|
|
||||||
// Swap buffers.
|
// Swap buffers.
|
||||||
bool swapBuffers();
|
bool swapBuffers() _IRR_OVERRIDE_;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SIrrlichtCreationParameters Params;
|
SIrrlichtCreationParameters Params;
|
||||||
|
@ -748,9 +748,11 @@ bool CBurningVideoDriver::setRenderTargetEx(IRenderTarget* target, u16 clearFlag
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
static inline f32 map_value(f32 x, f32 in_min, f32 in_max, f32 out_min, f32 out_max) {
|
static inline f32 map_value(f32 x, f32 in_min, f32 in_max, f32 out_min, f32 out_max) {
|
||||||
return (x - in_min) * (out_max - out_min) / (f32)(in_max - in_min) + out_min;
|
return (x - in_min) * (out_max - out_min) / (f32)(in_max - in_min) + out_min;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
//! sets a render target
|
//! sets a render target
|
||||||
void CBurningVideoDriver::setRenderTargetImage2(video::IImage* color, video::IImage* depth, video::IImage* stencil)
|
void CBurningVideoDriver::setRenderTargetImage2(video::IImage* color, video::IImage* depth, video::IImage* stencil)
|
||||||
@ -2166,8 +2168,8 @@ void CBurningVideoDriver::drawVertexPrimitiveList(const void* vertices, u32 vert
|
|||||||
{
|
{
|
||||||
// if primitive fully outside or outside on same side
|
// if primitive fully outside or outside on same side
|
||||||
continue;
|
continue;
|
||||||
vOut = 0;
|
//vOut = 0;
|
||||||
vertex_from_clipper = 0;
|
//vertex_from_clipper = 0;
|
||||||
}
|
}
|
||||||
else if (clipMask_o == VERTEX4D_INSIDE)
|
else if (clipMask_o == VERTEX4D_INSIDE)
|
||||||
{
|
{
|
||||||
|
@ -277,7 +277,7 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
//visualize mipmap
|
//visualize mipmap
|
||||||
for (i = 1; i < 0 && i < array_size(MipMap); ++i)
|
for (i = 1; i < 0 && i < array_size(MipMap); ++i)
|
||||||
{
|
{
|
||||||
@ -327,7 +327,7 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
calcDerivative();
|
calcDerivative();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ public:
|
|||||||
|
|
||||||
//! draws an indexed triangle list
|
//! draws an indexed triangle list
|
||||||
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_;
|
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_;
|
||||||
virtual bool canWireFrame () { return true; }
|
virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void fragmentShader();
|
virtual void fragmentShader();
|
||||||
|
@ -85,7 +85,7 @@ public:
|
|||||||
|
|
||||||
//! draws an indexed triangle list
|
//! draws an indexed triangle list
|
||||||
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_;
|
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_;
|
||||||
virtual bool canWireFrame () { return true; }
|
virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void fragmentShader();
|
virtual void fragmentShader();
|
||||||
|
@ -103,7 +103,7 @@ public:
|
|||||||
|
|
||||||
//! draws an indexed triangle list
|
//! draws an indexed triangle list
|
||||||
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_;
|
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_;
|
||||||
virtual bool canWireFrame () { return true; }
|
virtual bool canWireFrame () _IRR_OVERRIDE_ { return true; }
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -9,7 +9,7 @@ public:
|
|||||||
|
|
||||||
//! draws an indexed triangle list
|
//! draws an indexed triangle list
|
||||||
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_;
|
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) _IRR_OVERRIDE_;
|
||||||
virtual bool canWireFrame() { return true; }
|
virtual bool canWireFrame() _IRR_OVERRIDE_ { return true; }
|
||||||
|
|
||||||
virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_;
|
virtual void OnSetMaterial(const SBurningShaderMaterial& material) _IRR_OVERRIDE_;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user