Skip to content

Fix transparency #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 13, 2015
Merged

Fix transparency #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7fec69
Closes #868
cbrightsci Feb 12, 2015
6ccce9b
Merge branch 'master' into fix-transparency
cbrightsci Feb 12, 2015
cfabe6e
Closes #874
cbrightsci Feb 12, 2015
c30c310
Fixed so lists aren't created unless that rendering type is selected
cbrightsci Feb 12, 2015
230d6cf
Merge branch 'master' into fix-transparency
cbrightsci Feb 12, 2015
97f17c7
Merge branch 'master' into fix-transparency
cbrightsci Feb 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Core/Algorithms/Visualization/RenderFieldState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ class RenderState

// Node flags
USE_SPHERE,
USE_TRANSPARENT_NODES,

// Edge flags
USE_CYLINDER,
USE_TRANSPARENT_EDGES,

// Face flags
USE_NORMALS,
Expand Down
261 changes: 138 additions & 123 deletions src/Interface/Modules/Render/ES/SRInterface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,128 +344,136 @@ namespace SCIRun {

// Add index buffer objects.
nameIndex = 0;
for (auto it = obj->mIBOs.cbegin(); it != obj->mIBOs.cend(); ++it, ++nameIndex)
{
const Core::Datatypes::GeometryObject::SpireIBO& ibo = *it;
GLenum primType = GL_UNSIGNED_SHORT;
switch (ibo.indexSize)
{
case 1: // 8-bit
primType = GL_UNSIGNED_BYTE;
break;

case 2: // 16-bit
primType = GL_UNSIGNED_SHORT;
break;

case 4: // 32-bit
primType = GL_UNSIGNED_INT;
break;

default:
primType = GL_UNSIGNED_INT;
throw std::invalid_argument("Unable to determine index buffer depth.");
break;
}
for (auto it = obj->mIBOs.cbegin(); it != obj->mIBOs.cend(); ++it, ++nameIndex)
{
const Core::Datatypes::GeometryObject::SpireIBO& ibo = *it;
GLenum primType = GL_UNSIGNED_SHORT;
switch (ibo.indexSize)
{
case 1: // 8-bit
primType = GL_UNSIGNED_BYTE;
break;

case 2: // 16-bit
primType = GL_UNSIGNED_SHORT;
break;

case 4: // 32-bit
primType = GL_UNSIGNED_INT;
break;

default:
primType = GL_UNSIGNED_INT;
throw std::invalid_argument("Unable to determine index buffer depth.");
break;
}

GLenum primitive = GL_TRIANGLES;
switch (ibo.prim)
{
case Core::Datatypes::GeometryObject::SpireIBO::POINTS:
primitive = GL_POINTS;
break;

case Core::Datatypes::GeometryObject::SpireIBO::LINES:
primitive = GL_LINES;
break;

case Core::Datatypes::GeometryObject::SpireIBO::TRIANGLES:
default:
primitive = GL_TRIANGLES;
break;
}
/// Create sorted lists of Buffers for transparency in each direction of the axis
uint32_t* ibo_buffer = reinterpret_cast<uint32_t*>(ibo.data->getBuffer());
size_t num_triangles = ibo.data->getBufferSize() / (sizeof(uint32_t) * 3);
Core::Geometry::Vector dir(0.0, 0.0, 0.0);
GLenum primitive = GL_TRIANGLES;
switch (ibo.prim)
{
case Core::Datatypes::GeometryObject::SpireIBO::POINTS:
primitive = GL_POINTS;
break;

case Core::Datatypes::GeometryObject::SpireIBO::LINES:
primitive = GL_LINES;
break;

case Core::Datatypes::GeometryObject::SpireIBO::TRIANGLES:
default:
primitive = GL_TRIANGLES;
break;
}

std::vector<DepthIndex> rel_depth(num_triangles);
for (int i = 0; i <= 6; ++i)
if (mRenderSortType == RenderState::TransparencySortType::LISTS_SORT)
{
std::string name = ibo.name;

if (i == 0)
{
dir = Core::Geometry::Vector(1.0, 0.0, 0.0);
name += "X";
}
if (i == 1)
{
dir = Core::Geometry::Vector(0.0, 1.0, 0.0);
name += "Y";
}
if (i == 2)
{
dir = Core::Geometry::Vector(0.0, 0.0, 1.0);
name += "Z";
}
if (i == 3)
{
dir = Core::Geometry::Vector(-1.0, 0.0, 0.0);
name += "NegX";
}
if (i == 4)
{
dir = Core::Geometry::Vector(0.0, -1.0, 0.0);
name += "NegY";
}
if (i == 5)
{
dir = Core::Geometry::Vector(0.0, 0.0, -1.0);
name += "NegZ";
}
if (i < 6)
/// Create sorted lists of Buffers for transparency in each direction of the axis
uint32_t* ibo_buffer = reinterpret_cast<uint32_t*>(ibo.data->getBuffer());
size_t num_triangles = ibo.data->getBufferSize() / (sizeof(uint32_t) * 3);
Core::Geometry::Vector dir(0.0, 0.0, 0.0);

std::vector<DepthIndex> rel_depth(num_triangles);
for (int i = 0; i <= 6; ++i)
{
for (size_t j = 0; j < num_triangles; j++)
std::string name = ibo.name;
if (i == 0)
{
int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
iboMan.addInMemoryIBO(ibo.data->getBuffer(), ibo.data->getBufferSize(), primitive, primType, numPrimitives, ibo.name);
}
if (i == 1)
{
float* vertex1 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3]));
Core::Geometry::Point node1(vertex1[0], vertex1[1], vertex1[2]);
dir = Core::Geometry::Vector(1.0, 0.0, 0.0);
name += "X";
}
if (i == 2)
{
dir = Core::Geometry::Vector(0.0, 1.0, 0.0);
name += "Y";
}
if (i == 3)
{
dir = Core::Geometry::Vector(0.0, 0.0, 1.0);
name += "Z";
}
if (i == 4)
{
dir = Core::Geometry::Vector(-1.0, 0.0, 0.0);
name += "NegX";
}
if (i == 5)
{
dir = Core::Geometry::Vector(0.0, -1.0, 0.0);
name += "NegY";
}
if (i == 6)
{
dir = Core::Geometry::Vector(0.0, 0.0, -1.0);
name += "NegZ";
}
if (i > 0)
{
for (size_t j = 0; j < num_triangles; j++)
{
float* vertex1 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3]));
Core::Geometry::Point node1(vertex1[0], vertex1[1], vertex1[2]);

float* vertex2 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3 + 1]));
Core::Geometry::Point node2(vertex2[0], vertex2[1], vertex2[2]);
float* vertex2 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3 + 1]));
Core::Geometry::Point node2(vertex2[0], vertex2[1], vertex2[2]);

float* vertex3 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3 + 2]));
Core::Geometry::Point node3(vertex3[0], vertex3[1], vertex3[2]);
float* vertex3 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3 + 2]));
Core::Geometry::Point node3(vertex3[0], vertex3[1], vertex3[2]);

rel_depth[j].mDepth = Core::Geometry::Dot(dir, node1) + Core::Geometry::Dot(dir, node2) + Core::Geometry::Dot(dir, node3);
rel_depth[j].mIndex = j;
}
rel_depth[j].mDepth = Core::Geometry::Dot(dir, node1) + Core::Geometry::Dot(dir, node2) + Core::Geometry::Dot(dir, node3);
rel_depth[j].mIndex = j;
}

std::sort(rel_depth.begin(), rel_depth.end());
std::sort(rel_depth.begin(), rel_depth.end());

int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;

std::vector<char> sorted_buffer(ibo.data->getBufferSize());
char* ibuffer = reinterpret_cast<char*>(ibo.data->getBuffer());
char* sbuffer = !sorted_buffer.empty() ? reinterpret_cast<char*>(&sorted_buffer[0]) : 0;

if (sbuffer && num_triangles > 0)
{
size_t tri_size = ibo.data->getBufferSize() / num_triangles;
for (size_t j = 0; j < num_triangles; j++)
std::vector<char> sorted_buffer(ibo.data->getBufferSize());
char* ibuffer = reinterpret_cast<char*>(ibo.data->getBuffer());
char* sbuffer = !sorted_buffer.empty() ? reinterpret_cast<char*>(&sorted_buffer[0]) : 0;

if (sbuffer && num_triangles > 0)
{
memcpy(sbuffer + j * tri_size, ibuffer + rel_depth[j].mIndex * tri_size, tri_size);
size_t tri_size = ibo.data->getBufferSize() / num_triangles;
for (size_t j = 0; j < num_triangles; j++)
{
memcpy(sbuffer + j * tri_size, ibuffer + rel_depth[j].mIndex * tri_size, tri_size);
}
iboMan.addInMemoryIBO(sbuffer, ibo.data->getBufferSize(), primitive, primType, numPrimitives, name);
}
iboMan.addInMemoryIBO(sbuffer, ibo.data->getBufferSize(), primitive, primType, numPrimitives, name);
}
}
else
{
int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
iboMan.addInMemoryIBO(ibo.data->getBuffer(), ibo.data->getBufferSize(), primitive, primType, numPrimitives, ibo.name);
}
}
}
}
else
{
int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
iboMan.addInMemoryIBO(ibo.data->getBuffer(), ibo.data->getBufferSize(), primitive, primType, numPrimitives, ibo.name);
}
}

// Add default identity transform to the object globally (instead of per-pass)
glm::mat4 xform;
Expand All @@ -484,23 +492,30 @@ namespace SCIRun {
if (pass.renderType == Core::Datatypes::GeometryObject::RENDER_VBO_IBO)
{
addVBOToEntity(entityID, pass.vboName);
for (int i = 0; i <= 6; ++i)
if (mRenderSortType == RenderState::TransparencySortType::LISTS_SORT)
{
std::string name = pass.iboName;
if (i == 0)
name += "X";
if (i == 1)
name += "Y";
if (i == 2)
name += "Z";
if (i == 3)
name += "NegX";
if (i == 4)
name += "NegY";
if (i == 5)
name += "NegZ";

addIBOToEntity(entityID, name);
for (int i = 0; i <= 6; ++i)
{
std::string name = pass.iboName;
if (i == 1)
name += "X";
if (i == 2)
name += "Y";
if (i == 3)
name += "Z";
if (i == 4)
name += "NegX";
if (i == 5)
name += "NegY";
if (i == 6)
name += "NegZ";

addIBOToEntity(entityID, name);
}
}
else
{
addIBOToEntity(entityID, pass.iboName);
}
}
else
Expand Down
11 changes: 3 additions & 8 deletions src/Interface/Modules/Render/ES/systems/RenderBasicSys.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,15 @@ class RenderBasicSys :
return;
}

if (srstate.front().state.get(RenderState::USE_TRANSPARENCY))
if (srstate.front().state.get(RenderState::USE_TRANSPARENCY) ||
srstate.front().state.get(RenderState::USE_TRANSPARENT_EDGES) ||
srstate.front().state.get(RenderState::USE_TRANSPARENT_NODES))
{
return;
}

GLuint iboID = ibo.front().glid;

int index = 0;
for (auto it = ibo.begin(); it != ibo.end(); ++it, ++index)
{
if (index == 6)
iboID = it->glid;
}

// Setup *everything*. We don't want to enter multiple conditional
// statements if we can avoid it. So we assume everything has not been
// setup (including uniforms) if the simple geom hasn't been setup.
Expand Down
13 changes: 4 additions & 9 deletions src/Interface/Modules/Render/ES/systems/RenderColorMapSys.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,15 @@ class RenderColorMapSys :
return;
}

if (srstate.front().state.get(RenderState::USE_TRANSPARENCY))
if (srstate.front().state.get(RenderState::USE_TRANSPARENCY) ||
srstate.front().state.get(RenderState::USE_TRANSPARENT_EDGES) ||
srstate.front().state.get(RenderState::USE_TRANSPARENT_NODES))
{
return;
}

GLuint iboID = ibo.front().glid;

int index = 0;
for (auto it = ibo.begin(); it != ibo.end(); ++it, ++index)
{
if (index == 6)
iboID = it->glid;
}


// Setup *everything*. We don't want to enter multiple conditional
// statements if we can avoid it. So we assume everything has not been
// setup (including uniforms) if the simple geom hasn't been setup.
Expand Down
Loading