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

Don't render neck/neck base when blend face is active.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-09-20 17:55:31 -07:00
parent 133ba3a00a
commit 24bf1e2036
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -699,6 +699,10 @@ void Avatar::renderBody(bool lookingInMirror, bool renderAvatarBalls) {
SKIN_COLOR[1] - _bodyBall[b].touchForce * 0.2f, SKIN_COLOR[1] - _bodyBall[b].touchForce * 0.2f,
SKIN_COLOR[2] - _bodyBall[b].touchForce * 0.1f); SKIN_COLOR[2] - _bodyBall[b].touchForce * 0.1f);
if (b == BODY_BALL_NECK_BASE && _head.getBlendFace().isActive()) {
continue; // don't render the neck if we have a face model
}
if ((b != BODY_BALL_HEAD_TOP ) if ((b != BODY_BALL_HEAD_TOP )
&& (b != BODY_BALL_HEAD_BASE )) { && (b != BODY_BALL_HEAD_BASE )) {
glPushMatrix(); glPushMatrix();

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

@ -30,6 +30,8 @@ public:
BlendFace(Head* owningHead); BlendFace(Head* owningHead);
~BlendFace(); ~BlendFace();
bool isActive() const { return _iboID != 0; }
bool render(float alpha); bool render(float alpha);
Q_INVOKABLE void setModelURL(const QUrl& url); Q_INVOKABLE void setModelURL(const QUrl& url);

4
interface/src/avatar/MyAvatar.cpp
View file

@ -567,6 +567,10 @@ void MyAvatar::renderBody(bool lookingInMirror, bool renderAvatarBalls) {
alpha); alpha);
} }
if (b == BODY_BALL_NECK_BASE && _head.getBlendFace().isActive()) {
continue; // don't render the neck if we have a face model
}
if ((b != BODY_BALL_HEAD_TOP ) if ((b != BODY_BALL_HEAD_TOP )
&& (b != BODY_BALL_HEAD_BASE )) { && (b != BODY_BALL_HEAD_BASE )) {
glPushMatrix(); glPushMatrix();