From 36fa6f9bc53da2073ebd636797c6163ccee20a2a Mon Sep 17 00:00:00 2001 From: selimanac Date: Tue, 27 Sep 2022 10:32:46 +0300 Subject: [PATCH] no message --- daabbcc/include/DynamicTree.hpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/daabbcc/include/DynamicTree.hpp b/daabbcc/include/DynamicTree.hpp index 0d68d22..b887ca6 100644 --- a/daabbcc/include/DynamicTree.hpp +++ b/daabbcc/include/DynamicTree.hpp @@ -9,10 +9,10 @@ #include struct orderResultValues - { - int32 proxyID; - float32 distance; - }; +{ + int32 proxyID; + float32 distance; +}; class DynamicTree { @@ -45,12 +45,12 @@ class DynamicTree float32 RayCastCallback(const b2RayCastInputAABB &input, int32 proxyId, int groupId); // RayCast to AABB - void RayCast(int groupId, float start_x, float start_y, float end_x, float end_y); + void RayCast(int groupId, float start_x, float start_y, float end_x, float end_y); - void RayCastShort(int groupId, float start_x, float start_y, float end_x, float end_y); + void RayCastShort(int groupId, float start_x, float start_y, float end_x, float end_y); // Query with AABB - void QueryAABB(int groupId, float x, float y, int w, int h); + void QueryAABB(int groupId, float x, float y, int w, int h); // Query with ID void QueryID(int groupId, int proxyID); // std::vector QueryID(int groupId, int proxyID); @@ -58,7 +58,7 @@ class DynamicTree // Query with ID - Distance Ordered void QueryIDShort(int groupId, int proxyID); - void QueryAABBShort(int groupId, float x, float y, int w, int h); + void QueryAABBShort(int groupId, float x, float y, int w, int h); // Query result jc::Array result; @@ -66,12 +66,12 @@ class DynamicTree // Raycast result jc::Array ray_result; - // Query order result + // Query order result jc::Array orderResult; // Assert bool CheckGroup(int groupID); - bool isShorted = false; + bool isShorted = false; private: // Hashtable for Groups @@ -81,8 +81,6 @@ class DynamicTree }; typedef jc::HashTable hashtable_t; - - // Hashtable defaults uint32_t numelements = 20; // The maximum number of entries to store uint32_t load_factor = 50; // percent @@ -107,10 +105,10 @@ class DynamicTree int nodeProxyID; b2Vec2 nodeProxyCenter; b2Vec2 targetProxyCenter; - + orderResultValues tmpOrder; jc::Array tmpOrderResult; - + // Reset class void ResetTree(); };