wanp/townengine
2
1
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

/apps/demos/scenery: fix world origin relation

Browse Source
This commit is contained in:
veclavtalica 2025-03-02 01:04:09 +03:00
parent 119bd52c51
commit 55829a1bef
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/demos/scenery/scenes/ingame.c
View File

@ -214,8 +214,8 @@ static void process_fly_mode(State *state) {
/* TODO: could be baked in map format */ /* TODO: could be baked in map format */
static Vec3 normal_at(SceneIngame *scn, Vec2 position) { static Vec3 normal_at(SceneIngame *scn, Vec2 position) {
int const x = (int)(roundf(HALF_TERRAIN_DISTANCE + (position.x - scn->pos.x))); int const x = (int)(floorf(position.x - scn->world_center.x));
int const y = (int)(roundf(HALF_TERRAIN_DISTANCE + (position.y - scn->pos.z))); int const y = (int)(floorf(position.y - scn->world_center.y));
float const height0 = heightmap[x][y]; float const height0 = heightmap[x][y];
float const height1 = heightmap[x + 1][y]; float const height1 = heightmap[x + 1][y];
@ -229,8 +229,8 @@ static Vec3 normal_at(SceneIngame *scn, Vec2 position) {
/* TODO: don't operate on triangles, instead interpolate on quads */ /* TODO: don't operate on triangles, instead interpolate on quads */
static float height_at(SceneIngame *scn, Vec2 position) { static float height_at(SceneIngame *scn, Vec2 position) {
int const x = (int)(roundf(HALF_TERRAIN_DISTANCE + (position.x - scn->pos.x))); int const x = (int)(floorf(position.x - scn->world_center.x));
int const y = (int)(roundf(HALF_TERRAIN_DISTANCE + (position.y - scn->pos.z))); int const y = (int)(floorf(position.y - scn->world_center.y));
float const height0 = heightmap[x][y]; float const height0 = heightmap[x][y];
float const height1 = heightmap[x + 1][y]; float const height1 = heightmap[x + 1][y];
@ -313,6 +313,8 @@ static void generate_terrain(SceneIngame *scn) {
heightmap[lx][ly] = height; heightmap[lx][ly] = height;
} }
} }
scn->world_center = (Vec2){ floorf(scn->pos.x - HALF_TERRAIN_DISTANCE), floorf(scn->pos.z - HALF_TERRAIN_DISTANCE) };
} }

1
apps/demos/scenery/scenes/ingame.h
View File

@ -13,6 +13,7 @@ typedef struct SceneIngame {
Scene base; Scene base;
Vec3 looking_direction; Vec3 looking_direction;
Vec2 world_center;
Vec3 pos; Vec3 pos;
float yaw; float yaw;