Skip to content

Test what a much bigger player feels like #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Test what a much bigger player feels like #234

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a276cf1
Test what a much bigger player feels like
petterarvidsson Dec 6, 2016
be7dd9e
Set 1.3 height
petterarvidsson Dec 9, 2016
64ee2ae
f
petterarvidsson Dec 9, 2016
aa4554d
test walking over one block
petterarvidsson Dec 9, 2016
16d0db8
3 in height with climb
petterarvidsson Dec 9, 2016
e23edcb
Revert "3 in height with climb"
petterarvidsson Dec 18, 2016
a2416f2
Test new jump mutliplier
petterarvidsson Dec 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions lib/src/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace konstructs {
using namespace Eigen;
using nonstd::nullopt;

static float CAMERA_OFFSET = 0.5f;
static float CAMERA_OFFSET = 2.3f;
static Vector3f CAMERA_OFFSET_VECTOR = Vector3f(0, CAMERA_OFFSET, 0);

static bool block_is_obstacle(const optional<BlockData> &block, const BlockTypeInfo &blocks) {
Expand Down Expand Up @@ -111,7 +111,7 @@ namespace konstructs {
vy = 1;
} else if(dy == 0) {
// Jump when walking changes the acceleration upwards to 8
dy = 8;
dy = 3.5f * CAMERA_OFFSET;
} else {
// Get middle of block
Vector3i iPos((int)(position[0] + 0.5f), (int)(position[1]), (int)(position[2] + 0.5f));
Expand Down Expand Up @@ -214,7 +214,7 @@ namespace konstructs {
float x = position[0];
float y = position[1];
float z = position[2];
int height = 2;
int height = 4;
int p = chunked(x);
int q = chunked(z);
int k = chunked(y);
Expand All @@ -225,43 +225,42 @@ namespace konstructs {
float py = y - ny;
float pz = z - nz;
float pad = near_distance * 2;

try {

if (block_is_obstacle(world.get_block(feet()), blocks)) {
position[1] += 1.0f;
position[1] += (pad / 16.0f);
return 1;
}

if(sneaking) {
if (px < -pad && !block_is_obstacle(world.get_block(Vector3i(nx - 1, ny - 2, nz)), blocks)) {
if (px < -pad && !block_is_obstacle(world.get_block(Vector3i(nx - 1, ny - 4, nz)), blocks)) {
position[0] = nx - pad;
}
if (px > pad && !block_is_obstacle(world.get_block(Vector3i(nx + 1, ny - 2, nz)), blocks)) {
if (px > pad && !block_is_obstacle(world.get_block(Vector3i(nx + 1, ny - 4, nz)), blocks)) {
position[0] = nx + pad;
}
if (pz < -pad && !block_is_obstacle(world.get_block(Vector3i(nx, ny - 2, nz - 1)), blocks)) {
if (pz < -pad && !block_is_obstacle(world.get_block(Vector3i(nx, ny - 4, nz - 1)), blocks)) {
position[2] = nz - pad;
}
if (pz > pad && !block_is_obstacle(world.get_block(Vector3i(nx, ny - 2, nz + 1)), blocks)) {
if (pz > pad && !block_is_obstacle(world.get_block(Vector3i(nx, ny - 4, nz + 1)), blocks)) {
position[2] = nz + pad;
}
}
for (int dy = 0; dy < height; dy++) {
if (py < -pad && block_is_obstacle(world.get_block(Vector3i(nx, ny - 2, nz)), blocks)) {
position[1] = ny - pad;
result = 1;
}
if (py > pad && block_is_obstacle(world.get_block(Vector3i(nx, ny + 2, nz)), blocks)) {
position[1] = ny + pad;
result = 1;
}
for (int dy = -2; dy < height - 3; dy++) {
if (px < -pad && block_is_obstacle(world.get_block(Vector3i(nx - 1, ny - dy, nz)), blocks)) {
position[0] = nx - pad;
}
if (px > pad && block_is_obstacle(world.get_block(Vector3i(nx + 1, ny - dy, nz)), blocks)) {
position[0] = nx + pad;
}
if (py < -pad && block_is_obstacle(world.get_block(Vector3i(nx, ny - dy - 1, nz)), blocks)) {
position[1] = ny - pad;
result = 1;
}
if (py > (pad - CAMERA_OFFSET) && block_is_obstacle(world.get_block(Vector3i(nx, ny - dy + 1, nz)), blocks)) {
position[1] = ny + pad - CAMERA_OFFSET;
result = 1;
}
if (pz < -pad && block_is_obstacle(world.get_block(Vector3i(nx, ny - dy, nz - 1)), blocks)) {
position[2] = nz - pad;
}
Expand Down