Browse Source

Doc++

vectorfields
Vladimír Vondruš 14 years ago
parent
commit
c7894df33f
  1. 8
      src/Trade/Mesh.h
  2. 5
      src/Trade/Object.h

8
src/Trade/Mesh.h

@ -38,7 +38,13 @@ class MAGNUM_EXPORT Mesh {
public:
/**
* @brief Constructor
* @param primitive Primitive
* @param primitive Primitive
* @param indices Array with indices or 0, if this is not
* indexed mesh
* @param vertices Array with vertex arrays
* @param normals Array with normal arrays
* @param textureCoords2D Array with two-dimensional texture
* coordinate arrays
*/
inline Mesh(Magnum::Mesh::Primitive primitive, std::vector<unsigned int>* indices, std::vector<std::vector<Vector3>*> vertices, std::vector<std::vector<Vector3>*> normals, std::vector<std::vector<Vector2>*> textureCoords2D): _primitive(primitive), _indices(indices), _vertices(vertices), _normals(normals), _textureCoords2D(textureCoords2D) {}

5
src/Trade/Object.h

@ -28,7 +28,7 @@ namespace Magnum { namespace Trade {
Provides access to object transformation and hierarchy.
*/
struct MAGNUM_EXPORT Object {
class MAGNUM_EXPORT Object {
Object(const Object& other) = delete;
Object(Object&& other) = delete;
Object& operator=(const Object& other) = delete;
@ -40,7 +40,10 @@ struct MAGNUM_EXPORT Object {
*/
Object(size_t parent, const Matrix4& transformation): _parent(parent), _transformation(transformation) {}
/** @brief Parent object */
inline size_t parent() const { return _parent; }
/** @brief Transformation relative to parent */
inline size_t transformation() const { return _transformation; }
private:

Loading…
Cancel
Save