Changeset 1481 for trunk/neercs/video/render.cpp
- Timestamp:
- Jun 15, 2012, 2:40:55 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/neercs/video/render.cpp
r1477 r1481 41 41 #define DEBUG 1 // debug flag //#if defined(_DEBUG) 42 42 #define SHADER 1 // shader flag 43 #define FUCK 0 // test flag44 43 #define PI 3.1415926535f // pi 45 44 #define PID PI/180.0f // pi ratio … … 170 169 #endif 171 170 172 #if FUCK173 171 /* 174 172 * Text rendering interface … … 183 181 for (int j = 0; j < m_height; j++) 184 182 for (int i = 0; i < m_width; i++) 185 m_vertices << vec2(5. 0 / 128.0 * i - 0.75, 0.5 - 0.0525 * j);183 m_vertices << vec2(5.1 / 128.0 * i - 0.91, 0.75 - 0.0525 * j); 186 184 } 187 185 … … 264 262 265 263 TextRender *text_render; 266 #endif267 264 268 265 void init_viewport(int type) … … 465 462 : m_caca(caca) 466 463 { 467 #if FUCK468 464 text_render = new TextRender(m_caca); 469 #endif470 465 } 471 466 … … 484 479 CreateGLWindow("LOL"); 485 480 todo = 0; 486 #if FUCK487 481 text_render->Init(); 488 #endif489 482 } 490 483 … … 535 528 Draw2D(); 536 529 Draw3D(); 537 538 #if FUCK539 text_render->Blit();540 #endif541 530 } 542 531 … … 556 545 glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); 557 546 #endif 547 548 text_render->Blit(); 558 549 559 550 glEnableClientState(GL_VERTEX_ARRAY); … … 611 602 glTexCoordPointer(2, GL_FLOAT, 0, shell_tex); 612 603 glDrawArrays(GL_QUADS, 0, 4); 613 #if !FUCK614 // draw dos text615 glVertexPointer(2, GL_INT, 0, dos_vtx);616 float x = dos_m + font_size.x;617 float y = dos_m + (font_size.y*1.5f+3)*ratio_2d.y;618 619 /* background colors */620 glDisable(GL_TEXTURE_2D);621 for (int j = 0; j < caca_get_canvas_height(m_caca); j++)622 for (int i = 0; i < caca_get_canvas_width(m_caca); i++)623 {624 uint32_t att = caca_get_attr(m_caca, i, j);625 626 glLoadIdentity();627 glTranslated(x+i*font_size.x*ratio_2d.x, y+j*font_size.y*ratio_2d.y, 0);628 629 uint16_t bg = caca_attr_to_rgb12_bg(att);630 glColor3f((float)(bg >> 8) / 16.f,631 (float)((bg & 0xf0) >> 4) / 16.f,632 (float)(bg & 0xf) / 16.f);633 glDrawArrays(GL_QUADS, 0, 4);634 }635 glEnable(GL_TEXTURE_2D);636 637 /* Foreground characters */638 for (int j = 0; j < caca_get_canvas_height(m_caca); j++)639 for (int i = 0; i < caca_get_canvas_width(m_caca); i++)640 {641 uint32_t car = caca_get_char(m_caca, i, j);642 uint32_t att = caca_get_attr(m_caca, i, j);643 644 if (car <= 32 || car >= 127)645 continue;646 647 glLoadIdentity();648 glTranslated(x+i*font_size.x*ratio_2d.x, y+j*font_size.y*ratio_2d.y, 0);649 vec2 uv((car%16)*car_size.x, (car-car%16)*1.0f/map_size.y/16*font_size.y);650 float dos_tex[]={uv.x+car_size.x, uv.y+0.5f+car_size.y, uv.x+car_size.x, uv.y+0.5f, uv.x, uv.y+0.5f, uv.x, uv.y+0.5f+car_size.y};651 652 glTexCoordPointer(2, GL_FLOAT, 0, dos_tex);653 uint16_t fg = caca_attr_to_rgb12_fg(att);654 glColor3f((float)(fg >> 8) / 16.f,655 (float)((fg & 0xf0) >> 4) / 16.f,656 (float)(fg & 0xf) / 16.f);657 // FIXME: draw cursor!658 //if(car==car_cursor) glColor3f(CR*(dos_color.r+64), CR*(dos_color.g+48), CR*(dos_color.b+48));659 glDrawArrays(GL_QUADS, 0, 4);660 //if(car==car_cursor) glColor3f(1.0f, 1.0f, 1.0f);661 }662 #endif663 604 } 664 605 // draw corner
Note: See TracChangeset
for help on using the changeset viewer.