Fixing bug with collisions

server/server.cpp

@@ -340,8 +340,8 @@ private:
 
 			{
 				const std::vector<Eigen::Vector3f> localOffsets = {
-					Eigen::Vector3f(-1.5f, 0.9f, 5.0f),
-					Eigen::Vector3f(1.5f, 0.9f, 5.0f)
+					Eigen::Vector3f(-1.5f, 0.9f - 6.f, 5.0f),
+					Eigen::Vector3f(1.5f, 0.9f - 6.f, 5.0f)
 				};
 
 				uint64_t now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
@@ -532,7 +532,8 @@ void update_world(net::steady_timer& timer, net::io_context& ioc) {
 
 		{
 			std::lock_guard<std::mutex> bm(g_boxes_mutex);
-			const float projectileHitRadius = 1.5f;
+			//const float projectileHitRadius = 1.5f;
+			const float projectileHitRadius = 5.0f;
 			const float boxCollisionRadius = 2.0f;
 
 			std::vector<std::pair<size_t, size_t>> boxProjectileCollisions;
@@ -540,11 +541,12 @@ void update_world(net::steady_timer& timer, net::io_context& ioc) {
 			for (size_t bi = 0; bi < g_serverBoxes.size(); ++bi) {
 				if (g_serverBoxes[bi].destroyed) continue;
 
-				Eigen::Vector3f boxWorld = g_serverBoxes[bi].position + Eigen::Vector3f(0.0f, 6.0f, 45000.0f);
+				Eigen::Vector3f boxWorld = g_serverBoxes[bi].position + Eigen::Vector3f(0.0f, 0.0f, 45000.0f);
 
 				for (size_t pi = 0; pi < g_projectiles.size(); ++pi) {
 					const auto& pr = g_projectiles[pi];
 					Eigen::Vector3f diff = pr.pos - boxWorld;
+					//std::cout << "diff norm is " << diff.norm() << std::endl;
 					float thresh = boxCollisionRadius + projectileHitRadius;
 
 					if (diff.squaredNorm() <= thresh * thresh) {
@@ -714,6 +716,7 @@ int main() {
 		{
 			std::lock_guard<std::mutex> lock(g_boxes_mutex);
 			g_serverBoxes = generateServerBoxes(50);
+			//g_serverBoxes = generateServerBoxes(1);
 			std::cout << "Generated " << g_serverBoxes.size() << " boxes on server\n";
 		}
 		net::io_context ioc;