From 9865ae1fb4bbea9c22c630ad8a055ef432d99c9e Mon Sep 17 00:00:00 2001 From: Allanis Date: Wed, 21 Feb 2018 21:34:03 +0000 Subject: [PATCH] [Add] CollisionContact struct. --- src/collider/Makefile.am | 2 +- src/collider/collider.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/collider/collider.h diff --git a/src/collider/Makefile.am b/src/collider/Makefile.am index 6946719..9475b79 100644 --- a/src/collider/Makefile.am +++ b/src/collider/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libcollider.a libcollider_a_SOURCES = geom_tree.cpp geom.cpp collision_space.cpp -include_HEADERS = geom_tree.h geom.h collision_space.h +include_HEADERS = geom_tree.h geom.h collision_space.h collider.h diff --git a/src/collider/collider.h b/src/collider/collider.h new file mode 100644 index 0000000..f9c292e --- /dev/null +++ b/src/collider/collider.h @@ -0,0 +1,16 @@ +#pragma once +#include "../vector.h" +#include "geom_tree.h" +#include "collision_space.h" +#include "geom.h" + +class Geom; + +struct CollisionContact { + vector3d pos; + vector3d normal; + double depth; + int triIdx; + Geom* g1, *g2; +}; +