* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
62 lines
1.2 KiB
C++
62 lines
1.2 KiB
C++
#include "stdafx.h"
|
|
#include "DataLayer.h"
|
|
|
|
DataLayer::DataLayer(int length, int depthBits) : depthBits(depthBits), depthBitsPlusFour(depthBits + 4)
|
|
{
|
|
data = byteArray(length >> 1);
|
|
}
|
|
|
|
DataLayer::DataLayer(byteArray data, int depthBits) : depthBits(depthBits), depthBitsPlusFour(depthBits + 4)
|
|
{
|
|
this->data = data;
|
|
}
|
|
|
|
DataLayer::~DataLayer()
|
|
{
|
|
delete[] data.data;
|
|
}
|
|
|
|
int DataLayer::get(int x, int y, int z)
|
|
{
|
|
int pos = (x << depthBitsPlusFour | z << depthBits | y);
|
|
int slot = pos >> 1;
|
|
int part = pos & 1;
|
|
|
|
if (part == 0)
|
|
{
|
|
return data[slot] & 0xf;
|
|
} else
|
|
{
|
|
return (data[slot] >> 4) & 0xf;
|
|
}
|
|
}
|
|
|
|
void DataLayer::set(int x, int y, int z, int val)
|
|
{
|
|
int pos = (x << depthBitsPlusFour | z << depthBits | y);
|
|
|
|
int slot = pos >> 1;
|
|
int part = pos & 1;
|
|
|
|
if (part == 0)
|
|
{
|
|
data[slot] = static_cast<byte>((data[slot] & 0xf0) | (val & 0xf));
|
|
} else
|
|
{
|
|
data[slot] = static_cast<byte>((data[slot] & 0x0f) | ((val & 0xf) << 4));
|
|
}
|
|
}
|
|
|
|
bool DataLayer::isValid()
|
|
{
|
|
return data.data != nullptr;
|
|
}
|
|
|
|
void DataLayer::setAll(int br)
|
|
{
|
|
byte val = static_cast<byte>(br & (br << 4));
|
|
for (unsigned int i = 0; i < data.length; i++)
|
|
{
|
|
data[i] = val;
|
|
}
|
|
} |