Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 15:13:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

warnings

Browse source
This commit is contained in:
SamGondelman 2018-03-07 13:16:13 -08:00
parent 19e4fb2355
commit 96e48a0162
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
View file

@ -123,5 +123,5 @@ void MaterialEntityRenderer::doRender(RenderArgs* args) {
// Draw!
DependencyManager::get<GeometryCache>()->renderSphere(batch);
args->_details._trianglesRendered += DependencyManager::get<GeometryCache>()->getSphereTriangleCount();
args->_details._trianglesRendered += (int)DependencyManager::get<GeometryCache>()->getSphereTriangleCount();
}

9
libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
View file

@ -138,11 +138,12 @@ ItemKey ShapeEntityRenderer::getKey() {
}
bool ShapeEntityRenderer::useMaterialPipeline() const {
withReadLock([&] {
if (_procedural.isReady()) {
return false;
}
bool proceduralReady = resultWithReadLock<bool>([&] {
return _procedural.isReady();
});
if (proceduralReady) {
return false;
}
graphics::MaterialKey drawMaterialKey;
auto mat = _materials.find("0");

3
libraries/render-utils/src/GeometryCache.cpp
View file

@ -401,7 +401,7 @@ vec2 calculateSphereTexCoord(const vec3& vertex) {
}
vec3 calculateSphereTangent(float u) {
float phi = u * M_PI * 2.0f;
float phi = u * (float)M_PI * 2.0f;
return -glm::normalize(glm::vec3(glm::sin(phi), 0.0f, glm::cos(phi)));
}
@ -414,7 +414,6 @@ void setupSmoothShape(GeometryCache::ShapeData& shapeData, const geometry::Solid
for (const auto& vertex : shape.vertices) {
addVec3ToVector(vertices, vertex);
addVec3ToVector(vertices, vertex);
vec2 uv = calculateSphereTexCoord(vertex);
addVec2ToVector(vertices, calculateSphereTexCoord(vertex));
// We'll fill in the correct tangents later, once we correct the UVs
addVec3ToVector(vertices, vec3(0.0f));

14
libraries/shared/src/shared/Shapes.cpp
View file

@ -22,7 +22,7 @@ Solid<3> tesselate(const Solid<3>& solid_, int count) {
Solid<3> solid = solid_;
float length = glm::length(solid.vertices[0]);
for (int i = 0; i < count; ++i) {
Solid<3> result { solid.vertices, {} };
Solid<3> result { solid.vertices, {}, {} };
result.vertices.reserve(solid.vertices.size() + solid.faces.size() * 6);
for (size_t f = 0; f < solid.faces.size(); ++f) {
Index baseVertex = (Index)result.vertices.size();
@ -171,16 +171,16 @@ const Solid<5>& dodecahedron() {
// 1 = 3 * x1 + 3 * x2 + x3
// x1 + 2 * x3 = (golden ratio) * x1
// x2 = x1 + 2 * x3
static const float x1 = 4.0f / (17.0f + 7.0f * sqrt(5.0f));
static const float x2 = (1.0f / 11.0f) * (5.0f * sqrt(5.0f) - 9.0f);
static const float x1 = 4.0f / (17.0f + 7.0f * sqrtf(5.0f));
static const float x2 = (1.0f / 11.0f) * (5.0f * sqrtf(5.0f) - 9.0f);
static const float x2_2 = x2 / 2.0f;
static const float x3 = (1.0f / 11.0f) * (6.0f * sqrt(5.0f) - 13.0f);
static const float x3 = (1.0f / 11.0f) * (6.0f * sqrtf(5.0f) - 13.0f);
// y1 and y2 are the solutions to the following system of equations (x is the sidelength, but is different than x1 because the scale in the y direction is different):
// 1 = 3 * y1 + 2 * y2
// y1 = sin(108 deg) * x
// y1 + y2 = x * sqrt(5 + 2 * sqrt(5)) / 2
static const float y1 = sqrt(2.0f * (5.0f + sqrt(5.0f))) / (sqrt(2.0f * (5.0f + sqrt(5.0f))) + 4.0f * sqrt(5.0f + 2.0f * sqrt(5.0f)));
static const float y2 = -(sqrt(2.0f * (5.0f + sqrt(5.0f))) - 2.0f * sqrt(5.0f + 2.0f * sqrt(5.0f))) / (sqrt(2.0f * (5.0f + sqrt(5.0f))) + 4.0f * sqrt(5.0f + 2.0f * sqrt(5.0f)));
// y1 + y2 = x * sqrtf(5 + 2 * sqrtf(5)) / 2
static const float y1 = sqrtf(2.0f * (5.0f + sqrtf(5.0f))) / (sqrtf(2.0f * (5.0f + sqrtf(5.0f))) + 4.0f * sqrtf(5.0f + 2.0f * sqrtf(5.0f)));
static const float y2 = -(sqrtf(2.0f * (5.0f + sqrtf(5.0f))) - 2.0f * sqrtf(5.0f + 2.0f * sqrtf(5.0f))) / (sqrtf(2.0f * (5.0f + sqrtf(5.0f))) + 4.0f * sqrtf(5.0f + 2.0f * sqrtf(5.0f)));
static const Solid<5> DODECAHEDRON = Solid<5>{
{