diff col.h @ 91:cb6c6de125dc

halfway
author Atuto SHIROMA <e095729@ie.u-ryukyu.ac.jp>
date Thu, 26 May 2011 14:44:03 +0900
parents 8edae89a3877
children 0b65ca27f113
line wrap: on
line diff
--- a/col.h	Thu May 19 16:41:21 2011 +0900
+++ b/col.h	Thu May 26 14:44:03 2011 +0900
@@ -1,11 +1,15 @@
 #ifndef COL_H
 #define COL_H
 
+#include "libps2.h"
+#include "stdbool.h"
+
+
 typedef struct detection_face {
-  //    FVECTOR p0;
-  //    FVECTOR v0;
-  //    FVECTOR v1;
-  //    FVECTOR normal;
+  FVECTOR p0;
+  FVECTOR v0;
+  FVECTOR v1;
+  FVECTOR normal;
 } ColFace, *ColFacePtr;
 
 typedef struct col_face_handler {
@@ -14,11 +18,16 @@
     int facenum;
 } ColFaceHd;
 
-extern void col_init(ColFaceHd* hd);//, PolygonInfo* face);
-//extern bool col_detect(ColFaceHd* hd);
+extern void col_init(ColFaceHd* hd, PolygonInfo* face);
+extern bool col_detect(ColFaceHd* hd, FVECTOR pose, FVECTOR p);
+
+
+
+
+bool col_detect_approx(FVECTOR p, FVECTOR v0, FVECTOR v1);
 
 
 #endif
 
 //FVECTOR p, FVECTOR v0, FVECTOR v1);
-//, FVECTOR pose, FVECTOR p);
+