doom 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f1be6b4e908fb60c850e5ac7e4e9d5ade8fff60fd7c9744d89da3132625e5a
-  data.tar.gz: bdbc30dcb9141292e4c6ae8d974b604b0d8cdb440dac964bc637615fd9cf53b4
+  metadata.gz: f2114bdabac04335b93702676f54d54e26ae49a2c47250c90be096c2a827f763
+  data.tar.gz: 0df53b232c93033c26a3bf0e44894e4e525967417ca600915069f233f44c9ca5
 SHA512:
-  metadata.gz: e5a2273db5baa4bb26c5d9d08cc78b734ef102d7b8d354a95109e44e72bb8deaf901b743aa59a9a3ff4f1770059d13b2e7069f3f8be5d6ccaec942b7b69d3053
-  data.tar.gz: 6cb2b7e235928e9a72ab95a87a44c7be3c84dbc0f59bcd45d7c0e40f0f3ebee54a46198baea930191b2355cc7a713e326d8c412354ab6eee103adf7ebe9bf5c9
+  metadata.gz: abb268a3b9b6b8605de489c49fc47825d4460b2db849a13cf0f89d465950cf3617075cbd0e4064c04c9703ff9cac184485a11419587f43787d53f7e918d35024
+  data.tar.gz: bcdfff32f9101693e8067790e0e1031d6f3c540bf574d7ccfca1967ca52763479ca019844efc3e247eecb683d6f480c662d19e4c8a256519c41d8fdab77ed8d1

data/README.md

@@ -127,6 +127,12 @@ to present every frame the old way.
 brew install sdl2
 ```
 
+If an older installation reports `symbol not found in flat namespace _OBJC_CLASS_$_NSScreen`,
+update the gem with `gem update doom`. This is fixed in Doom Ruby 0.11.1.
+
+If the first-run WAD downloader fails with `uninitialized constant Doom::Net::HTTP`,
+update to Doom Ruby 0.11.2.
+
 **Ubuntu/Debian:**
 ```bash
 sudo apt-get install build-essential libsdl2-dev libgl1-mesa-dev libopenal-dev libsndfile1-dev libmpg123-dev libfontconfig1-dev

data/bin/doom

@@ -131,13 +131,18 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'truffleruby' && RUBY_PLATFORM.includ
     %w[
       /opt/homebrew/lib/libSDL2-2.0.0.dylib /opt/homebrew/lib/libSDL2.dylib
       /usr/local/lib/libSDL2-2.0.0.dylib /usr/local/lib/libSDL2.dylib
-    ].each { |p| (Fiddle.dlopen(p); break) if File.exist?(p) }
+    ].each do |path|
+      next unless File.exist?(path)
+
+      Fiddle.dlopen(path)
+      break
+    end
   rescue StandardError => e
     warn "[doom] SDL2 preload for TruffleRuby failed (#{e.message}); the window may not open"
   end
   unless (ENV['JAVA_TOOL_OPTIONS'].to_s + ENV['TRUFFLERUBYOPT'].to_s).include?('XstartOnFirstThread')
-    warn "[doom] on TruffleRuby/macOS the window needs the main thread: run with " \
-         "`truffleruby --vm.XstartOnFirstThread bin/doom ...`"
+    warn '[doom] on TruffleRuby/macOS the window needs the main thread: run with ' \
+         '`truffleruby --vm.XstartOnFirstThread bin/doom ...`'
   end
 end
 

data/lib/doom/game/player_physics.rb

@@ -284,9 +284,11 @@ module Doom
       # Iterate linedefs that may interact with the player moving from
       # (x1, y1) to (x2, y2). Uses BLOCKMAP when available; otherwise falls
       # back to scanning all linedefs.
-      def each_nearby_linedef(x1, y1, x2, y2, &)
+      def each_nearby_linedef(x1, y1, x2, y2, &block)
+        return enum_for(__method__, x1, y1, x2, y2) unless block
+
         unless @map.respond_to?(:blockmap_loaded?) && @map.blockmap_loaded?
-          @map.linedefs.each(&)
+          @map.linedefs.each(&block)
           return
         end
 
@@ -295,7 +297,7 @@ module Doom
         max_x = [x1, x2].max + PLAYER_RADIUS
         min_y = [y1, y2].min - PLAYER_RADIUS
         max_y = [y1, y2].max + PLAYER_RADIUS
-        @map.each_linedef_near(min_x, min_y, max_x, max_y, &)
+        @map.each_linedef_near(min_x, min_y, max_x, max_y, &block)
       end
 
       def crosses_blocking_linedef?(x1, y1, x2, y2, linedef)

data/lib/doom/game/snapshot.rb

@@ -44,9 +44,11 @@ module Doom
         end
 
         # length-prefixed homogeneous array
-        def list(items, &)
+        def list(items, &block)
+          return enum_for(__method__, items) unless block
+
           u32(items.size)
-          items.each(&)
+          items.each(&block)
         end
 
         def to_s = @buf.dup
@@ -76,8 +78,10 @@ module Doom
           take(u16)
         end
 
-        def list(&)
-          Array.new(u32, &)
+        def list(&block)
+          return enum_for(__method__) unless block
+
+          Array.new(u32, &block)
         end
 
         private

data/lib/doom/map/data.rb

@@ -302,9 +302,16 @@ module Doom
       # Yield each linedef whose block overlaps the bounding box (min_x, min_y,
       # max_x, max_y). Yields each linedef at most once per call. Falls back
       # to iterating all linedefs if no blockmap is loaded.
-      def each_linedef_near(min_x, min_y, max_x, max_y, &)
+      # Avoid anonymous block forwarding: Ruby 4.0.9's parser rejects that form.
+      def each_linedef_near(min_x, min_y, max_x, max_y)
+        return enum_for(__method__, min_x, min_y, max_x, max_y) unless block_given?
+
         unless @blockmap_blocks
-          @linedefs.each(&)
+          line_index = 0
+          while line_index < @linedefs.size
+            yield @linedefs[line_index]
+            line_index += 1
+          end
           return
         end
 

data/lib/doom/platform/gosu_loader.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rbconfig'
+
+module Doom
+  module Platform
+    # Gosu 1.4.6's macOS extension can be linked without its AppKit and SDL2
+    # dependencies when sdl2-config does not implement --static-libs. Load the
+    # frameworks globally first so dyld can resolve the extension's symbols.
+    module GosuLoader
+      APPKIT = '/System/Library/Frameworks/AppKit.framework/AppKit'
+      SDL2_CANDIDATES = %w[
+        /opt/homebrew/opt/sdl2/lib/libSDL2.dylib
+        /usr/local/opt/sdl2/lib/libSDL2.dylib
+        /opt/homebrew/lib/libSDL2.dylib
+        /usr/local/lib/libSDL2.dylib
+      ].freeze
+
+      module_function
+
+      def prepare!
+        return unless RbConfig::CONFIG['host_os'].include?('darwin')
+
+        require 'fiddle'
+        flags = Fiddle::RTLD_GLOBAL | Fiddle::RTLD_LAZY
+        @handles ||= []
+        @handles << Fiddle::Handle.new(APPKIT, flags)
+
+        sdl2 = SDL2_CANDIDATES.find { |path| File.file?(path) }
+        unless sdl2
+          raise LoadError,
+                'Could not find Homebrew SDL2 required by Gosu. Install it with `brew install sdl2`.'
+        end
+
+        @sdl2_handle = Fiddle::Handle.new(sdl2, flags)
+        @handles << @sdl2_handle
+      rescue Fiddle::DLError => e
+        raise LoadError, "Could not load macOS frameworks required by Gosu: #{e.message}"
+      end
+
+      def sdl2_handle
+        @sdl2_handle
+      end
+    end
+  end
+end

data/lib/doom/platform/gosu_window.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'gosu_loader'
+Doom::Platform::GosuLoader.prepare!
 require 'gosu'
 require_relative 'sdl'
 require_relative 'window_logic'

data/lib/doom/platform/sdl.rb

@@ -9,12 +9,13 @@ module Doom
         gosu_spec = Gem.loaded_specs['gosu']
         lib_ext = RbConfig::CONFIG['DLEXT'] || 'so'
         bundle = File.join(gosu_spec.full_gem_path, 'lib', "gosu.#{lib_ext}")
-        @lib = Fiddle.dlopen(bundle)
+        @gosu_lib = Fiddle.dlopen(bundle)
+        @sdl_lib = Doom::Platform::GosuLoader.sdl2_handle || @gosu_lib
         @shared_window = Fiddle::Function.new(
-          @lib['_ZN4Gosu13shared_windowEv'], [], Fiddle::TYPE_VOIDP
+          @gosu_lib['_ZN4Gosu13shared_windowEv'], [], Fiddle::TYPE_VOIDP
         )
         @set_kb_grab = Fiddle::Function.new(
-          @lib['SDL_SetWindowKeyboardGrab'],
+          @sdl_lib['SDL_SetWindowKeyboardGrab'],
           [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT], Fiddle::TYPE_VOID
         )
         @ready = true
@@ -52,7 +53,8 @@ module Doom
         require 'fiddle'
         gosu_spec = Gem.loaded_specs['gosu']
         lib_ext = RbConfig::CONFIG['DLEXT'] || 'so'
-        lib = Fiddle.dlopen(File.join(gosu_spec.full_gem_path, 'lib', "gosu.#{lib_ext}"))
+        bundle = File.join(gosu_spec.full_gem_path, 'lib', "gosu.#{lib_ext}")
+        lib = Doom::Platform::GosuLoader.sdl2_handle || Fiddle.dlopen(bundle)
 
         get_mode = Fiddle::Function.new(
           lib['SDL_GetCurrentDisplayMode'],

data/lib/doom/render/hardware_renderer.rb

@@ -5,7 +5,7 @@
 begin
   require 'opengl'
 rescue LoadError
-  warn "[doom] opengl gem not available; the hardware renderer is disabled" if $VERBOSE
+  warn '[doom] opengl gem not available; the hardware renderer is disabled' if $VERBOSE
 end
 
 module Doom

data/lib/doom/render/ray_tracing/bvh.rb

@@ -94,8 +94,10 @@ module Doom
           [minimum, maximum]
         end
 
-        def axes(&)
-          3.times.map(&)
+        def axes(&block)
+          return enum_for(__method__) unless block
+
+          3.times.map(&block)
         end
       end
     end

data/lib/doom/render/renderer.rb

@@ -67,13 +67,8 @@ module Doom
         # Opt-in: route the wall/floor/ceiling rasterisation through the
         # spinel_native-compiled port of this renderer's hot path. Everything
         # else (sprites, weapon, HUD, physics, sound) stays the real game.
-        @native_kernel = !ENV["DOOM_NATIVE"].to_s.empty? && ENV["DOOM_NATIVE"] != "0"
-        if @native_kernel
-          warn "[doom] compiling spinel_native render kernel (first run may take a few seconds)..."
-          @sn = build_native_renderer
-          @native_kernel = !@sn.nil?
-          warn "[doom] spinel_native renderer ready" if @sn
-        end
+        @native_kernel = !ENV['DOOM_NATIVE'].to_s.empty? && ENV['DOOM_NATIVE'] != '0'
+        warn '[doom] spinel_native renderer requested; loading it on first frame' if @native_kernel
         @sprites = sprites
         @animations = animations
         @hidden_things = nil
@@ -309,7 +304,7 @@ module Doom
       def build_native_renderer
         # Dynamic form so the spinel AOT compiler ignores this require (it pulls
         # in the spinel_native gem, irrelevant to an AOT build); CRuby is unaffected.
-        send(:require_relative, "spinel_native_renderer")
+        send(:require_relative, 'spinel_native_renderer')
         SpinelNativeRenderer.new(@map, @palette, @colormap, @textures, @flats_array)
       rescue StandardError, LoadError => e
         warn "[doom] spinel_native renderer unavailable, using Ruby renderer (#{e.message.lines.first.to_s.strip})"

data/lib/doom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Doom
-  VERSION = '0.11.0'
+  VERSION = '0.11.2'
 end

data/lib/doom/wad_downloader.rb

@@ -83,28 +83,28 @@ module Doom
     def self.download_from_url(url, destination, redirect_limit: 5)
       raise DownloadError, 'Too many redirects' if redirect_limit.negative?
 
-      uri = URI.parse(url)
+      uri = ::URI.parse(url)
       ssl_opts = { use_ssl: uri.scheme == 'https' }
 
       if ssl_opts[:use_ssl]
         begin
-          Net::HTTP.start(uri.host, uri.port, **ssl_opts) { |h| h.head(uri) }
-        rescue OpenSSL::SSL::SSLError
+          ::Net::HTTP.start(uri.host, uri.port, **ssl_opts) { |h| h.head(uri) }
+        rescue ::OpenSSL::SSL::SSLError
           puts 'SSL certificate verification failed, retrying without verification...'
-          ssl_opts[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
+          ssl_opts[:verify_mode] = ::OpenSSL::SSL::VERIFY_NONE
         end
       end
 
       downloaded = 0
-      Net::HTTP.start(uri.host, uri.port, **ssl_opts) do |http|
-        request = Net::HTTP::Get.new(uri)
+      ::Net::HTTP.start(uri.host, uri.port, **ssl_opts) do |http|
+        request = ::Net::HTTP::Get.new(uri)
 
         http.request(request) do |response|
           case response
-          when Net::HTTPRedirection
+          when ::Net::HTTPRedirection
             return download_from_url(response['location'], destination,
                                      redirect_limit: redirect_limit - 1)
-          when Net::HTTPSuccess
+          when ::Net::HTTPSuccess
             total_size = response['content-length']&.to_i || SHAREWARE_SIZE
 
             File.open(destination, 'wb') do |file|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doom
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Chris Hasinski
@@ -148,6 +148,7 @@ files:
 - lib/doom/net/protocol.rb
 - lib/doom/net/session.rb
 - lib/doom/net/transport.rb
+- lib/doom/platform/gosu_loader.rb
 - lib/doom/platform/gosu_window.rb
 - lib/doom/platform/sdl.rb
 - lib/doom/platform/window_logic.rb
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Doom engine port with multiplayer and modern renderers
 test_files: []