Merge remote-tracking branch 'origin/main' into ShipSpawn

src/network/ClientState.h

@@ -27,6 +27,14 @@ constexpr long long SERVER_DELAY = 0; //ms
 constexpr long long CLIENT_DELAY = 500; //ms
 constexpr long long CUTOFF_TIME = 5000; //ms
 
+constexpr float PROJECTILE_VELOCITY = 600.f;
+constexpr float PROJECTILE_LIFE = 15000.f; //ms
+
+const float projectileHitRadius = 1.5f * 5;
+const float boxCollisionRadius = 2.0f * 5;
+const float shipCollisionRadius = 15.0f * 5;
+const float npcCollisionRadius = 5.0f * 5;
+
 uint32_t fnv1a_hash(const std::string& data);
 
 struct ClientState {

src/network/LocalClient.cpp

@@ -21,8 +21,8 @@ namespace ZL {
 		std::random_device rd;
 		std::mt19937 gen(rd());
 
-		const float MIN_COORD = -100.0f;
-		const float MAX_COORD = 100.0f;
+		const float MIN_COORD = -1000.0f;
+		const float MAX_COORD = 1000.0f;
 		const float MIN_DISTANCE = 3.0f;
 		const float MIN_DISTANCE_SQUARED = MIN_DISTANCE * MIN_DISTANCE;
 		const int MAX_ATTEMPTS = 1000;
@@ -68,7 +68,7 @@ namespace ZL {
 	Eigen::Vector3f LocalClient::generateRandomPosition() {
 		std::random_device rd;
 		std::mt19937 gen(rd());
-		std::uniform_real_distribution<> distrib(-500.0, 500.0);
+		std::uniform_real_distribution<> distrib(-5000.0, 5000.0);
 
 		return Eigen::Vector3f(
 			(float)distrib(gen),
@@ -238,11 +238,6 @@ namespace ZL {
 		auto now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
 			std::chrono::system_clock::now().time_since_epoch()).count();
 
-		const float projectileHitRadius = 1.5f;
-		const float boxCollisionRadius = 2.0f;
-		const float shipCollisionRadius = 15.0f;
-		const float npcCollisionRadius = 5.0f;
-
 		std::vector<std::pair<size_t, size_t>> boxProjectileCollisions;
 
 		for (size_t bi = 0; bi < serverBoxes.size(); ++bi) {