forked from mirrors/kolyah35-minecraft-pe-0.6.1
all was broken :\
This commit is contained in:
parent
0645905fc6
commit
de72a9a3b7
20 changed files with 141 additions and 127 deletions
|
|
@ -62,7 +62,7 @@ void ClientSideNetworkHandler::requestNextChunk()
|
|||
|
||||
//LOGI("requesting chunks @ (%d, %d)\n", chunk.x, chunk.y);
|
||||
|
||||
//raknetInstance->send(new RequestChunkPacket(requestNextChunkPosition % CHUNK_CACHE_WIDTH, requestNextChunkPosition / CHUNK_CACHE_WIDTH));
|
||||
//raknetInstance->send(new RequestChunkPacket(requestNextChunkPosition % LevelConstants::CHUNK_CACHE_WIDTH, requestNextChunkPosition / LevelConstants::CHUNK_CACHE_WIDTH));
|
||||
requestNextChunkIndex++;
|
||||
requestNextChunkPosition++;
|
||||
}
|
||||
|
|
@ -70,16 +70,16 @@ void ClientSideNetworkHandler::requestNextChunk()
|
|||
|
||||
bool ClientSideNetworkHandler::areAllChunksLoaded()
|
||||
{
|
||||
return (requestNextChunkPosition >= (CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH));
|
||||
return (requestNextChunkPosition >= (LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH));
|
||||
}
|
||||
|
||||
bool ClientSideNetworkHandler::isChunkLoaded(int x, int z)
|
||||
{
|
||||
if (x < 0 || x >= CHUNK_CACHE_WIDTH || z < 0 || z >= CHUNK_CACHE_WIDTH) {
|
||||
if (x < 0 || x >= LevelConstants::CHUNK_CACHE_WIDTH || z < 0 || z >= LevelConstants::CHUNK_CACHE_WIDTH) {
|
||||
LOGE("Error: Tried to request chunk (%d, %d)\n", x, z);
|
||||
return true;
|
||||
}
|
||||
return chunksLoaded[x * CHUNK_CACHE_WIDTH + z];
|
||||
return chunksLoaded[x * LevelConstants::CHUNK_CACHE_WIDTH + z];
|
||||
//return areAllChunksLoaded();
|
||||
}
|
||||
|
||||
|
|
@ -100,9 +100,9 @@ void ClientSideNetworkHandler::onUnableToConnect()
|
|||
|
||||
void ClientSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid)
|
||||
{
|
||||
CHUNK_CACHE_WIDTH = 16;
|
||||
LEVEL_WIDTH = CHUNK_CACHE_WIDTH * CHUNK_WIDTH;
|
||||
LEVEL_DEPTH = CHUNK_CACHE_WIDTH * CHUNK_DEPTH;
|
||||
LevelConstants::CHUNK_CACHE_WIDTH = 16;
|
||||
LevelConstants::LEVEL_WIDTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH;
|
||||
LevelConstants::LEVEL_DEPTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_DEPTH;
|
||||
|
||||
// TODO: Good disconnecting
|
||||
LOGI("onDisconnect\n");
|
||||
|
|
@ -164,12 +164,12 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, StartGam
|
|||
// we can put it directly to selectLevel?
|
||||
if (packet->chunkCacheWidth != 0) {
|
||||
printf("lol \n");
|
||||
CHUNK_CACHE_WIDTH = packet->chunkCacheWidth;
|
||||
LEVEL_WIDTH = CHUNK_CACHE_WIDTH * CHUNK_WIDTH;
|
||||
LEVEL_DEPTH = CHUNK_CACHE_WIDTH * CHUNK_DEPTH;
|
||||
LevelConstants::CHUNK_CACHE_WIDTH = packet->chunkCacheWidth;
|
||||
LevelConstants::LEVEL_WIDTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH;
|
||||
LevelConstants::LEVEL_DEPTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_DEPTH;
|
||||
|
||||
}
|
||||
NumRequestChunks = CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH;
|
||||
NumRequestChunks = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH;
|
||||
requestNextChunkIndexList.resize(NumRequestChunks);
|
||||
chunksLoaded.resize(NumRequestChunks);
|
||||
|
||||
|
|
@ -551,19 +551,19 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
|
|||
//unsigned char* blockIds = chunk->getBlockData();
|
||||
DataLayer& blockData = chunk->data;
|
||||
|
||||
const int setSize = LEVEL_HEIGHT / 8;
|
||||
const int setShift = 4; // power of LEVEL_HEIGHT / 8
|
||||
const int setSize = LevelConstants::LEVEL_HEIGHT / 8;
|
||||
const int setShift = 4; // power of LevelConstants::LEVEL_HEIGHT / 8
|
||||
|
||||
bool recalcHeight = false;
|
||||
|
||||
int x0 = 16, x1 = 0, z0 = 16, z1 = 0, y0 = LEVEL_HEIGHT, y1 = 0;
|
||||
int x0 = 16, x1 = 0, z0 = 16, z1 = 0, y0 = LevelConstants::LEVEL_HEIGHT, y1 = 0;
|
||||
int rx = packet->x << 4;
|
||||
int rz = packet->z << 4;
|
||||
|
||||
unsigned char readBlockBuffer[setSize];
|
||||
unsigned char readDataBuffer[setSize / 2];
|
||||
|
||||
for (int i = 0; i < CHUNK_COLUMNS; i++)
|
||||
for (int i = 0; i < LevelConstants::CHUNK_COLUMNS; i++)
|
||||
{
|
||||
unsigned char updateBits = 0;
|
||||
packet->chunkData.Read(updateBits);
|
||||
|
|
@ -572,8 +572,8 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
|
|||
{
|
||||
recalcHeight = true;
|
||||
|
||||
int colX = (i % CHUNK_WIDTH);
|
||||
int colZ = (i / CHUNK_WIDTH);
|
||||
int colX = (i % LevelConstants::CHUNK_WIDTH);
|
||||
int colZ = (i / LevelConstants::CHUNK_WIDTH);
|
||||
int colDataPosition = colX << 11 | colZ << 7;
|
||||
|
||||
for (int set = 0; set < 8; set++)
|
||||
|
|
@ -607,26 +607,26 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
|
|||
{
|
||||
y0 = ((1 << set) << setShift);
|
||||
}
|
||||
if (((1 << set) << setShift) + (LEVEL_HEIGHT / 8) - 1 > y1)
|
||||
if (((1 << set) << setShift) + (LevelConstants::LEVEL_HEIGHT / 8) - 1 > y1)
|
||||
{
|
||||
y1 = ((1 << set) << setShift) + (LEVEL_HEIGHT / 8) - 1;
|
||||
y1 = ((1 << set) << setShift) + (LevelConstants::LEVEL_HEIGHT / 8) - 1;
|
||||
}
|
||||
}
|
||||
if ((i % CHUNK_WIDTH) < x0)
|
||||
if ((i % LevelConstants::CHUNK_WIDTH) < x0)
|
||||
{
|
||||
x0 = (i % CHUNK_WIDTH);
|
||||
x0 = (i % LevelConstants::CHUNK_WIDTH);
|
||||
}
|
||||
if ((i % CHUNK_WIDTH) > x1)
|
||||
if ((i % LevelConstants::CHUNK_WIDTH) > x1)
|
||||
{
|
||||
x1 = (i % CHUNK_WIDTH);
|
||||
x1 = (i % LevelConstants::CHUNK_WIDTH);
|
||||
}
|
||||
if ((i / CHUNK_WIDTH) < z0)
|
||||
if ((i / LevelConstants::CHUNK_WIDTH) < z0)
|
||||
{
|
||||
z0 = (i / CHUNK_WIDTH);
|
||||
z0 = (i / LevelConstants::CHUNK_WIDTH);
|
||||
}
|
||||
if ((i / CHUNK_WIDTH) > z1)
|
||||
if ((i / LevelConstants::CHUNK_WIDTH) > z1)
|
||||
{
|
||||
z1 = (i / CHUNK_WIDTH);
|
||||
z1 = (i / LevelConstants::CHUNK_WIDTH);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -655,7 +655,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
|
|||
//chunk->terrainPopulated = true;
|
||||
chunk->unsaved = false;
|
||||
|
||||
chunksLoaded[packet->x * CHUNK_CACHE_WIDTH + packet->z] = true;
|
||||
chunksLoaded[packet->x * LevelConstants::CHUNK_CACHE_WIDTH + packet->z] = true;
|
||||
|
||||
if (areAllChunksLoaded())
|
||||
{
|
||||
|
|
@ -703,14 +703,14 @@ void ClientSideNetworkHandler::arrangeRequestChunkOrder() {
|
|||
clearChunksLoaded();
|
||||
|
||||
// Default sort is around center of the world
|
||||
int cx = CHUNK_CACHE_WIDTH / 2;
|
||||
int cz = CHUNK_CACHE_WIDTH / 2;
|
||||
int cx = LevelConstants::CHUNK_CACHE_WIDTH / 2;
|
||||
int cz = LevelConstants::CHUNK_CACHE_WIDTH / 2;
|
||||
|
||||
// If player exists, let's sort around him
|
||||
Player* p = minecraft? minecraft->player : NULL;
|
||||
if (p) {
|
||||
cx = Mth::floor(p->x / (float)CHUNK_WIDTH);
|
||||
cz = Mth::floor(p->z / (float)CHUNK_DEPTH);
|
||||
cx = Mth::floor(p->x / (float)LevelConstants::CHUNK_WIDTH);
|
||||
cz = Mth::floor(p->z / (float)LevelConstants::CHUNK_DEPTH);
|
||||
}
|
||||
|
||||
_ChunkSorter sorter(cx, cz);
|
||||
|
|
@ -1004,8 +1004,8 @@ void ClientSideNetworkHandler::clearChunksLoaded()
|
|||
{
|
||||
// Init the chunk positions
|
||||
for (int i = 0; i < NumRequestChunks; ++i) {
|
||||
requestNextChunkIndexList[i].x = i/CHUNK_WIDTH;
|
||||
requestNextChunkIndexList[i].y = i%CHUNK_WIDTH;
|
||||
requestNextChunkIndexList[i].x = i / LevelConstants::CHUNK_WIDTH;
|
||||
requestNextChunkIndexList[i].y = i % LevelConstants::CHUNK_WIDTH;
|
||||
chunksLoaded[i] = false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
|
|||
gameType,
|
||||
newPlayer->entityId,
|
||||
newPlayer->x, newPlayer->y - newPlayer->heightOffset, newPlayer->z,
|
||||
CHUNK_CACHE_WIDTH
|
||||
LevelConstants::CHUNK_CACHE_WIDTH
|
||||
).write(&bitStream);
|
||||
|
||||
rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
|
||||
|
|
|
|||
|
|
@ -236,9 +236,9 @@ std::string CommandServer::parse(ConnectedClient& client, const std::string& s)
|
|||
if (x0 < 0) x0 = 0;
|
||||
if (y0 < 0) y0 = 0;
|
||||
if (z0 < 0) z0 = 0;
|
||||
if (x1 >= LEVEL_WIDTH ) x1 = LEVEL_WIDTH - 1;
|
||||
if (y1 >= LEVEL_HEIGHT) y1 = LEVEL_HEIGHT - 1;
|
||||
if (z1 >= LEVEL_DEPTH ) z1 = LEVEL_DEPTH - 1;
|
||||
if (x1 >= LevelConstants::LEVEL_WIDTH ) x1 = LevelConstants::LEVEL_WIDTH - 1;
|
||||
if (y1 >= LevelConstants::LEVEL_HEIGHT) y1 = LevelConstants::LEVEL_HEIGHT - 1;
|
||||
if (z1 >= LevelConstants::LEVEL_DEPTH ) z1 = LevelConstants::LEVEL_DEPTH - 1;
|
||||
|
||||
for (int y = y0; y <= y1; ++y)
|
||||
for (int z = z0; z <= z1; ++z)
|
||||
|
|
@ -456,7 +456,7 @@ std::string CommandServer::parse(ConnectedClient& client, const std::string& s)
|
|||
sw.start();
|
||||
|
||||
// Save a cuboid around the player
|
||||
const int CSize = CHUNK_CACHE_WIDTH;
|
||||
const int CSize = LevelConstants::CHUNK_CACHE_WIDTH;
|
||||
int cx = (int)e->x / CSize;
|
||||
int cz = (int)e->z / CSize;
|
||||
|
||||
|
|
@ -504,7 +504,7 @@ bool CommandServer::handleCheckpoint(bool doRestore ) {
|
|||
const int cz = restorePos.z;
|
||||
const int y0 = restorePos.y;
|
||||
const int y1 = y0 + RestoreHeight;
|
||||
const int CSize = CHUNK_CACHE_WIDTH;
|
||||
const int CSize = LevelConstants::CHUNK_CACHE_WIDTH;
|
||||
const int numChunkBytes = RestoreHeight * CSize * CSize * 20 / 8;
|
||||
|
||||
if (!restoreBuffer) {
|
||||
|
|
|
|||
|
|
@ -33,18 +33,18 @@ public:
|
|||
unsigned char* blockIds = chunk->getBlockData();
|
||||
DataLayer& blockData = chunk->data;
|
||||
|
||||
const int setSize = LEVEL_HEIGHT / 8;
|
||||
const int setShift = 4; // power of LEVEL_HEIGHT / 8
|
||||
const int setSize = LevelConstants::LEVEL_HEIGHT / 8;
|
||||
const int setShift = 4; // power of LevelConstants::LEVEL_HEIGHT / 8
|
||||
|
||||
chunkData.Reset();
|
||||
for (int i = 0; i < CHUNK_COLUMNS; i++)
|
||||
for (int i = 0; i < LevelConstants::CHUNK_COLUMNS; i++)
|
||||
{
|
||||
unsigned char updateBits = chunk->updateMap[i];
|
||||
chunkData.Write(updateBits);
|
||||
|
||||
if (updateBits > 0)
|
||||
{
|
||||
int colDataPosition = (i % CHUNK_WIDTH) << 11 | (i / CHUNK_WIDTH) << 7;
|
||||
int colDataPosition = (i % LevelConstants::CHUNK_WIDTH) << 11 | (i / LevelConstants::CHUNK_WIDTH) << 7;
|
||||
|
||||
for (int set = 0; set < 8; set++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public:
|
|||
bitStream->Write(x);
|
||||
bitStream->Write(y);
|
||||
bitStream->Write(z);
|
||||
bitStream->Write(CHUNK_CACHE_WIDTH);
|
||||
bitStream->Write(LevelConstants::CHUNK_CACHE_WIDTH);
|
||||
}
|
||||
|
||||
void read(RakNet::BitStream* bitStream)
|
||||
|
|
@ -55,7 +55,7 @@ public:
|
|||
bitStream->Read(x);
|
||||
bitStream->Read(y);
|
||||
bitStream->Read(z);
|
||||
|
||||
|
||||
if (bitStream->GetNumberOfUnreadBits() > 0) {
|
||||
bitStream->Read(chunkCacheWidth);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue