X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2F3dgfx.h;h=2a82284b7a3dfcccebf1d33f6f4b725870c3ac7c;hp=68d0783ace5b50cb925453326bf0f7628ed555b3;hb=45f6f46fe758d15aafccdb69ae837fc7d84ee466;hpb=90a1ba8903eed9e3d4b17f4b56cd02ed801dd8b6

diff --git a/src/3dgfx.h b/src/3dgfx.h
index 68d0783..2a82284 100644
--- a/src/3dgfx.h
+++ b/src/3dgfx.h
@@ -1,11 +1,13 @@
 #ifndef THREEDGFX_H_
 #define THREEDGFX_H_
 
+#include "inttypes.h"
+
 struct g3d_vertex {
 	float x, y, z, w;
 	float nx, ny, nz;
 	float u, v;
-	unsigned char r, g, b;
+	unsigned char r, g, b, a;
 };
 
 enum {
@@ -17,10 +19,16 @@ enum {
 
 /* g3d_enable/g3d_disable bits */
 enum {
-	G3D_CULL_FACE = 1,
-	G3D_DEPTH_TEST = 2,	/* XXX not implemented */
-	G3D_LIGHTING = 4,
-	G3D_TEXTURE = 8,
+	G3D_CULL_FACE	= 0x0001,
+	G3D_DEPTH_TEST	= 0x0002,	/* XXX not implemented */
+	G3D_LIGHTING	= 0x0004,
+	G3D_LIGHT0		= 0x0008,
+	G3D_LIGHT1		= 0x0010,
+	G3D_LIGHT2		= 0x0020,
+	G3D_LIGHT3		= 0x0040,
+	G3D_TEXTURE		= 0x0080,
+	G3D_BLEND		= 0x0100,
+	G3D_TEXTURE_GEN	= 0x0200,
 
 	G3D_ALL = 0x7fffffff
 };
@@ -28,6 +36,15 @@ enum {
 /* arg to g3d_front_face */
 enum { G3D_CCW, G3D_CW };
 
+/* arg to g3d_polygon_mode */
+enum {
+	G3D_WIRE,
+	G3D_FLAT,
+	G3D_GOURAUD,
+	G3D_TEX,
+	G3D_TEX_GOURAUD
+};
+
 /* matrix stacks */
 enum {
 	G3D_MODELVIEW,
@@ -40,6 +57,7 @@ int g3d_init(void);
 void g3d_destroy(void);
 
 void g3d_framebuffer(int width, int height, void *pixels);
+void g3d_viewport(int x, int y, int w, int h);
 
 void g3d_enable(unsigned int opt);
 void g3d_disable(unsigned int opt);
@@ -47,6 +65,7 @@ void g3d_setopt(unsigned int opt, unsigned int mask);
 unsigned int g3d_getopt(unsigned int mask);
 
 void g3d_front_face(unsigned int order);
+void g3d_polygon_mode(int pmode);
 
 void g3d_matrix_mode(int mmode);
 
@@ -63,10 +82,33 @@ void g3d_ortho(float left, float right, float bottom, float top, float znear, fl
 void g3d_frustum(float left, float right, float bottom, float top, float znear, float zfar);
 void g3d_perspective(float vfov, float aspect, float znear, float zfar);
 
+/* returns pointer to the *internal* matrix, and if argument m is not null,
+ * also copies the internal matrix there. */
 const float *g3d_get_matrix(int which, float *m);
 
+void g3d_light_pos(int idx, float x, float y, float z);
+void g3d_light_color(int idx, float r, float g, float b);
+
+void g3d_light_ambient(float r, float g, float b);
+
+void g3d_mtl_diffuse(float r, float g, float b);
+void g3d_mtl_specular(float r, float g, float b);
+void g3d_mtl_shininess(float shin);
+
+void g3d_set_texture(int xsz, int ysz, void *pixels);
+
 void g3d_draw(int prim, const struct g3d_vertex *varr, int varr_size);
 void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
-		const int16_t *iarr, int iarr_size);
+		const uint16_t *iarr, int iarr_size);
+
+void g3d_begin(int prim);
+void g3d_end(void);
+void g3d_vertex(float x, float y, float z);
+void g3d_normal(float x, float y, float z);
+void g3d_color3b(unsigned char r, unsigned char g, unsigned char b);
+void g3d_color4b(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+void g3d_color3f(float r, float g, float b);
+void g3d_color4f(float r, float g, float b, float a);
+void g3d_texcoord(float u, float v);
 
 #endif	/* THREEDGFX_H_ */