More NoCopy - embarrassingly left out in previous commit :(

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5933 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2010-09-09 00:30:58 +00:00
parent 42581e1719
commit c1a239a7e6
13 changed files with 39 additions and 15 deletions

View File

@@ -28,6 +28,7 @@
using namespace irr;
#include "io/xml_node.hpp"
#include "utils/no_copy.hpp"
#include "utils/vec3.hpp"
class Kart;
@@ -36,7 +37,7 @@ class Kart;
* \brief Handles the game camera
* \ingroup graphicsp"
*/
class Camera
class Camera : public NoCopy
{
public:
enum Mode {

View File

@@ -20,6 +20,8 @@
#ifndef HEADER_EXPLOSION_HPP
#define HEADER_EXPLOSION_HPP
#include "utils/no_copy.hpp"
#include "irrlicht.h"
using namespace irr;
@@ -29,7 +31,7 @@ class SFXBase;
/**
* \ingroup graphics
*/
class Explosion
class Explosion : public NoCopy
{
private:
SFXBase* m_explode_sound;

View File

@@ -178,6 +178,7 @@ void IrrDriver::initDevice()
file_manager->setDevice(m_device);
m_device->setWindowCaption(L"SuperTuxKart");
m_scene_manager = m_device->getSceneManager();
// Force creation of mipmaps even if the mipmaps flag in a b3d file
// does not set the 'enable mipmap' flag.
m_scene_manager->getParameters()->setAttribute(scene::B3D_LOADER_IGNORE_MIPMAP_FLAG, true);
@@ -480,9 +481,10 @@ scene::IParticleSystemSceneNode *IrrDriver::addParticleNode(bool default_emitter
* since the node is not optimised.
* \param mesh The mesh to add.
*/
scene::IMeshSceneNode *IrrDriver::addMesh(scene::IMesh *mesh)
scene::IMeshSceneNode *IrrDriver::addMesh(scene::IMesh *mesh,
scene::ISceneNode *parent)
{
return m_scene_manager->addMeshSceneNode(mesh);
return m_scene_manager->addMeshSceneNode(mesh, parent);
} // addMesh
// ----------------------------------------------------------------------------

View File

@@ -27,6 +27,7 @@
#include <string>
#include <vector>
#include "utils/no_copy.hpp"
#include "utils/ptr_vector.hpp"
#include "utils/vec3.hpp"
@@ -45,7 +46,7 @@ struct VideoMode
* \brief class that creates the irrLicht device and offers higher-level ways to manage the 3D scene
* \ingroup graphics
*/
class IrrDriver : public IEventReceiver
class IrrDriver : public IEventReceiver, public NoCopy
{
private:
/** The irrlicht device. */
@@ -111,7 +112,8 @@ public:
scene::ISceneNode *addWaterNode(scene::IMesh *mesh, float wave_height,
float wave_speed, float wave_length);
scene::IMeshSceneNode*addOctTree(scene::IMesh *mesh);
scene::IMeshSceneNode*addMesh(scene::IMesh *mesh);
scene::IMeshSceneNode*addMesh(scene::IMesh *mesh,
scene::ISceneNode *parent=NULL);
scene::ISceneNode *addBillboard(const core::dimension2d< f32 > size, video::ITexture *texture, scene::ISceneNode* parent=NULL);
scene::IParticleSystemSceneNode

View File

@@ -20,6 +20,8 @@
#ifndef HEADER_MATERIAL_HPP
#define HEADER_MATERIAL_HPP
#include "utils/no_copy.hpp"
#include <string>
#include "irrlicht.h"
@@ -31,7 +33,7 @@ class SFXBase;
/**
* \ingroup graphics
*/
class Material
class Material : public NoCopy
{
public:
enum GraphicalEffect {GE_NONE, GE_SMOKE, GE_WATER};

View File

@@ -20,6 +20,8 @@
#ifndef HEADER_MATERIAL_MANAGER_HPP
#define HEADER_MATERIAL_MANAGER_HPP
#include "utils/no_copy.hpp"
#include "irrlicht.h"
using namespace irr;
@@ -32,7 +34,7 @@ class XMLReader;
/**
* \ingroup graphics
*/
class MaterialManager
class MaterialManager : public NoCopy
{
private:

View File

@@ -20,6 +20,8 @@
#ifndef MOVING_TEXTURE_HPP
#define MOVING_TEXTURE_HPP
#include "utils/no_copy.hpp"
#include <string>
#include "irrlicht.h"
using namespace irr;
@@ -30,7 +32,7 @@ class XMLNode;
* \brief Handles animated textures (textures that move)
* \ingroup graphics
*/
class MovingTexture
class MovingTexture : public NoCopy
{
private:
/** Translation increment per second. */

View File

@@ -20,6 +20,8 @@
#ifndef HEADER_NITRO_HPP
#define HEADER_NITRO_HPP
#include "utils/no_copy.hpp"
#include "irrlicht.h"
using namespace irr;
@@ -29,7 +31,7 @@ class Kart;
* \brief Handles nitro particle effects
* \ingroup graphics
*/
class Nitro
class Nitro : public NoCopy
{
private:
/** The kart to which this nitro belongs. */

View File

@@ -20,6 +20,8 @@
#ifndef HEADER_SHADOW_HPP
#define HEADER_SHADOW_HPP
#include "utils/no_copy.hpp"
#include <string>
#include "irrlicht.h"
@@ -31,7 +33,7 @@ using namespace irr;
* be added later.
* \ingroup graphics
*/
class Shadow
class Shadow : public NoCopy
{
private:
/** The scene node for the shadow. */

View File

@@ -25,6 +25,7 @@
#include "irrlicht.h"
using namespace irr;
#include "utils/no_copy.hpp"
#include "utils/vec3.hpp"
class Kart;
@@ -32,7 +33,7 @@ class Kart;
/** \brief This class is responsible for drawing skid marks for a kart.
* \ingroup graphics
*/
class SkidMarks
class SkidMarks : public NoCopy
{
private:
/** Reference to the kart to which these skidmarks belong. */
@@ -51,7 +52,7 @@ private:
/** Material to use for the skid marks. */
video::SMaterial *m_material;
class SkidMarkQuads : public scene::SMeshBuffer
class SkidMarkQuads : public scene::SMeshBuffer, public NoCopy
{
/** Used to move skid marks at the same location slightly on
* top of each other to avoid a 'wobbling' effect when sometines

View File

@@ -24,6 +24,8 @@
using namespace irr;
#include "graphics/moving_texture.hpp"
#include "utils/no_copy.hpp"
class Kart;
/**

View File

@@ -17,6 +17,8 @@
#ifndef HEADER_STARS_HPP
#define HEADER_STARS_HPP
#include "utils/no_copy.hpp"
#include <vector>
#include "irrlicht.h"
@@ -26,7 +28,7 @@ using namespace irr;
* \brief This class is used to display rotating stars around a kart's head.
* \ingroup graphics
*/
class Stars
class Stars : public NoCopy
{
private:

View File

@@ -20,6 +20,8 @@
#ifndef HEADER_WATER_SPLASH_HPP
#define HEADER_WATER_SPLASH_HPP
#include "utils/no_copy.hpp"
#include "irrlicht.h"
using namespace irr;
@@ -29,7 +31,7 @@ class Kart;
* \brief Handles a water-splash particle effect
* \ingroup graphics
*/
class WaterSplash
class WaterSplash : public NoCopy
{
private:
/** The kart to which this smoke belongs. */