OBJ.hpp   OBJ.hpp 
skipping to change at line 338 skipping to change at line 338
QVector<StelModel> m_stelModels; QVector<StelModel> m_stelModels;
QVector<Material> m_materials; QVector<Material> m_materials;
QVector<Vertex> m_vertexArray; QVector<Vertex> m_vertexArray;
QVector<unsigned int> m_indexArray; QVector<unsigned int> m_indexArray;
//! OpenGL objects //! OpenGL objects
QOpenGLBuffer m_vertexBuffer; QOpenGLBuffer m_vertexBuffer;
QOpenGLBuffer m_indexBuffer; QOpenGLBuffer m_indexBuffer;
QOpenGLVertexArrayObject* m_vertexArrayObject; QOpenGLVertexArrayObject* m_vertexArrayObject;
static QOpenGLFunctions* gl;
//! Heightmap //! Heightmap
friend class Heightmap; friend class Heightmap;
}; };
inline OBJ::Material& OBJ::getMaterial(int i) { return m_materials[i]; } inline OBJ::Material& OBJ::getMaterial(int i) { return m_materials[i]; }
inline const OBJ::StelModel& OBJ::getStelModel(int i) const { return m_stel Models[i]; } inline const OBJ::StelModel& OBJ::getStelModel(int i) const { return m_stel Models[i]; }
inline int OBJ::getNumberOfIndices() const { return m_numberOfTriangles * 3 ; } inline int OBJ::getNumberOfIndices() const { return m_numberOfTriangles * 3 ; }
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/