quake-rb 0.1.0 → 0.2.0

data/lib/quake/sound/events.rb

@@ -27,19 +27,85 @@ module Quake
       # Player sounds
       PLAYER_SOUNDS = {
         jump: "player/plyrjmp8.wav",
+        swim1: "misc/water1.wav",
+        swim2: "misc/water2.wav",
         land: "player/land.wav",
+        land_hurt: "player/land2.wav",
+        water_land: "player/h2ojump.wav",
+        axe_body_hit: "player/axhit1.wav",
+        axe_wall_hit: "player/axhit2.wav",
         water_enter: "player/inh2o.wav",
-        water_exit: "player/inlava.wav"
+        water_exit: "misc/outwater.wav",
+        lava_enter: "player/inlava.wav",
+        slime_enter: "player/slimbrn2.wav",
+        burn1: "player/lburn1.wav",
+        burn2: "player/lburn2.wav",
+        pain1: "player/pain1.wav",
+        pain2: "player/pain2.wav",
+        pain3: "player/pain3.wav",
+        pain4: "player/pain4.wav",
+        pain5: "player/pain5.wav",
+        pain6: "player/pain6.wav",
+        death1: "player/death1.wav",
+        death2: "player/death2.wav",
+        death3: "player/death3.wav",
+        death4: "player/death4.wav",
+        death5: "player/death5.wav",
+        water_death: "player/h2odeath.wav",
+        teledeath: "player/teledth1.wav",
+        gib: "player/gib.wav",
+        udeath: "player/udeath.wav",
+        gasp: "player/gasp1.wav",
+        gasp_deep: "player/gasp2.wav",
+        drown1: "player/drown1.wav",
+        drown2: "player/drown2.wav",
+        quad_attack: "items/damage3.wav",
+        ring_expiring: "items/inv2.wav",
+        pentagram_expiring: "items/protect2.wav",
+        biosuit_expiring: "items/suit2.wav",
+        quad_expiring: "items/damage2.wav",
+        pentagram_protect: "items/protect3.wav",
+        ring_idle: ["items/inv3.wav", 0.5]
       }.freeze
 
+      AMBIENT_SOUNDS = {
+        "light_fluoro" => ["ambience/fl_hum1.wav", 0.5],
+        "light_fluorospark" => ["ambience/buzz1.wav", 0.5],
+        "light_torch_small_walltorch" => ["ambience/fire1.wav", 0.5],
+        "light_flame_large_yellow" => ["ambience/fire1.wav", 0.5],
+        "light_flame_small_yellow" => ["ambience/fire1.wav", 0.5],
+        "light_flame_small_white" => ["ambience/fire1.wav", 0.5],
+        "ambient_suck_wind" => ["ambience/suck1.wav", 1.0],
+        "ambient_drone" => ["ambience/drone6.wav", 0.5],
+        "ambient_flouro_buzz" => ["ambience/buzz1.wav", 1.0],
+        "ambient_drip" => ["ambience/drip1.wav", 0.5],
+        "ambient_comp_hum" => ["ambience/comp1.wav", 1.0],
+        "ambient_thunder" => ["ambience/thunder1.wav", 0.5],
+        "ambient_light_buzz" => ["ambience/fl_hum1.wav", 0.5],
+        "ambient_swamp1" => ["ambience/swamp1.wav", 0.5],
+        "ambient_swamp2" => ["ambience/swamp2.wav", 0.5],
+        "trigger_teleport" => ["ambience/hum1.wav", 0.5]
+      }.freeze
+
+      NOISEMAKER_SOUNDS = [
+        "enforcer/enfire.wav",
+        "enforcer/enfstop.wav",
+        "enforcer/sight1.wav",
+        "enforcer/sight2.wav",
+        "enforcer/sight3.wav",
+        "enforcer/sight4.wav",
+        "enforcer/pain1.wav"
+      ].freeze
+
       def initialize(mixer)
         @mixer = mixer
       end
 
       def on_pickup(event)
         return unless @mixer&.loaded?
-        sound = PICKUP_SOUNDS[event[:type]]
+        sound = event[:sound] || PICKUP_SOUNDS[event[:type]]
         @mixer.play(sound) if sound
+        event[:extra_sounds]&.each { |extra| @mixer.play(extra) }
       end
 
       def on_door(action)
@@ -51,8 +117,66 @@ module Quake
       def on_player(action)
         return unless @mixer&.loaded?
         sound = PLAYER_SOUNDS[action]
+        return unless sound
+
+        if sound.is_a?(Array)
+          path, volume = sound
+          @mixer.play(path, volume: (volume * 128).to_i)
+        else
+          @mixer.play(sound)
+        end
+      end
+
+      def on_weapon_fire(event)
+        return unless @mixer&.loaded?
+        @mixer.play(event.sound) if event&.sound
+      end
+
+      def on_trigger(entity)
+        return unless @mixer&.loaded?
+
+        sound = entity.instance_variable_get(:@noise)
         @mixer.play(sound) if sound
       end
+
+      def on_trigger_secret(entity)
+        on_trigger(entity)
+      end
+
+      def on_misc_noisemaker(_entity)
+        return unless @mixer&.loaded?
+
+        NOISEMAKER_SOUNDS.each { |sound| @mixer.play(sound) }
+      end
+
+      def on_trigger_push_player
+        return unless @mixer&.loaded?
+
+        @mixer.play("ambience/windfly.wav")
+      end
+
+      def on_teleport_fog(sound)
+        return unless @mixer&.loaded?
+
+        @mixer.play(sound)
+      end
+
+      def on_grenade_bounce
+        return unless @mixer&.loaded?
+
+        @mixer.play("weapons/bounce.wav")
+      end
+
+      def on_ambient_entity(entity)
+        return unless @mixer&.loaded?
+        return if entity.classname == "trigger_teleport" && (entity.spawnflags & 2) != 0
+
+        sound = AMBIENT_SOUNDS[entity.classname]
+        return unless sound
+
+        path, volume, count = sound
+        (count || 1).times { @mixer.play(path, volume: (volume * 128).to_i, loop_count: -1) }
+      end
     end
   end
 end

data/lib/quake/sound/mixer.rb

@@ -1,24 +1,54 @@
 # frozen_string_literal: true
 
 require "ffi"
+require "rbconfig"
 
 module Quake
   module Sound
     # Low-level FFI bindings to SDL2_mixer for WAV playback.
     module MixerLib
       extend FFI::Library
-      ffi_lib "/opt/homebrew/lib/libSDL2_mixer.dylib"
+
+      def self.library_names
+        env = ENV["QUAKE_SDL2_MIXER"]
+        return [env] if env && !env.empty?
+
+        host_os = RbConfig::CONFIG["host_os"]
+        case host_os
+        when /darwin/
+          [
+            "SDL2_mixer",
+            "libSDL2_mixer.dylib",
+            "/opt/homebrew/lib/libSDL2_mixer.dylib",
+            "/usr/local/lib/libSDL2_mixer.dylib"
+          ]
+        when /mingw|mswin/
+          ["SDL2_mixer.dll", "libSDL2_mixer.dll"]
+        else
+          ["SDL2_mixer", "libSDL2_mixer.so", "libSDL2_mixer-2.0.so.0"]
+        end
+      end
 
       MIX_DEFAULT_FORMAT = 0x8010 # AUDIO_S16LSB
 
-      attach_function :Mix_OpenAudio, [:int, :uint16, :int, :int], :int
-      attach_function :Mix_CloseAudio, [], :void
-      attach_function :Mix_AllocateChannels, [:int], :int
-      attach_function :Mix_LoadWAV_RW, [:pointer, :int], :pointer
-      attach_function :Mix_FreeChunk, [:pointer], :void
-      attach_function :Mix_PlayChannelTimed, [:int, :pointer, :int, :int], :int
-      attach_function :Mix_Volume, [:int, :int], :int
-      attach_function :Mix_HaltChannel, [:int], :int
+      begin
+        ffi_lib library_names
+
+        attach_function :Mix_OpenAudio, [:int, :uint16, :int, :int], :int
+        attach_function :Mix_CloseAudio, [], :void
+        attach_function :Mix_AllocateChannels, [:int], :int
+        attach_function :Mix_LoadWAV_RW, [:pointer, :int], :pointer
+        attach_function :Mix_FreeChunk, [:pointer], :void
+        attach_function :Mix_PlayChannelTimed, [:int, :pointer, :int, :int], :int
+        attach_function :Mix_Volume, [:int, :int], :int
+        attach_function :Mix_HaltChannel, [:int], :int
+        AVAILABLE = true
+      rescue LoadError, FFI::NotFoundError => e
+        LOAD_ERROR = e
+        AVAILABLE = false
+      end
+
+      def self.available? = AVAILABLE
     end
 
     # High-level sound manager: loads WAVs from PAK, plays them by name.
@@ -32,6 +62,11 @@ module Quake
       end
 
       def open
+        unless MixerLib.available?
+          puts "Warning: SDL2_mixer not available (#{MixerLib::LOAD_ERROR.message})"
+          return
+        end
+
         result = MixerLib.Mix_OpenAudio(22050, MixerLib::MIX_DEFAULT_FORMAT, 2, 1024)
         if result < 0
           puts "Warning: Could not open audio"

data/lib/quake/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quake
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/quake/wad/reader.rb

@@ -23,15 +23,13 @@ module Quake
       end
 
       def read(name)
-        entry = @entries[name.downcase]
-        return nil unless entry
+        entry = lump_info(name)
         @data[entry.offset, entry.size]
       end
 
       # Read a QPic (status bar graphic): 4-byte width, 4-byte height, pixels
       def read_qpic(name)
-        entry = @entries[name.downcase]
-        return nil unless entry
+        entry = lump_info(name)
 
         raw = @data[entry.offset, entry.size]
         return nil unless raw && raw.bytesize >= 8
@@ -44,10 +42,10 @@ module Quake
       private
 
       def parse_directory
-        return if @data.bytesize < 12
-
         magic = @data[0, 4]
-        return unless magic == MAGIC
+        raise "Wad file doesn't have WAD2 id" unless magic == MAGIC
+
+        return if @data.bytesize < 12
 
         numlumps, infotableofs = @data[4, 8].unpack("VV")
 
@@ -57,13 +55,25 @@ module Quake
 
           filepos, disksize, _size, type = @data[offset, 16].unpack("VVVC")
           _compression = @data[offset + 13].unpack1("C")
-          name = @data[offset + 16, 16].unpack1("Z16").downcase
+          name = cleanup_name(@data[offset + 16, 16].unpack1("Z16"))
+          next if @entries.key?(name)
 
           @entries[name] = Entry.new(
             name: name, offset: filepos, size: disksize, type: type
           )
         end
       end
+
+      def cleanup_name(name)
+        name[0, 16].downcase
+      end
+
+      def lump_info(name)
+        entry = @entries[cleanup_name(name)]
+        raise "W_GetLumpinfo: #{name} not found" unless entry
+
+        entry
+      end
     end
   end
 end

data/lib/quake/window.rb

@@ -45,6 +45,9 @@ module Quake
 
       GL.Viewport(0, 0, width, height)
       GL.Enable(GL::DEPTH_TEST)
+      GL.DepthFunc(GL::LEQUAL) # R_Clear
+      # Quake's axis flip reverses winding, so front faces are culled (R_SetupGL)
+      GL.CullFace(GL::FRONT)
       GL.ClearColor(0.0, 0.0, 0.0, 1.0)
 
       SDL.SetRelativeMouseMode(SDL::TRUE) if visible

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quake-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Hasinski
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/quake
 - bin/quake-debug
 - lib/quake.rb
@@ -98,6 +99,7 @@ files:
 - lib/quake/palette.rb
 - lib/quake/physics/hull_trace.rb
 - lib/quake/physics/player.rb
+- lib/quake/renderer/anorm_dots.rb
 - lib/quake/renderer/gl_alias_model.rb
 - lib/quake/renderer/gl_brush_model.rb
 - lib/quake/renderer/gl_hud.rb
@@ -106,7 +108,9 @@ files:
 - lib/quake/renderer/gl_sky.rb
 - lib/quake/renderer/gl_texture_manager.rb
 - lib/quake/renderer/gl_textured.rb
+- lib/quake/renderer/gl_view_blend.rb
 - lib/quake/renderer/gl_viewmodel.rb
+- lib/quake/renderer/gl_warp_subdivision.rb
 - lib/quake/renderer/gl_water.rb
 - lib/quake/renderer/gl_wireframe.rb
 - lib/quake/sound/events.rb