From 7af5ff17b6901c80680a6c665799672dc6760cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 27 Feb 2013 22:51:38 +0100 Subject: [PATCH] Trade: using new type aliases in whole Trade namespace. --- src/Trade/AbstractImporter.h | 170 +++++++++++++++++----------------- src/Trade/ImageData.h | 10 +- src/Trade/MeshData2D.h | 20 ++-- src/Trade/MeshData3D.h | 26 +++--- src/Trade/MeshObjectData2D.h | 6 +- src/Trade/MeshObjectData3D.h | 6 +- src/Trade/ObjectData2D.h | 12 +-- src/Trade/ObjectData3D.h | 12 +-- src/Trade/PhongMaterialData.h | 6 +- src/Trade/SceneData.h | 8 +- src/Trade/Trade.h | 4 +- 11 files changed, 140 insertions(+), 140 deletions(-) diff --git a/src/Trade/AbstractImporter.h b/src/Trade/AbstractImporter.h index 8bc77668f..b2c78dea5 100644 --- a/src/Trade/AbstractImporter.h +++ b/src/Trade/AbstractImporter.h @@ -105,10 +105,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * @note The function is not const, because the value will probably * be lazy-populated. */ - virtual inline std::int32_t defaultScene() { return -1; } + virtual inline Int defaultScene() { return -1; } /** @brief %Scene count */ - virtual inline std::uint32_t sceneCount() const { return 0; } + virtual inline UnsignedInt sceneCount() const { return 0; } /** * @brief %Scene ID for given name @@ -116,7 +116,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no scene for given name exists, returns -1. * @see sceneName() */ - virtual std::int32_t sceneForName(const std::string& name); + virtual Int sceneForName(const std::string& name); /** * @brief %Scene name @@ -124,7 +124,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see sceneForName() */ - virtual std::string sceneName(std::uint32_t id); + virtual std::string sceneName(UnsignedInt id); /** * @brief %Scene @@ -132,10 +132,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given scene or nullptr, if no such scene exists. */ - virtual SceneData* scene(std::uint32_t id); + virtual SceneData* scene(UnsignedInt id); /** @brief %Light count */ - virtual inline std::uint32_t lightCount() const { return 0; } + virtual inline UnsignedInt lightCount() const { return 0; } /** * @brief %Light ID for given name @@ -143,7 +143,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no light for given name exists, returns -1. * @see lightName() */ - virtual std::int32_t lightForName(const std::string& name); + virtual Int lightForName(const std::string& name); /** * @brief %Light name @@ -151,7 +151,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see lightForName() */ - virtual std::string lightName(std::uint32_t id); + virtual std::string lightName(UnsignedInt id); /** * @brief %Light @@ -159,10 +159,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given light or nullptr, if no such light exists. */ - virtual LightData* light(std::uint32_t id); + virtual LightData* light(UnsignedInt id); /** @brief Camera count */ - virtual inline std::uint32_t cameraCount() const { return 0; } + virtual inline UnsignedInt cameraCount() const { return 0; } /** * @brief Camera ID for given name @@ -170,7 +170,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no camera for given name exists, returns -1. * @see cameraName() */ - virtual std::int32_t cameraForName(const std::string& name); + virtual Int cameraForName(const std::string& name); /** * @brief Camera name @@ -178,7 +178,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see cameraForName() */ - virtual std::string cameraName(std::uint32_t id); + virtual std::string cameraName(UnsignedInt id); /** * @brief Camera @@ -187,10 +187,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * Returns pointer to given camera or nullptr, if no such camera * exists. */ - virtual CameraData* camera(std::uint32_t id); + virtual CameraData* camera(UnsignedInt id); /** @brief Two-dimensional object count */ - virtual inline std::uint32_t object2DCount() const { return 0; } + virtual inline UnsignedInt object2DCount() const { return 0; } /** * @brief Two-dimensional object ID for given name @@ -198,7 +198,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no scene for given name exists, returns -1. * @see object2DName() */ - virtual std::int32_t object2DForName(const std::string& name); + virtual Int object2DForName(const std::string& name); /** * @brief Two-dimensional object name @@ -206,7 +206,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see object2DForName() */ - virtual std::string object2DName(std::uint32_t id); + virtual std::string object2DName(UnsignedInt id); /** * @brief Two-dimensional object @@ -215,10 +215,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * Returns pointer to given object or nullptr, if no such object * exists. */ - virtual ObjectData2D* object2D(std::uint32_t id); + virtual ObjectData2D* object2D(UnsignedInt id); /** @brief Three-dimensional object count */ - virtual inline std::uint32_t object3DCount() const { return 0; } + virtual inline UnsignedInt object3DCount() const { return 0; } /** * @brief Three-dimensional object ID for given name @@ -226,7 +226,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no scene for given name exists, returns -1. * @see object3DName() */ - virtual std::int32_t object3DForName(const std::string& name); + virtual Int object3DForName(const std::string& name); /** * @brief Three-dimensional object name @@ -234,7 +234,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see object3DForName() */ - virtual std::string object3DName(std::uint32_t id); + virtual std::string object3DName(UnsignedInt id); /** * @brief Three-dimensional object @@ -243,10 +243,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * Returns pointer to given object or nullptr, if no such object * exists. */ - virtual ObjectData3D* object3D(std::uint32_t id); + virtual ObjectData3D* object3D(UnsignedInt id); /** @brief Two-dimensional mesh count */ - virtual inline std::uint32_t mesh2DCount() const { return 0; } + virtual inline UnsignedInt mesh2DCount() const { return 0; } /** * @brief Two-dimensional mesh ID for given name @@ -254,7 +254,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no mesh for given name exists, returns -1. * @see mesh2DName() */ - virtual std::int32_t mesh2DForName(const std::string& name); + virtual Int mesh2DForName(const std::string& name); /** * @brief Two-dimensional mesh name @@ -262,7 +262,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see mesh2DForName() */ - virtual std::string mesh2DName(std::uint32_t id); + virtual std::string mesh2DName(UnsignedInt id); /** * @brief Two-dimensional mesh @@ -270,10 +270,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given mesh or nullptr, if no such mesh exists. */ - virtual MeshData2D* mesh2D(std::uint32_t id); + virtual MeshData2D* mesh2D(UnsignedInt id); /** @brief Three-dimensional mesh count */ - virtual inline std::uint32_t mesh3DCount() const { return 0; } + virtual inline UnsignedInt mesh3DCount() const { return 0; } /** * @brief Three-dimensional mesh ID for given name @@ -281,7 +281,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no mesh for given name exists, returns -1. * @see mesh3DName() */ - virtual std::int32_t mesh3DForName(const std::string& name); + virtual Int mesh3DForName(const std::string& name); /** * @brief Three-dimensional mesh name @@ -289,7 +289,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see mesh3DForName() */ - virtual std::string mesh3DName(std::uint32_t id); + virtual std::string mesh3DName(UnsignedInt id); /** * @brief Three-dimensional mesh @@ -297,10 +297,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given mesh or nullptr, if no such mesh exists. */ - virtual MeshData3D* mesh3D(std::uint32_t id); + virtual MeshData3D* mesh3D(UnsignedInt id); /** @brief Material count */ - virtual inline std::uint32_t materialCount() const { return 0; } + virtual inline UnsignedInt materialCount() const { return 0; } /** * @brief Material ID for given name @@ -308,7 +308,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no material for given name exists, returns -1. * @see materialName() */ - virtual std::int32_t materialForName(const std::string& name); + virtual Int materialForName(const std::string& name); /** * @brief Material name @@ -316,7 +316,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see materialForName() */ - virtual std::string materialName(std::uint32_t id); + virtual std::string materialName(UnsignedInt id); /** * @brief Material @@ -325,10 +325,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * Returns pointer to given material or nullptr, if no such material * exists. */ - virtual AbstractMaterialData* material(std::uint32_t id); + virtual AbstractMaterialData* material(UnsignedInt id); /** @brief %Texture count */ - virtual inline std::uint32_t textureCount() const { return 0; } + virtual inline UnsignedInt textureCount() const { return 0; } /** * @brief %Texture ID for given name @@ -336,7 +336,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no texture for given name exists, returns -1. * @see textureName() */ - virtual std::int32_t textureForName(const std::string& name); + virtual Int textureForName(const std::string& name); /** * @brief %Texture name @@ -344,7 +344,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see textureForName() */ - virtual std::string textureName(std::uint32_t id); + virtual std::string textureName(UnsignedInt id); /** * @brief %Texture @@ -353,10 +353,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * Returns pointer to given texture or nullptr, if no such texture * exists. */ - virtual TextureData* texture(std::uint32_t id); + virtual TextureData* texture(UnsignedInt id); /** @brief One-dimensional image count */ - virtual inline std::uint32_t image1DCount() const { return 0; } + virtual inline UnsignedInt image1DCount() const { return 0; } /** * @brief One-dimensional image ID for given name @@ -364,7 +364,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no image for given name exists, returns -1. * @see image1Dname() */ - virtual std::int32_t image1DForName(const std::string& name); + virtual Int image1DForName(const std::string& name); /** * @brief One-dimensional image name @@ -372,7 +372,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see image1DForName() */ - virtual std::string image1DName(std::uint32_t id); + virtual std::string image1DName(UnsignedInt id); /** * @brief One-dimensional image @@ -380,10 +380,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given image or nullptr, if no such image exists. */ - virtual ImageData1D* image1D(std::uint32_t id); + virtual ImageData1D* image1D(UnsignedInt id); /** @brief Two-dimensional image count */ - virtual inline std::uint32_t image2DCount() const { return 0; } + virtual inline UnsignedInt image2DCount() const { return 0; } /** * @brief Two-dimensional image ID for given name @@ -391,7 +391,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no image for given name exists, returns -1. * @see image2DName() */ - virtual std::int32_t image2DForName(const std::string& name); + virtual Int image2DForName(const std::string& name); /** * @brief Two-dimensional image name @@ -399,7 +399,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see image2DForName() */ - virtual std::string image2DName(std::uint32_t id); + virtual std::string image2DName(UnsignedInt id); /** * @brief Two-dimensional image @@ -407,10 +407,10 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given image or nullptr, if no such image exists. */ - virtual ImageData2D* image2D(std::uint32_t id); + virtual ImageData2D* image2D(UnsignedInt id); /** @brief Three-dimensional image count */ - virtual inline std::uint32_t image3DCount() const { return 0; } + virtual inline UnsignedInt image3DCount() const { return 0; } /** * @brief Three-dimensional image ID for given name @@ -418,7 +418,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * If no image for given name exists, returns -1. * @see image3DName() */ - virtual std::int32_t image3DForName(const std::string& name); + virtual Int image3DForName(const std::string& name); /** * @brief Three-dimensional image name @@ -426,7 +426,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * @see image3DForName() */ - virtual std::string image3DName(std::uint32_t id); + virtual std::string image3DName(UnsignedInt id); /** * @brief Three-dimensional image @@ -434,7 +434,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { * * Returns pointer to given image or nullptr, if no such image exists. */ - virtual ImageData3D* image3D(std::uint32_t id); + virtual ImageData3D* image3D(UnsignedInt id); /*@}*/ }; @@ -442,42 +442,42 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { CORRADE_ENUMSET_OPERATORS(AbstractImporter::Features) /* Implementations for inline functions with unused parameters */ -inline std::int32_t AbstractImporter::sceneForName(const std::string&) { return -1; } -inline std::string AbstractImporter::sceneName(std::uint32_t) { return {}; } -inline SceneData* AbstractImporter::scene(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::lightForName(const std::string&) { return -1; } -inline std::string AbstractImporter::lightName(std::uint32_t) { return {}; } -inline LightData* AbstractImporter::light(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::cameraForName(const std::string&) { return -1; } -inline std::string AbstractImporter::cameraName(std::uint32_t) { return {}; } -inline CameraData* AbstractImporter::camera(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::object2DForName(const std::string&) { return -1; } -inline std::string AbstractImporter::object2DName(std::uint32_t) { return {}; } -inline ObjectData2D* AbstractImporter::object2D(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::object3DForName(const std::string&) { return -1; } -inline std::string AbstractImporter::object3DName(std::uint32_t) { return {}; } -inline ObjectData3D* AbstractImporter::object3D(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::mesh2DForName(const std::string&) { return -1; } -inline std::string AbstractImporter::mesh2DName(std::uint32_t) { return {}; } -inline MeshData2D* AbstractImporter::mesh2D(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::mesh3DForName(const std::string&) { return -1; } -inline std::string AbstractImporter::mesh3DName(std::uint32_t) { return {}; } -inline MeshData3D* AbstractImporter::mesh3D(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::materialForName(const std::string&) { return -1; } -inline std::string AbstractImporter::materialName(std::uint32_t) { return {}; } -inline AbstractMaterialData* AbstractImporter::material(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::textureForName(const std::string&) { return -1; } -inline std::string AbstractImporter::textureName(std::uint32_t) { return {}; } -inline TextureData* AbstractImporter::texture(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::image1DForName(const std::string&) { return -1; } -inline std::string AbstractImporter::image1DName(std::uint32_t) { return {}; } -inline ImageData1D* AbstractImporter::image1D(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::image2DForName(const std::string&) { return -1; } -inline std::string AbstractImporter::image2DName(std::uint32_t) { return {}; } -inline ImageData2D* AbstractImporter::image2D(std::uint32_t) { return nullptr; } -inline std::int32_t AbstractImporter::image3DForName(const std::string&) { return -1; } -inline std::string AbstractImporter::image3DName(std::uint32_t) { return {}; } -inline ImageData3D* AbstractImporter::image3D(std::uint32_t) { return nullptr; } +inline Int AbstractImporter::sceneForName(const std::string&) { return -1; } +inline std::string AbstractImporter::sceneName(UnsignedInt) { return {}; } +inline SceneData* AbstractImporter::scene(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::lightForName(const std::string&) { return -1; } +inline std::string AbstractImporter::lightName(UnsignedInt) { return {}; } +inline LightData* AbstractImporter::light(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::cameraForName(const std::string&) { return -1; } +inline std::string AbstractImporter::cameraName(UnsignedInt) { return {}; } +inline CameraData* AbstractImporter::camera(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::object2DForName(const std::string&) { return -1; } +inline std::string AbstractImporter::object2DName(UnsignedInt) { return {}; } +inline ObjectData2D* AbstractImporter::object2D(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::object3DForName(const std::string&) { return -1; } +inline std::string AbstractImporter::object3DName(UnsignedInt) { return {}; } +inline ObjectData3D* AbstractImporter::object3D(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::mesh2DForName(const std::string&) { return -1; } +inline std::string AbstractImporter::mesh2DName(UnsignedInt) { return {}; } +inline MeshData2D* AbstractImporter::mesh2D(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::mesh3DForName(const std::string&) { return -1; } +inline std::string AbstractImporter::mesh3DName(UnsignedInt) { return {}; } +inline MeshData3D* AbstractImporter::mesh3D(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::materialForName(const std::string&) { return -1; } +inline std::string AbstractImporter::materialName(UnsignedInt) { return {}; } +inline AbstractMaterialData* AbstractImporter::material(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::textureForName(const std::string&) { return -1; } +inline std::string AbstractImporter::textureName(UnsignedInt) { return {}; } +inline TextureData* AbstractImporter::texture(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::image1DForName(const std::string&) { return -1; } +inline std::string AbstractImporter::image1DName(UnsignedInt) { return {}; } +inline ImageData1D* AbstractImporter::image1D(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::image2DForName(const std::string&) { return -1; } +inline std::string AbstractImporter::image2DName(UnsignedInt) { return {}; } +inline ImageData2D* AbstractImporter::image2D(UnsignedInt) { return nullptr; } +inline Int AbstractImporter::image3DForName(const std::string&) { return -1; } +inline std::string AbstractImporter::image3DName(UnsignedInt) { return {}; } +inline ImageData3D* AbstractImporter::image3D(UnsignedInt) { return nullptr; } }} diff --git a/src/Trade/ImageData.h b/src/Trade/ImageData.h index bd41ecf74..d1c4d9094 100644 --- a/src/Trade/ImageData.h +++ b/src/Trade/ImageData.h @@ -32,9 +32,9 @@ Access to image data provided by AbstractImporter subclasses. Interchangeable with Image, ImageWrapper or BufferImage. @see ImageData1D, ImageData2D, ImageData3D */ -template class ImageData: public AbstractImage { +template class ImageData: public AbstractImage { public: - const static std::uint8_t Dimensions = dimensions; /**< @brief %Image dimension count */ + const static UnsignedInt Dimensions = dimensions; /**< @brief %Image dimension count */ /** * @brief Constructor @@ -46,20 +46,20 @@ template class ImageData: public AbstractImage { * Note that the image data are not copied on construction, but they * are deleted on class destruction. */ - inline ImageData(const typename DimensionTraits::VectorType& size, Format format, Type type, GLvoid* data): AbstractImage(format, type), _size(size), _data(reinterpret_cast(data)) {} + inline ImageData(const typename DimensionTraits::VectorType& size, Format format, Type type, GLvoid* data): AbstractImage(format, type), _size(size), _data(reinterpret_cast(data)) {} /** @brief Destructor */ inline ~ImageData() { delete[] _data; } /** @brief %Image size */ - inline typename DimensionTraits::VectorType size() const { return _size; } + inline typename DimensionTraits::VectorType size() const { return _size; } /** @brief Pointer to raw data */ inline void* data() { return _data; } inline const void* data() const { return _data; } /**< @overload */ private: - Math::Vector _size; + Math::Vector _size; char* _data; }; diff --git a/src/Trade/MeshData2D.h b/src/Trade/MeshData2D.h index 85f6ea7d3..08dbc9911 100644 --- a/src/Trade/MeshData2D.h +++ b/src/Trade/MeshData2D.h @@ -47,7 +47,7 @@ class MAGNUM_EXPORT MeshData2D { * @param textureCoords2D Array with two-dimensional texture * coordinate arrays or empty array */ - inline MeshData2D(Mesh::Primitive primitive, std::vector* indices, std::vector*> positions, std::vector*> textureCoords2D): _primitive(primitive), _indices(indices), _positions(positions), _textureCoords2D(textureCoords2D) {} + inline MeshData2D(Mesh::Primitive primitive, std::vector* indices, std::vector*> positions, std::vector*> textureCoords2D): _primitive(primitive), _indices(indices), _positions(positions), _textureCoords2D(textureCoords2D) {} /** @brief Move constructor */ MeshData2D(MeshData2D&&) = default; @@ -65,11 +65,11 @@ class MAGNUM_EXPORT MeshData2D { * @brief Indices * @return Indices or nullptr if the mesh is not indexed. */ - inline std::vector* indices() { return _indices; } - inline const std::vector* indices() const { return _indices; } /**< @overload */ + inline std::vector* indices() { return _indices; } + inline const std::vector* indices() const { return _indices; } /**< @overload */ /** @brief Count of vertex position arrays */ - inline std::uint32_t positionArrayCount() const { return _positions.size(); } + inline UnsignedInt positionArrayCount() const { return _positions.size(); } /** * @brief Positions @@ -77,11 +77,11 @@ class MAGNUM_EXPORT MeshData2D { * @return Positions or nullptr if there is no vertex array with given * ID. */ - inline std::vector* positions(std::uint32_t id) { return _positions[id]; } - inline const std::vector* positions(std::uint32_t id) const { return _positions[id]; } /**< @overload */ + inline std::vector* positions(UnsignedInt id) { return _positions[id]; } + inline const std::vector* positions(UnsignedInt id) const { return _positions[id]; } /**< @overload */ /** @brief Count of 2D texture coordinate arrays */ - inline std::uint32_t textureCoords2DArrayCount() const { return _textureCoords2D.size(); } + inline UnsignedInt textureCoords2DArrayCount() const { return _textureCoords2D.size(); } /** * @brief 2D texture coordinates @@ -89,12 +89,12 @@ class MAGNUM_EXPORT MeshData2D { * @return %Texture coordinates or nullptr if there is no texture * coordinates array with given ID. */ - inline std::vector* textureCoords2D(std::uint32_t id) { return _textureCoords2D[id]; } - inline const std::vector* textureCoords2D(std::uint32_t id) const { return _textureCoords2D[id]; } /**< @overload */ + inline std::vector* textureCoords2D(UnsignedInt id) { return _textureCoords2D[id]; } + inline const std::vector* textureCoords2D(UnsignedInt id) const { return _textureCoords2D[id]; } /**< @overload */ private: Mesh::Primitive _primitive; - std::vector* _indices; + std::vector* _indices; std::vector*> _positions; std::vector*> _textureCoords2D; }; diff --git a/src/Trade/MeshData3D.h b/src/Trade/MeshData3D.h index 17a1ac802..94c60def4 100644 --- a/src/Trade/MeshData3D.h +++ b/src/Trade/MeshData3D.h @@ -48,7 +48,7 @@ class MAGNUM_EXPORT MeshData3D { * @param textureCoords2D Array with two-dimensional texture * coordinate arrays or empty array */ - inline MeshData3D(Mesh::Primitive primitive, std::vector* indices, std::vector*> positions, std::vector*> normals, std::vector*> textureCoords2D): _primitive(primitive), _indices(indices), _positions(positions), _normals(normals), _textureCoords2D(textureCoords2D) {} + inline MeshData3D(Mesh::Primitive primitive, std::vector* indices, std::vector*> positions, std::vector*> normals, std::vector*> textureCoords2D): _primitive(primitive), _indices(indices), _positions(positions), _normals(normals), _textureCoords2D(textureCoords2D) {} /** @brief Move constructor */ MeshData3D(MeshData3D&&) = default; @@ -66,11 +66,11 @@ class MAGNUM_EXPORT MeshData3D { * @brief Indices * @return Indices or nullptr if the mesh is not indexed. */ - inline std::vector* indices() { return _indices; } - inline const std::vector* indices() const { return _indices; } /**< @overload */ + inline std::vector* indices() { return _indices; } + inline const std::vector* indices() const { return _indices; } /**< @overload */ /** @brief Count of vertex position arrays */ - inline std::uint32_t positionArrayCount() const { return _positions.size(); } + inline UnsignedInt positionArrayCount() const { return _positions.size(); } /** * @brief Positions @@ -78,11 +78,11 @@ class MAGNUM_EXPORT MeshData3D { * @return Positions or nullptr if there is no vertex array with given * ID. */ - inline std::vector* positions(std::uint32_t id) { return _positions[id]; } - inline const std::vector* positions(std::uint32_t id) const { return _positions[id]; } /**< @overload */ + inline std::vector* positions(UnsignedInt id) { return _positions[id]; } + inline const std::vector* positions(UnsignedInt id) const { return _positions[id]; } /**< @overload */ /** @brief Count of normal arrays */ - inline std::uint32_t normalArrayCount() const { return _normals.size(); } + inline UnsignedInt normalArrayCount() const { return _normals.size(); } /** * @brief Normals @@ -90,11 +90,11 @@ class MAGNUM_EXPORT MeshData3D { * @return Normals or nullptr if there is no normal array with given * ID. */ - inline std::vector* normals(std::uint32_t id) { return _normals[id]; } - inline const std::vector* normals(std::uint32_t id) const { return _normals[id]; } /**< @overload */ + inline std::vector* normals(UnsignedInt id) { return _normals[id]; } + inline const std::vector* normals(UnsignedInt id) const { return _normals[id]; } /**< @overload */ /** @brief Count of 2D texture coordinate arrays */ - inline std::uint32_t textureCoords2DArrayCount() const { return _textureCoords2D.size(); } + inline UnsignedInt textureCoords2DArrayCount() const { return _textureCoords2D.size(); } /** * @brief 2D texture coordinates @@ -102,12 +102,12 @@ class MAGNUM_EXPORT MeshData3D { * @return %Texture coordinates or nullptr if there is no texture * coordinates array with given ID. */ - inline std::vector* textureCoords2D(std::uint32_t id) { return _textureCoords2D[id]; } - inline const std::vector* textureCoords2D(std::uint32_t id) const { return _textureCoords2D[id]; } /**< @overload */ + inline std::vector* textureCoords2D(UnsignedInt id) { return _textureCoords2D[id]; } + inline const std::vector* textureCoords2D(UnsignedInt id) const { return _textureCoords2D[id]; } /**< @overload */ private: Mesh::Primitive _primitive; - std::vector* _indices; + std::vector* _indices; std::vector*> _positions; std::vector*> _normals; std::vector*> _textureCoords2D; diff --git a/src/Trade/MeshObjectData2D.h b/src/Trade/MeshObjectData2D.h index ac99eb223..14dabdd4e 100644 --- a/src/Trade/MeshObjectData2D.h +++ b/src/Trade/MeshObjectData2D.h @@ -45,13 +45,13 @@ class MeshObjectData2D: public ObjectData2D { * * Creates object with mesh instance type. */ - inline MeshObjectData2D(const std::vector& children, const Matrix4& transformation, std::uint32_t instance, std::uint32_t material): ObjectData2D(children, transformation, InstanceType::Mesh, instance), _material(material) {} + inline MeshObjectData2D(const std::vector& children, const Matrix4& transformation, UnsignedInt instance, UnsignedInt material): ObjectData2D(children, transformation, InstanceType::Mesh, instance), _material(material) {} /** @brief Material ID */ - inline std::uint32_t material() const { return _material; } + inline UnsignedInt material() const { return _material; } private: - std::uint32_t _material; + UnsignedInt _material; }; }} diff --git a/src/Trade/MeshObjectData3D.h b/src/Trade/MeshObjectData3D.h index 8c1f381a1..05dbf10e2 100644 --- a/src/Trade/MeshObjectData3D.h +++ b/src/Trade/MeshObjectData3D.h @@ -45,13 +45,13 @@ class MeshObjectData3D: public ObjectData3D { * * Creates object with mesh instance type. */ - inline MeshObjectData3D(const std::vector& children, const Matrix4& transformation, std::uint32_t instance, std::uint32_t material): ObjectData3D(children, transformation, InstanceType::Mesh, instance), _material(material) {} + inline MeshObjectData3D(const std::vector& children, const Matrix4& transformation, UnsignedInt instance, UnsignedInt material): ObjectData3D(children, transformation, InstanceType::Mesh, instance), _material(material) {} /** @brief Material ID */ - inline std::uint32_t material() const { return _material; } + inline UnsignedInt material() const { return _material; } private: - std::uint32_t _material; + UnsignedInt _material; }; }} diff --git a/src/Trade/ObjectData2D.h b/src/Trade/ObjectData2D.h index 40ae13a97..a40f305ce 100644 --- a/src/Trade/ObjectData2D.h +++ b/src/Trade/ObjectData2D.h @@ -54,20 +54,20 @@ class ObjectData2D { * @param instanceType Instance type * @param instanceId Instance ID */ - inline ObjectData2D(const std::vector& children, const Matrix3& transformation, InstanceType instanceType, std::uint32_t instanceId): _children(children), _transformation(transformation), _instanceType(instanceType), _instanceId(instanceId) {} + inline ObjectData2D(const std::vector& children, const Matrix3& transformation, InstanceType instanceType, UnsignedInt instanceId): _children(children), _transformation(transformation), _instanceType(instanceType), _instanceId(instanceId) {} /** * @brief Constructor for empty instance * @param children Child objects * @param transformation Transformation (relative to parent) */ - inline ObjectData2D(const std::vector& children, const Matrix3& transformation): _children(children), _transformation(transformation), _instanceType(InstanceType::Empty), _instanceId(-1) {} + inline ObjectData2D(const std::vector& children, const Matrix3& transformation): _children(children), _transformation(transformation), _instanceType(InstanceType::Empty), _instanceId(-1) {} /** @brief Destructor */ inline virtual ~ObjectData2D() {} /** @brief Child objects */ - inline std::vector& children() { return _children; } + inline std::vector& children() { return _children; } /** @brief Transformation (relative to parent) */ inline Matrix3 transformation() const { return _transformation; } @@ -86,13 +86,13 @@ class ObjectData2D { * @return ID of given camera / light / mesh etc., specified by * instanceType() */ - inline std::int32_t instanceId() const { return _instanceId; } + inline Int instanceId() const { return _instanceId; } private: - std::vector _children; + std::vector _children; Matrix3 _transformation; InstanceType _instanceType; - std::int32_t _instanceId; + Int _instanceId; }; /** @debugoperator{Magnum::Trade::ObjectData2D} */ diff --git a/src/Trade/ObjectData3D.h b/src/Trade/ObjectData3D.h index e6862cb52..3884c2a12 100644 --- a/src/Trade/ObjectData3D.h +++ b/src/Trade/ObjectData3D.h @@ -55,20 +55,20 @@ class ObjectData3D { * @param instanceType Instance type * @param instanceId Instance ID */ - inline ObjectData3D(const std::vector& children, const Matrix4& transformation, InstanceType instanceType, std::uint32_t instanceId): _children(children), _transformation(transformation), _instanceType(instanceType), _instanceId(instanceId) {} + inline ObjectData3D(const std::vector& children, const Matrix4& transformation, InstanceType instanceType, UnsignedInt instanceId): _children(children), _transformation(transformation), _instanceType(instanceType), _instanceId(instanceId) {} /** * @brief Constructor for empty instance * @param children Child objects * @param transformation Transformation (relative to parent) */ - inline ObjectData3D(const std::vector& children, const Matrix4& transformation): _children(children), _transformation(transformation), _instanceType(InstanceType::Empty), _instanceId(-1) {} + inline ObjectData3D(const std::vector& children, const Matrix4& transformation): _children(children), _transformation(transformation), _instanceType(InstanceType::Empty), _instanceId(-1) {} /** @brief Destructor */ inline virtual ~ObjectData3D() {} /** @brief Child objects */ - inline std::vector& children() { return _children; } + inline std::vector& children() { return _children; } /** @brief Transformation (relative to parent) */ inline Matrix4 transformation() const { return _transformation; } @@ -87,13 +87,13 @@ class ObjectData3D { * @return ID of given camera / light / mesh etc., specified by * instanceType() */ - inline std::int32_t instanceId() const { return _instanceId; } + inline Int instanceId() const { return _instanceId; } private: - std::vector _children; + std::vector _children; Matrix4 _transformation; InstanceType _instanceType; - std::int32_t _instanceId; + Int _instanceId; }; /** @debugoperator{Magnum::Trade::ObjectData3D} */ diff --git a/src/Trade/PhongMaterialData.h b/src/Trade/PhongMaterialData.h index f726f1c3b..3d80f83e1 100644 --- a/src/Trade/PhongMaterialData.h +++ b/src/Trade/PhongMaterialData.h @@ -37,7 +37,7 @@ class PhongMaterialData: public AbstractMaterialData { * @param specularColor Specular color * @param shininess Shininess */ - PhongMaterialData(const Vector3& ambientColor, const Vector3& diffuseColor, const Vector3& specularColor, GLfloat shininess): AbstractMaterialData(Phong), _ambientColor(ambientColor), _diffuseColor(diffuseColor), _specularColor(specularColor), _shininess(shininess) {} + PhongMaterialData(const Vector3& ambientColor, const Vector3& diffuseColor, const Vector3& specularColor, Float shininess): AbstractMaterialData(Phong), _ambientColor(ambientColor), _diffuseColor(diffuseColor), _specularColor(specularColor), _shininess(shininess) {} /** @brief Ambient color */ inline Vector3 ambientColor() const { return _ambientColor; } @@ -49,13 +49,13 @@ class PhongMaterialData: public AbstractMaterialData { inline Vector3 specularColor() const { return _specularColor; } /** @brief Shininess */ - inline GLfloat shininess() const { return _shininess; } + inline Float shininess() const { return _shininess; } private: Vector3 _ambientColor, _diffuseColor, _specularColor; - GLfloat _shininess; + Float _shininess; }; }} diff --git a/src/Trade/SceneData.h b/src/Trade/SceneData.h index 17ad448eb..acc962870 100644 --- a/src/Trade/SceneData.h +++ b/src/Trade/SceneData.h @@ -39,16 +39,16 @@ class MAGNUM_EXPORT SceneData { * @param children2D Two-dimensional child objects * @param children3D Three-dimensional child objects */ - inline SceneData(const std::vector& children2D, const std::vector& children3D): _children2D(children2D), _children3D(children3D) {} + inline SceneData(const std::vector& children2D, const std::vector& children3D): _children2D(children2D), _children3D(children3D) {} /** @brief Two-dimensional child objects */ - inline const std::vector& children2D() const { return _children2D; } + inline const std::vector& children2D() const { return _children2D; } /** @brief Three-dimensional child objects */ - inline const std::vector& children3D() const { return _children3D; } + inline const std::vector& children3D() const { return _children3D; } private: - std::vector _children2D, + std::vector _children2D, _children3D; }; diff --git a/src/Trade/Trade.h b/src/Trade/Trade.h index b629b96d8..5ac365db3 100644 --- a/src/Trade/Trade.h +++ b/src/Trade/Trade.h @@ -19,7 +19,7 @@ * @brief Forward declarations for Magnum::Trade namespace */ -#include +#include "Types.h" namespace Magnum { namespace Trade { @@ -29,7 +29,7 @@ class AbstractImporter; class AbstractMaterialData; class CameraData; -template class ImageData; +template class ImageData; typedef ImageData<1> ImageData1D; typedef ImageData<2> ImageData2D; typedef ImageData<3> ImageData3D;