summaryrefslogtreecommitdiffstats
path: root/zoom/types.h
diff options
context:
space:
mode:
Diffstat (limited to 'zoom/types.h')
-rw-r--r--zoom/types.h28
1 files changed, 3 insertions, 25 deletions
diff --git a/zoom/types.h b/zoom/types.h
index 1fce68b..51dc259 100644
--- a/zoom/types.h
+++ b/zoom/types.h
@@ -1,7 +1,7 @@
-#ifndef GAME_TYPES_H
-#define GAME_TYPES_H
+#ifndef ZOOM_TYPES_H
+#define ZOOM_TYPES_H
-#include <GL/gl.h>
+#include <neofx/types.h>
#define TRIANGLE_UNKNOWN 0
#define TRIANGLE_WALL 1
@@ -22,28 +22,6 @@
#define STATE_CLOSING 4
#pragma pack(push, 2)
-typedef union _MATRIX {
- float m[4][4];
- float f[16];
-} MATRIX;
-
-typedef struct _VECTOR_VERTEX {
- float x, y, z;
-} VECTOR, VERTEX;
-
-typedef struct _TEXCOORDS {
- float s, t;
-} TEXCOORDS;
-
-typedef struct _TRIANGLE {
- unsigned char type;
- unsigned char visible;
- VERTEX vertices[3];
- VECTOR normal;
- int texture;
- TEXCOORDS texcoords[3];
-} TRIANGLE;
-
typedef struct _OBJECT {
unsigned char type;
unsigned char visible;