1
0
mirror of https://github.com/rwengine/openrw.git synced 2024-10-06 09:07:19 +02:00

Cleanup rwcore headers

This commit is contained in:
Filip Gawin 2018-12-09 23:06:02 +01:00
parent 1a7d4ac7e6
commit c03fbf79f8
6 changed files with 13 additions and 10 deletions

View File

@ -1,13 +1,11 @@
#ifndef _LIBRW_CLUMP_HPP_ #ifndef _LIBRW_CLUMP_HPP_
#define _LIBRW_CLUMP_HPP_ #define _LIBRW_CLUMP_HPP_
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include <vector> #include <vector>
#include <glm/glm.hpp>
#include <gl/gl_core_3_3.h>
#include <gl/DrawBuffer.hpp> #include <gl/DrawBuffer.hpp>
#include <gl/GeometryBuffer.hpp> #include <gl/GeometryBuffer.hpp>
#include <gl/TextureData.hpp> #include <gl/TextureData.hpp>

View File

@ -1,5 +1,6 @@
#ifndef _LIBRW_DRAWBUFFER_HPP_ #ifndef _LIBRW_DRAWBUFFER_HPP_
#define _LIBRW_DRAWBUFFER_HPP_ #define _LIBRW_DRAWBUFFER_HPP_
#include <gl/gl_core_3_3.h> #include <gl/gl_core_3_3.h>
class GeometryBuffer; class GeometryBuffer;
@ -9,7 +10,6 @@ class GeometryBuffer;
*/ */
class DrawBuffer { class DrawBuffer {
GLuint vao; GLuint vao;
GLenum facetype; GLenum facetype;
public: public:

View File

@ -1,6 +1,8 @@
#ifndef _LIBRW_GEOMETRYBUFFER_HPP_ #ifndef _LIBRW_GEOMETRYBUFFER_HPP_
#define _LIBRW_GEOMETRYBUFFER_HPP_ #define _LIBRW_GEOMETRYBUFFER_HPP_
#include <gl/gl_core_3_3.h> #include <gl/gl_core_3_3.h>
#include <vector> #include <vector>
/** /**

View File

@ -1,7 +1,8 @@
#ifndef _LIBRW_TEXTUREDATA_HPP_ #ifndef _LIBRW_TEXTUREDATA_HPP_
#define _LIBRW_TEXTUREDATA_HPP_ #define _LIBRW_TEXTUREDATA_HPP_
#include <gl/gl_core_3_3.h> #include <gl/gl_core_3_3.h>
#include <glm/glm.hpp> #include <glm/vec2.hpp>
#include <map> #include <map>
#include <memory> #include <memory>

View File

@ -2,7 +2,6 @@
#define _LIBRW_LOADERDFF_HPP_ #define _LIBRW_LOADERDFF_HPP_
#include <data/Clump.hpp> #include <data/Clump.hpp>
#include <gl/TextureData.hpp>
#include <rw/forward.hpp> #include <rw/forward.hpp>
#include <functional> #include <functional>

View File

@ -1,14 +1,17 @@
#ifndef _LIBRW_RWBINARYSTREAM_HPP_ #ifndef _LIBRW_RWBINARYSTREAM_HPP_
#define _LIBRW_RWBINARYSTREAM_HPP_ #define _LIBRW_RWBINARYSTREAM_HPP_
#include <cstdint>
#include <glm/glm.hpp>
#include <cstring>
#include <cstddef> #include <glm/gtc/type_precision.hpp>
#include <glm/mat3x3.hpp>
#include <glm/vec3.hpp>
#include "rw/debug.hpp" #include "rw/debug.hpp"
#include "rw/casts.hpp" #include "rw/casts.hpp"
#include <cstddef>
#include <cstdint>
#include <cstring>
/** /**
* @brief Class for working with RenderWare binary streams. * @brief Class for working with RenderWare binary streams.
* *