Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 3 files). Show all
Unified · Split
| @@ -11,11 +11,12 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #include "GeometryCache.h" |
| 13 | 13 | |
| 14 | + | |
| 14 | 15 | #include <cmath> |
| 15 | 16 | |
| 16 | −#include <QNetworkReply> | |
| 17 | −#include <QThreadPool> | |
| 17 | +#include <QtCore/QThreadPool> | |
| 18 | 18 | #include <QtCore/QFileInfo> |
| 19 | +#include <QtNetwork/QNetworkReply> | |
| 19 | 20 | |
| 20 | 21 | #include <FSTReader.h> |
| 21 | 22 | #include <NumericalConstants.h> |
| @@ -1462,11 +1463,11 @@ void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const · 1440 unmodified lines | ||
| 1462 | 1463 | auto GS = gpu::Shader::createGeometry(std::string(glowLine_geom)); |
| 1463 | 1464 | auto PS = gpu::Shader::createPixel(std::string(glowLine_frag)); |
| 1464 | 1465 | auto program = gpu::Shader::createProgram(VS, GS, PS); |
| 1465 | − state->setCullMode(gpu::State::CULL_BACK); | |
| 1466 | + state->setCullMode(gpu::State::CULL_NONE); | |
| 1466 | 1467 | state->setDepthTest(true, true, gpu::LESS_EQUAL); |
| 1467 | − state->setDepthBias(1.0f); | |
| 1468 | − state->setDepthBiasSlopeScale(1.0f); | |
| 1469 | − state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA); | |
| 1468 | + state->setBlendFunction(true, | |
| 1469 | + gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA, | |
| 1470 | + gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE); | |
| 1470 | 1471 | gpu::Shader::BindingSet slotBindings; |
| 1471 | 1472 | slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingMap"), render::ShapePipeline::Slot::MAP::NORMAL_FITTING)); |
| 1472 | 1473 | gpu::Shader::makeProgram(*program, slotBindings); |