Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

get sizing for spheres to work properly

Browse source
This commit is contained in:
ZappoMan 2015-01-27 20:30:58 -08:00
parent 5df45c7dce
commit e7742351b7
3 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities-renderer/src/RenderableSphereEntityItem.cpp
View file

@ -46,7 +46,9 @@ void RenderableSphereEntityItem::render(RenderArgs* args) {
glTranslatef(positionToCenter.x, positionToCenter.y, positionToCenter.z); glTranslatef(positionToCenter.x, positionToCenter.y, positionToCenter.z);
glScalef(dimensions.x, dimensions.y, dimensions.z); glScalef(dimensions.x, dimensions.y, dimensions.z);
DependencyManager::get<DeferredLightingEffect>()->renderSolidSphere(0.5f, 15, 15, sphereColor); const int SLICES = 40;
const int STACKS = 40;
DependencyManager::get<DeferredLightingEffect>()->renderSolidSphere(0.5f, SLICES, STACKS, sphereColor);
glPopMatrix(); glPopMatrix();
glPopMatrix(); glPopMatrix();
}; };

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

@ -53,10 +53,11 @@ const int NUM_BYTES_PER_INDEX = sizeof(GLushort);
void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm::vec4& color, bool solid) { void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm::vec4& color, bool solid) {
//Vec2Pair key(glm::vec2(radius, slices), glm::vec2(stacks, 0)); Vec2Pair keyRadius(glm::vec2(radius, slices), glm::vec2(stacks, 0));
IntPair key(slices, stacks); IntPair keySlicesStacks(slices, stacks);
//qDebug() << " key:" << key; //qDebug() << " key:" << key;
//qDebug() << "renderSphere() radius:" << radius << "slices:" << slices << "stacks:" << stacks;
Vec3Pair colorKey(glm::vec3(color.x, color.y, slices),glm::vec3(color.z, color.y, stacks)); Vec3Pair colorKey(glm::vec3(color.x, color.y, slices),glm::vec3(color.z, color.y, stacks));
@ -64,9 +65,9 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm
int vertices = slices * (stacks - 1) + 2; int vertices = slices * (stacks - 1) + 2;
int indices = slices * stacks * NUM_VERTICES_PER_TRIANGULATED_QUAD; int indices = slices * stacks * NUM_VERTICES_PER_TRIANGULATED_QUAD;
if (!_sphereVertices.contains(key)) { if (!_sphereVertices.contains(keyRadius)) {
gpu::BufferPointer verticesBuffer(new gpu::Buffer()); gpu::BufferPointer verticesBuffer(new gpu::Buffer());
_sphereVertices[key] = verticesBuffer; _sphereVertices[keyRadius] = verticesBuffer;
GLfloat* vertexData = new GLfloat[vertices * NUM_COORDS_PER_VERTEX]; GLfloat* vertexData = new GLfloat[vertices * NUM_COORDS_PER_VERTEX];
GLfloat* vertex = vertexData; GLfloat* vertex = vertexData;
@ -74,18 +75,19 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm
// south pole // south pole
*(vertex++) = 0.0f; *(vertex++) = 0.0f;
*(vertex++) = 0.0f; *(vertex++) = 0.0f;
*(vertex++) = -1.0f; *(vertex++) = -1.0f * radius;
//add stacks vertices climbing up Y axis //add stacks vertices climbing up Y axis
for (int i = 1; i < stacks; i++) { for (int i = 1; i < stacks; i++) {
float phi = PI * (float)i / (float)(stacks) - PI_OVER_TWO; float phi = PI * (float)i / (float)(stacks) - PI_OVER_TWO;
float z = sinf(phi), radius = cosf(phi); float z = sinf(phi) * radius;
float stackRadius = cosf(phi) * radius;
for (int j = 0; j < slices; j++) { for (int j = 0; j < slices; j++) {
float theta = TWO_PI * (float)j / (float)slices; float theta = TWO_PI * (float)j / (float)slices;
*(vertex++) = sinf(theta) * radius; *(vertex++) = sinf(theta) * stackRadius;
*(vertex++) = cosf(theta) * radius; *(vertex++) = cosf(theta) * stackRadius;
*(vertex++) = z; *(vertex++) = z;
} }
} }
@ -93,11 +95,11 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm
// north pole // north pole
*(vertex++) = 0.0f; *(vertex++) = 0.0f;
*(vertex++) = 0.0f; *(vertex++) = 0.0f;
*(vertex++) = 1.0f; *(vertex++) = 1.0f * radius;
verticesBuffer->append(sizeof(GLfloat) * vertices * NUM_COORDS_PER_VERTEX, (gpu::Buffer::Byte*) vertexData); verticesBuffer->append(sizeof(GLfloat) * vertices * NUM_COORDS_PER_VERTEX, (gpu::Buffer::Byte*) vertexData);
delete[] vertexData; delete[] vertexData;
qDebug() << "GeometryCache::renderSphere()..."; qDebug() << "GeometryCache::renderSphere()... --- CREATING VERTICES BUFFER";
qDebug() << " radius:" << radius; qDebug() << " radius:" << radius;
qDebug() << " slices:" << slices; qDebug() << " slices:" << slices;
qDebug() << " stacks:" << stacks; qDebug() << " stacks:" << stacks;
@ -105,9 +107,9 @@ qDebug() << " stacks:" << stacks;
qDebug() << " _sphereVertices.size():" << _sphereVertices.size(); qDebug() << " _sphereVertices.size():" << _sphereVertices.size();
} }
if (!_sphereIndices.contains(key)) { if (!_sphereIndices.contains(keySlicesStacks)) {
gpu::BufferPointer indicesBuffer(new gpu::Buffer()); gpu::BufferPointer indicesBuffer(new gpu::Buffer());
_sphereIndices[key] = indicesBuffer; _sphereIndices[keySlicesStacks] = indicesBuffer;
GLushort* indexData = new GLushort[indices]; GLushort* indexData = new GLushort[indices];
GLushort* index = indexData; GLushort* index = indexData;
@ -148,7 +150,7 @@ qDebug() << " _sphereVertices.size():" << _sphereVertices.size();
} }
indicesBuffer->append(sizeof(GLushort) * indices, (gpu::Buffer::Byte*) indexData); indicesBuffer->append(sizeof(GLushort) * indices, (gpu::Buffer::Byte*) indexData);
delete[] indexData; delete[] indexData;
qDebug() << "GeometryCache::renderSphere()..."; qDebug() << "GeometryCache::renderSphere()... --- CREATING INDEX BUFFER";
qDebug() << " radius:" << radius; qDebug() << " radius:" << radius;
qDebug() << " slices:" << slices; qDebug() << " slices:" << slices;
qDebug() << " stacks:" << stacks; qDebug() << " stacks:" << stacks;
@ -175,14 +177,16 @@ qDebug() << " _sphereIndices.size():" << _sphereIndices.size();
colorBuffer->append(sizeof(int) * vertices, (gpu::Buffer::Byte*) colorData); colorBuffer->append(sizeof(int) * vertices, (gpu::Buffer::Byte*) colorData);
delete[] colorData; delete[] colorData;
qDebug() << "GeometryCache::renderSphere()..."; qDebug() << "GeometryCache::renderSphere()... --- CREATING COLORS BUFFER";
qDebug() << " color:" << color; qDebug() << " color:" << color;
qDebug() << " slices:" << slices;
qDebug() << " stacks:" << stacks;
qDebug() << " _sphereColors.size():" << _sphereColors.size(); qDebug() << " _sphereColors.size():" << _sphereColors.size();
} }
gpu::BufferPointer verticesBuffer = _sphereVertices[key]; gpu::BufferPointer verticesBuffer = _sphereVertices[keyRadius];
gpu::BufferPointer indicesBuffer = _sphereIndices[key]; gpu::BufferPointer indicesBuffer = _sphereIndices[keySlicesStacks];
gpu::BufferPointer colorBuffer = _sphereColors[colorKey]; gpu::BufferPointer colorBuffer = _sphereColors[colorKey];

2
libraries/render-utils/src/GeometryCache.h
View file

@ -249,7 +249,7 @@ private:
QHash<Vec3Pair, gpu::BufferPointer> _alternateGridBuffers; QHash<Vec3Pair, gpu::BufferPointer> _alternateGridBuffers;
QHash<Vec3Pair, gpu::BufferPointer> _gridColors; QHash<Vec3Pair, gpu::BufferPointer> _gridColors;
QHash<IntPair, gpu::BufferPointer> _sphereVertices; QHash<Vec2Pair, gpu::BufferPointer> _sphereVertices;
QHash<IntPair, gpu::BufferPointer> _sphereIndices; QHash<IntPair, gpu::BufferPointer> _sphereIndices;
QHash<Vec3Pair, gpu::BufferPointer> _sphereColors; QHash<Vec3Pair, gpu::BufferPointer> _sphereColors;