ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

MeshData: use four-component vectors for vertices. 

Don't trade usability for space efficiency.
pull/279/head
Vladimír Vondruš 14 years ago
parent
5306d46b49
commit
c1158e0995
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/Trade/MeshData.h

8
src/Trade/MeshData.h
Unescape View File

@ -46,7 +46,7 @@ class MAGNUM_EXPORT MeshData {
* @param textureCoords2D Array with two-dimensional texture * @param textureCoords2D Array with two-dimensional texture
* coordinate arrays * coordinate arrays
*/ */
inline MeshData(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) {} inline MeshData(Mesh::Primitive primitive, std::vector<unsigned int>* indices, std::vector<std::vector<Vector4>*> vertices, std::vector<std::vector<Vector3>*> normals, std::vector<std::vector<Vector2>*> textureCoords2D): _primitive(primitive), _indices(indices), _vertices(vertices), _normals(normals), _textureCoords2D(textureCoords2D) {}
/** @brief Destructor */ /** @brief Destructor */
~MeshData(); ~MeshData();
@ -69,7 +69,7 @@ class MAGNUM_EXPORT MeshData {
* @return Vertices or nullptr if there is no vertex array with given * @return Vertices or nullptr if there is no vertex array with given
* ID. * ID.
*/ */
inline std::vector<Vector3>* vertices(size_t id) { return _vertices[id]; } inline std::vector<Vector4>* vertices(size_t id) { return _vertices[id]; }
/** @brief Count of normal arrays */ /** @brief Count of normal arrays */
inline size_t normalArrayCount() { return _normals.size(); }; inline size_t normalArrayCount() { return _normals.size(); };
@ -96,8 +96,8 @@ class MAGNUM_EXPORT MeshData {
private: private:
Mesh::Primitive _primitive; Mesh::Primitive _primitive;
std::vector<unsigned int>* _indices; std::vector<unsigned int>* _indices;
std::vector<std::vector<Vector3>*> _vertices, std::vector<std::vector<Vector4>*> _vertices;
_normals; std::vector<std::vector<Vector3>*> _normals;
std::vector<std::vector<Vector2>*> _textureCoords2D; std::vector<std::vector<Vector2>*> _textureCoords2D;
}; };

Write Preview
Loading…
Cancel
Save