Changeset 1585Tweet

Timestamp:

Jul 6, 2012, 1:38:25 AM (11 years ago)

Author:

rez

Message:

added function key and renamed some variables

Location:

trunk/tools/neercs

Files:

• neercs.cpp (modified) (2 diffs)
• video/render.cpp (modified) (10 diffs)
• video/render.h (modified) (1 diff)
• video/text.lolfx (modified) (1 diff)

trunk/tools/neercs/neercs.cpp

@@ -60 +60 @@
     m_time += seconds;
 
+    /* draw something */
     caca_set_color_argb(m_caca, 0xfff, 0x222);
     caca_clear_canvas(m_caca);
@@ -86 +87 @@
     caca_put_str(m_caca, 0, 0, "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
     caca_put_str(m_caca, 0, 1, " !\"#$%&'()*+,-./0123456789");
-
-    if (Input::GetButtonState(27 /*SDLK_ESCAPE*/))
-        Ticker::Shutdown();
-
 }
 

trunk/tools/neercs/video/render.cpp

@@ -47 +47 @@
  */
 
-int keys[256];             // keyboard array
 int active = true;         // window active flag
 bool fullscreen = DEBUG?false:true; // fullscreen flag
-bool paused = false;       // pause flag
+bool m_paused = false;       // pause flag
 float nearplane = 0.1f;    // nearplane
 float farplane = 1000.0f;  // farplane
@@ -108 +107 @@
 float value, angle, radius, scale, speed;
 /* shader variable */
-bool shader_flag = true;
+bool m_shader = true;      /* TO DELETE */
 bool shader_blur_flag = true;
 bool shader_glow_flag = true;
@@ -222 +221 @@
     glCullFace(GL_BACK);      // don't draw front face
 
-    if (shader_flag)
+    if (m_shader)
     {
         /* Initialise framebuffer objects */
@@ -279 +278 @@
 }
 
-int CreateGLWindow(char const *title)
+int CreateGLWindow()
 {
     screen_size = Video::GetSize();
@@ -307 +306 @@
 Render::Render(caca_canvas_t *caca)
   : m_caca(caca),
-    m_ready(false)
+    m_ready(false),
+    m_shader(true)
 {
     text_render = new TextRender(m_caca, font_size);
@@ -319 +319 @@
 void Render::TickDraw(float seconds)
 {
+    /* keyboard manager */
+    if (Input::GetButtonState(27/*SDLK_ESCAPE*/))
+        Ticker::Shutdown();
+    if (Input::GetButtonState(8 /*SDLK_BACKSPACE*/))
+        m_paused=!m_paused;
+    if (Input::GetButtonState(112 /*SDLK_F1*/))
+        m_shader=!m_shader;
+
     Entity::TickDraw(seconds);
 
     if (!m_ready)
     {
-        CreateGLWindow("LOL");
+        CreateGLWindow();
         text_render->Init();
 
@@ -330 +338 @@
 
     // timer
-    if(!paused)
+    if(!m_paused)
         main_angle += seconds * 100.0f * PID;
     if(sync_flag)
@@ -382 +390 @@
     text_render->Render();
 
-    if(shader_flag)
+    if(m_shader)
         fbo_back->Bind();
 
@@ -454 +462 @@
     glDisable(GL_TEXTURE_2D);
     glDisable(GL_BLEND);
+    glColor3f(0, 1.0f, 0);
     glVertexPointer(2, GL_INT, 0, corner_vtx);
     glLoadIdentity();
@@ -472 +481 @@
 void Render::Draw3D()
 {
-    if (!shader_flag)
+    if (!m_shader)
         return;
 

trunk/tools/neercs/video/render.h

@@ -23 +23 @@
     caca_canvas_t *m_caca;
     bool m_ready;
+    bool m_shader;
 };
 

trunk/tools/neercs/video/text.lolfx

@@ -23 +23 @@
     float D = float((in_Attr >> 18u) & 0x7u) / 7.0;
 
-        float E = float((in_Attr >> 15u) & 0x7u) / 7.0;
-        float F = float((in_Attr >> 11u) & 0xfu) / 15.0;
-        float G = float((in_Attr >> 7u) & 0xfu) / 15.0;
-        float H = float((in_Attr >> 4u) & 0x7u) / 7.0;
+    float E = float((in_Attr >> 15u) & 0x7u) / 7.0;
+    float F = float((in_Attr >> 11u) & 0xfu) / 15.0;
+    float G = float((in_Attr >> 7u) & 0xfu) / 15.0;
+    float H = float((in_Attr >> 4u) & 0x7u) / 7.0;
 
     pass_Background = vec4(B, C, D, 1.0 - A);