make compilable after latest change

Makefile.common

@@ -24,8 +24,8 @@ MODULES += \
 	engine/imuse \
 	engine/lua \
 	engine/smush \
-	engine/tinygl \
 	common \
+	graphics \
 	mixer
 
 

engine/gfx_tinygl.cpp

@@ -34,8 +34,8 @@
 #include "engine/vector3d.h"
 #include "engine/gfx_tinygl.h"
 
-#include "engine/tinygl/gl.h"
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/gl.h"
+#include "graphics/tinygl/zgl.h"
 
 // below funcs lookAt, transformPoint and tgluProject are from Mesa glu sources
 static void lookAt(TGLfloat eyex, TGLfloat eyey, TGLfloat eyez, TGLfloat centerx,

engine/gfx_tinygl.h

@@ -35,8 +35,8 @@
 #include "engine/vector3d.h"
 #include "engine/gfx_base.h"
 
-#include "engine/tinygl/gl.h"
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/gl.h"
+#include "graphics/tinygl/zgl.h"
 
 class GfxTinyGL : public GfxBase {
 public:

graphics/module.mk

@@ -1,27 +1,27 @@
-MODULE := engine/tinygl
+MODULE := graphics
 
 MODULE_OBJS := \
-	api.o \
-	arrays.o \
-	clear.o \
-	clip.o \
-	get.o \
-	image_util.o \
-	init.o \
-	light.o \
-	list.o \
-	matrix.o \
-	memory.o \
-	misc.o \
-	select.o \
-	specbuf.o \
-	texture.o \
-	vertex.o \
-	zbuffer.o \
-	zline.o \
-	zmath.o \
-	ztriangle.o \
-	ztriangle_shadow.o
+	tinygl/api.o \
+	tinygl/arrays.o \
+	tinygl/clear.o \
+	tinygl/clip.o \
+	tinygl/get.o \
+	tinygl/image_util.o \
+	tinygl/init.o \
+	tinygl/light.o \
+	tinygl/list.o \
+	tinygl/matrix.o \
+	tinygl/memory.o \
+	tinygl/misc.o \
+	tinygl/select.o \
+	tinygl/specbuf.o \
+	tinygl/texture.o \
+	tinygl/vertex.o \
+	tinygl/zbuffer.o \
+	tinygl/zline.o \
+	tinygl/zmath.o \
+	tinygl/ztriangle.o \
+	tinygl/ztriangle_shadow.o
 
 # Include common rules
 include $(srcdir)/rules.mk

graphics/tinygl/api.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 // glVertex
 

graphics/tinygl/arrays.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 #define VERTEX_ARRAY	0x0001
 #define COLOR_ARRAY		0x0002

graphics/tinygl/clear.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 void glopClearColor(GLContext *c, TGLParam *p) {
 	c->clear_color.v[0] = p[1].f;

graphics/tinygl/clip.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 // fill triangle profile
 // #define TINYGL_PROFILE

graphics/tinygl/get.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 void tglGetIntegerv(int pname,int *params) {
 	GLContext *c=gl_get_context();

graphics/tinygl/image_util.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 // image conversion
 

graphics/tinygl/init.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 GLContext *gl_ctx;
 

graphics/tinygl/light.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 void glopMaterial(GLContext *c, TGLParam *p) {
 	int mode = p[1].i;

graphics/tinygl/list.cpp

@@ -1,22 +1,22 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 static const char *op_table_str[] = {
 #define ADD_OP(a, b, c) "gl" #a " " #c,
 
-#include "engine/tinygl/opinfo.h"
+#include "graphics/tinygl/opinfo.h"
 };
 
 static void (*op_table_func[])(GLContext *, TGLParam *) = {
 #define ADD_OP(a, b, c) glop ## a ,
 
-#include "engine/tinygl/opinfo.h"
+#include "graphics/tinygl/opinfo.h"
 };
 
 static int op_table_size[] = {
 #define ADD_OP(a, b, c) b + 1 ,
 
-#include "engine/tinygl/opinfo.h"
+#include "graphics/tinygl/opinfo.h"
 };
 
 GLContext *gl_get_context() {

graphics/tinygl/matrix.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 void gl_print_matrix(const float *m) {
 	int i;

graphics/tinygl/memory.cpp

@@ -1,7 +1,7 @@
 
 // Memory allocator for TinyGL
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 // modify these functions so that they suit your needs
 

graphics/tinygl/misc.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 void glopViewport(GLContext *c, TGLParam *p) {
 	int xsize, ysize, xmin, ymin, xsize_req, ysize_req;

graphics/tinygl/select.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 int glRenderMode(int mode) {
 	GLContext *c = gl_get_context();

graphics/tinygl/specbuf.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 static void calc_buf(GLSpecBuf *buf, const float shininess) {
 	int i;

graphics/tinygl/texture.cpp

@@ -1,7 +1,7 @@
 
 // Texture Manager
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 static GLTexture *find_texture(GLContext *c, int h) {
 	GLTexture *t;

graphics/tinygl/vertex.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zgl.h"
+#include "graphics/tinygl/zgl.h"
 
 #include <string.h>
 

graphics/tinygl/zbuffer.cpp

@@ -6,7 +6,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "engine/tinygl/zbuffer.h"
+#include "graphics/tinygl/zbuffer.h"
 
 ZBuffer *ZB_open(int xsize, int ysize, int mode, void *frame_buffer) {
 	ZBuffer *zb;

graphics/tinygl/zgl.h

@@ -3,15 +3,15 @@
 
 #include "common/debug.h"
 
-#include "engine/tinygl/gl.h"
-#include "engine/tinygl/zbuffer.h"
-#include "engine/tinygl/zmath.h"
+#include "graphics/tinygl/gl.h"
+#include "graphics/tinygl/zbuffer.h"
+#include "graphics/tinygl/zmath.h"
 
 enum {
 
 #define ADD_OP(a,b,c) OP_ ## a ,
 
-#include "engine/tinygl/opinfo.h"
+#include "graphics/tinygl/opinfo.h"
 
 	DUMMY
 };

graphics/tinygl/zline.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zbuffer.h"
+#include "graphics/tinygl/zbuffer.h"
 
 #define ZCMP(z,zpix) ((z) >= (zpix))
 
@@ -21,24 +21,24 @@ void ZB_plot(ZBuffer * zb, ZBufferPoint * p) {
 
 #define INTERP_Z
 static void ZB_line_flat_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2, int color) {
-#include "engine/tinygl/zline.h"
+#include "graphics/tinygl/zline.h"
 }
 
 // line with color interpolation
 #define INTERP_Z
 #define INTERP_RGB
 static void ZB_line_interp_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) {
-#include "engine/tinygl/zline.h"
+#include "graphics/tinygl/zline.h"
 }
 
 // no Z interpolation
 static void ZB_line_flat(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2, int color) {
-#include "engine/tinygl/zline.h"
+#include "graphics/tinygl/zline.h"
 }
 
 #define INTERP_RGB
 static void ZB_line_interp(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) {
-#include "engine/tinygl/zline.h"
+#include "graphics/tinygl/zline.h"
 }
 
 void ZB_line_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) {

graphics/tinygl/zmath.cpp

@@ -5,7 +5,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "engine/tinygl/zmath.h"
+#include "graphics/tinygl/zmath.h"
 
 void gl_M4_Id(M4 *a) {
 	int i, j;

graphics/tinygl/ztriangle.cpp

@@ -1,7 +1,7 @@
 
 #include <stdlib.h>
 
-#include "engine/tinygl/zbuffer.h"
+#include "graphics/tinygl/zbuffer.h"
 
 #define ZCMP(z, zpix) ((z) >= (zpix))
 
@@ -23,7 +23,7 @@ void ZB_fillTriangleFlat(ZBuffer *zb, ZBufferPoint *p0, ZBufferPoint *p1, ZBuffe
 	z += dzdx;								\
 }
 
-#include "engine/tinygl/ztriangle.h"
+#include "graphics/tinygl/ztriangle.h"
 }
 
 // Smooth filled triangle.
@@ -88,7 +88,7 @@ void ZB_fillTriangleSmooth(ZBuffer *zb, ZBufferPoint *p0, ZBufferPoint *p1, ZBuf
 	}												\
 }
 
-#include "engine/tinygl/ztriangle.h"
+#include "graphics/tinygl/ztriangle.h"
 }
 
 void ZB_setTexture(ZBuffer *zb, PIXEL *texture) {
@@ -116,7 +116,7 @@ void ZB_fillTriangleMapping(ZBuffer *zb, ZBufferPoint *p0, ZBufferPoint *p1, ZBu
 	t += dtdx;								\
 }
 
-#include "engine/tinygl/ztriangle.h"
+#include "graphics/tinygl/ztriangle.h"
 }
 
 void ZB_fillTriangleMappingPerspective(ZBuffer *zb, ZBufferPoint *p0, ZBufferPoint *p1, ZBufferPoint *p2) {

graphics/tinygl/ztriangle_shadow.cpp

@@ -1,5 +1,5 @@
 
-#include "engine/tinygl/zbuffer.h"
+#include "graphics/tinygl/zbuffer.h"
 
 #define ZCMP(z, zpix) ((z) >= (zpix))