From bcfa593af31cd1e2f1556294da04e645142826b8 Mon Sep 17 00:00:00 2001 From: rez Date: Thu, 19 Jul 2012 23:31:05 +0000 Subject: [PATCH] remanency buffer now use ONLY ONE buffer / renamed font map, added a new one (dos) / fixed the ASCII logo --- neercs/neercs.cpp | 18 ++++---- neercs/video/remanency.lolfx | 10 ++--- neercs/video/render.cpp | 57 +++++++++--------------- neercs/video/resource/charset_amiga.png | Bin 0 -> 4042 bytes neercs/video/resource/charset_dos.png | Bin 0 -> 4730 bytes neercs/video/resource/map.png | Bin 2095 -> 0 bytes neercs/video/text-render.cpp | 2 +- 7 files changed, 34 insertions(+), 53 deletions(-) create mode 100644 neercs/video/resource/charset_amiga.png create mode 100755 neercs/video/resource/charset_dos.png delete mode 100644 neercs/video/resource/map.png diff --git a/neercs/neercs.cpp b/neercs/neercs.cpp index 2b48871..e895818 100644 --- a/neercs/neercs.cpp +++ b/neercs/neercs.cpp @@ -92,23 +92,23 @@ void Neercs::TickGame(float seconds) } /* -.___ __ ______ ______ ______ ______ ______, - \° \| /° __ \° __ \° __ \/° ___//° ___/ - / ` > ____/ ____/ ,_ <_ <____\___ \ -/__/\___\______\______\__| \__/_____________\ + __ _________ ______ _____ ______ ______ + / \/ / __ Y __ Y __ \/ ___// ___/ + / / ____/ ____/ __ < <____\___ \ +/__/\__/\_______________/ \________________\ */ - int logo_x = (w - 45) / 2; + int logo_x = (w - 46) / 2; int logo_y = h / 2 - 2; caca_set_color_argb(m_caca, hex_color(0.5f + 0.5f * lol::cos(m_time * 3 ), 0.5f, 0.5f + 0.25f * lol::sin(m_time * 3 )), bg_color); - caca_put_str(m_caca, logo_x, logo_y ,".___ __ ______ ______ ______ ______ ______,"); + caca_put_str(m_caca, logo_x + 3, logo_y ,"__ _________ ______ _____ ______ ______"); caca_set_color_argb(m_caca, hex_color(0.5f + 0.5f * lol::cos(m_time * 3 + M_PI / 4 * 1), 0.5f, 0.5f + 0.25f * lol::sin(m_time * 3 + M_PI / 4 * 1)), bg_color); - caca_put_str(m_caca, logo_x, logo_y + 1, " \\° \\| /° __ \\° __ \\° __ \\/° ___//° ___/"); + caca_put_str(m_caca, logo_x + 2, logo_y + 1, "/ \\/ / __ Y __ Y __ \\/ ___// ___/"); caca_set_color_argb(m_caca, hex_color(0.5f + 0.5f * lol::cos(m_time * 3 + M_PI / 4 * 2), 0.5f, 0.5f + 0.25f * lol::sin(m_time * 3 + M_PI / 4 * 2)), bg_color); - caca_put_str(m_caca, logo_x, logo_y + 2, " / ` > ____/ ____/ ,_ <_ <____\\___ \\"); + caca_put_str(m_caca, logo_x + 1, logo_y + 2, "/ / ____/ ____/ __ < <____\\___ \\"); caca_set_color_argb(m_caca, hex_color(0.5f + 0.5f * lol::cos(m_time * 3 + M_PI / 4 * 3), 0.5f, 0.5f + 0.25f * lol::sin(m_time * 3 + M_PI / 4 * 3)), bg_color); - caca_put_str(m_caca, logo_x, logo_y + 3, "/__/\\___\\______\\______\\__| \\__/_____________\\"); + caca_put_str(m_caca, logo_x , logo_y + 3, "/__/\\__/\\_______________/ \\________________\\"); caca_set_color_argb(m_caca, 0xdef, bg_color); caca_put_str(m_caca, logo_x + 5, logo_y + 5, "ALL YOUR TERMINALS ARE BELONG TO US"); diff --git a/neercs/video/remanency.lolfx b/neercs/video/remanency.lolfx index c0b70c3..4ea79c2 100644 --- a/neercs/video/remanency.lolfx +++ b/neercs/video/remanency.lolfx @@ -13,9 +13,7 @@ void main() #version 120 uniform sampler2D texture; -uniform sampler2D texture_buffer1; -uniform sampler2D texture_buffer2; -uniform sampler2D texture_buffer3; +uniform sampler2D texture_buffer; uniform vec2 screen_size; uniform float time; uniform float value1; @@ -25,9 +23,7 @@ void main(void) { vec2 p=gl_TexCoord[0].xy; vec4 source=texture2D(texture,p); - vec4 buffer1=texture2D(texture_buffer1,p); - vec4 buffer2=texture2D(texture_buffer2,p); - vec4 buffer3=texture2D(texture_buffer3,p); - vec4 color=source*value1+buffer1*value2+buffer2*value2+buffer3*value2; + vec4 buffer=texture2D(texture_buffer,p); + vec4 color=source*value1+buffer*value2; gl_FragColor=color; } \ No newline at end of file diff --git a/neercs/video/render.cpp b/neercs/video/render.cpp index 95a2327..740d66d 100644 --- a/neercs/video/render.cpp +++ b/neercs/video/render.cpp @@ -116,9 +116,7 @@ ShaderUniform shader_blur_v_texture, shader_blur_v_time, shader_blur_v_value; ShaderUniform shader_remanency_texture, - shader_remanency_texture_buffer1, - shader_remanency_texture_buffer2, - shader_remanency_texture_buffer3, + shader_remanency_texture_buffer, shader_remanency_screen_size, shader_remanency_time, shader_remanency_value1, @@ -146,8 +144,7 @@ ShaderUniform shader_postfx_texture, shader_postfx_scanline, shader_postfx_sync; -FrameBuffer *fbo_back, *fbo_front; -FrameBuffer *fbo_buffer1, *fbo_buffer2, *fbo_buffer3, *fbo_buffer4, *fbo_buffer5, *fbo_buffer6; +FrameBuffer *fbo_back, *fbo_front, *fbo_buffer; FrameBuffer *fbo_blur_h, *fbo_blur_v, *fbo_ping, *fbo_pong; TextRender *text_render; @@ -186,12 +183,7 @@ int Render::InitDraw(void) /* Initialise framebuffer objects */ fbo_back = new FrameBuffer(screen_size); fbo_front = new FrameBuffer(screen_size); - fbo_buffer1 = new FrameBuffer(screen_size); - fbo_buffer2 = new FrameBuffer(screen_size); - fbo_buffer3 = new FrameBuffer(screen_size); - fbo_buffer4 = new FrameBuffer(screen_size); - fbo_buffer5 = new FrameBuffer(screen_size); - fbo_buffer6 = new FrameBuffer(screen_size); + fbo_buffer = new FrameBuffer(screen_size); fbo_blur_h = new FrameBuffer(screen_size / glow_fbo_size); fbo_blur_v = new FrameBuffer(screen_size / glow_fbo_size); fbo_ping = new FrameBuffer(screen_size); @@ -214,9 +206,7 @@ int Render::InitDraw(void) // shader remanency shader_remanency = Shader::Create(lolfx_remanency); shader_remanency_texture = shader_remanency->GetUniformLocation("texture"); - shader_remanency_texture_buffer1 = shader_remanency->GetUniformLocation("texture_buffer1"); - shader_remanency_texture_buffer2 = shader_remanency->GetUniformLocation("texture_buffer2"); - shader_remanency_texture_buffer3 = shader_remanency->GetUniformLocation("texture_buffer3"); + shader_remanency_texture_buffer = shader_remanency->GetUniformLocation("texture_buffer"); shader_remanency_screen_size = shader_remanency->GetUniformLocation("screen_size"); shader_remanency_time = shader_remanency->GetUniformLocation("time"); shader_remanency_value1 = shader_remanency->GetUniformLocation("value1"); @@ -440,13 +430,11 @@ void Render::Draw3D() fbo_ping->Bind(); shader_remanency->Bind(); shader_remanency->SetTexture(shader_remanency_texture, fbo_back->GetTexture(), 0); - shader_remanency->SetTexture(shader_remanency_texture_buffer1, fbo_buffer2->GetTexture(), 1); - shader_remanency->SetTexture(shader_remanency_texture_buffer2, fbo_buffer4->GetTexture(), 2); - shader_remanency->SetTexture(shader_remanency_texture_buffer3, fbo_buffer6->GetTexture(), 3); + shader_remanency->SetTexture(shader_remanency_texture_buffer, fbo_buffer->GetTexture(), 1); shader_remanency->SetUniform(shader_remanency_screen_size, vec2(1.0f)); shader_remanency->SetUniform(shader_remanency_time, fx_angle); shader_remanency->SetUniform(shader_remanency_value1, 0.25f); - shader_remanency->SetUniform(shader_remanency_value2, 0.25f); + shader_remanency->SetUniform(shader_remanency_value2, 0.75f); fs_quad(); shader_remanency->Unbind(); fbo_ping->Unbind(); @@ -455,24 +443,21 @@ void Render::Draw3D() draw_shader_simple(fbo_ping, 0); fbo_back->Unbind(); // save previous fbo - fbo_buffer6->Bind(); - draw_shader_simple(fbo_buffer5, 0); - fbo_buffer6->Unbind(); - fbo_buffer5->Bind(); - draw_shader_simple(fbo_buffer4, 0); - fbo_buffer5->Unbind(); - fbo_buffer4->Bind(); - draw_shader_simple(fbo_buffer3, 0); - fbo_buffer4->Unbind(); - fbo_buffer3->Bind(); - draw_shader_simple(fbo_buffer2, 0); - fbo_buffer3->Unbind(); - fbo_buffer2->Bind(); - draw_shader_simple(fbo_buffer1, 0); - fbo_buffer2->Unbind(); - fbo_buffer1->Bind(); - draw_shader_simple(fbo_front, 0); - fbo_buffer1->Unbind(); + fbo_ping->Bind(); + shader_remanency->Bind(); + shader_remanency->SetTexture(shader_remanency_texture, fbo_front->GetTexture(), 0); + shader_remanency->SetTexture(shader_remanency_texture_buffer, fbo_buffer->GetTexture(), 1); + shader_remanency->SetUniform(shader_remanency_screen_size, vec2(1.0f)); + shader_remanency->SetUniform(shader_remanency_time, fx_angle); + shader_remanency->SetUniform(shader_remanency_value1, 0.25f); + shader_remanency->SetUniform(shader_remanency_value2, 0.75f); + fs_quad(); + shader_remanency->Unbind(); + fbo_ping->Unbind(); + // shader simple + fbo_buffer->Bind(); + draw_shader_simple(fbo_ping, 0); + fbo_buffer->Unbind(); } if (m_shader_fx && m_shader_blur) diff --git a/neercs/video/resource/charset_amiga.png b/neercs/video/resource/charset_amiga.png new file mode 100644 index 0000000000000000000000000000000000000000..ae141e81aac99cc843a46951e8456c3c9b35d3d9 GIT binary patch literal 4042 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 literal 0 HcmV?d00001 diff --git a/neercs/video/resource/map.png b/neercs/video/resource/map.png deleted file mode 100644 index e9d0f1503f93b9c2fa0ef61a523f6d8d145dd439..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2095 zcmZvdc{mh$7sr1yV=OVYWNV6PiiC_IqoEqhj3s-DY+RKuZGP zyI@3{0pKbIfLU(<@Oc0zL=?VoG!`r*9BiD40^Ql!fkF{mTRc;t+HCTkAkS3a3rUc~VvaS;@E_TUQP7ei) z?cnC}<8+qh{qPiZPA*>g2(PP-EJ-};NTen$1#r%!9Sd3Ja;0c4o9jj(Y$b)eVgwra zoeGeiaoCJDk4Vs2?Dy`l2wiF&N_mZ$+(*-PfBH&|%eU1+!KLW;ZrO!HRV|K7(OkIjZ1UO`Ho|gJQys%KUkBezHO{O>ei172s%#dH zbi>XaO76X=TbGcV$h(z!`?6(iqdM@59&bJH31<@fL$~;oeRUK{z8(+yO44$Su5||@ zP}GG%vQFReqz8R_92eGg-3bp#Zyg35DCi8CKSClzXupL-OX$z3S?9R#Wv<>BZ5~kC zszNbizh0M4bAP%ye&_Eqsf%vC_KsF*D$wC~Ais)h2Fe~tLGOU*S;ic#J-Jf^6j>e6 zbmMoYwL?p=`&`3r-e%xeI`X5bP> zMgVh_L06DWF!y~+a!!&_fzQmP$rs^rYr5m&J?j8-GN5_hz5;m2xwm;@vpWlXS5C0=6CpGhhwDw%7UG6xyksjcEngg4J8}DVX$W-em34^8V`WdEMI8 z@yiVtwbvGuTvq<(_bwVj290G}in3Gh9*ln{x)hY7xIJK9ShlOFXS$U#>>JAuy9Nru zVdW59#fZ^K%rls`&pb>0SZA>DtHl#I3WXhxgyNk_on8V|_OQ_fZF@pEGyOG{T9TLy z5oK1+tIz4^FHI%4ZcVoCYw(91SZ7_4{JhIn^{(Vz>BN`UBvA79NCuAqsIF!~BS%td zUSR+~7O55Z=AWIZ?xtm4s>@`xme(s4zItmRdrGP17uB!nYc1PJgt2T1a(j-^SCkb= zzeD)1b06@D{!HWj^xB_ztW16*2>(6<+s9^oJxg;gw8OU!@_)HaF-f4uOq!6A60H5hXEdT#d(e~=8J{AI za!EcNo~L)?#j>2+T|{Ho3CI3`R+eqxqK z3SJ*jgvhxE@@58ovQzC_h_89TtUoJDj9^ngxI9ohWXX`jK2rhK~y(w#OMMMWu!2vszRX96mU9CcJDa+=l{cdO$dD^af?dJY=vg6xp( zUMgJt*u1CIdNd7o{)W;Y8&JFh<dF^QSZ|J6b{L?S*x>`Q|3Uze$GI#81H*D+RA1FgJ_BbBy~S+w>pk4cenh6 z)y-l;s1RTdY?hIaLp#<6(GUl%@{Qyz6X`qz-ETggi%bL)IAkD1=`;R8ha3^^Rext=AGtY)g z_3NpBsMYCoakK5cT1y=2rqd3j&FF(D|f40IxRspV!x@}>=qh! zSwH(`S)DnZQD7K z$$wHfBT3rRvvz~Aa)evgbX{FVE{A`fMOVnp4m@b?FZp~r1pfYmWvcZ_87&vYgkDqS zZzqs6z67R%JmZnC^aOY7Lf7r~tcpn~f?+;7ZpCr@Qvb{HNhumumhG*U9r=h;bovzhQ1FRK?rs&Re z*T(VWFO#Qo5yP~9iS;VMueANhZ#FVOA_O1vP$bbc($6Q-A5XsQFA#vm=wh`o2HLt< zXAB09!Qyo>nu3bKR6GoE{yzgH+%GsF=6?oVXRIC`tB=PV|F5BR!0d^@0IZ01=GCU& GH~s_2N4ci} diff --git a/neercs/video/text-render.cpp b/neercs/video/text-render.cpp index 7eb6b80..9df2a78 100644 --- a/neercs/video/text-render.cpp +++ b/neercs/video/text-render.cpp @@ -40,7 +40,7 @@ TextRender::TextRender(caca_canvas_t *caca, ivec2 font_size) void TextRender::Init() { - m_font = new TileSet("tools/neercs/video/resource/map.png", + m_font = new TileSet("tools/neercs/video/resource/charset_amiga.png", ivec2(256, 256), ivec2(1)); m_shader = Shader::Create(lolfx_text);