LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-31 19:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

TU19: merge Minecraft.World/Level

Browse Source
This commit is contained in:
Tropical
2026-03-21 17:07:51 -05:00
parent 29522d1ac9
commit 86e08af338
73 changed files with 3013 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Minecraft.World/Level/Storage/CompressedTileStorage.cpp
View File

@@ -12,6 +12,7 @@ static const int sc_maxCompressTiles = 64;
static CompressedTileStorage_compress_dataIn
g_compressTileDataIn[sc_maxCompressTiles] __attribute__((__aligned__(16)));
static int g_currentCompressTiles = 0;
// #define DISABLE_SPU_CODE
#endif //__PS3__
// Note: See header for an overview of this class
@@ -150,7 +151,7 @@ bool CompressedTileStorage::isRenderChunkEmpty(
for (int x = 0; x < 16; x += 4)
for (int z = 0; z < 16; z += 4) {
getBlock(&block, x, y, z);
__uint64* comp = (__uint64*)&blockIndices[block];
uint64_t* comp = (uint64_t*)&blockIndices[block];
// Are the 4 y regions stored here all zero? (INDEX_TYPE_0_OR_8_BIT
// | INDEX_TYPE_0_BIT_FLAG )
if ((*comp) != 0x0007000700070007L) return false;
@@ -168,17 +169,17 @@ bool CompressedTileStorage::isSameAs(CompressedTileStorage* other) {
// Attempt to compare as much as we can in 64-byte chunks (8 groups of 8
// bytes)
int quickCount = allocatedSize / 64;
__int64* pOld = (__int64*)indicesAndData;
__int64* pNew = (__int64*)other->indicesAndData;
int64_t* pOld = (int64_t*)indicesAndData;
int64_t* pNew = (int64_t*)other->indicesAndData;
for (int i = 0; i < quickCount; i++) {
__int64 d0 = pOld[0] ^ pNew[0];
__int64 d1 = pOld[1] ^ pNew[1];
__int64 d2 = pOld[2] ^ pNew[2];
__int64 d3 = pOld[3] ^ pNew[3];
__int64 d4 = pOld[4] ^ pNew[4];
__int64 d5 = pOld[5] ^ pNew[5];
__int64 d6 = pOld[6] ^ pNew[6];
__int64 d7 = pOld[7] ^ pNew[7];
int64_t d0 = pOld[0] ^ pNew[0];
int64_t d1 = pOld[1] ^ pNew[1];
int64_t d2 = pOld[2] ^ pNew[2];
int64_t d3 = pOld[3] ^ pNew[3];
int64_t d4 = pOld[4] ^ pNew[4];
int64_t d5 = pOld[5] ^ pNew[5];
int64_t d6 = pOld[6] ^ pNew[6];
int64_t d7 = pOld[7] ^ pNew[7];
d0 |= d1;
d2 |= d3;
d4 |= d5;
@@ -292,7 +293,7 @@ void CompressedTileStorage::setData(byteArray dataIn, unsigned int inOffset) {
int offsets[512];
int memToAlloc = 0;
// static int type0 = 0, type1 = 0, type2 = 0, type4 = 0, type8 = 0,
//chunkTotal = 0;
// chunkTotal = 0;
// Loop round all blocks
for (int i = 0; i < 512; i++) {
@@ -327,8 +328,8 @@ void CompressedTileStorage::setData(byteArray dataIn, unsigned int inOffset) {
}
}
#else
__uint64 usedFlags[4] = {0, 0, 0, 0};
__int64 i64_1 = 1; // MGH - instead of 1i64, which is MS specific
uint64_t usedFlags[4] = {0, 0, 0, 0};
int64_t i64_1 = 1; // MGH - instead of 1i64, which is MS specific
for (int j = 0; j < 64; j++) // This loop of 64 is to go round the 4 x
// 4 tiles in the block
{
@@ -374,8 +375,8 @@ void CompressedTileStorage::setData(byteArray dataIn, unsigned int inOffset) {
// chunkTotal++;
// printf("%d: %d (0) %d (1) %d (2) %d (4) %d (8)\n", chunkTotal, type0 /
//chunkTotal, type1 / chunkTotal, type2 / chunkTotal, type4 / chunkTotal,
//type8 / chunkTotal);
// chunkTotal, type1 / chunkTotal, type2 / chunkTotal, type4 / chunkTotal,
// type8 / chunkTotal);
memToAlloc += 1024; // For the indices
unsigned char* newIndicesAndData = (unsigned char*)XPhysicalAlloc(
@@ -976,8 +977,8 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) {
}
#else
__uint64 usedFlags[4] = {0, 0, 0, 0};
__int64 i64_1 =
uint64_t usedFlags[4] = {0, 0, 0, 0};
int64_t i64_1 =
1; // MGH - instead of 1i64, which is MS specific
for (int j = 0; j < 64; j++) // This loop of 64 is to go round
// the 4x4x4 tiles in the block
@@ -1076,6 +1077,7 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) {
memToAlloc, MAXULONG_PTR, 4096,
PAGE_READWRITE); //(unsigned char *)malloc( memToAlloc );
if (newIndicesAndData == NULL) {
DWORD lastError = GetLastError();
#ifndef _DURANGO
MEMORYSTATUS memStatus;
GlobalMemoryStatus(&memStatus);
@@ -1380,4 +1382,4 @@ void CompressedTileStorage::reverseIndices(unsigned char* indices) {
for (int i = 0; i < 512; i++) {
System::ReverseUSHORT(&blockIndices[i]);
}
}
}