improved physics

client/Game.cpp

@@ -34,28 +34,34 @@ static void tickConnectedState() {
     back.normalize();
     Vector3 right = back.cross(up);
 
-    constexpr float speed = 0.1f;
     constexpr float rotationSpeed = 4.0f;
     ControllerPacket cp;
+
+    Vector3 force;
     if(Game::controller.down.isDown()) {
         cp.set(ControllerPacket::Type::DOWN);
-        Game::player.addForce(back * speed);
+        force += back;
     }
     if(Game::controller.up.isDown()) {
         cp.set(ControllerPacket::Type::UP);
-        Game::player.addForce(back * -speed);
+        force -= back;
     }
     if(Game::controller.left.isDown()) {
         cp.set(ControllerPacket::Type::LEFT);
-        Game::player.addForce(right * -speed);
+        force -= right;
     }
     if(Game::controller.right.isDown()) {
         cp.set(ControllerPacket::Type::RIGHT);
-        Game::player.addForce(right * speed);
+        force += right;
+    }
+    if(force.squareLength() > 0.0f) {
+        force.normalize();
     }
+    Game::player.addForce(force * 0.1f);
+
     if(Game::controller.jump.isDown() && Game::player.isOnGround()) {
         cp.set(ControllerPacket::Type::JUMP);
-        Game::player.addForce(up * 0.5f);
+        Game::player.addForce(up * (0.42f / 0.98f + 0.08f));
     }
     if(Game::controller.sneak.isDown()) {
         cp.set(ControllerPacket::Type::SNEAK);
@@ -111,6 +117,7 @@ bool Game::init() {
     tickState = tickConnectState;
     renderState = renderConnectState;
 
+    Game::player.setPosition(Vector3(0.0f, 2.0f, 0.0f));
     world.addEntity(&player);
     return false;
 }
@@ -134,13 +141,17 @@ void Game::renderOverlay() {
         .append(" &999TPS: &722")
         .append(Engine::getTickClock().getUpdatesPerSecond());
     Engine::renderer.renderString(Vector2(10.0f, 10.0f), s);
+    s.clear().append("a = ").append(player.acceleration);
+    Engine::renderer.renderString(Vector2(10.0f, 20.0f), s);
+    s.clear().append("v = ").append(player.velocity);
+    Engine::renderer.renderString(Vector2(10.0f, 30.0f), s);
 }
 
 void Game::onEntityUpdate(EntityUpdatePacket& p) {
     float distance = (p.position - player.position).squareLength();
-    StringBuffer<50>(distance).printLine();
+    LOG_DEBUG(StringBuffer<50>(distance));
     if(distance > 25.0f) {
-        std::cout << "set\n";
+        LOG_DEBUG("set");
         player.setPosition(p.position);
     }
     // player.position = p.position;

common/entities/Entity.cpp

@@ -12,10 +12,10 @@ void Entity::tick() {
     lastLengthAngle = lengthAngle;
     lastWidthAngle = widthAngle;
 
-    constexpr float drag = 0.48f;
-    acceleration += Vector3(-velocity[0] * drag, 0.0f, -velocity[2] * drag);
     velocity += acceleration;
-
+    velocity[0] *= 0.686f;
+    velocity[1] *= 0.98f;
+    velocity[2] *= 0.686f;
     acceleration = Vector3(0.0f, -0.08f, 0.0f);
 }
 

server/Game.cpp

@@ -60,7 +60,7 @@ void Game::addPlayer(ServerPlayer& p) {
             WorldPackets::sendChunk(p, world, x, z);
         }
     }
-    p.setPosition(Vector3(0.0f, 2.0f, 0.0f));
+    p.setPosition(Vector3(0.0f, 1.0f, 0.0f));
     test = &p;
     world.addEntity(&p);
 }

server/entities/ServerPlayer.cpp

@@ -21,24 +21,26 @@ void ServerPlayer::tick() {
     back.normalize();
     Vector3 right = back.cross(up);
 
-    constexpr float speed = 0.1f;
+    Vector3 force;
     if(cp.has(ControllerPacket::Type::DOWN)) {
-        addForce(back * speed);
+        force += back;
     }
     if(cp.has(ControllerPacket::Type::UP)) {
-        addForce(back * -speed);
+        force -= back;
     }
     if(cp.has(ControllerPacket::Type::LEFT)) {
-        addForce(right * -speed);
+        force -= right;
     }
     if(cp.has(ControllerPacket::Type::RIGHT)) {
-        addForce(right * speed);
+        force += right;
     }
-    if(cp.has(ControllerPacket::Type::JUMP) && isOnGround()) {
-        addForce(up * 0.5f);
+    if(force.squareLength() > 0.0f) {
+        force.normalize();
     }
-    if(cp.has(ControllerPacket::Type::SNEAK)) {
-        addForce(up * -speed);
+    addForce(force * 0.1f);
+
+    if(cp.has(ControllerPacket::Type::JUMP) && isOnGround()) {
+        addForce(up * (0.42f / 0.98f + 0.08f));
     }
 
     constexpr float rotationSpeed = 4.0f;