From 16dca7381bb37a7304fa29d553a73a068e2fe431 Mon Sep 17 00:00:00 2001
From: neoraider <devnull@localhost>
Date: Fri, 22 Apr 2005 19:51:02 +0000
Subject: Libneofx von Libzoom abgespalten

---
 zoom/collision.h | 11 -----------
 zoom/init.h      |  4 ++--
 zoom/level.h     |  4 ++--
 zoom/math.h      | 21 ---------------------
 zoom/player.h    |  4 ++--
 zoom/render.h    |  4 ++--
 zoom/texture.h   |  4 ++--
 zoom/types.h     | 28 +++-------------------------
 8 files changed, 13 insertions(+), 67 deletions(-)
 delete mode 100644 zoom/collision.h
 delete mode 100644 zoom/math.h

(limited to 'zoom')

diff --git a/zoom/collision.h b/zoom/collision.h
deleted file mode 100644
index 6d35079..0000000
--- a/zoom/collision.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef GAME_COLLISION_H
-#define GAME_COLLISION_H
-
-#include "types.h"
-
-int CollisionPointTriangle(VERTEX, TRIANGLE);
-int CollisionRayTriangle(VERTEX, VECTOR,  TRIANGLE, float*);
-int CollisionSphereTriangle(VERTEX, float,TRIANGLE);
-int CollisionMovingSphereTriangle(VERTEX, float, VECTOR, float, TRIANGLE);
-
-#endif
diff --git a/zoom/init.h b/zoom/init.h
index 482102d..ceeffbe 100644
--- a/zoom/init.h
+++ b/zoom/init.h
@@ -1,5 +1,5 @@
-#ifndef GAME_INIT_H
-#define GAME_INIT_H
+#ifndef ZOOM_INIT_H
+#define ZOOM_INIT_H
 
 int InitGame();
 void UninitGame();
diff --git a/zoom/level.h b/zoom/level.h
index 50911b0..223afe1 100644
--- a/zoom/level.h
+++ b/zoom/level.h
@@ -1,5 +1,5 @@
-#ifndef GAME_LEVEL_H
-#define GAME_LEVEL_H
+#ifndef ZOOM_LEVEL_H
+#define ZOOM_LEVEL_H
 
 #include <GL/gl.h>
 #include "types.h"
diff --git a/zoom/math.h b/zoom/math.h
deleted file mode 100644
index 5644e60..0000000
--- a/zoom/math.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef GAME_MATH_H
-#define GAME_MATH_H
-
-#include "types.h"
-
-float VectorDot(VECTOR, VECTOR);
-VECTOR VectorCross(VECTOR, VECTOR);
-VECTOR VectorSub(VECTOR, VECTOR);
-VECTOR VectorAdd(VECTOR, VECTOR);
-VECTOR VectorMul(VECTOR, float);
-VECTOR VectorNormalize(VECTOR);
-VECTOR VectorNeg(VECTOR);
-float VectorLength(VECTOR);
-float VectorLengthSq(VECTOR);
-int VectorEqual(VECTOR, VECTOR);
-MATRIX MatrixMul(MATRIX, MATRIX);
-MATRIX MatrixIdentity();
-MATRIX VectorMatrix(VERTEX, VECTOR, VERTEX, VECTOR);
-VECTOR VectorMatrixMul(VECTOR, MATRIX);
-
-#endif
diff --git a/zoom/player.h b/zoom/player.h
index 200edcc..06c0e28 100644
--- a/zoom/player.h
+++ b/zoom/player.h
@@ -1,5 +1,5 @@
-#ifndef GAME_PLAYER_H
-#define GAME_PLAYER_H
+#ifndef ZOOM_PLAYER_H
+#define ZOOM_PLAYER_H
 
 #include "types.h"
 
diff --git a/zoom/render.h b/zoom/render.h
index d114ddd..606d6eb 100644
--- a/zoom/render.h
+++ b/zoom/render.h
@@ -1,5 +1,5 @@
-#ifndef GAME_RENDER_H
-#define GAME_RENDER_H
+#ifndef ZOOM_RENDER_H
+#define ZOOM_RENDER_H
 
 void Render();
 
diff --git a/zoom/texture.h b/zoom/texture.h
index c40f2f6..23540d7 100644
--- a/zoom/texture.h
+++ b/zoom/texture.h
@@ -1,5 +1,5 @@
-#ifndef GAME_TEXTURE_H
-#define GAME_TEXTURE_H
+#ifndef ZOOM_TEXTURE_H
+#define ZOOM_TEXTURE_H
 
 typedef struct _TEXLIST {
 	char name[30];
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;
-- 
cgit v1.2.3