From: paramat <paramat@users.noreply.github.com>
Date: Sun, 5 Nov 2017 04:28:52 +0000 (+0000)
Subject: Player API: Set eye height property for new player model
X-Git-Tag: 5.0.0~151
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d4e1bd053ed572573aeca2ec0e89f4c208a5b5f1;p=oweals%2Fminetest_game.git

Player API: Set eye height property for new player model

Correct the collisionbox height.
---

diff --git a/game_api.txt b/game_api.txt
index 379e3f85..82711288 100644
--- a/game_api.txt
+++ b/game_api.txt
@@ -364,8 +364,9 @@ The player API can register player models and update the player's appearence
 			bar = {x = 20, y = 39},
 		-- ...
 		},
-		collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.77, 0.3}, -- In nodes from feet position
+		collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, -- In nodes from feet position
 		stepheight = 0.6, -- In nodes
+		eye_height = 1.47, -- In nodes above feet position
 	}
 
 
diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua
index c79aedc3..e309b08d 100644
--- a/mods/player_api/api.lua
+++ b/mods/player_api/api.lua
@@ -45,8 +45,9 @@ function player_api.set_model(player, model_name)
 			textures = player_textures[name] or model.textures,
 			visual = "mesh",
 			visual_size = model.visual_size or {x = 1, y = 1},
-			collisionbox = model.collisionbox or {-0.3, 0.0, -0.3, 0.3, 1.77, 0.3},
+			collisionbox = model.collisionbox or {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3},
 			stepheight = model.stepheight or 0.6,
+			eye_height = model.eye_height or 1.47,
 		})
 		player_api.set_animation(player, "stand")
 	else
@@ -55,6 +56,7 @@ function player_api.set_model(player, model_name)
 			visual = "upright_sprite",
 			collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.75, 0.3},
 			stepheight = 0.6,
+			eye_height = 1.625,
 		})
 	end
 	player_model[name] = model_name
diff --git a/mods/player_api/init.lua b/mods/player_api/init.lua
index 86ea340d..7a1f353e 100644
--- a/mods/player_api/init.lua
+++ b/mods/player_api/init.lua
@@ -15,6 +15,7 @@ player_api.register_model("character.b3d", {
 	},
 	collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3},
 	stepheight = 0.6,
+	eye_height = 1.47,
 })
 
 -- Update appearance when the player joins