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

Stylish updates

Browse source
This commit is contained in:
Liv 2017-06-09 11:46:38 -07:00
parent 1808505d8b
commit 8c488d95d1
1 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,7 @@ std::vector<vec3> polygon() {
std::vector<vec3> result; std::vector<vec3> result;
result.reserve(SIDES); result.reserve(SIDES);
double angleIncrement = 2.0 * M_PI / SIDES; double angleIncrement = 2.0 * M_PI / SIDES;
for (size_t i = 0; i < SIDES; ++i) { for (size_t i = 0; i < SIDES; i++) {
double angle = (double)i * angleIncrement; double angle = (double)i * angleIncrement;
result.push_back(vec3{ cos(angle) * 0.5, 0.0, sin(angle) * 0.5 }); result.push_back(vec3{ cos(angle) * 0.5, 0.0, sin(angle) * 0.5 });
} }
@ -172,20 +172,20 @@ void setupFlatShape(GeometryCache::ShapeData& shapeData, const geometry::Solid<N
vertices.reserve(N * faceCount * 2); vertices.reserve(N * faceCount * 2);
solidIndices.reserve(faceIndexCount * faceCount); solidIndices.reserve(faceIndexCount * faceCount);
for (size_t f = 0; f < faceCount; ++f) { for (size_t f = 0; f < faceCount; f++) {
const Face<N>& face = shape.faces[f]; const Face<N>& face = shape.faces[f];
// Compute the face normal // Compute the face normal
vec3 faceNormal = shape.getFaceNormal(f); vec3 faceNormal = shape.getFaceNormal(f);
// Create the vertices for the face // Create the vertices for the face
for (Index i = 0; i < N; ++i) { for (Index i = 0; i < N; i++) {
Index originalIndex = face[i]; Index originalIndex = face[i];
vertices.push_back(shape.vertices[originalIndex]); vertices.push_back(shape.vertices[originalIndex]);
vertices.push_back(faceNormal); vertices.push_back(faceNormal);
} }
// Create the wire indices for unseen edges // Create the wire indices for unseen edges
for (Index i = 0; i < N; ++i) { for (Index i = 0; i < N; i++) {
Index a = i; Index a = i;
Index b = (i + 1) % N; Index b = (i + 1) % N;
auto token = indexToken(face[a], face[b]); auto token = indexToken(face[a], face[b]);
@ -197,7 +197,7 @@ void setupFlatShape(GeometryCache::ShapeData& shapeData, const geometry::Solid<N
} }
// Create the solid face indices // Create the solid face indices
for (Index i = 0; i < N - 2; ++i) { for (Index i = 0; i < N - 2; i++) {
solidIndices.push_back(0 + baseVertex); solidIndices.push_back(0 + baseVertex);
solidIndices.push_back(i + 1 + baseVertex); solidIndices.push_back(i + 1 + baseVertex);
solidIndices.push_back(i + 2 + baseVertex); solidIndices.push_back(i + 2 + baseVertex);
@ -229,10 +229,10 @@ void setupSmoothShape(GeometryCache::ShapeData& shapeData, const geometry::Solid
solidIndices.reserve(faceIndexCount * faceCount); solidIndices.reserve(faceIndexCount * faceCount);
for (size_t f = 0; f < faceCount; ++f) { for (size_t f = 0; f < faceCount; f++) {
const Face<N>& face = shape.faces[f]; const Face<N>& face = shape.faces[f];
// Create the wire indices for unseen edges // Create the wire indices for unseen edges
for (Index i = 0; i < N; ++i) { for (Index i = 0; i < N; i++) {
Index a = face[i]; Index a = face[i];
Index b = face[(i + 1) % N]; Index b = face[(i + 1) % N];
auto token = indexToken(a, b); auto token = indexToken(a, b);
@ -244,7 +244,7 @@ void setupSmoothShape(GeometryCache::ShapeData& shapeData, const geometry::Solid
} }
// Create the solid face indices // Create the solid face indices
for (Index i = 0; i < N - 2; ++i) { for (Index i = 0; i < N - 2; i++) {
solidIndices.push_back(face[i] + baseVertex); solidIndices.push_back(face[i] + baseVertex);
solidIndices.push_back(face[i + 1] + baseVertex); solidIndices.push_back(face[i + 1] + baseVertex);
solidIndices.push_back(face[i + 2] + baseVertex); solidIndices.push_back(face[i + 2] + baseVertex);
@ -267,20 +267,20 @@ void extrudePolygon(GeometryCache::ShapeData& shapeData, gpu::BufferPointer& ver
if (isConical) { if (isConical) {
for (uint32_t i = 0; i < N; i++) { for (uint32_t i = 0; i < N; i++) {
vertices.push_back(vec3(0.0f, 0.5f, 0.0f)); vertices.push_back(vec3(0.0f, 0.5f, 0.0f));
vertices.push_back(vec3(0, 1, 0)); vertices.push_back(vec3(0.0f, 1.0f, 0.0f));
} }
} }
else { else {
for (const vec3& v : shape) { for (const vec3& v : shape) {
vertices.push_back(vec3(v.x, 0.5f, v.z)); vertices.push_back(vec3(v.x, 0.5f, v.z));
vertices.push_back(vec3(0, 1, 0)); vertices.push_back(vec3(0.0f, 1.0f, 0.0f));
} }
} }
for (const vec3& v : shape) { for (const vec3& v : shape) {
vertices.push_back(vec3(v.x, -0.5f, v.z)); vertices.push_back(vec3(v.x, -0.5f, v.z));
vertices.push_back(vec3(0, -1, 0)); vertices.push_back(vec3(0.0f, -1.0f, 0.0f));
} }
for (uint32_t i = 2; i < N; ++i) { for (uint32_t i = 2; i < N; i++) {
solidIndices.push_back(baseVertex + 0); solidIndices.push_back(baseVertex + 0);
solidIndices.push_back(baseVertex + i); solidIndices.push_back(baseVertex + i);
solidIndices.push_back(baseVertex + i - 1); solidIndices.push_back(baseVertex + i - 1);
@ -288,7 +288,7 @@ void extrudePolygon(GeometryCache::ShapeData& shapeData, gpu::BufferPointer& ver
solidIndices.push_back(baseVertex + i + N - 1); solidIndices.push_back(baseVertex + i + N - 1);
solidIndices.push_back(baseVertex + i + N); solidIndices.push_back(baseVertex + i + N);
} }
for (uint32_t i = 1; i <= N; ++i) { for (uint32_t i = 1; i <= N; i++) {
wireIndices.push_back(baseVertex + (i % N)); wireIndices.push_back(baseVertex + (i % N));
wireIndices.push_back(baseVertex + i - 1); wireIndices.push_back(baseVertex + i - 1);
wireIndices.push_back(baseVertex + (i % N) + N); wireIndices.push_back(baseVertex + (i % N) + N);
@ -298,12 +298,12 @@ void extrudePolygon(GeometryCache::ShapeData& shapeData, gpu::BufferPointer& ver
// Now do the sides // Now do the sides
baseVertex += 2 * N; baseVertex += 2 * N;
for (uint32_t i = 0; i < N; ++i) { for (uint32_t i = 0; i < N; i++) {
vec3 left = shape[i]; vec3 left = shape[i];
vec3 right = shape[(i + 1) % N]; vec3 right = shape[(i + 1) % N];
vec3 normal = glm::normalize(left + right); vec3 normal = glm::normalize(left + right);
vec3 topLeft = (isConical ? vec3(0.0f, 0.5f, 0.0f) : vec3(left.x, 0.5f, left.z)); vec3 topLeft = (isConical ? vec3(0.0f, 0.5f, 0.0f) : vec3(left.x, 0.5f, left.z));
vec3 topRight = (isConical? vec3(0.0f, 0.5f, 0.0f) : vec3(right.x, 0.5f, right.z)); vec3 topRight = (isConical ? vec3(0.0f, 0.5f, 0.0f) : vec3(right.x, 0.5f, right.z));
vec3 bottomLeft = vec3(left.x, -0.5f, left.z); vec3 bottomLeft = vec3(left.x, -0.5f, left.z);
vec3 bottomRight = vec3(right.x, -0.5f, right.z); vec3 bottomRight = vec3(right.x, -0.5f, right.z);
@ -340,27 +340,28 @@ void drawCircle(GeometryCache::ShapeData& shapeData, gpu::BufferPointer& vertexB
Index baseVertex = (Index)(vertexBuffer->getSize() / SHAPE_VERTEX_STRIDE); Index baseVertex = (Index)(vertexBuffer->getSize() / SHAPE_VERTEX_STRIDE);
VertexVector vertices; VertexVector vertices;
IndexVector solidIndices, wireIndices; IndexVector solidIndices, wireIndices;
const int numCircleVertices = 64; const int NUM_CIRCLE_VERTICES = 64;
std::vector<vec3> shape = polygon<numCircleVertices>(); std::vector<vec3> shape = polygon<NUM_CIRCLE_VERTICES>();
for (const vec3& v : shape) { for (const vec3& v : shape) {
vertices.push_back(vec3(v.x, 0.0f, v.z)); vertices.push_back(vec3(v.x, 0.0f, v.z));
vertices.push_back(vec3(0, 0, 0)); vertices.push_back(vec3(0.0f, 0.0f, 0.0f));
} }
for (uint32_t i = 2; i < numCircleVertices; ++i) { for (uint32_t i = 2; i < NUM_CIRCLE_VERTICES; i++) {
solidIndices.push_back(baseVertex + 0); solidIndices.push_back(baseVertex + 0);
solidIndices.push_back(baseVertex + i); solidIndices.push_back(baseVertex + i);
solidIndices.push_back(baseVertex + i - 1); solidIndices.push_back(baseVertex + i - 1);
solidIndices.push_back(baseVertex + numCircleVertices); solidIndices.push_back(baseVertex + NUM_CIRCLE_VERTICES);
solidIndices.push_back(baseVertex + i + numCircleVertices - 1); solidIndices.push_back(baseVertex + i + NUM_CIRCLE_VERTICES - 1);
solidIndices.push_back(baseVertex + i + numCircleVertices); solidIndices.push_back(baseVertex + i + NUM_CIRCLE_VERTICES);
} }
for (uint32_t i = 1; i <= numCircleVertices; ++i) {
wireIndices.push_back(baseVertex + (i % numCircleVertices)); for (uint32_t i = 1; i <= NUM_CIRCLE_VERTICES; i++) {
wireIndices.push_back(baseVertex + (i % NUM_CIRCLE_VERTICES));
wireIndices.push_back(baseVertex + i - 1); wireIndices.push_back(baseVertex + i - 1);
wireIndices.push_back(baseVertex + (i % numCircleVertices) + numCircleVertices); wireIndices.push_back(baseVertex + (i % NUM_CIRCLE_VERTICES) + NUM_CIRCLE_VERTICES);
wireIndices.push_back(baseVertex + (i - 1) + numCircleVertices); wireIndices.push_back(baseVertex + (i - 1) + NUM_CIRCLE_VERTICES);
} }
shapeData.setupVertices(vertexBuffer, vertices); shapeData.setupVertices(vertexBuffer, vertices);
@ -399,8 +400,8 @@ void GeometryCache::buildShapes() {
Index baseVertex = (Index)(_shapeVertices->getSize() / SHAPE_VERTEX_STRIDE); Index baseVertex = (Index)(_shapeVertices->getSize() / SHAPE_VERTEX_STRIDE);
ShapeData& shapeData = _shapes[Line]; ShapeData& shapeData = _shapes[Line];
shapeData.setupVertices(_shapeVertices, VertexVector { shapeData.setupVertices(_shapeVertices, VertexVector {
vec3(-0.5, 0, 0), vec3(-0.5f, 0, 0), vec3(-0.5f, 0.0f, 0.0f), vec3(-0.5f, 0.0f, 0.0f),
vec3(0.5f, 0, 0), vec3(0.5f, 0, 0) vec3(0.5f, 0.0f, 0.0f), vec3(0.5f, 0.0f, 0.0f)
}); });
IndexVector wireIndices; IndexVector wireIndices;
// Only two indices // Only two indices
@ -641,7 +642,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, con
auto pointCount = points.size(); auto pointCount = points.size();
auto colorCount = colors.size(); auto colorCount = colors.size();
int compactColor = 0; int compactColor = 0;
for (auto i = 0; i < pointCount; ++i) { for (auto i = 0; i < pointCount; i++) {
const auto& point = points[i]; const auto& point = points[i];
*(vertex++) = point.x; *(vertex++) = point.x;
*(vertex++) = point.y; *(vertex++) = point.y;
@ -718,7 +719,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec3>& points, con
const glm::vec3 NORMAL(0.0f, 0.0f, 1.0f); const glm::vec3 NORMAL(0.0f, 0.0f, 1.0f);
auto pointCount = points.size(); auto pointCount = points.size();
auto colorCount = colors.size(); auto colorCount = colors.size();
for (auto i = 0; i < pointCount; ++i) { for (auto i = 0; i < pointCount; i++) {
const glm::vec3& point = points[i]; const glm::vec3& point = points[i];
if (i < colorCount) { if (i < colorCount) {
const glm::vec4& color = colors[i]; const glm::vec4& color = colors[i];