LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

More code restructuring.

Browse Source 
Move all love.graphics functionality that doesn’t call OpenGL out of the OpenGL backend Graphics class.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-12-30 18:36:54 -04:00
parent d94b363b39
commit f12596dd19
38 changed files with 1603 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Mesh.h
+5 -21
View File
@@ -28,6 +28,7 @@
#include "common/StringMap.h"
#include "graphics/Drawable.h"
#include "graphics/Texture.h"
#include "graphics/vertex.h"
#include "GLBuffer.h"
// C++
@@ -52,15 +53,6 @@ public:
static love::Type type;
// The expected usage pattern of the Mesh's vertex data.
enum Usage
{
USAGE_STREAM,
USAGE_DYNAMIC,
USAGE_STATIC,
USAGE_MAX_ENUM
};
// How the Mesh's vertices are used when drawing.
// http://escience.anu.edu.au/lecture/cg/surfaceModeling/image/surfaceModeling015.png
enum DrawMode
@@ -87,11 +79,11 @@ public:
int components; // max 4
};
Mesh(const std::vector<AttribFormat> &vertexformat, const void *data, size_t datasize, DrawMode drawmode, Usage usage);
Mesh(const std::vector<AttribFormat> &vertexformat, int vertexcount, DrawMode drawmode, Usage usage);
Mesh(const std::vector<AttribFormat> &vertexformat, const void *data, size_t datasize, DrawMode drawmode, vertex::Usage usage);
Mesh(const std::vector<AttribFormat> &vertexformat, int vertexcount, DrawMode drawmode, vertex::Usage usage);
Mesh(const std::vector<Vertex> &vertices, DrawMode drawmode, Usage usage);
Mesh(int vertexcount, DrawMode drawmode, Usage usage);
Mesh(const std::vector<Vertex> &vertices, DrawMode drawmode, vertex::Usage usage);
Mesh(int vertexcount, DrawMode drawmode, vertex::Usage usage);
virtual ~Mesh();
@@ -202,11 +194,6 @@ public:
// Implements Drawable.
void draw(Graphics *gfx, const Matrix4 &m) override;
static GLenum getGLBufferUsage(Usage usage);
static bool getConstant(const char *in, Usage &out);
static bool getConstant(Usage in, const char *&out);
static bool getConstant(const char *in, DrawMode &out);
static bool getConstant(DrawMode in, const char *&out);
@@ -260,9 +247,6 @@ private:
StrongRef<Texture> texture;
static StringMap<Usage, USAGE_MAX_ENUM>::Entry usageEntries[];
static StringMap<Usage, USAGE_MAX_ENUM> usages;
static StringMap<DrawMode, DRAWMODE_MAX_ENUM>::Entry drawModeEntries[];
static StringMap<DrawMode, DRAWMODE_MAX_ENUM> drawModes;