Merge PFD/HITBOX/COLLISION

iScsc · Jan 19, 2022 · 7744a88 · 7744a88
1 parent f4b8c6b
commit 7744a88
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 19 deletions.
diff --git a/include/phx/force.h b/include/phx/force.h
diff --git a/include/phx/hitbox.h b/include/phx/hitbox.h
@@ -43,4 +43,4 @@ class Hitbox{
     std::vector<std::pair<unsigned int, unsigned int>> getHitbox();
 };
 
-#endif
+#endif
diff --git a/include/phx/phx.h b/include/phx/phx.h
@@ -11,9 +11,4 @@
 
 Vel updateCinematics(PhysicalEntity const);
 
-class Hitbox {
-private:
-    std::vector<Vec> m_vertices;
-};
-
 #endif
diff --git a/include/phx/toolbox.h b/include/phx/toolbox.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,4 +43,4 @@ class Hitbox{ @@
         std::vector<std::pair<unsigned int, unsigned int>> getHitbox();
     };
-    #endif
+    #endif