mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Fix rendering depth/order issues

Browse Source
pull/349/head
Kyle Cooley 7 years ago
parent c8f79ea838
commit eb23367175
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File

19
apps/opencs/view/render/object.cpp
Unescape Escape View File

@ -336,6 +336,9 @@ osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
osg::ref_ptr<osg::DrawElementsUShort> primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, osg::ref_ptr<osg::DrawElementsUShort> primitives = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES,
IndexCount); IndexCount);
// prevent some depth collision issues from overlaps
osg::Vec3f offset = getMarkerPosition(0, MarkerShaftWidth/4, 0, axis);
for (size_t i = 0; i < SegmentCount; ++i) for (size_t i = 0; i < SegmentCount; ++i)
{ {
size_t index = i * VerticesPerSegment; size_t index = i * VerticesPerSegment;
@ -346,10 +349,10 @@ osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
float outerX = OuterRadius * std::cos(i * Angle); float outerX = OuterRadius * std::cos(i * Angle);
float outerY = OuterRadius * std::sin(i * Angle); float outerY = OuterRadius * std::sin(i * Angle);
vertices->at(index++) = getMarkerPosition(innerX, innerY, MarkerShaftWidth / 2, axis); vertices->at(index++) = getMarkerPosition(innerX, innerY, MarkerShaftWidth / 2, axis) + offset;
vertices->at(index++) = getMarkerPosition(innerX, innerY, -MarkerShaftWidth / 2, axis); vertices->at(index++) = getMarkerPosition(innerX, innerY, -MarkerShaftWidth / 2, axis) + offset;
vertices->at(index++) = getMarkerPosition(outerX, outerY, MarkerShaftWidth / 2, axis); vertices->at(index++) = getMarkerPosition(outerX, outerY, MarkerShaftWidth / 2, axis) + offset;
vertices->at(index++) = getMarkerPosition(outerX, outerY, -MarkerShaftWidth / 2, axis); vertices->at(index++) = getMarkerPosition(outerX, outerY, -MarkerShaftWidth / 2, axis) + offset;
} }
colors->at(0) = osg::Vec4f ( colors->at(0) = osg::Vec4f (
@ -390,17 +393,11 @@ osg::ref_ptr<osg::Node> CSVRender::Object::makeRotateMarker (int axis)
void CSVRender::Object::setupCommonMarkerState(osg::ref_ptr<osg::Geometry> geometry) void CSVRender::Object::setupCommonMarkerState(osg::ref_ptr<osg::Geometry> geometry)
{ {
const int RenderBin = osg::StateSet::TRANSPARENT_BIN;
osg::ref_ptr<osg::StateSet> state = geometry->getOrCreateStateSet(); osg::ref_ptr<osg::StateSet> state = geometry->getOrCreateStateSet();
state->setMode(GL_LIGHTING, osg::StateAttribute::OFF); state->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
state->setMode(GL_BLEND, osg::StateAttribute::ON); state->setMode(GL_BLEND, osg::StateAttribute::ON);
osg::ref_ptr<osg::Depth> depth(new osg::Depth); state->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
depth->setWriteMask(false);
state->setAttributeAndModes(depth, osg::StateAttribute::ON);
state->setRenderBinDetails(RenderBin, "RenderBin");
} }
osg::Vec3f CSVRender::Object::getMarkerPosition (float x, float y, float z, int axis) osg::Vec3f CSVRender::Object::getMarkerPosition (float x, float y, float z, int axis)

Write Preview
Loading…
Cancel
Save