WebSVN – gelsvn – Diff – /branches/cpp11-devel/src/GLGraphics/Console.cpp

  * @author Anders Wang Kristensen <awk@imm.dtu.dk>
  * @date   Fri Oct 22 18:36:58 2011
  */
 #include "../GLGraphics/Console.h"
-#include "../GLGraphics/gel_glut.h"
+#include "../GLGraphics/gel_glu.h"
 #include <cstdarg>
 #include <set>
 #include <iostream> //cerr
 #include <iterator> //back_inserter
 #include <fstream>
     m_history_index = 0;
+}
 //----------------------------------------------------------------------------
-void Console::display()
+void Console::display(int scaling)
+{
     if (m_font == 0)
+    {
         glGenTextures(1, &m_font);
         glBindTexture(GL_TEXTURE_2D, m_font);
             for (int w=0; w<width; ++w)
                 std::swap(*p++, *q++);
         glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA8, width, height, 0,
             GL_ALPHA, GL_UNSIGNED_BYTE, data);
         stbi_image_free(data);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
         glBindTexture(GL_TEXTURE_2D, 0);
+    }
     //setup matrices
     int vp[4];
     glPushAttrib(GL_COLOR_BUFFER_BIT);
     glPushAttrib(GL_ENABLE_BIT);
     glEnable(GL_BLEND);
     glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glDisable(GL_LIGHTING);
+    glDisable(GL_DEPTH_TEST);
     glColor4f(0.15f, 0.15f, 0.15f, 0.75f);
     glRecti(0, 0, width, height);
-    glColor4f(0.7f, 0.7f, 0.7f, 0.75f);
-    glRecti(0, 1, width, 2);
-    glColor4f(0.5f, 0.5f, 0.5f, 0.75f);
-    glRecti(0, 0, width, 1);
-    glPopAttrib();
-    glPopAttrib();
     int current = 3;
     //draw caret
     if (!m_is_executing)
+    {
+        glColor4f(1,1,0, 0.75f);
-        const int cx = int(m_caret*char_spacing) + char_spacing + 1;
+        const int cx = int(m_caret*char_spacing*scaling) + char_spacing*scaling + 1;
-        glRecti(cx, current, cx+char_spacing, current+2);
+        glRecti(cx, current, cx+char_spacing*scaling, current+2);
+    }
+    glPopAttrib();
+    glPopAttrib();
     //restore matrices
     glMatrixMode(GL_PROJECTION);
     glPopMatrix();
     glMatrixMode(GL_MODELVIEW);
     glPopMatrix();
     //draw command line
     if (!m_is_executing)
+    {
-        draw_textf(1, current,
+        draw_textf(scaling, 1, current,
 .9f, 0.9f, 0.9f,
                    ">%s", m_current_command.c_str());
-        current += line_spacing;
+        current += line_spacing*scaling;
+    }
     //draw rest
     std::vector<std::string>::const_reverse_iterator it;
     for (it=m_buffer.rbegin(); it!=m_buffer.rend(); ++it)
+    {
-        draw_text(1, current,
+        draw_text(scaling, 1, current,
 .75f, 0.75f, 0.75f,
                   it->c_str());
-        current += line_spacing;
+        current += scaling * line_spacing;
         if (current > height)
             break;
+    }
+}
 //----------------------------------------------------------------------------
-void Console::draw_text(int cx, int cy,
+void Console::draw_text(int scaling, int cx, int cy,
                         float r, float g, float b,
                         const char* buffer)
+{
     //save OpenGL state
     glPushAttrib(GL_ENABLE_BIT);
         float tyu = (fy + 15.f) / 256.f;
         glTexCoord2f(txl, tyl);
         glVertex2i(cx +  0, cy +  1);
         glTexCoord2f(txr, tyl);
-        glVertex2i(cx + 7, cy +  1);
+        glVertex2i(cx + 7 * scaling, cy +  1);
         glTexCoord2f(txr, tyu);
-        glVertex2i(cx + 7, cy + 16);
+        glVertex2i(cx + 7 * scaling, cy +  16 * scaling);
         glTexCoord2f(txl, tyu);
-        glVertex2i(cx +  0, cy + 16);
+        glVertex2i(cx +  0, cy +  16 * scaling);
-        cx += char_spacing;
+        cx += char_spacing * scaling;
+    }
     glEnd();
     glBindTexture(GL_TEXTURE_2D, 0);
     glPopAttrib();
     glPopAttrib();
     glPopAttrib();
+}
-void Console::draw_textf(int x, int y,
+void Console::draw_textf(int scaling, int x, int y,
                          float r, float g, float b,
                          const char* fmt, ...)
+{
     //format text
     char buffer[1024];
     va_list arguments;
     va_start(arguments, fmt);
     vsnprintf(buffer, 1024, fmt, arguments);
     va_end(arguments);
-    draw_text(x, y, r, g, b, buffer);
+    draw_text(scaling, x, y, r, g, b, buffer);
+}
 //----------------------------------------------------------------------------
 void Console::tab_completion()
+        }
         break;
+    }
+}
-void Console::special(int key)
+void Console::key_left() {
-{
-    switch (key)
-    {
-    case GLUT_KEY_LEFT:
-        if (m_caret > 0)
+    if (m_caret > 0)
-            m_caret -= 1;
+        m_caret -= 1;
-        break;
-    case GLUT_KEY_RIGHT:
-        if (m_caret < m_current_command.size())
-            m_caret += 1;
-        break;
+}
-    case GLUT_KEY_HOME:
-        m_caret = 0;
-        break;
-    case GLUT_KEY_END:
+void Console::key_right(){
-        m_caret = m_current_command.size();
+    if (m_caret < m_current_command.size())
-        break;
+        m_caret += 1;
+}
-    case GLUT_KEY_UP:
+void Console::key_home() {
-        if (!m_history.empty())
+    m_caret = 0;
-        {
+}
-            if (m_history_index > 0)
-                m_history_index--;
-            m_current_command = m_history[m_history_index];
+void Console::key_end() {
-            m_caret = m_current_command.size();
+    m_caret = m_current_command.size();
-        }
+}
-        break;
-    case GLUT_KEY_DOWN:
+void Console::key_up() {
-        if (m_history_index < m_history.size())
+    if (!m_history.empty())
-        {
+    {
-            if (m_history_index < m_history.size()-1)
+        if (m_history_index > 0)
-                m_history_index++;
+            m_history_index--;
+        m_current_command = m_history[m_history_index];
+        m_caret = m_current_command.size();
+    }
+}
+void Console::key_down() {
-            assert(m_history_index < m_history.size());
+    if (m_history_index < m_history.size())
+    {
-            m_current_command = m_history[m_history_index];
+        if (m_history_index < m_history.size()-1)
-            m_caret = m_current_command.size();
+            m_history_index++;
-        }
+        assert(m_history_index < m_history.size());
+        m_current_command = m_history[m_history_index];
-        break;
+        m_caret = m_current_command.size();
+    }
+}
 //----------------------------------------------------------------------------
 void Console::execute(const char* buffer)
+{
     //split into command arg0 arg1 ..

Subversion Repositories gelsvn

(root)/branches/cpp11-devel/src/GLGraphics/Console.cpp – Rev 630 → 647