From 1021d32f7ccb9f3f10253934fd4e5202b7382b2d Mon Sep 17 00:00:00 2001
From: neoraider <devnull@localhost>
Date: Fri, 20 Oct 2006 12:57:05 +0000
Subject: Physik-Engine angefangen. Lightmaps implementiert.

---
 neofx/types.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'neofx/types.h')

diff --git a/neofx/types.h b/neofx/types.h
index add2c88..8586545 100644
--- a/neofx/types.h
+++ b/neofx/types.h
@@ -1,15 +1,14 @@
 #ifndef NEOFX_TYPES_H
 #define NEOFX_TYPES_H
 
-#pragma pack(push, 2)
 typedef union _MATRIX {
 	float m[4][4];
 	float f[16];
 } MATRIX;
 
-typedef struct _VECTOR_VERTEX {
+typedef struct _VECTOR_VERTEX_ROTATION {
 	float x, y, z;
-} VECTOR, VERTEX;
+} VECTOR, VERTEX, ROTATION;
 
 typedef struct _TEXCOORDS {
 	float s, t;
@@ -19,6 +18,13 @@ typedef struct _TRIANGLE {
 	VERTEX vertices[3];
 	VECTOR normal;
 } TRIANGLE;
-#pragma pack(pop)
+
+typedef struct _OBJECT {
+	VERTEX pos;
+	VECTOR move;
+	ROTATION rot;
+	float air_resistance;
+	float bounce;
+} OBJECT;
 
 #endif
-- 
cgit v1.2.3