YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prog

Browse Source
This commit is contained in:
Dominic Masters
2025-10-09 15:07:07 -05:00
parent 7622f81309
commit c4c43b23ad
11 changed files with 162 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/rpg/world/worldunit.c
View File

@@ -8,7 +8,7 @@
#include "worldunit.h"
#include "assert/assert.h"
void worldChunkPosAdd(worldchunkpos_t *pos, worldsubtile_t amt) {
void worldChunkPosAdd(worldchunkpos_t *pos, const worldsubtile_t amt) {
assertNotNull(pos, "Position pointer cannot be NULL");
/*
@@ -29,12 +29,34 @@ void worldChunkPosAdd(worldchunkpos_t *pos, worldsubtile_t amt) {
pos->tile = (uint8_t)(pos->tile + (uint8_t)tileCarry);
}
void worldPosAddSubtile(worldpos_t *pos, const worldsubtile_t amt) {
assertNotNull(pos, "Position pointer cannot be NULL");
// Same as worldChunkPosAdd but with chunk handling.
int32_t shiftedTotal = (int32_t)pos->subtile + (int32_t)amt + 128;
int32_t tileCarry = shiftedTotal >> 8; // divide by 256
int32_t wrappedSubtile = shiftedTotal - (tileCarry << 8);
pos->subtile = (int8_t)(wrappedSubtile - 128);
int32_t newTile = (int32_t)pos->tile + (int32_t)tileCarry;
int32_t chunkCarry = newTile / WORLD_CHUNK_SIZE;
pos->tile = (uint8_t)(newTile % WORLD_CHUNK_SIZE);
pos->chunk = (uint8_t)(pos->chunk + (uint8_t)chunkCarry);
}
float_t worldChunkPosToF32(worldchunkpos_t pos, const uint8_t tileSize) {
const float scaleFactor = (float)tileSize * (1.0f / 256.0f);
float_t worldChunkPosToF32(const worldchunkpos_t pos, const uint8_t tileSize) {
const float_t scaleFactor = (float_t)tileSize * (1.0f / 256.0f);
return (
(float)pos.tile * (float)tileSize + ((float)pos.subtile + 128.0f) *
(float_t)pos.tile * (float_t)tileSize + ((float_t)pos.subtile + 128.0f) *
scaleFactor
);
}
float_t worldPosToF32(const worldpos_t pos, const uint8_t tileSize) {
const float_t scaleFactor = (float_t)tileSize * (1.0f / 256.0f);
const float_t chunkFactor = WORLD_CHUNK_SIZE * (float_t)tileSize;
return (
(float_t)pos.chunk * chunkFactor +
(float_t)pos.tile * (float_t)tileSize +
((float_t)pos.subtile + 128.0f) * scaleFactor
);
}

30
src/rpg/world/worldunit.h
View File

@@ -11,6 +11,7 @@
#define WORLD_DIMENSIONS 3
#define WORLD_SUBTITLE_MIN -128
#define WORLD_SUBTITLE_MAX 127
#define WORLD_CHUNK_SIZE 256 // Tiles per axis per chunk.
/**
* Position in SUBTILE space in a world, each unit represents a single subtile.
@@ -67,10 +68,16 @@ typedef struct worldpos_s {
* @param pos Pointer to the world chunk position to modify.
* @param amt The amount of subtiles to add (can be negative).
*/
void worldChunkPosAdd(
worldchunkpos_t *pos,
const worldsubtile_t amt
);
void worldChunkPosAdd(worldchunkpos_t *pos, const worldsubtile_t amt);
/**
* Adds a number of subtiles to a world position, rolling over into tiles and
* chunks as necessary.
*
* @param pos Pointer to the world position to modify.
* @param amt The amount of subtiles to add (can be negative).
*/
void worldPosAddSubtile(worldpos_t *pos, const worldsubtile_t amt);
/**
* Converts a world chunk position to a floating point number, given the tile
@@ -80,7 +87,14 @@ void worldChunkPosAdd(
* @param tileSize The size of a tile in pixels.
* @return The position as a floating point number.
*/
float_t worldChunkPosToF32(
const worldchunkpos_t pos,
const uint8_t tileSize
);
float_t worldChunkPosToF32(const worldchunkpos_t pos, const uint8_t tileSize);
/**
* Converts a world position to a floating point number, given the tile size
* in pixels.
*
* @param pos Pointer to the world position to convert.
* @param tileSize The size of a tile in pixels.
* @return The position as a floating point number.
*/
float_t worldPosToF32(const worldpos_t pos, const uint8_t tileSize);