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

Added the basic key press/message composition display.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-04-25 17:36:47 -07:00
parent d5da35e91a
commit 1713bebb64
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Audio.cpp
View file

@ -517,6 +517,7 @@ float Audio::getInputLoudness() const {
void Audio::render(int screenWidth, int screenHeight)
{
if (initialized) {
glLineWidth(3);
glBegin(GL_LINES);
glColor3f(1,1,1);

19
interface/src/Avatar.cpp
View file

@ -652,8 +652,9 @@ void Avatar::render(bool lookingInMirror) {
if (!_chatMessage.empty()) {
float width = 0;
float lastWidth;
for (string::iterator it = _chatMessage.begin(); it != _chatMessage.end(); it++) {
width += glutStrokeWidth(GLUT_STROKE_ROMAN, *it)*chatMessageScale;
width += (lastWidth = glutStrokeWidth(GLUT_STROKE_ROMAN, *it)*chatMessageScale);
}
glPushMatrix();
@ -668,7 +669,21 @@ void Avatar::render(bool lookingInMirror) {
glTranslatef(width * 0.5, 0, 0);
glDisable(GL_LIGHTING);
drawtext(0, 0, chatMessageScale, 180, 1.0, 0, _chatMessage.c_str(), 0, 1, 0);
if (_keyState == NoKeyDown) {
drawtext(0, 0, chatMessageScale, 180, 1.0, 0, _chatMessage.c_str(), 0, 1, 0);
} else {
// rather than using substr and allocating a new string, just replace the last
// character with a null, then restore it
int lastIndex = _chatMessage.size() - 1;
char lastChar = _chatMessage[lastIndex];
_chatMessage[lastIndex] = '\0';
drawtext(0, 0, chatMessageScale, 180, 1.0, 0, _chatMessage.c_str(), 0, 1, 0);
_chatMessage[lastIndex] = lastChar;
glTranslatef(lastWidth - width, 0, 0);
drawtext(0, 0, chatMessageScale, 180, 3.0,
0, _chatMessage.c_str() + lastIndex, 0, 1, 0);
}
glEnable(GL_LIGHTING);
glPopMatrix();

1
interface/src/main.cpp
View file

@ -1381,6 +1381,7 @@ void key(unsigned char k, int x, int y)
if (chatEntry.key(k)) {
myAvatar.setKeyState(k == '\b' || k == 127 ? // backspace or delete
AvatarData::DeleteKeyDown : AvatarData::InsertKeyDown);
myAvatar.setChatMessage(string(chatEntry.getContents().size(), 'X'));
} else {
myAvatar.setChatMessage(chatEntry.getContents());