Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-18 18:38:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't call getMesh from render

Browse source
This commit is contained in:
Seth Alves 2016-03-23 22:46:43 -07:00
parent 2d7f32a554
commit 462da3aaf3
4 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -99,7 +99,7 @@ bool isEdged(PolyVoxEntityItem::PolyVoxSurfaceStyle surfaceStyle) {
void RenderablePolyVoxEntityItem::setVoxelData(QByteArray voxelData) {
bool doDecompress = true;
withWriteLock([&] {
if (_voxelData == voxelData && _voxelDataDirty == false) {
if (_voxelData == voxelData) {
doDecompress = false;
return;
}
@ -126,6 +126,7 @@ void RenderablePolyVoxEntityItem::setVoxelSurfaceStyle(PolyVoxSurfaceStyle voxel
bool willBeEdged = isEdged(voxelSurfaceStyle);
if (wasEdged != willBeEdged) {
qDebug() << "setvoxelsurfacestyle _volDataDirty = true";
_volDataDirty = true;
if (_volData) {
delete _volData;
@ -232,6 +233,7 @@ void RenderablePolyVoxEntityItem::setVoxelsFromData(QByteArray uncompressedData,
qDebug() << "setvoxelsfromdata _volDataDirty = true";
_volDataDirty = true;
});
getMesh();
}
void RenderablePolyVoxEntityItem::forEachVoxelValue(quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize,
@ -548,18 +550,10 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) {
model::MeshPointer mesh;
glm::vec3 voxelVolumeSize;
bool doGetMesh = false;
withReadLock([&] {
if (_volDataDirty) {
doGetMesh = true;
}
mesh = _mesh;
voxelVolumeSize = _voxelVolumeSize;
});
if (doGetMesh) {
qDebug() << "RENDER calling getMesh";
getMesh();
}
if (!_pipeline) {
gpu::ShaderPointer vertexShader = gpu::Shader::createVertex(std::string(polyvox_vert));
@ -836,7 +830,7 @@ bool RenderablePolyVoxEntityItem::updateOnCount(int x, int y, int z, uint8_t toV
void RenderablePolyVoxEntityItem::decompressVolumeData() {
// take compressed data and expand it into _volData.
QByteArray voxelData;
EntityItemPointer entity = getThisPointer();
auto entity = std::static_pointer_cast<RenderablePolyVoxEntityItem>(getThisPointer());
withReadLock([&] {
voxelData = _voxelData;
@ -854,7 +848,7 @@ void RenderablePolyVoxEntityItem::decompressVolumeData() {
voxelZSize == 0 || voxelZSize > PolyVoxEntityItem::MAX_VOXEL_DIMENSION) {
qDebug() << "voxelSize is not reasonable, skipping decompressions."
<< voxelXSize << voxelYSize << voxelZSize << getName() << getID();
// std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity)->setVoxelDataDirty(true);
entity->setVoxelDataDirty(false);
return;
}
int rawSize = voxelXSize * voxelYSize * voxelZSize;
@ -868,12 +862,11 @@ void RenderablePolyVoxEntityItem::decompressVolumeData() {
qDebug() << "PolyVox decompress -- size is (" << voxelXSize << voxelYSize << voxelZSize << ")"
<< "so expected uncompressed length of" << rawSize << "but length is" << uncompressedData.size()
<< getName() << getID();
std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity)->setVoxelDataDirty(false);
entity->setVoxelDataDirty(false);
return;
}
std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity)->setVoxelsFromData(uncompressedData,
voxelXSize, voxelYSize, voxelZSize);
entity->setVoxelsFromData(uncompressedData, voxelXSize, voxelYSize, voxelZSize);
});
}
@ -1140,7 +1133,8 @@ void RenderablePolyVoxEntityItem::getMesh() {
if (vertexBufferPtr->getSize() > sizeof(float) * 3) {
vertexBufferSize = vertexBufferPtr->getSize() - sizeof(float) * 3;
}
auto vertexBufferView = new gpu::BufferView(vertexBufferPtr, 0, vertexBufferSize, sizeof(PolyVox::PositionMaterialNormal),
auto vertexBufferView = new gpu::BufferView(vertexBufferPtr, 0, vertexBufferSize,
sizeof(PolyVox::PositionMaterialNormal),
gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::RAW));
mesh->setVertexBuffer(*vertexBufferView);
mesh->addAttribute(gpu::Stream::NORMAL,
@ -1192,8 +1186,6 @@ void RenderablePolyVoxEntityItem::computeShapeInfoWorker() {
});
if (!meshInitialized) {
qDebug() << "computeShapeInfoWorker calling getMesh";
getMesh();
return;
}

5
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
View file

@ -159,11 +159,8 @@ private:
// these are run off the main thread
void decompressVolumeData();
void compressVolumeDataAndSendEditPacket();
void compressVolumeDataAndSendEditPacketAsync();
void getMesh();
void getMeshAsync();
virtual void getMesh(); // recompute mesh
void computeShapeInfoWorker();
void computeShapeInfoWorkerAsync();
// these are cached lookups of _xNNeighborID, _yNNeighborID, _zNNeighborID, _xPNeighborID, _yPNeighborID, _zPNeighborID
EntityItemWeakPointer _xNNeighbor; // neighor found by going along negative X axis

1
libraries/entities/src/PolyVoxEntityItem.cpp
View file

@ -150,6 +150,7 @@ bool PolyVoxEntityItem::setProperties(const EntityItemProperties& properties) {
"now=" << now << " getLastEdited()=" << getLastEdited();
}
setLastEdited(properties._lastEdited);
getMesh();
}
return somethingChanged;
}

1
libraries/entities/src/PolyVoxEntityItem.h
View file

@ -129,6 +129,7 @@ class PolyVoxEntityItem : public EntityItem {
virtual void rebakeMesh() {};
void setVoxelDataDirty(bool value) { withWriteLock([&] { _voxelDataDirty = value; }); }
virtual void getMesh() {}; // recompute mesh
protected:
glm::vec3 _voxelVolumeSize; // this is always 3 bytes