termfront 0.1.5 → 0.1.7

data/lib/termfront/sprite.rb

@@ -4,46 +4,82 @@ module Termfront
   module Sprite
     module_function
 
+    EXECUTOR_EYE  = Color.rgb_to_256(180, 120, 255)
+    EXECUTOR_HEAD = Color.rgb_to_256(130, 80, 220)
+    EXECUTOR_NECK = Color.rgb_to_256(90, 50, 180)
+    EXECUTOR_BODY = Color.rgb_to_256(80, 40, 160)
+
+    CRAWLER_EYE  = Color.rgb_to_256(255, 240, 100)
+    CRAWLER_BODY = Color.rgb_to_256(220, 140, 30)
+    CRAWLER_LEG  = Color.rgb_to_256(160, 100, 20)
+
+    PLAYER_EYE  = Color.rgb_to_256(140, 220, 255)
+    PLAYER_HEAD = Color.rgb_to_256(40, 130, 180)
+    PLAYER_NECK = Color.rgb_to_256(30, 100, 160)
+    PLAYER_BODY = Color.rgb_to_256(25, 80, 140)
+
+    PLAYER_ENEMY_EYE  = Color.rgb_to_256(210, 170, 165)
+    PLAYER_ENEMY_HEAD = Color.rgb_to_256(110, 80, 90)
+    PLAYER_ENEMY_NECK = Color.rgb_to_256(100, 50, 70)
+    PLAYER_ENEMY_BODY = Color.rgb_to_256(95, 30, 50)
+
+    DUMMY_HEAD  = Color.rgb_to_256(235, 80, 80)
+    DUMMY_TORSO = Color.rgb_to_256(210, 210, 210)
+    DUMMY_LOWER = Color.rgb_to_256(200, 200, 200)
+    DUMMY_LEG   = Color.rgb_to_256(180, 180, 180)
+
     def executor(nx, ny)
-      return "180;120;255" if ((nx - 0.43) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
-      return "180;120;255" if ((nx - 0.57) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
-      return "130;80;220" if ((nx - 0.5) / 0.18)**2 + ((ny - 0.12) / 0.12)**2 <= 1.0
-      return "90;50;180" if ((nx - 0.5) / 0.38)**2 + ((ny - 0.30) / 0.08)**2 <= 1.0
-      return "80;40;160" if ((nx - 0.5) / 0.25)**2 + ((ny - 0.50) / 0.22)**2 <= 1.0
-      return "80;40;160" if ((nx - 0.38) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
-      return "80;40;160" if ((nx - 0.62) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
+      return EXECUTOR_EYE  if ((nx - 0.43) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
+      return EXECUTOR_EYE  if ((nx - 0.57) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
+      return EXECUTOR_HEAD if ((nx - 0.5) / 0.18)**2 + ((ny - 0.12) / 0.12)**2 <= 1.0
+      return EXECUTOR_NECK if ((nx - 0.5) / 0.38)**2 + ((ny - 0.30) / 0.08)**2 <= 1.0
+      return EXECUTOR_BODY if ((nx - 0.5) / 0.25)**2 + ((ny - 0.50) / 0.22)**2 <= 1.0
+      return EXECUTOR_BODY if ((nx - 0.38) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
+      return EXECUTOR_BODY if ((nx - 0.62) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
 
       nil
     end
 
     def crawler(nx, ny)
-      return "255;240;100" if ((nx - 0.36) / 0.063)**2 + ((ny - 0.28) / 0.063)**2 <= 1.0
-      return "255;240;100" if ((nx - 0.64) / 0.063)**2 + ((ny - 0.28) / 0.063)**2 <= 1.0
-      return "220;140;30" if ((nx - 0.5) / 0.40)**2 + ((ny - 0.40) / 0.40)**2 <= 1.0
-      return "160;100;20" if ((nx - 0.35) / 0.12)**2 + ((ny - 0.90) / 0.10)**2 <= 1.0
-      return "160;100;20" if ((nx - 0.65) / 0.12)**2 + ((ny - 0.90) / 0.10)**2 <= 1.0
+      return CRAWLER_EYE  if ((nx - 0.36) / 0.063)**2 + ((ny - 0.28) / 0.063)**2 <= 1.0
+      return CRAWLER_EYE  if ((nx - 0.64) / 0.063)**2 + ((ny - 0.28) / 0.063)**2 <= 1.0
+      return CRAWLER_BODY if ((nx - 0.5) / 0.40)**2 + ((ny - 0.40) / 0.40)**2 <= 1.0
+      return CRAWLER_LEG  if ((nx - 0.35) / 0.12)**2 + ((ny - 0.90) / 0.10)**2 <= 1.0
+      return CRAWLER_LEG  if ((nx - 0.65) / 0.12)**2 + ((ny - 0.90) / 0.10)**2 <= 1.0
 
       nil
     end
 
     def player(nx, ny)
-      return "140;220;255" if ((nx - 0.43) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
-      return "140;220;255" if ((nx - 0.57) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
-      return "40;130;180" if ((nx - 0.5) / 0.18)**2 + ((ny - 0.12) / 0.12)**2 <= 1.0
-      return "30;100;160" if ((nx - 0.5) / 0.38)**2 + ((ny - 0.30) / 0.08)**2 <= 1.0
-      return "25;80;140" if ((nx - 0.5) / 0.25)**2 + ((ny - 0.50) / 0.22)**2 <= 1.0
-      return "25;80;140" if ((nx - 0.38) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
-      return "25;80;140" if ((nx - 0.62) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
+      return PLAYER_EYE  if ((nx - 0.43) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
+      return PLAYER_EYE  if ((nx - 0.57) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
+      return PLAYER_HEAD if ((nx - 0.5) / 0.18)**2 + ((ny - 0.12) / 0.12)**2 <= 1.0
+      return PLAYER_NECK if ((nx - 0.5) / 0.38)**2 + ((ny - 0.30) / 0.08)**2 <= 1.0
+      return PLAYER_BODY if ((nx - 0.5) / 0.25)**2 + ((ny - 0.50) / 0.22)**2 <= 1.0
+      return PLAYER_BODY if ((nx - 0.38) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
+      return PLAYER_BODY if ((nx - 0.62) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
+
+      nil
+    end
+
+    def player_enemy(nx, ny)
+      return PLAYER_ENEMY_EYE  if ((nx - 0.43) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
+      return PLAYER_ENEMY_EYE  if ((nx - 0.57) / 0.045)**2 + ((ny - 0.11) / 0.045)**2 <= 1.0
+      return PLAYER_ENEMY_HEAD if ((nx - 0.5) / 0.18)**2 + ((ny - 0.12) / 0.12)**2 <= 1.0
+      return PLAYER_ENEMY_NECK if ((nx - 0.5) / 0.38)**2 + ((ny - 0.30) / 0.08)**2 <= 1.0
+      return PLAYER_ENEMY_BODY if ((nx - 0.5) / 0.25)**2 + ((ny - 0.50) / 0.22)**2 <= 1.0
+      return PLAYER_ENEMY_BODY if ((nx - 0.38) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
+      return PLAYER_ENEMY_BODY if ((nx - 0.62) / 0.10)**2 + ((ny - 0.85) / 0.15)**2 <= 1.0
 
       nil
     end
 
     def training_dummy(nx, ny)
-      return "235;80;80" if ((nx - 0.5) / 0.18)**2 + ((ny - 0.18) / 0.14)**2 <= 1.0
-      return "210;210;210" if ((nx - 0.5) / 0.08)**2 + ((ny - 0.42) / 0.14)**2 <= 1.0
-      return "200;200;200" if ((nx - 0.5) / 0.22)**2 + ((ny - 0.66) / 0.12)**2 <= 1.0
-      return "180;180;180" if ((nx - 0.38) / 0.08)**2 + ((ny - 0.90) / 0.12)**2 <= 1.0
-      return "180;180;180" if ((nx - 0.62) / 0.08)**2 + ((ny - 0.90) / 0.12)**2 <= 1.0
+      return DUMMY_HEAD  if ((nx - 0.5) / 0.18)**2 + ((ny - 0.18) / 0.14)**2 <= 1.0
+      return DUMMY_TORSO if ((nx - 0.5) / 0.08)**2 + ((ny - 0.42) / 0.14)**2 <= 1.0
+      return DUMMY_LOWER if ((nx - 0.5) / 0.22)**2 + ((ny - 0.66) / 0.12)**2 <= 1.0
+      return DUMMY_LEG   if ((nx - 0.38) / 0.08)**2 + ((ny - 0.90) / 0.12)**2 <= 1.0
+      return DUMMY_LEG   if ((nx - 0.62) / 0.08)**2 + ((ny - 0.90) / 0.12)**2 <= 1.0
 
       nil
     end

data/lib/termfront/terminal_output.rb

@@ -3,7 +3,6 @@
 module Termfront
   module TerminalOutput
     module_function
-    ANSI_PATTERN = /\e\[[0-9;]*[A-Za-z]/.freeze
 
     def begin_frame(home: false, clear: false)
       buf = +""
@@ -17,25 +16,41 @@ module Termfront
     end
 
     def fit_ansi(text, width)
-      visible = 0
       out = +""
-      index = 0
+      visible = 0
+      any_ansi = false
+      i = 0
+      len = text.bytesize
+      segment_start = 0
 
-      while index < text.length && visible < width
-        if (match = ANSI_PATTERN.match(text, index)) && match.begin(0) == index
-          out << match[0]
-          index = match.end(0)
-          next
-        end
+      while i < len
+        byte = text.getbyte(i)
+        if byte == 0x1B
+          out << text.byteslice(segment_start, i - segment_start) if i > segment_start
 
-        char = text[index]
-        out << char
-        visible += 1
-        index += 1
+          esc_start = i
+          i += 1
+          while i < len
+            b = text.getbyte(i)
+            i += 1
+            break if (b >= 65 && b <= 90) || (b >= 97 && b <= 122)
+          end
+          out << text.byteslice(esc_start, i - esc_start)
+          any_ansi = true
+          segment_start = i
+        else
+          if (byte & 0xC0) != 0x80
+            break if visible >= width
+
+            visible += 1
+          end
+          i += 1
+        end
       end
 
-      out << "\e[0m" if out.include?("\e[")
-      out << (" " * (width - visible)) if visible < width
+      out << text.byteslice(segment_start, i - segment_start) if i > segment_start
+      out << "\e[0m" if any_ansi
+      (width - visible).times { out << " " } if visible < width
       out
     end
 
@@ -47,7 +62,7 @@ module Termfront
         begin
           written = io.syswrite(data.byteslice(total, bytes - total))
           total += written
-        rescue IO::WaitWritable
+        rescue IO::WaitWritable, Errno::EAGAIN
           IO.select(nil, [io])
         end
       end

data/lib/termfront/title_screen.rb

@@ -7,12 +7,35 @@ module Termfront
       [13.0, 8.0], [10.0, 8.5], [5.0, 8.5], [2.5, 5.0]
     ].freeze
 
+    TITLE_TEXT = "T E R M F R O N T"
+    SUB_TEXT = "Terminal FPS"
+    MENU_ITEMS = ["[P] PvP", "[F] Wavesfight", "[C] Campaign", "[S] Training", "[Q] Quit"].freeze
+
+    TITLE_CEIL_C              = Color.rgb_to_256(0, 0, 95)
+    TITLE_FLOOR_C             = Color.rgb_to_256(28, 28, 28)
+    TITLE_EXECUTOR_FALLBACK   = Color.rgb_to_256(100, 60, 200)
+    TITLE_CRAWLER_FALLBACK    = Color.rgb_to_256(220, 140, 30)
+
     def initialize(stdout)
       @stdout = stdout
       @title_spin = 0.0
       @demo_wp_idx = 0
       @demo_wp_t = 0.0
       @demo_fire = 0
+
+      mission_class = Mission::Base.campaign.first
+      if mission_class
+        m = mission_class.new
+        @demo_map = m.map_data.map { |row| row.is_a?(Array) ? row : row.chars }.freeze
+        @demo_map_h = @demo_map.size
+        @demo_map_w = @demo_map[0].size
+        @demo_enemies = m.enemy_defs.freeze
+      end
+
+      @static_lines_cols = 0
+      @static_title_line = nil
+      @static_sub_line = nil
+      @static_menu_lines = nil
     end
 
     def show
@@ -24,11 +47,15 @@ module Termfront
       TerminalOutput.write_all(@stdout, TerminalOutput.begin_frame(home: true, clear: true) + TerminalOutput.end_frame)
 
       STDIN.raw do |stdin|
+        last_render = clock - Config::RENDER_DT
         loop do
           now = clock
           @title_spin += 0.015
 
-          render
+          if now - last_render >= Config::RENDER_DT
+            render
+            last_render = now
+          end
 
           while IO.select([stdin], nil, nil, 0)
             begin
@@ -60,6 +87,20 @@ module Termfront
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
 
+    def ensure_static_lines(cols)
+      return if @static_lines_cols == cols
+
+      tc = [(cols - TITLE_TEXT.size) / 2 + 1, 1].max
+      sc = [(cols - SUB_TEXT.size) / 2 + 1, 1].max
+      @static_title_line = TerminalOutput.fit_ansi("#{" " * (tc - 1)}\e[1;38;2;120;140;255m#{TITLE_TEXT}\e[0m", cols)
+      @static_sub_line = TerminalOutput.fit_ansi("#{" " * (sc - 1)}\e[38;2;80;80;120m#{SUB_TEXT}\e[0m", cols)
+      @static_menu_lines = MENU_ITEMS.map do |item|
+        ic = [(cols - item.size) / 2 + 1, 1].max
+        TerminalOutput.fit_ansi("#{" " * (ic - 1)}\e[97m#{item}\e[0m", cols)
+      end
+      @static_lines_cols = cols
+    end
+
     def render
       rows, cols = @stdout.winsize
       rows = [rows, 10].max
@@ -76,13 +117,11 @@ module Termfront
       virt_h = th * 2
       color = Array.new(tw * virt_h, nil)
 
-      mission = Mission::Base.campaign.first
-      return unless mission
+      return unless @demo_map
 
-      m = mission.new
-      demo_map = m.map_data.map { |r| r.is_a?(Array) ? r : r.chars }
-      dm_h = demo_map.size
-      dm_w = demo_map[0].size
+      demo_map = @demo_map
+      dm_h = @demo_map_h
+      dm_w = @demo_map_w
 
       @demo_wp_t += Config::DEMO_SPEED
       if @demo_wp_t >= 1.0
@@ -109,8 +148,8 @@ module Termfront
       dists = Array.new(tw, 100.0)
       horizon = (virt_h / 2 + bob).to_i
 
-      ceil_c = "0;0;95"
-      floor_c = "28;28;28"
+      ceil_c = TITLE_CEIL_C
+      floor_c = TITLE_FLOOR_C
 
       tw.times do |col|
         ray_a = cam_a - half_fov + fov * col.to_f / tw
@@ -167,9 +206,9 @@ module Termfront
           flash = @demo_fire / 4.0 * (1.0 - dist / 4.0)
           rr = (grey + flash * 160).to_i.clamp(0, 255)
           gg = (grey + flash * 60).to_i.clamp(0, 255)
-          wall_c = "#{rr};#{gg};#{grey}"
+          wall_c = Color.rgb_to_256(rr, gg, grey)
         else
-          wall_c = "#{grey};#{grey};#{grey}"
+          wall_c = Color.rgb_to_256(grey, grey, grey)
         end
 
         virt_h.times do |vr|
@@ -184,7 +223,7 @@ module Termfront
       end
 
       # Demo enemies
-      demo_enemies = m.enemy_defs
+      demo_enemies = @demo_enemies
       ddx = Math.cos(cam_a)
       ddy = Math.sin(cam_a)
       ppx = -ddy * Math.tan(fov / 2.0)
@@ -237,54 +276,158 @@ module Termfront
               sc = Sprite.for(type, nx, ny)
               next unless sc
             else
-              sc = type == :executor ? "100;60;200" : "220;140;30"
+              sc = type == :executor ? TITLE_EXECUTOR_FALLBACK : TITLE_CRAWLER_FALLBACK
             end
             color[vr * tw + c] = sc
           end
         end
       end
 
-      # Half-block rendering
-      th.times do |r|
-        vp0 = r * 2
-        vp1 = r * 2 + 1
+      # Half-block rendering - build each line directly to skip fit_ansi
+      fg_256 = Renderer::FG_256
+      bg_256 = Renderer::BG_256
+      cap_w = tw < cols ? tw : cols
+
+      r = 0
+      while r < th
+        vp0_offset = (r * 2) * tw
+        vp1_offset = vp0_offset + tw
+
+        first_tc = color[vp0_offset]
+        first_bc = color[vp1_offset]
+
+        if first_tc && first_tc == first_bc
+          uniform = true
+          cu = 1
+          while cu < cap_w
+            if color[vp0_offset + cu] != first_tc || color[vp1_offset + cu] != first_bc
+              uniform = false
+              break
+            end
+            cu += 1
+          end
+          if uniform
+            lines[r] = +bg_256[first_tc] << "\e[K\e[0m"
+            r += 1
+            next
+          end
+        elsif first_tc.nil? && first_bc.nil?
+          all_nil = true
+          cu = 1
+          while cu < cap_w
+            if !color[vp0_offset + cu].nil? || !color[vp1_offset + cu].nil?
+              all_nil = false
+              break
+            end
+            cu += 1
+          end
+          if all_nil
+            lines[r] = " " * cols
+            r += 1
+            next
+          end
+        end
+
         line = +""
-        tw.times do |c|
-          tc = color[vp0 * tw + c]
-          bc = color[vp1 * tw + c]
-          line << if tc && bc
-                    if tc == bc
-                      "\e[38;2;#{tc}m\xE2\x96\x88\e[0m"
-                    else
-                      "\e[38;2;#{tc};48;2;#{bc}m\xE2\x96\x80\e[0m"
-                    end
-                  elsif tc
-                    "\e[38;2;#{tc}m\xE2\x96\x80\e[0m"
-                  elsif bc
-                    "\e[38;2;#{bc}m\xE2\x96\x84\e[0m"
-                  else
-                    " "
-                  end
+        pfg = nil
+        pbg = nil
+        visible = 0
+
+        c = 0
+        while c < tw && visible < cap_w
+          tc = color[vp0_offset + c]
+          bc = color[vp1_offset + c]
+
+          if tc == bc
+            run_end = c + 1
+            while run_end < tw &&
+                  color[vp0_offset + run_end] == tc &&
+                  color[vp1_offset + run_end] == bc
+              run_end += 1
+            end
+            n = run_end - c
+            n = cap_w - visible if visible + n > cap_w
+
+            if tc.nil?
+              if pfg || pbg
+                line << "\e[0m"
+                pfg = nil
+                pbg = nil
+              end
+              line << (n == 1 ? " " : " " * n)
+            else
+              if pfg != tc || pbg
+                line << fg_256[tc]
+                line << "\e[49m" if pbg
+                pfg = tc
+                pbg = nil
+              end
+              line << (n == 1 ? "\xE2\x96\x88" : "\xE2\x96\x88" * n)
+            end
+            visible += n
+            c += n
+          else
+            if tc && bc
+              if pfg != tc || pbg != bc
+                line << fg_256[tc]
+                line << bg_256[bc]
+                pfg = tc
+                pbg = bc
+              end
+              line << "\xE2\x96\x80"
+            elsif tc
+              if pfg != tc || pbg
+                line << fg_256[tc]
+                line << "\e[49m" if pbg
+                pfg = tc
+                pbg = nil
+              end
+              line << "\xE2\x96\x80"
+            elsif bc
+              if pfg != bc || pbg
+                line << fg_256[bc]
+                line << "\e[49m" if pbg
+                pfg = bc
+                pbg = nil
+              end
+              line << "\xE2\x96\x84"
+            else
+              if pfg || pbg
+                line << "\e[0m"
+                pfg = nil
+                pbg = nil
+              end
+              line << " "
+            end
+            visible += 1
+            c += 1
+          end
+        end
+
+        if visible < cols
+          if pfg || pbg
+            line << "\e[0m"
+            pfg = nil
+            pbg = nil
+          end
+          line << (" " * (cols - visible))
         end
-        lines[r] = TerminalOutput.fit_ansi(line, cols)
+        line << "\e[0m" if pfg || pbg
+
+        lines[r] = line
+        r += 1
       end
 
-      # Title text
+      # Title text + menu items (memoized per cols)
+      ensure_static_lines(cols)
+
       title_row = [[th + 1, rows - 4].min, 1].max
-      title = "T E R M F R O N T"
-      sub   = "Terminal FPS"
-      tc = [(cols - title.size) / 2 + 1, 1].max
-      sc = [(cols - sub.size) / 2 + 1, 1].max
-      lines[title_row - 1] = TerminalOutput.fit_ansi("#{" " * (tc - 1)}\e[1;38;2;120;140;255m#{title}\e[0m", cols)
-      lines[title_row] = TerminalOutput.fit_ansi("#{" " * (sc - 1)}\e[38;2;80;80;120m#{sub}\e[0m", cols)
-
-      # Menu items
-      items = ["[P] PvP", "[F] Wavesfight", "[C] Campaign", "[S] Training", "[Q] Quit"]
-      items_count_for_menu = items.size
-      menu_row = [[title_row + 2, rows - items_count_for_menu].min, 1].max
-      items.each_with_index do |item, i|
-        ic = [(cols - item.size) / 2 + 1, 1].max
-        lines[menu_row + i - 1] = TerminalOutput.fit_ansi("#{" " * (ic - 1)}\e[97m#{item}\e[0m", cols)
+      lines[title_row - 1] = @static_title_line
+      lines[title_row] = @static_sub_line
+
+      menu_row = [[title_row + 2, rows - MENU_ITEMS.size].min, 1].max
+      @static_menu_lines.each_with_index do |menu_line, i|
+        lines[menu_row + i - 1] = menu_line
       end
 
       lines.each_with_index do |line, index|

data/lib/termfront/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Termfront
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/lib/termfront.rb

@@ -4,6 +4,7 @@ require "io/console"
 
 require_relative "termfront/version"
 require_relative "termfront/config"
+require_relative "termfront/color"
 require_relative "termfront/map"
 require_relative "termfront/weapon/base"
 require_relative "termfront/weapon/pistol"
@@ -32,6 +33,7 @@ require_relative "termfront/remote_enemy"
 require_relative "termfront/sprite"
 require_relative "termfront/input"
 require_relative "termfront/terminal_output"
+require_relative "termfront/async_writer"
 require_relative "termfront/renderer"
 require_relative "termfront/demo_player"
 require_relative "termfront/scene_player"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: termfront
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - S-H-GAMELINKS
@@ -51,7 +51,9 @@ files:
 - exe/termfront
 - exe/termfront-server
 - lib/termfront.rb
+- lib/termfront/async_writer.rb
 - lib/termfront/audio_manager.rb
+- lib/termfront/color.rb
 - lib/termfront/config.rb
 - lib/termfront/demo_player.rb
 - lib/termfront/drop_item/base.rb