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

FIxed the issue on mac due to the abs function not correctly executing

Browse source
This commit is contained in:
samcake 2015-07-09 15:05:03 -07:00
parent 8ed0c8a919
commit 1f13106f51
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/model/src/model/Light.cpp
View file

@ -88,9 +88,11 @@ void Light::setSpotAngle(float angle) {
dangle = glm::half_pi<double>(); dangle = glm::half_pi<double>();
} }
editSchema()._spot.x = (float)abs(cos(dangle)); auto cosAngle = cos(dangle);
editSchema()._spot.y = (float)abs(sin(dangle)); auto sinAngle = sin(dangle);
editSchema()._spot.z = (float)dangle; editSchema()._spot.x = (float) std::abs(cosAngle);
editSchema()._spot.y = (float) std::abs(sinAngle);
editSchema()._spot.z = (float) angle;
} }
void Light::setSpotExponent(float exponent) { void Light::setSpotExponent(float exponent) {

17
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -509,15 +509,9 @@ void DeferredLightingEffect::render(RenderArgs* args) {
batch._glUniform4fv(_spotLightLocations.coneParam, 1, reinterpret_cast< const GLfloat* >(&coneParam)); batch._glUniform4fv(_spotLightLocations.coneParam, 1, reinterpret_cast< const GLfloat* >(&coneParam));
Transform model; Transform model;
model.setTranslation(glm::vec3(light->getPosition().x, light->getPosition().y, light->getPosition().z)); model.setTranslation(light->getPosition());
model.postRotate(light->getOrientation());
glm::quat spotRotation = rotationBetween(glm::vec3(0.0f, 0.0f, -1.0f), light->getDirection()); model.postScale(glm::vec3(expandedRadius, expandedRadius, expandedRadius));
spotRotation = light->getOrientation();
model.postRotate(spotRotation);
float base = expandedRadius * glm::tan(light->getSpotAngle());
float height = expandedRadius;
model.postScale(glm::vec3(height, height, height));
batch.setModelTransform(model); batch.setModelTransform(model);
auto mesh = getSpotLightMesh(); auto mesh = getSpotLightMesh();
@ -679,7 +673,7 @@ model::MeshPointer DeferredLightingEffect::getSpotLightMesh() {
if (!_spotLightMesh) { if (!_spotLightMesh) {
_spotLightMesh.reset(new model::Mesh()); _spotLightMesh.reset(new model::Mesh());
int slices = 16; int slices = 32;
int rings = 3; int rings = 3;
int vertices = 2 + rings * slices; int vertices = 2 + rings * slices;
int originVertex = vertices - 2; int originVertex = vertices - 2;
@ -762,7 +756,8 @@ model::MeshPointer DeferredLightingEffect::getSpotLightMesh() {
delete[] indexData; delete[] indexData;
model::Mesh::Part part(0, indices, 0, model::Mesh::TRIANGLES); model::Mesh::Part part(0, indices, 0, model::Mesh::TRIANGLES);
//DEBUG: model::Mesh::Part part(0, indices, 0, model::Mesh::LINE_STRIP);
_spotLightMesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(sizeof(part), (gpu::Byte*) &part), gpu::Element::PART_DRAWCALL)); _spotLightMesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(sizeof(part), (gpu::Byte*) &part), gpu::Element::PART_DRAWCALL));
_spotLightMesh->makeBufferStream(); _spotLightMesh->makeBufferStream();