From 7bae1a3f8a223f8ecea42acdaf8d0cbe6b71410f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 23 Feb 2012 14:34:14 +0100 Subject: [PATCH] Renamed data access classes in Trade to avoid confusion. --- src/CMakeLists.txt | 2 +- src/CubeMapTexture.h | 12 +++---- src/Texture.h | 6 ++-- src/Trade/AbstractImporter.h | 36 +++++++++---------- ...tractMaterial.h => AbstractMaterialData.h} | 20 +++++------ src/Trade/{Camera.h => CameraData.h} | 16 ++++----- src/Trade/{Image.h => ImageData.h} | 26 +++++++------- src/Trade/{Light.h => LightData.h} | 16 ++++----- src/Trade/{Mesh.cpp => MeshData.cpp} | 4 +-- src/Trade/{Mesh.h => MeshData.h} | 28 +++++++-------- src/Trade/{Object.h => ObjectData.h} | 18 +++++----- .../{PhongMaterial.h => PhongMaterialData.h} | 12 +++---- src/Trade/{Scene.h => SceneData.h} | 16 ++++----- src/Trade/{Texture.h => TextureData.h} | 16 ++++----- 14 files changed, 114 insertions(+), 114 deletions(-) rename src/Trade/{AbstractMaterial.h => AbstractMaterialData.h} (65%) rename src/Trade/{Camera.h => CameraData.h} (65%) rename src/Trade/{Image.h => ImageData.h} (68%) rename src/Trade/{Light.h => LightData.h} (65%) rename src/Trade/{Mesh.cpp => MeshData.cpp} (94%) rename src/Trade/{Mesh.h => MeshData.h} (75%) rename src/Trade/{Object.h => ObjectData.h} (69%) rename src/Trade/{PhongMaterial.h => PhongMaterialData.h} (74%) rename src/Trade/{Scene.h => SceneData.h} (65%) rename src/Trade/{Texture.h => TextureData.h} (64%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 25cab50cd..2d09f0a08 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,7 +21,7 @@ set(Magnum_SRCS TypeTraits.cpp Trade/AbstractImporter.cpp - Trade/Mesh.cpp + Trade/MeshData.cpp Math/Math.cpp ) diff --git a/src/CubeMapTexture.h b/src/CubeMapTexture.h index f137114c9..af2c22607 100644 --- a/src/CubeMapTexture.h +++ b/src/CubeMapTexture.h @@ -65,9 +65,9 @@ class CubeMapTexture: public Texture2D { inline CubeMapTexture(GLint layer = 0): Texture(layer, Target::CubeMap) {} template inline void setData(GLint mipLevel, InternalFormat internalFormat, const Math::Vector& _dimensions, ColorFormat colorFormat, const T* data) = delete; - void setData(GLint mipLevel, InternalFormat internalFormat, const Trade::Image* image) = delete; + void setData(GLint mipLevel, InternalFormat internalFormat, const Trade::ImageData* image) = delete; template inline void setSubData(GLint mipLevel, const Math::Vector& offset, const Math::Vector& _dimensions, ColorFormat colorFormat, const T* data) = delete; - void setSubData(GLint mipLevel, const Math::Vector& offset, const Trade::Image* image) = delete; + void setSubData(GLint mipLevel, const Math::Vector& offset, const Trade::ImageData* image) = delete; /** * @copydoc Texture::setData(GLint, InternalFormat, const Math::Vector&, ColorFormat, const T*) @@ -78,10 +78,10 @@ class CubeMapTexture: public Texture2D { } /** - * @copydetails Texture::setData(GLint, InternalFormat, const Trade::Image*) + * @copydetails Texture::setData(GLint, InternalFormat, const Trade::ImageData*) * @param coordinate Coordinate */ - inline void setData(Coordinate coordinate, GLint mipLevel, InternalFormat internalFormat, const Trade::Image* image) { + inline void setData(Coordinate coordinate, GLint mipLevel, InternalFormat internalFormat, const Trade::ImageData* image) { setData(coordinate, mipLevel, internalFormat, image->dimensions(), image->colorFormat(), image->type(), image->data()); } @@ -94,10 +94,10 @@ class CubeMapTexture: public Texture2D { } /** - * @copydoc Texture::setSubData(GLint, const Math::Vector&, const Trade::Image*) + * @copydoc Texture::setSubData(GLint, const Math::Vector&, const Trade::ImageData*) * @param coordinate Coordinate */ - inline void setSubData(Coordinate coordinate, GLint mipLevel, const Math::Vector& offset, const Trade::Image* image) { + inline void setSubData(Coordinate coordinate, GLint mipLevel, const Math::Vector& offset, const Trade::ImageData* image) { setSubData(coordinate, mipLevel, offset, image->dimensions(), image->colorFormat(), image->type(), image->data()); } diff --git a/src/Texture.h b/src/Texture.h index ba035a7db..83c2243cb 100644 --- a/src/Texture.h +++ b/src/Texture.h @@ -19,7 +19,7 @@ * @brief Class Magnum::Texture */ -#include "Trade/Image.h" +#include "Trade/ImageData.h" namespace Magnum { @@ -104,7 +104,7 @@ template class Texture: public AbstractTexture { * Sets texture data from given image. The image is not deleted * afterwards. */ - inline void setData(GLint mipLevel, InternalFormat internalFormat, const Trade::Image* image) { + inline void setData(GLint mipLevel, InternalFormat internalFormat, const Trade::ImageData* image) { bind(); DataHelper::set(target, mipLevel, internalFormat, image->dimensions(), image->colorFormat(), image->type(), image->data()); } @@ -135,7 +135,7 @@ template class Texture: public AbstractTexture { * Sets texture subdata from given image. The image is not deleted * afterwards. */ - inline void setSubData(GLint mipLevel, const Math::Vector& offset, const Trade::Image* image) { + inline void setSubData(GLint mipLevel, const Math::Vector& offset, const Trade::ImageData* image) { bind(); DataHelper::setSub(target, mipLevel, offset, image->dimensions(), image->colorFormat(), image->type(), image->data()); } diff --git a/src/Trade/AbstractImporter.h b/src/Trade/AbstractImporter.h index 6ce1c1786..29c3699b0 100644 --- a/src/Trade/AbstractImporter.h +++ b/src/Trade/AbstractImporter.h @@ -20,7 +20,7 @@ */ #include "PluginManager/Plugin.h" -#include "Image.h" +#include "ImageData.h" namespace Magnum { @@ -32,13 +32,13 @@ for direct access to the data. */ namespace Trade { -class AbstractMaterial; -class Camera; -class Light; -class Mesh; -class Object; -class Scene; -class Texture; +class AbstractMaterialData; +class CameraData; +class LightData; +class MeshData; +class ObjectData; +class SceneData; +class TextureData; /** @brief Base class for importer plugins @@ -111,7 +111,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given scene or nullptr, if no such scene exists. */ - virtual inline Scene* scene(size_t id) { return nullptr; } + virtual inline SceneData* scene(size_t id) { return nullptr; } /** @brief Light count */ virtual inline size_t lightCount() const { return 0; } @@ -122,7 +122,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given light or nullptr, if no such light exists. */ - virtual inline Light* light(size_t id) { return nullptr; } + virtual inline LightData* light(size_t id) { return nullptr; } /** @brief Camera count */ virtual inline size_t cameraCount() const { return 0; } @@ -134,7 +134,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * Returns pointer to given camera or nullptr, if no such camera * exists. */ - virtual inline Camera* camera(size_t id) { return nullptr; } + virtual inline CameraData* camera(size_t id) { return nullptr; } /** @brief Object count (without lights and cameras) */ virtual inline size_t objectCount() const { return 0; } @@ -146,7 +146,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * Returns pointer to given object or nullptr, if no such object * exists. */ - virtual inline Object* object(size_t id) { return nullptr; } + virtual inline ObjectData* object(size_t id) { return nullptr; } /** @brief Mesh count */ virtual inline size_t meshCount() const { return 0; } @@ -157,7 +157,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given mesh or nullptr, if no such mesh exists. */ - virtual inline Mesh* mesh(size_t id) { return nullptr; } + virtual inline MeshData* mesh(size_t id) { return nullptr; } /** @brief Material count */ virtual inline size_t materialCount() const { return 0; } @@ -169,7 +169,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * Returns pointer to given material or nullptr, if no such material * exists. */ - virtual inline AbstractMaterial* material(size_t id) { return nullptr; } + virtual inline AbstractMaterialData* material(size_t id) { return nullptr; } /** @brief Texture count */ virtual inline size_t textureCount() const { return 0; } @@ -181,7 +181,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * Returns pointer to given texture or nullptr, if no such texture * exists. */ - virtual inline Texture* texture(size_t id) { return nullptr; } + virtual inline TextureData* texture(size_t id) { return nullptr; } /** @brief One-dimensional image count */ virtual inline size_t image1DCount() const { return 0; } @@ -192,7 +192,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given image or nullptr, if no such image exists. */ - virtual inline Image1D* image1D(size_t id) { return nullptr; } + virtual inline ImageData1D* image1D(size_t id) { return nullptr; } /** @brief Two-dimensional image count */ virtual inline size_t image2DCount() const { return 0; } @@ -203,7 +203,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given image or nullptr, if no such image exists. */ - virtual inline Image2D* image2D(size_t id) { return nullptr; } + virtual inline ImageData2D* image2D(size_t id) { return nullptr; } /** @brief Three-dimensional image count */ virtual inline size_t image3DCount() const { return 0; } @@ -214,7 +214,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given image or nullptr, if no such image exists. */ - virtual inline Image3D* image3D(size_t id) { return nullptr; } + virtual inline ImageData3D* image3D(size_t id) { return nullptr; } /*@}*/ }; diff --git a/src/Trade/AbstractMaterial.h b/src/Trade/AbstractMaterialData.h similarity index 65% rename from src/Trade/AbstractMaterial.h rename to src/Trade/AbstractMaterialData.h index a369ea276..425df6059 100644 --- a/src/Trade/AbstractMaterial.h +++ b/src/Trade/AbstractMaterialData.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Trade_AbstractMaterial_h -#define Magnum_Trade_AbstractMaterial_h +#ifndef Magnum_Trade_AbstractMaterialData_h +#define Magnum_Trade_AbstractMaterialData_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Trade::AbstractMaterial + * @brief Class Magnum::Trade::AbstractMaterialData */ namespace Magnum { namespace Trade { @@ -26,11 +26,11 @@ namespace Magnum { namespace Trade { Subclasses provide access to parameters for given material type. */ -class MAGNUM_EXPORT AbstractMaterial { - AbstractMaterial(const AbstractMaterial& other) = delete; - AbstractMaterial(AbstractMaterial&& other) = delete; - AbstractMaterial& operator=(const AbstractMaterial& other) = delete; - AbstractMaterial& operator=(AbstractMaterial&& other) = delete; +class MAGNUM_EXPORT AbstractMaterialData { + AbstractMaterialData(const AbstractMaterialData& other) = delete; + AbstractMaterialData(AbstractMaterialData&& other) = delete; + AbstractMaterialData& operator=(const AbstractMaterialData& other) = delete; + AbstractMaterialData& operator=(AbstractMaterialData&& other) = delete; public: /** @brief Material type */ @@ -42,10 +42,10 @@ class MAGNUM_EXPORT AbstractMaterial { * @brief Constructor * @param type Material type */ - inline AbstractMaterial(Type type): _type(type) {} + inline AbstractMaterialData(Type type): _type(type) {} /** @brief Destructor */ - virtual ~AbstractMaterial() {} + virtual ~AbstractMaterialData() {} /** @brief Material type */ inline Type type() const { return _type; } diff --git a/src/Trade/Camera.h b/src/Trade/CameraData.h similarity index 65% rename from src/Trade/Camera.h rename to src/Trade/CameraData.h index 2aa0065f5..954081bd5 100644 --- a/src/Trade/Camera.h +++ b/src/Trade/CameraData.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Trade_Camera_h -#define Magnum_Trade_Camera_h +#ifndef Magnum_Trade_CameraData_h +#define Magnum_Trade_CameraData_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Trade::Camera + * @brief Class Magnum::Trade::CameraData */ namespace Magnum { namespace Trade { @@ -24,11 +24,11 @@ namespace Magnum { namespace Trade { /** @brief %Camera */ -class MAGNUM_EXPORT Camera { - Camera(const Camera& other) = delete; - Camera(Camera&& other) = delete; - Camera& operator=(const Camera& other) = delete; - Camera& operator=(Camera&& other) = delete; +class MAGNUM_EXPORT CameraData { + CameraData(const CameraData& other) = delete; + CameraData(CameraData&& other) = delete; + CameraData& operator=(const CameraData& other) = delete; + CameraData& operator=(CameraData&& other) = delete; }; }} diff --git a/src/Trade/Image.h b/src/Trade/ImageData.h similarity index 68% rename from src/Trade/Image.h rename to src/Trade/ImageData.h index cc9e00be0..9a53c413a 100644 --- a/src/Trade/Image.h +++ b/src/Trade/ImageData.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Trade_Image_h -#define Magnum_Trade_Image_h +#ifndef Magnum_Trade_ImageData_h +#define Magnum_Trade_ImageData_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Trade::Image + * @brief Class Magnum::Trade::ImageData */ #include "AbstractTexture.h" @@ -29,11 +29,11 @@ namespace Magnum { namespace Trade { Provides access to image data and additional information about data type and dimensions. */ -template class Image { - Image(const Image& other) = delete; - Image(Image&& other) = delete; - Image& operator=(const Image& other) = delete; - Image& operator=(Image&& other) = delete; +template class ImageData { + ImageData(const ImageData& other) = delete; + ImageData(ImageData&& other) = delete; + ImageData& operator=(const ImageData& other) = delete; + ImageData& operator=(ImageData&& other) = delete; public: const static size_t Dimensions = imageDimensions; /**< @brief %Image dimension count */ @@ -48,10 +48,10 @@ template class Image { * @attention Note that the image data are not copied on construction, * but they are deleted on class destruction. */ - template Image(const Math::Vector& dimensions, AbstractTexture::ColorFormat colorFormat, const T* data): _dimensions(dimensions), _colorFormat(colorFormat), _type(TypeTraits::TextureType>::glType()), _data(reinterpret_cast(data)) {} + template ImageData(const Math::Vector& dimensions, AbstractTexture::ColorFormat colorFormat, const T* data): _dimensions(dimensions), _colorFormat(colorFormat), _type(TypeTraits::TextureType>::glType()), _data(reinterpret_cast(data)) {} /** @brief Destructor */ - virtual ~Image() { delete[] _data; } + virtual ~ImageData() { delete[] _data; } /** @brief %Image dimensions */ inline const Math::Vector& dimensions() const { return _dimensions; } @@ -73,13 +73,13 @@ template class Image { }; /** @brief One-dimensional image */ -typedef Image<1> Image1D; +typedef ImageData<1> ImageData1D; /** @brief Two-dimensional image */ -typedef Image<2> Image2D; +typedef ImageData<2> ImageData2D; /** @brief Three-dimensional image */ -typedef Image<3> Image3D; +typedef ImageData<3> ImageData3D; }} diff --git a/src/Trade/Light.h b/src/Trade/LightData.h similarity index 65% rename from src/Trade/Light.h rename to src/Trade/LightData.h index f96dee289..2fc2119ef 100644 --- a/src/Trade/Light.h +++ b/src/Trade/LightData.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Trade_Light_h -#define Magnum_Trade_Light_h +#ifndef Magnum_Trade_LightData_h +#define Magnum_Trade_LightData_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Trade::Light + * @brief Class Magnum::Trade::LightData */ namespace Magnum { namespace Trade { @@ -24,11 +24,11 @@ namespace Magnum { namespace Trade { /** @brief %Light */ -class MAGNUM_EXPORT Light { - Light(const Light& other) = delete; - Light(Light&& other) = delete; - Light& operator=(const Light& other) = delete; - Light& operator=(Light&& other) = delete; +class MAGNUM_EXPORT LightData { + LightData(const LightData& other) = delete; + LightData(LightData&& other) = delete; + LightData& operator=(const LightData& other) = delete; + LightData& operator=(LightData&& other) = delete; }; }} diff --git a/src/Trade/Mesh.cpp b/src/Trade/MeshData.cpp similarity index 94% rename from src/Trade/Mesh.cpp rename to src/Trade/MeshData.cpp index 1396f66c0..8c51fd064 100644 --- a/src/Trade/Mesh.cpp +++ b/src/Trade/MeshData.cpp @@ -13,11 +13,11 @@ GNU Lesser General Public License version 3 for more details. */ -#include "Mesh.h" +#include "MeshData.h" namespace Magnum { namespace Trade { -Mesh::~Mesh() { +MeshData::~MeshData() { delete _indices; for(auto i: _vertices) delete i; for(auto i: _normals) delete i; diff --git a/src/Trade/Mesh.h b/src/Trade/MeshData.h similarity index 75% rename from src/Trade/Mesh.h rename to src/Trade/MeshData.h index 0b4ab26b7..dcab53dfb 100644 --- a/src/Trade/Mesh.h +++ b/src/Trade/MeshData.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Trade_Mesh_h -#define Magnum_Trade_Mesh_h +#ifndef Magnum_Trade_MeshData_h +#define Magnum_Trade_MeshData_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,10 +16,10 @@ */ /** @file - * @brief Class Magnum::Trade::Mesh + * @brief Class Magnum::Trade::MeshData */ -#include "../Mesh.h" +#include "Mesh.h" namespace Magnum { namespace Trade { @@ -29,11 +29,11 @@ namespace Magnum { namespace Trade { Provides access to mesh data and additional information, such as primitive type. */ -class MAGNUM_EXPORT Mesh { - Mesh(const Mesh& other) = delete; - Mesh(Mesh&& other) = delete; - Mesh& operator=(const Mesh& other) = delete; - Mesh& operator=(Mesh&& other) = delete; +class MAGNUM_EXPORT MeshData { + MeshData(const MeshData& other) = delete; + MeshData(MeshData&& other) = delete; + MeshData& operator=(const MeshData& other) = delete; + MeshData& operator=(MeshData&& other) = delete; public: /** @@ -46,13 +46,13 @@ class MAGNUM_EXPORT Mesh { * @param textureCoords2D Array with two-dimensional texture * coordinate arrays */ - inline Mesh(Magnum::Mesh::Primitive primitive, std::vector* indices, std::vector*> vertices, std::vector*> normals, std::vector*> textureCoords2D): _primitive(primitive), _indices(indices), _vertices(vertices), _normals(normals), _textureCoords2D(textureCoords2D) {} + inline MeshData(Mesh::Primitive primitive, std::vector* indices, std::vector*> vertices, std::vector*> normals, std::vector*> textureCoords2D): _primitive(primitive), _indices(indices), _vertices(vertices), _normals(normals), _textureCoords2D(textureCoords2D) {} /** @brief Destructor */ - ~Mesh(); + ~MeshData(); /** @brief Primitive */ - inline Magnum::Mesh::Primitive primitive() const { return _primitive; } + inline Mesh::Primitive primitive() const { return _primitive; } /** * @brief Indices @@ -88,13 +88,13 @@ class MAGNUM_EXPORT Mesh { /** * @brief 2D texture coordinates * @param id ID of texture coordinates array - * @return Texture coordinates or nullptr if there is no texture + * @return %Texture coordinates or nullptr if there is no texture * coordinates array with given ID. */ inline std::vector* textureCoords2D(size_t id) { return _textureCoords2D[id]; } private: - Magnum::Mesh::Primitive _primitive; + Mesh::Primitive _primitive; std::vector* _indices; std::vector*> _vertices, _normals; diff --git a/src/Trade/Object.h b/src/Trade/ObjectData.h similarity index 69% rename from src/Trade/Object.h rename to src/Trade/ObjectData.h index 4fc3ab7d0..7124150cd 100644 --- a/src/Trade/Object.h +++ b/src/Trade/ObjectData.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Trade_Object_h -#define Magnum_Trade_Object_h +#ifndef Magnum_Trade_ObjectData_h +#define Magnum_Trade_ObjectData_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Trade::Object + * @brief Class Magnum::Trade::ObjectData */ #include "Magnum.h" @@ -28,17 +28,17 @@ namespace Magnum { namespace Trade { Provides access to object transformation and hierarchy. */ -class MAGNUM_EXPORT Object { - Object(const Object& other) = delete; - Object(Object&& other) = delete; - Object& operator=(const Object& other) = delete; - Object& operator=(Object&& other) = delete; +class MAGNUM_EXPORT ObjectData { + ObjectData(const ObjectData& other) = delete; + ObjectData(ObjectData&& other) = delete; + ObjectData& operator=(const ObjectData& other) = delete; + ObjectData& operator=(ObjectData&& other) = delete; public: /** * @brief Constructor */ - Object(size_t parent, const Matrix4& transformation): _parent(parent), _transformation(transformation) {} + ObjectData(size_t parent, const Matrix4& transformation): _parent(parent), _transformation(transformation) {} /** @brief Parent object */ inline size_t parent() const { return _parent; } diff --git a/src/Trade/PhongMaterial.h b/src/Trade/PhongMaterialData.h similarity index 74% rename from src/Trade/PhongMaterial.h rename to src/Trade/PhongMaterialData.h index 50502a0a7..13d07ae63 100644 --- a/src/Trade/PhongMaterial.h +++ b/src/Trade/PhongMaterialData.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Trade_PhongMaterial_h -#define Magnum_Trade_PhongMaterial_h +#ifndef Magnum_Trade_PhongMaterialData_h +#define Magnum_Trade_PhongMaterialData_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,18 +16,18 @@ */ /** @file - * @brief Class Magnum::Trade::PhongMaterial + * @brief Class Magnum::Trade::PhongMaterialData */ #include "Magnum.h" -#include "AbstractMaterial.h" +#include "AbstractMaterialData.h" namespace Magnum { namespace Trade { /** @brief Phong material */ -class MAGNUM_EXPORT PhongMaterial: public AbstractMaterial { +class MAGNUM_EXPORT PhongMaterialData: public AbstractMaterialData { public: /** * @brief Constructor @@ -36,7 +36,7 @@ class MAGNUM_EXPORT PhongMaterial: public AbstractMaterial { * @param specularColor Specular color * @param shininess Shininess */ - PhongMaterial(const Vector3& ambientColor, const Vector3& diffuseColor, const Vector3& specularColor, GLfloat shininess): AbstractMaterial(Phong), _ambientColor(ambientColor), _diffuseColor(diffuseColor), _specularColor(specularColor), _shininess(shininess) {} + PhongMaterialData(const Vector3& ambientColor, const Vector3& diffuseColor, const Vector3& specularColor, GLfloat shininess): AbstractMaterialData(Phong), _ambientColor(ambientColor), _diffuseColor(diffuseColor), _specularColor(specularColor), _shininess(shininess) {} /** @brief Ambient color */ inline Vector3 ambientColor() const { return _ambientColor; } diff --git a/src/Trade/Scene.h b/src/Trade/SceneData.h similarity index 65% rename from src/Trade/Scene.h rename to src/Trade/SceneData.h index 7f488633d..358976f32 100644 --- a/src/Trade/Scene.h +++ b/src/Trade/SceneData.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Trade_Scene_h -#define Magnum_Trade_Scene_h +#ifndef Magnum_Trade_SceneData_h +#define Magnum_Trade_SceneData_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Trade::Scene + * @brief Class Magnum::Trade::SceneData */ namespace Magnum { namespace Trade { @@ -24,11 +24,11 @@ namespace Magnum { namespace Trade { /** @brief %Scene */ -class MAGNUM_EXPORT Scene { - Scene(const Scene& other) = delete; - Scene(Scene&& other) = delete; - Scene& operator=(const Scene& other) = delete; - Scene& operator=(Scene&& other) = delete; +class MAGNUM_EXPORT SceneData { + SceneData(const SceneData& other) = delete; + SceneData(SceneData&& other) = delete; + SceneData& operator=(const SceneData& other) = delete; + SceneData& operator=(SceneData&& other) = delete; }; }} diff --git a/src/Trade/Texture.h b/src/Trade/TextureData.h similarity index 64% rename from src/Trade/Texture.h rename to src/Trade/TextureData.h index eb3ec15a7..6d03b3ee5 100644 --- a/src/Trade/Texture.h +++ b/src/Trade/TextureData.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Trade_Texture_h -#define Magnum_Trade_Texture_h +#ifndef Magnum_Trade_TextureData_h +#define Magnum_Trade_TextureData_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Trade::Texture + * @brief Class Magnum::Trade::TextureData */ namespace Magnum { namespace Trade { @@ -24,11 +24,11 @@ namespace Magnum { namespace Trade { /** @brief %Texture */ -class MAGNUM_EXPORT Texture { - Texture(const Texture& other) = delete; - Texture(Texture&& other) = delete; - Texture& operator=(const Texture& other) = delete; - Texture& operator=(Texture&& other) = delete; +class MAGNUM_EXPORT TextureData { + TextureData(const TextureData& other) = delete; + TextureData(TextureData&& other) = delete; + TextureData& operator=(const TextureData& other) = delete; + TextureData& operator=(TextureData&& other) = delete; }; }}