gltail 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.1.3 / 2008-03-28
+
+* Render strings as number + text to reuse OpenGL call-lists in more cases.
+  Fixes the annoying stuttering every second with more than a trivial amount
+  of text.
+
 == 0.1.2 / 2008-03-04
 
 * Handle rubygems versions > 0.x

data/lib/gl_tail/element.rb

@@ -225,31 +225,30 @@ class Element
       if @rate < 0.0001
         txt = "    r/m "
       else
-        txt = "#{sprintf("%7.2f",@rate * 60)} "
+        txt = "#{sprintf("%8.2f",@rate * 60)} "
       end
     when 1
       if @total == 0
         txt = "  total "
       else
-        txt = "#{sprintf("%7d",@total)} "
+        txt = "#{sprintf("%8d",@total)} "
       end
     when 2
       if @average == 0
         txt = "    avg "
       else
-        txt = "#{sprintf("%7.2f",@average)} "
+        txt = "#{sprintf("%8.2f",@average)} "
       end
     else
       raise "unknown block type #{self.inspect}"
     end
 
     if @x < 0
-     str = sprintf("%#{@block.width}s %s", @name.length > @block.width ? @name[-@block.width..-1] : @name, txt)
+      engine.render_string(sprintf("%#{@block.width}s", @name.length > @block.width ? @name[-@block.width..-1] : @name), txt)
     else
-     str = sprintf("%s%s", txt, @name[0..@block.width-1])
+      engine.render_string(txt[1..-1], @name[0..@block.width-1])
     end
 
-    engine.render_string(str)
 
     glPopMatrix()
 

data/lib/gl_tail/engine.rb

@@ -5,8 +5,8 @@ include Glut
 module GlTail
   class Engine
 
-    def render_string(string)
-      FontStore.render_string(self, string)
+    def render_string(left,right = nil)
+      FontStore.render_string(self, left,right)
     end
 
     def screen

data/lib/gl_tail/font_store.rb

@@ -5,6 +5,10 @@ class FontStore
 
   @font_texture = nil
 
+  WIDTH   =  8 / 256.0
+  HEIGHT  = 13 / 256.0
+
+  
   def self.generate_textures
     if @font_texture.nil?
       @font_texture = glGenTextures(1)[0]
@@ -112,8 +116,6 @@ class FontStore
     offsetx = ((base%16) ) / (32.0)
     offsety = ((base/16) * 16) / (256.0)
 
-    width   =  8 / 256.0
-    height  = 13 / 256.0
 
     pos_offset = char_size * pos
 
@@ -121,41 +123,58 @@ class FontStore
     glNormal3f(1.0, 1.0, 0.0)
     glVertex3f(pos_offset, 0, 0.0)
 
-    glTexCoord2f(offsetx+width,offsety)
+    glTexCoord2f(offsetx+WIDTH,offsety)
     glNormal3f(1.0, 1.0, 0.0)
     glVertex3f(pos_offset + char_size, 0.0, 0.0)
 
-    glTexCoord2f(offsetx+width,offsety + height)
+    glTexCoord2f(offsetx+WIDTH,offsety + HEIGHT)
     glNormal3f(1.0, 1.0, 0.0)
     glVertex3f(pos_offset + char_size, engine.line_size, 0.0)
 
-    glTexCoord2f(offsetx,offsety + height)
+    glTexCoord2f(offsetx,offsety + HEIGHT)
     glNormal3f(1.0, 1.0, 0.0)
     glVertex3f(pos_offset, engine.line_size, 0.0)
   end
 
 
-  def self.render_string(engine, txt)
+  def self.render_string(engine, left, right = nil)
     glPushMatrix
     glEnable(GL_BLEND)
     glBlendFunc(GL_ONE, GL_ONE)
     glBindTexture(GL_TEXTURE_2D, @font_texture)
 
-    unless BlobStore.has(txt)
+    pos = 0
+
+    unless BlobStore.has(left)
       list = glGenLists(1)
       glNewList(list, GL_COMPILE)
       glBegin(GL_QUADS)
-      pos = 0
-      txt.each_byte do |c|
+      left.each_byte do |c|
+        self.render_char(engine, c, pos) unless c == 32
+        pos += 1
+      end
+      glEnd
+      glEndList
+      BlobStore.put(left,list)
+    else
+      pos += left.length
+    end 
+    glCallList(BlobStore.get(left))
+
+    unless BlobStore.has(right) || right.nil?
+      list = glGenLists(1)
+      glNewList(list, GL_COMPILE)
+      glBegin(GL_QUADS)
+      right.each_byte do |c|
         self.render_char(engine, c, pos)
         pos += 1
       end
       glEnd
       glEndList
-      BlobStore.put(txt,list)
+      BlobStore.put(right,list)
     end
-    glCallList(BlobStore.get(txt))
-
+    glCallList(BlobStore.get(right)) unless right.nil?
+    
     glBindTexture(GL_TEXTURE_2D, 0)
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
     glDisable(GL_BLEND)

data/lib/gl_tail.rb

@@ -5,7 +5,7 @@
 #
 
 module GlTail
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end
 
 begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gltail
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ""
 authors: 
 - Erlend Simonsen
@@ -29,7 +29,7 @@ cert_chain:
   /UfNqVgtDGy57Xw9DBNRbUm92FVILwpudQs3SX1z2Gik08RrKReELwpRciY=
   -----END CERTIFICATE-----
 
-date: 2008-03-04 00:00:00 +01:00
+date: 2008-03-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency