mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 07:37:20 +02:00
Pre CR tweaks
This commit is contained in:
parent
37fbbb0297
commit
1844eb2c9e
1 changed files with 6 additions and 5 deletions
|
@ -21,7 +21,7 @@ struct SendVoxelsOperationArgs {
|
||||||
};
|
};
|
||||||
|
|
||||||
bool sendVoxelsOperation(OctreeElement* element, void* extraData) {
|
bool sendVoxelsOperation(OctreeElement* element, void* extraData) {
|
||||||
VoxelTreeElement* voxel = (VoxelTreeElement*)element;
|
VoxelTreeElement* voxel = static_cast<VoxelTreeElement*>(element);
|
||||||
SendVoxelsOperationArgs* args = (SendVoxelsOperationArgs*)extraData;
|
SendVoxelsOperationArgs* args = (SendVoxelsOperationArgs*)extraData;
|
||||||
if (voxel->isColored()) {
|
if (voxel->isColored()) {
|
||||||
const unsigned char* nodeOctalCode = voxel->getOctalCode();
|
const unsigned char* nodeOctalCode = voxel->getOctalCode();
|
||||||
|
@ -117,19 +117,20 @@ DeleteVoxelCommand::~DeleteVoxelCommand() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeleteVoxelCommand::redo() {
|
void DeleteVoxelCommand::redo() {
|
||||||
if (_voxel.s == 0) {
|
if (_voxel.s == 0.0f) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_tree) {
|
if (_tree) {
|
||||||
_tree->deleteVoxelAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s); }
|
_tree->deleteVoxelAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s);
|
||||||
|
}
|
||||||
if (_packetSender) {
|
if (_packetSender) {
|
||||||
_packetSender->queueVoxelEditMessages(PacketTypeVoxelErase, 1, &_voxel);
|
_packetSender->queueVoxelEditMessages(PacketTypeVoxelErase, 1, &_voxel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeleteVoxelCommand::undo() {
|
void DeleteVoxelCommand::undo() {
|
||||||
if (_voxel.s == 0) {
|
if (_voxel.s == 0.0f) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,4 +158,4 @@ void DeleteVoxelCommand::undo() {
|
||||||
_packetSender->queueVoxelEditMessages(PacketTypeVoxelSet, 1, &_voxel);
|
_packetSender->queueVoxelEditMessages(PacketTypeVoxelSet, 1, &_voxel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue