Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 03:29:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Partial fix to billboards

Browse source
This commit is contained in:
Atlante45 2015-06-08 16:43:38 +02:00
parent 34bdcebbf6
commit d3eaa4755c
2 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
interface/src/avatar/Avatar.cpp
View file

@ -537,7 +537,7 @@ void Avatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, bool
if (_shouldRenderBillboard || !(_skeletonModel.isRenderable() && getHead()->getFaceModel().isRenderable())) { if (_shouldRenderBillboard || !(_skeletonModel.isRenderable() && getHead()->getFaceModel().isRenderable())) {
if (postLighting || renderArgs->_renderMode == RenderArgs::SHADOW_RENDER_MODE) { if (postLighting || renderArgs->_renderMode == RenderArgs::SHADOW_RENDER_MODE) {
// render the billboard until both models are loaded // render the billboard until both models are loaded
renderBillboard(); renderBillboard(renderArgs);
} }
return; return;
} }
@ -591,7 +591,7 @@ void Avatar::updateJointMappings() {
// no-op; joint mappings come from skeleton model // no-op; joint mappings come from skeleton model
} }
void Avatar::renderBillboard() { void Avatar::renderBillboard(RenderArgs* renderArgs) {
if (_billboard.isEmpty()) { if (_billboard.isEmpty()) {
return; return;
} }
@ -604,28 +604,21 @@ void Avatar::renderBillboard() {
if (!_billboardTexture->isLoaded()) { if (!_billboardTexture->isLoaded()) {
return; return;
} }
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, 0.5f);
glEnable(GL_TEXTURE_2D);
glDisable(GL_LIGHTING);
glBindTexture(GL_TEXTURE_2D, _billboardTexture->getID());
glPushMatrix();
glTranslatef(_position.x, _position.y, _position.z);
// rotate about vertical to face the camera // rotate about vertical to face the camera
glm::quat rotation = getOrientation(); glm::quat rotation = getOrientation();
glm::vec3 cameraVector = glm::inverse(rotation) * (Application::getInstance()->getCamera()->getPosition() - _position); glm::vec3 cameraVector = glm::inverse(rotation) * (Application::getInstance()->getCamera()->getPosition() - _position);
rotation = rotation * glm::angleAxis(atan2f(-cameraVector.x, -cameraVector.z), glm::vec3(0.0f, 1.0f, 0.0f)); rotation = rotation * glm::angleAxis(atan2f(-cameraVector.x, -cameraVector.z), glm::vec3(0.0f, 1.0f, 0.0f));
glm::vec3 axis = glm::axis(rotation);
glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z);
// compute the size from the billboard camera parameters and scale // compute the size from the billboard camera parameters and scale
float size = getBillboardSize(); float size = getBillboardSize();
glScalef(size, size, size);
gpu::Batch& batch = *renderArgs->_batch;
batch._glBindTexture(GL_TEXTURE_2D, _billboardTexture->getID());
Transform transform;
transform.setTranslation(_position);
transform.setRotation(rotation);
transform.setScale(size);
glm::vec2 topLeft(-1.0f, -1.0f); glm::vec2 topLeft(-1.0f, -1.0f);
glm::vec2 bottomRight(1.0f, 1.0f); glm::vec2 bottomRight(1.0f, 1.0f);
@ -634,14 +627,7 @@ void Avatar::renderBillboard() {
DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight, DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight,
glm::vec4(1.0f, 1.0f, 1.0f, 1.0f)); glm::vec4(1.0f, 1.0f, 1.0f, 1.0f));
batch._glBindTexture(GL_TEXTURE_2D, 0);
glPopMatrix();
glDisable(GL_TEXTURE_2D);
glEnable(GL_LIGHTING);
glDisable(GL_ALPHA_TEST);
glBindTexture(GL_TEXTURE_2D, 0);
} }
float Avatar::getBillboardSize() const { float Avatar::getBillboardSize() const {

2
interface/src/avatar/Avatar.h
View file

@ -248,7 +248,7 @@ private:
bool _shouldRenderBillboard; bool _shouldRenderBillboard;
bool _isLookAtTarget; bool _isLookAtTarget;
void renderBillboard(); void renderBillboard(RenderArgs* renderArgs);
float getBillboardSize() const; float getBillboardSize() const;