doom 0.3.0 → 0.5.0

data/lib/doom/wad/sprite.rb

@@ -140,6 +140,11 @@ module Doom
         @wad = wad
         @cache = {}
         @rotation_cache = {}
+
+        # Build sprite lump index: maps "PREFIXframe_rotation" -> [lump_name, mirrored?]
+        # Handles combined lumps like SPOSA2A8 (rotation 2 normal, rotation 8 mirrored)
+        @sprite_index = {}
+        build_sprite_index
       end
 
       # Get default sprite (rotation 0 or 1)
@@ -149,9 +154,8 @@ module Doom
         prefix = THING_SPRITES[thing_type]
         return nil unless prefix
 
-        # Try to find sprite with A0 (all angles) or A1 (front facing)
-        sprite = Sprite.load(@wad, "#{prefix}A0") ||
-                 Sprite.load(@wad, "#{prefix}A1")
+        sprite = load_sprite_frame(prefix, 'A', 0) ||
+                 load_sprite_frame(prefix, 'A', 1)
 
         @cache[thing_type] = sprite
         sprite
@@ -169,36 +173,105 @@ module Doom
         prefix = THING_SPRITES[thing_type]
         return nil unless prefix
 
-        # Check cache for rotation 0 (all angles) sprite
-        cache_key = "#{prefix}A0"
-        if @rotation_cache.key?(cache_key)
-          return @rotation_cache[cache_key] if @rotation_cache[cache_key]
-        else
-          sprite = Sprite.load(@wad, cache_key)
-          @rotation_cache[cache_key] = sprite
-          return sprite if sprite
-        end
+        # Check for rotation 0 (all angles) sprite first
+        sprite = load_sprite_frame(prefix, 'A', 0)
+        return sprite if sprite
 
         # Calculate rotation frame (1-8)
         # Doom rotations: 1=front, 2=front-right, 3=right, etc. (clockwise)
-        # The angle we need is: viewer's angle to sprite - sprite's facing angle
         angle_diff = viewer_angle - (thing_angle * Math::PI / 180.0)
-
-        # Normalize to 0-2π
         angle_diff = angle_diff % (2 * Math::PI)
         angle_diff += 2 * Math::PI if angle_diff < 0
+        rotation = ((angle_diff + Math::PI / 8) / (Math::PI / 4)).to_i % 8 + 1
+
+        load_sprite_frame(prefix, 'A', rotation) || @cache[thing_type]
+      end
+
+      # Get a specific frame (for death animations, etc.)
+      def get_frame(thing_type, frame_letter, viewer_angle, thing_angle)
+        prefix = THING_SPRITES[thing_type]
+        return nil unless prefix
 
-        # Convert to rotation frame (1-8)
-        # Each rotation covers 45 degrees (π/4 radians)
-        # Add π/8 to center the ranges
+        # Death frames typically use rotation 0 (same from all angles)
+        sprite = load_sprite_frame(prefix, frame_letter, 0)
+        return sprite if sprite
+
+        # Try with calculated rotation
+        angle_diff = viewer_angle - (thing_angle * Math::PI / 180.0)
+        angle_diff = angle_diff % (2 * Math::PI)
+        angle_diff += 2 * Math::PI if angle_diff < 0
         rotation = ((angle_diff + Math::PI / 8) / (Math::PI / 4)).to_i % 8 + 1
 
-        cache_key = "#{prefix}A#{rotation}"
-        unless @rotation_cache.key?(cache_key)
-          @rotation_cache[cache_key] = Sprite.load(@wad, cache_key)
+        load_sprite_frame(prefix, frame_letter, rotation)
+      end
+
+      private
+
+      def build_sprite_index
+        @wad.directory.each do |entry|
+          name = entry.name
+          next if name.length < 6
+
+          prefix = name[0, 4]
+          frame1 = name[4]
+          rot1 = name[5].to_i
+
+          # Register first frame+rotation
+          key = "#{prefix}#{frame1}#{rot1}"
+          @sprite_index[key] = [name, false]
+
+          # Check for mirrored second rotation (e.g., SPOSA2A8)
+          if name.length >= 8
+            frame2 = name[6]
+            rot2 = name[7].to_i
+            key2 = "#{prefix}#{frame2}#{rot2}"
+            @sprite_index[key2] = [name, true]
+          end
+        end
+      end
+
+      def load_sprite_frame(prefix, frame, rotation)
+        key = "#{prefix}#{frame}#{rotation}"
+        return @rotation_cache[key] if @rotation_cache.key?(key)
+
+        index_entry = @sprite_index[key]
+        unless index_entry
+          @rotation_cache[key] = nil
+          return nil
+        end
+
+        lump_name, mirrored = index_entry
+        # Load the base sprite (may be shared by mirrored pair)
+        base = load_or_cache_lump(lump_name)
+        unless base
+          @rotation_cache[key] = nil
+          return nil
         end
 
-        @rotation_cache[cache_key] || @cache[thing_type]
+        sprite = mirrored ? mirror_sprite(base) : base
+        @rotation_cache[key] = sprite
+        sprite
+      end
+
+      def load_or_cache_lump(lump_name)
+        cache_key = "_lump_#{lump_name}"
+        return @rotation_cache[cache_key] if @rotation_cache.key?(cache_key)
+
+        sprite = Sprite.load(@wad, lump_name)
+        @rotation_cache[cache_key] = sprite
+        sprite
+      end
+
+      def mirror_sprite(sprite)
+        # Flip columns horizontally, adjust left_offset
+        mirrored_columns = sprite.instance_variable_get(:@columns).reverse
+        mirrored_left = sprite.width - sprite.left_offset
+        Sprite.new(
+          "#{sprite.name}_M",
+          sprite.width, sprite.height,
+          mirrored_left, sprite.top_offset,
+          mirrored_columns
+        )
       end
     end
   end

data/lib/doom/wad/texture.rb

@@ -12,21 +12,12 @@ module Doom
         @width = width
         @height = height
         @patch_refs = patch_refs
-        @columns = nil
-      end
-
-      def columns
-        @columns ||= build_columns
-      end
-
-      def build_columns
-        # Will be built when patches are composited
-        nil
       end
 
       def self.load_all(wad)
         pnames = load_pnames(wad)
         textures = {}
+        texture_names = []
 
         %w[TEXTURE1 TEXTURE2].each do |lump_name|
           data = wad.read_lump(lump_name)
@@ -34,10 +25,11 @@ module Doom
 
           parse_texture_lump(data).each do |tex|
             textures[tex.name] = tex
+            texture_names << tex.name
           end
         end
 
-        { textures: textures, pnames: pnames }
+        { textures: textures, pnames: pnames, texture_names: texture_names }
       end
 
       def self.load_pnames(wad)
@@ -81,13 +73,14 @@ module Doom
     end
 
     class TextureManager
-      attr_reader :textures, :pnames, :patches
+      attr_reader :textures, :pnames, :patches, :texture_names
 
       def initialize(wad)
         @wad = wad
         result = Texture.load_all(wad)
         @textures = result[:textures]
         @pnames = result[:pnames]
+        @texture_names = result[:texture_names]
         @patches = {}
         @composite_cache = {}
       end
@@ -142,21 +135,29 @@ module Doom
         @width = width
         @height = height
         @columns = columns
+        @column_cache = Array.new(width)
+        precompute_columns
       end
 
-      def column_pixels(x, height_needed = nil)
-        x = x % @width
-        posts = @columns[x]
-        height_needed ||= @height
+      def column_pixels(x, _height_needed = nil)
+        @column_cache[x & (@width - 1)]
+      end
+
+      private
 
-        pixels = Array.new(height_needed, 0)
-        posts.each do |post|
-          post.pixels.each_with_index do |color, i|
-            y = (post.top_delta + i) % @height
-            pixels[y] = color if y < height_needed
+      def precompute_columns
+        @width.times do |x|
+          posts = @columns[x]
+          pixels = Array.new(@height, 0)
+          posts.each do |post|
+            td = post.top_delta
+            post.pixels.each_with_index do |color, i|
+              y = (td + i) % @height
+              pixels[y] = color
+            end
           end
+          @column_cache[x] = pixels.freeze
         end
-        pixels
       end
     end
   end

data/lib/doom/wad_downloader.rb

@@ -7,8 +7,8 @@ require 'fileutils'
 module Doom
   # Downloads the shareware DOOM1.WAD if not present
   class WadDownloader
-    # Official Doom shareware WAD, uploaded by id Software to archive.org
-    SHAREWARE_URL = 'https://archive.org/download/doom-shareware_1996/DOOM1.WAD'
+    # Doom shareware WAD v1.9 (freely distributable)
+    SHAREWARE_URL = 'https://raw.githubusercontent.com/Akbar30Bill/DOOM_wads/master/doom1.wad'
     SHAREWARE_SIZE = 4_196_020  # Expected size in bytes
     SHAREWARE_FILENAME = 'doom1.wad'
 

data/lib/doom.rb

@@ -9,8 +9,17 @@ require_relative 'doom/wad/flat'
 require_relative 'doom/wad/patch'
 require_relative 'doom/wad/texture'
 require_relative 'doom/wad/sprite'
+require_relative 'doom/wad/hud_graphics'
 require_relative 'doom/map/data'
+require_relative 'doom/game/player_state'
+require_relative 'doom/game/sector_actions'
+require_relative 'doom/game/animations'
+require_relative 'doom/game/item_pickup'
+require_relative 'doom/game/combat'
+require_relative 'doom/game/sector_effects'
 require_relative 'doom/render/renderer'
+require_relative 'doom/render/status_bar'
+require_relative 'doom/render/weapon_renderer'
 require_relative 'doom/platform/gosu_window'
 
 module Doom
@@ -39,6 +48,9 @@ module Doom
       puts 'Loading sprites...'
       sprites = Wad::SpriteManager.new(wad)
 
+      puts 'Loading HUD graphics...'
+      hud_graphics = Wad::HudGraphics.new(wad)
+
       puts "Loading map #{map_name}..."
       map = Map::MapData.load(wad, map_name)
       puts "  #{map.vertices.size} vertices, #{map.linedefs.size} linedefs"
@@ -53,12 +65,25 @@ module Doom
         player_start = Map::Thing.new(0, 0, 90, 1, 0)
       end
 
+      puts 'Initializing animations...'
+      flat_names = flats.map(&:name)
+      animations = Game::Animations.new(textures.texture_names, flat_names)
+
       puts 'Creating renderer...'
-      renderer = Render::Renderer.new(wad, map, textures, palette, colormap, flats, sprites)
+      renderer = Render::Renderer.new(wad, map, textures, palette, colormap, flats, sprites, animations)
       renderer.set_player(player_start.x, player_start.y, 41, player_start.angle)
 
+      puts 'Setting up player state and HUD...'
+      player_state = Game::PlayerState.new
+      status_bar = Render::StatusBar.new(hud_graphics, player_state)
+      weapon_renderer = Render::WeaponRenderer.new(hud_graphics, player_state)
+      sector_actions = Game::SectorActions.new(map)
+      sector_effects = Game::SectorEffects.new(map)
+      item_pickup = Game::ItemPickup.new(map, player_state)
+      combat = Game::Combat.new(map, player_state, sprites)
+
       puts 'Starting game window...'
-      window = Platform::GosuWindow.new(renderer, palette, map)
+      window = Platform::GosuWindow.new(renderer, palette, map, player_state, status_bar, weapon_renderer, sector_actions, animations, sector_effects, item_pickup, combat)
       window.show
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: doom
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Hasinski
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -64,12 +63,21 @@ files:
 - README.md
 - bin/doom
 - lib/doom.rb
+- lib/doom/game/animations.rb
+- lib/doom/game/combat.rb
+- lib/doom/game/item_pickup.rb
+- lib/doom/game/player_state.rb
+- lib/doom/game/sector_actions.rb
+- lib/doom/game/sector_effects.rb
 - lib/doom/map/data.rb
 - lib/doom/platform/gosu_window.rb
 - lib/doom/render/renderer.rb
+- lib/doom/render/status_bar.rb
+- lib/doom/render/weapon_renderer.rb
 - lib/doom/version.rb
 - lib/doom/wad/colormap.rb
 - lib/doom/wad/flat.rb
+- lib/doom/wad/hud_graphics.rb
 - lib/doom/wad/palette.rb
 - lib/doom/wad/patch.rb
 - lib/doom/wad/reader.rb
@@ -80,7 +88,6 @@ homepage: https://github.com/khasinski/doom-rb
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Doom engine port in pure Ruby
 test_files: []