api: more modular helper functions;

src/api.h

@@ -1,11 +1,4 @@
 #include "luax.h"
-#include "data/blob.h"
-#include "event/event.h"
-#include "graphics/canvas.h"
-#include "graphics/mesh.h"
-#include "math/math.h"
-#include "math/randomGenerator.h"
-#include "physics/physics.h"
 
 // Module loaders
 int l_lovrInit(lua_State* L);
@@ -104,22 +97,3 @@ extern const char* UniformAccesses[];
 extern const char* VerticalAligns[];
 extern const char* Windings[];
 extern const char* WrapModes[];
-
-// Shared helpers
-int luax_loadvertices(lua_State* L, int index, VertexFormat* format, VertexPointer vertices);
-bool luax_checkvertexformat(lua_State* L, int index, VertexFormat* format);
-int luax_pushvertexformat(lua_State* L, VertexFormat* format);
-int luax_pushvertexattribute(lua_State* L, VertexPointer* vertex, Attribute attribute);
-int luax_pushvertex(lua_State* L, VertexPointer* vertex, VertexFormat* format);
-void luax_setvertexattribute(lua_State* L, int index, VertexPointer* vertex, Attribute attribute);
-void luax_setvertex(lua_State* L, int index, VertexPointer* vertex, VertexFormat* format);
-int luax_readtransform(lua_State* L, int index, mat4 transform, int scaleComponents);
-Blob* luax_readblob(lua_State* L, int index, const char* debug);
-Seed luax_checkrandomseed(lua_State* L, int index);
-void luax_checkvariant(lua_State* L, int index, Variant* variant);
-int luax_pushvariant(lua_State* L, Variant* variant);
-int luax_checkuniform(lua_State* L, int index, const Uniform* uniform, void* dest, const char* debug);
-void luax_checkuniformtype(lua_State* L, int index, UniformType* baseType, int* components);
-int luax_optmipmap(lua_State* L, int index, Texture* texture);
-Texture* luax_checktexture(lua_State* L, int index);
-void luax_readattachments(lua_State* L, int index, Attachment* attachments, int* count);

src/api/data.c

@@ -1,4 +1,5 @@
 #include "api.h"
+#include "api/data.h"
 #include "data/audioStream.h"
 #include "data/modelData.h"
 #include "data/rasterizer.h"

src/api/data.h

@@ -0,0 +1,11 @@
+#include "data/blob.h"
+#include "data/vertexData.h"
+
+int luax_loadvertices(lua_State* L, int index, VertexFormat* format, VertexPointer vertices);
+bool luax_checkvertexformat(lua_State* L, int index, VertexFormat* format);
+int luax_pushvertexformat(lua_State* L, VertexFormat* format);
+int luax_pushvertexattribute(lua_State* L, VertexPointer* vertex, Attribute attribute);
+int luax_pushvertex(lua_State* L, VertexPointer* vertex, VertexFormat* format);
+void luax_setvertexattribute(lua_State* L, int index, VertexPointer* vertex, Attribute attribute);
+void luax_setvertex(lua_State* L, int index, VertexPointer* vertex, VertexFormat* format);
+Blob* luax_readblob(lua_State* L, int index, const char* debug);

src/api/event.c

@@ -1,4 +1,5 @@
 #include "api.h"
+#include "api/event.h"
 #include "event/event.h"
 
 const char* EventTypes[] = {

src/api/event.h

@@ -0,0 +1,4 @@
+#include "event/event.h"
+
+void luax_checkvariant(lua_State* L, int index, Variant* variant);
+int luax_pushvariant(lua_State* L, Variant* variant);

src/api/graphics.c

@@ -1,4 +1,6 @@
 #include "api.h"
+#include "api/data.h"
+#include "api/graphics.h"
 #include "graphics/graphics.h"
 #include "graphics/animator.h"
 #include "graphics/canvas.h"

src/api/graphics.h

@@ -0,0 +1,9 @@
+#include "graphics/canvas.h"
+#include "graphics/shader.h"
+#include "graphics/texture.h"
+
+int luax_checkuniform(lua_State* L, int index, const Uniform* uniform, void* dest, const char* debug);
+void luax_checkuniformtype(lua_State* L, int index, UniformType* baseType, int* components);
+int luax_optmipmap(lua_State* L, int index, Texture* texture);
+Texture* luax_checktexture(lua_State* L, int index);
+void luax_readattachments(lua_State* L, int index, Attachment* attachments, int* count);

src/api/math.c

@@ -1,4 +1,5 @@
 #include "api.h"
+#include "api/math.h"
 #include "math/math.h"
 #include "math/mat4.h"
 #include "math/quat.h"

src/api/math.h

@@ -0,0 +1,5 @@
+#include "math/mat4.h"
+#include "math/randomGenerator.h"
+
+int luax_readtransform(lua_State* L, int index, mat4 transform, int scaleComponents);
+Seed luax_checkrandomseed(lua_State* L, int index);

src/api/types/channel.c

@@ -1,4 +1,5 @@
 #include "api.h"
+#include "api/event.h"
 #include "thread/channel.h"
 
 static void luax_checktimeout(lua_State* L, int index, double* timeout) {

src/api/types/mesh.c

@@ -1,4 +1,5 @@
 #include "api.h"
+#include "api/data.h"
 #include "graphics/graphics.h"
 #include <limits.h>
 

src/api/types/randomGenerator.c

@@ -1,5 +1,7 @@
 #include "api.h"
+#include "api/math.h"
 #include "math/randomGenerator.h"
+#include <math.h>
 
 static double luax_checkrandomseedpart(lua_State* L, int index) {
   double x = luaL_checknumber(L, index);

src/api/types/shader.c

@@ -1,4 +1,5 @@
 #include "api.h"
+#include "api/graphics.h"
 #include "graphics/shader.h"
 #include "math/transform.h"
 

src/api/types/shaderBlock.c

@@ -1,4 +1,5 @@
 #include "api.h"
+#include "api/graphics.h"
 #include "graphics/shader.h"
 #include "math/transform.h"
 

src/api/types/vertexData.c

@@ -1,4 +1,5 @@
 #include "api.h"
+#include "api/data.h"
 
 int luax_loadvertices(lua_State* L, int index, VertexFormat* format, VertexPointer vertices) {
   uint32_t count = lua_objlen(L, index);