michael
/
MorriCraft
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

MorriCraft v2.3.7: Redesigned Torches with high-quality pixel art and improved 3D rendering (larger, stable, and better centered)

This commit is contained in:
Michael Howard 2026-04-25 17:39:52 -05:00
parent 0a142d0713
commit c09704151c
14 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -106,7 +106,7 @@ A pre-built `MorriCraft-Windows.zip` is available in the repository root.
## 📜 Version History ## 📜 Version History
### v2.3.6 - Major Update: Dynamic Spawn Plateau & Biome Smoothing (Current) ### v2.3.7 - Major Update: High-Quality 3D Torches & Asset Redesign (Current)
- **Hunger System**: Added player hunger bar, starvation mechanics, and health regeneration when full. - **Hunger System**: Added player hunger bar, starvation mechanics, and health regeneration when full.
- **Apple Item**: Added edible Apple item to restore hunger. - **Apple Item**: Added edible Apple item to restore hunger.
- **Grass Texture**: Improved `grass_top` texture with better pixel art. - **Grass Texture**: Improved `grass_top` texture with better pixel art.

BIN
assets/torch.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 779 KiB

After

Width:  |  Height:  |  Size: 552 KiB

2
assets/version.txt
View File

@ -1 +1 @@
v2.3.6 v2.3.7

BIN
build-linux/MorriCraft
View File

Binary file not shown.

BIN
build-linux/assets/torch.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 779 KiB

After

Width:  |  Height:  |  Size: 552 KiB

2
build-linux/assets/version.txt
View File

@ -1 +1 @@
v2.3.6 v2.3.7

BIN
build-windows/MorriCraft.exe
View File

Binary file not shown.

BIN
build-windows/assets/torch.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 779 KiB

After

Width:  |  Height:  |  Size: 552 KiB

2
build-windows/assets/version.txt
View File

@ -1 +1 @@
v2.3.6 v2.3.7

BIN
release/MorriCraft-Linux.zip
View File

Binary file not shown.

BIN
release/MorriCraft-Windows.zip
View File

Binary file not shown.

2
release/version.txt
View File

@ -1 +1 @@
v2.3.6 v2.3.7

49
src/main.cpp
View File

@ -395,7 +395,7 @@ void RebuildChunkRenderList(Chunk* chunk, int cx, int cz) {
unsigned char faces = GetExposedFaces(lx, ly, lz, chunk, nxM, nxP, nzM, nzP); unsigned char faces = GetExposedFaces(lx, ly, lz, chunk, nxM, nxP, nzM, nzP);
if (faces != 0) { if (faces != 0) {
// Simple Torch Lighting (v2.3.6) // Simple Torch Lighting (v2.3.7)
float blockLight = 0.0f; float blockLight = 0.0f;
Vector3 bPos = {(float)(worldX+lx), (float)ly, (float)(worldZ+lz)}; Vector3 bPos = {(float)(worldX+lx), (float)ly, (float)(worldZ+lz)};
for (const auto& tp : torchPositions) { for (const auto& tp : torchPositions) {
@ -705,7 +705,7 @@ float FindSpawnY(int spawnX, int spawnZ) {
// Feet land at top of block (y + 0.5). // Feet land at top of block (y + 0.5).
// We use +0.6f + 1.6f to ensure we start slightly ABOVE the block // We use +0.6f + 1.6f to ensure we start slightly ABOVE the block
// to avoid getting stuck in collision on frame 1. // to avoid getting stuck in collision on frame 1.
// v2.3.6: Spawn higher (feet at y + 1.5, eyes at y + 3.1) to avoid ground-clipping // v2.3.7: Spawn higher (feet at y + 1.5, eyes at y + 3.1) to avoid ground-clipping
return (float)y + 1.5f + 1.6f; return (float)y + 1.5f + 1.6f;
} }
} }
@ -746,7 +746,7 @@ void GenerateChunk(int cx, int cz) {
// Combine: broad hills (±12) + local detail (±4) = up to ±16 around Y=32 // Combine: broad hills (±12) + local detail (±4) = up to ±16 around Y=32
int height = 32 + (int)(continentNoise * 12.0f) + (int)(detailNoise * 4.0f); int height = 32 + (int)(continentNoise * 12.0f) + (int)(detailNoise * 4.0f);
// Spawn Plateau (v2.3.6): Center on ACTUAL spawn and force Grassland // Spawn Plateau (v2.3.7): Center on ACTUAL spawn and force Grassland
float dx = worldX - spawnSavedX; float dx = worldX - spawnSavedX;
float dz = worldZ - spawnSavedZ; float dz = worldZ - spawnSavedZ;
float distToSpawn = sqrtf(dx * dx + dz * dz); float distToSpawn = sqrtf(dx * dx + dz * dz);
@ -761,7 +761,7 @@ void GenerateChunk(int cx, int cz) {
if (height < 10) height = 10; if (height < 10) height = 10;
if (height >= CHUNK_HEIGHT - 2) height = CHUNK_HEIGHT - 2; if (height >= CHUNK_HEIGHT - 2) height = CHUNK_HEIGHT - 2;
// Biome noise: determines surface type (v2.3.6: 4x larger biomes) // Biome noise: determines surface type (v2.3.7: 4x larger biomes)
float biomeNoise = fbm(worldX * 0.002f, worldZ * 0.002f, globalSeedHash + 77777); float biomeNoise = fbm(worldX * 0.002f, worldZ * 0.002f, globalSeedHash + 77777);
// Force grassland in spawn plateau area // Force grassland in spawn plateau area
@ -1049,7 +1049,7 @@ int main(void)
// By default, windows have minimize, maximize, and close buttons on the top bar. // By default, windows have minimize, maximize, and close buttons on the top bar.
SetConfigFlags(FLAG_WINDOW_RESIZABLE | FLAG_VSYNC_HINT); SetConfigFlags(FLAG_WINDOW_RESIZABLE | FLAG_VSYNC_HINT);
InitWindow(screenWidth, screenHeight, "MorriCraft v2.3.6"); InitWindow(screenWidth, screenHeight, "MorriCraft v2.3.7");
LoadConfig(); LoadConfig();
SetExitKey(KEY_NULL); // Prevent ESC from closing the window SetExitKey(KEY_NULL); // Prevent ESC from closing the window
@ -1120,7 +1120,7 @@ int main(void)
float updateTimer = 0.0f; float updateTimer = 0.0f;
float downloadProgress = 0.0f; float downloadProgress = 0.0f;
std::string latestVersion = ""; std::string latestVersion = "";
std::string localVersion = "v2.3.6"; // Default fallback std::string localVersion = "v2.3.7"; // Default fallback
// Read local version // Read local version
std::ifstream vfile("assets/version.txt"); std::ifstream vfile("assets/version.txt");
@ -1732,7 +1732,7 @@ int main(void)
// --- GLOBAL TIME & AUDIO MANAGEMENT --- // --- GLOBAL TIME & AUDIO MANAGEMENT ---
float cycleLength = 600.0f; // Slower day cycle (v2.3.6: cut speed in half) float cycleLength = 600.0f; // Slower day cycle (v2.3.7: cut speed in half)
if (currentState == GAMEPLAY) { if (currentState == GAMEPLAY) {
gameTime += GetFrameTime(); gameTime += GetFrameTime();
@ -2145,7 +2145,7 @@ int main(void)
} }
NetSetBlock(hitX, hitY, hitZ, AIR); NetSetBlock(hitX, hitY, hitZ, AIR);
// Tool Durability Logic (v2.3.6) // Tool Durability Logic (v2.3.7)
InventorySlot* slot = &hotbar[activeHotbarSlot]; InventorySlot* slot = &hotbar[activeHotbarSlot];
if (slot->maxDurability > 0) { if (slot->maxDurability > 0) {
slot->durability--; slot->durability--;
@ -2392,7 +2392,7 @@ int main(void)
DrawTextEx(customFont, "BACK", (Vector2){ backBtn.x + 70, backBtn.y + 10 }, 20, 1.0f, WHITE); DrawTextEx(customFont, "BACK", (Vector2){ backBtn.x + 70, backBtn.y + 10 }, 20, 1.0f, WHITE);
} else { } else {
DrawTextEx(customFont, "Downloading update...", (Vector2){ (float)currentWidth/2 - 90, (float)currentHeight/2 - 60 }, 24, 1.0f, YELLOW); DrawTextEx(customFont, "Downloading update...", (Vector2){ (float)currentWidth/2 - 90, (float)currentHeight/2 - 60 }, 24, 1.0f, YELLOW);
// v2.3.6: Removed dynamic pulse to fix jitter // v2.3.7: Removed dynamic pulse to fix jitter
int bw = 500, bh = 35; int bw = 500, bh = 35;
Rectangle barBg = { (float)currentWidth/2 - bw/2, (float)currentHeight/2 - bh/2, (float)bw, (float)bh }; Rectangle barBg = { (float)currentWidth/2 - bw/2, (float)currentHeight/2 - bh/2, (float)bw, (float)bh };
@ -2687,8 +2687,8 @@ int main(void)
DrawTexturePro(titleTexture, sourceRec, destRec, origin, 0.0f, WHITE); DrawTexturePro(titleTexture, sourceRec, destRec, origin, 0.0f, WHITE);
EndMode2D(); EndMode2D();
// Show Version Number (v2.3.6) in Red // Show Version Number (v2.3.7) in Red
DrawTextEx(customFont, "v2.3.6", (Vector2){ 20, (float)currentHeight - 30 }, 22, 1.0f, RED); DrawTextEx(customFont, "v2.3.7", (Vector2){ 20, (float)currentHeight - 30 }, 22, 1.0f, RED);
// --- PLAYER NAME POPUP (IF MISSING) --- // --- PLAYER NAME POPUP (IF MISSING) ---
if (playerName == "") { if (playerName == "") {
@ -2866,7 +2866,7 @@ int main(void)
spawnSavedX = 0; spawnSavedY = -1; spawnSavedZ = 0; spawnSavedX = 0; spawnSavedY = -1; spawnSavedZ = 0;
} }
// Load Chests (v2.3.6) // Load Chests (v2.3.7)
chestInventories.clear(); chestInventories.clear();
std::ifstream cf("saves/" + currentWorldName + "/chests.dat", std::ios::binary); std::ifstream cf("saves/" + currentWorldName + "/chests.dat", std::ios::binary);
if (cf.is_open()) { if (cf.is_open()) {
@ -2884,7 +2884,7 @@ int main(void)
cf.close(); cf.close();
} }
// Load Torches (v2.3.6) // Load Torches (v2.3.7)
torchPositions.clear(); torchPositions.clear();
std::ifstream tf("saves/" + currentWorldName + "/torches.dat", std::ios::binary); std::ifstream tf("saves/" + currentWorldName + "/torches.dat", std::ios::binary);
if (tf.is_open()) { if (tf.is_open()) {
@ -3168,7 +3168,7 @@ int main(void)
snprintf(worldName, sizeof(worldName), "%s", currentWorldName.c_str()); snprintf(worldName, sizeof(worldName), "%s", currentWorldName.c_str());
worldNameLen = strlen(worldName); worldNameLen = strlen(worldName);
gameTime = 150.0f; // Start new world at 7:00 AM (v2.3.6 adjusted for slower cycle) gameTime = 150.0f; // Start new world at 7:00 AM (v2.3.7 adjusted for slower cycle)
if (serverMode) { if (serverMode) {
serverSocket = socket(AF_INET, SOCK_STREAM, 0); serverSocket = socket(AF_INET, SOCK_STREAM, 0);
@ -3334,14 +3334,13 @@ int main(void)
} else if (renderType == TORCH) { } else if (renderType == TORCH) {
for (Chunk* chunk : visibleChunks) { for (Chunk* chunk : visibleChunks) {
for (auto& data : chunk->renderLists[TORCH]) { for (auto& data : chunk->renderLists[TORCH]) {
// 3D Flickering Torch (v2.3.6) // Bigger, stable 3D Torch (v2.3.7)
float flicker = sinf(GetTime() * 12.0f) * 0.03f; float h = 0.85f;
float h = 0.6f + flicker; float w = 0.18f;
float w = 0.12f;
Texture2D tex = blockTextures[TORCH]; Texture2D tex = blockTextures[TORCH];
rlSetTexture(tex.id); rlSetTexture(tex.id);
rlPushMatrix(); rlPushMatrix();
rlTranslatef(data.x, data.y - 0.3f, data.z); rlTranslatef(data.x, data.y - 0.45f, data.z);
rlBegin(RL_QUADS); rlBegin(RL_QUADS);
rlColor4ub(255, 255, 255, 255); rlColor4ub(255, 255, 255, 255);
// Front // Front
@ -3609,7 +3608,7 @@ int main(void)
(Vector2){ (float)(sx + (slotSize/2) - (countSize.x/2)), (float)(hotbarY + slotSize - 14) }, (Vector2){ (float)(sx + (slotSize/2) - (countSize.x/2)), (float)(hotbarY + slotSize - 14) },
12, 1.0f, WHITE); 12, 1.0f, WHITE);
// Draw Hotbar Durability Bar (v2.3.6) // Draw Hotbar Durability Bar (v2.3.7)
if (hotbar[s].maxDurability > 0 && hotbar[s].durability < hotbar[s].maxDurability) { if (hotbar[s].maxDurability > 0 && hotbar[s].durability < hotbar[s].maxDurability) {
float durP = (float)hotbar[s].durability / hotbar[s].maxDurability; float durP = (float)hotbar[s].durability / hotbar[s].maxDurability;
int barW = slotSize - 10; int barW = slotSize - 10;
@ -3640,7 +3639,7 @@ int main(void)
DrawRectangleRec(slotRect, hov ? (Color){90,90,90,255} : (Color){60,60,60,255}); DrawRectangleRec(slotRect, hov ? (Color){90,90,90,255} : (Color){60,60,60,255});
DrawRectangleLinesEx(slotRect, 2.0f, hov ? WHITE : (Color){100,100,100,200}); DrawRectangleLinesEx(slotRect, 2.0f, hov ? WHITE : (Color){100,100,100,200});
// Draw Durability Bar (v2.3.6) // Draw Durability Bar (v2.3.7)
if (slot.maxDurability > 0 && slot.durability < slot.maxDurability) { if (slot.maxDurability > 0 && slot.durability < slot.maxDurability) {
float durPercent = (float)slot.durability / slot.maxDurability; float durPercent = (float)slot.durability / slot.maxDurability;
int barW = slotRect.width - 10; int barW = slotRect.width - 10;
@ -3919,7 +3918,7 @@ int main(void)
} }
} }
if (hov && IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) { if (hov && IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) {
// Right click: pick up/place one (v2.3.6) // Right click: pick up/place one (v2.3.7)
if (mouseHeldItem.blockType == AIR) { if (mouseHeldItem.blockType == AIR) {
if (chestInv[i].blockType != AIR && chestInv[i].count > 0) { if (chestInv[i].blockType != AIR && chestInv[i].count > 0) {
mouseHeldItem = InventorySlot(chestInv[i].blockType, 1); mouseHeldItem = InventorySlot(chestInv[i].blockType, 1);
@ -3966,7 +3965,7 @@ int main(void)
} }
} }
if (hov && IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) { if (hov && IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) {
// Right click logic for player inv in chest GUI (v2.3.6) // Right click logic for player inv in chest GUI (v2.3.7)
if (mouseHeldItem.blockType == AIR) { if (mouseHeldItem.blockType == AIR) {
if (inventory[i].blockType != AIR && inventory[i].count > 0) { if (inventory[i].blockType != AIR && inventory[i].count > 0) {
mouseHeldItem = InventorySlot(inventory[i].blockType, 1); mouseHeldItem = InventorySlot(inventory[i].blockType, 1);
@ -4152,7 +4151,7 @@ int main(void)
invf.close(); invf.close();
} }
// Save Chests (v2.3.6) // Save Chests (v2.3.7)
std::ofstream cf("saves/" + currentWorldName + "/chests.dat", std::ios::binary); std::ofstream cf("saves/" + currentWorldName + "/chests.dat", std::ios::binary);
if (cf.is_open()) { if (cf.is_open()) {
uint32_t count = (uint32_t)chestInventories.size(); uint32_t count = (uint32_t)chestInventories.size();
@ -4168,7 +4167,7 @@ int main(void)
cf.close(); cf.close();
} }
// Save Torches (v2.3.6) // Save Torches (v2.3.7)
std::ofstream tf("saves/" + currentWorldName + "/torches.dat", std::ios::binary); std::ofstream tf("saves/" + currentWorldName + "/torches.dat", std::ios::binary);
if (tf.is_open()) { if (tf.is_open()) {
uint32_t count = (uint32_t)torchPositions.size(); uint32_t count = (uint32_t)torchPositions.size();

2
version.txt
View File

@ -1 +1 @@
v2.3.6 v2.3.7