cyberarm/i-mic-fps
1
0
Fork 0
mirror of https://github.com/cyberarm/i-mic-fps.git synced 2025-12-16 08:02:36 +00:00
Code Issues Projects Releases Wiki Activity

Replaced usage of with CommonMethods.window (which uses ), refactored InputMapper to match actions to keys and visa-versa, removed categories from InputMapper, moved input mappings from Camera and Player into InputMapper (for now.)

Browse Source
This commit is contained in:
Cyberarm
2019-02-22 14:55:06 -06:00
parent 8b65973f6f
commit 6191699d8b
11 changed files with 178 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/states/game_states/game.rb
View File

@@ -77,8 +77,8 @@ class IMICFPS
end
# Draw crosshair
draw_rect($window.width/2-@crosshair_size, ($window.height/2-@crosshair_size)-@crosshair_thickness/2, @crosshair_size*2, @crosshair_thickness, @crosshair_color, 0, :default)
draw_rect(($window.width/2)-@crosshair_thickness/2, $window.height/2-(@crosshair_size*2), @crosshair_thickness, @crosshair_size*2, @crosshair_color, 0, :default)
draw_rect(window.width/2-@crosshair_size, (window.height/2-@crosshair_size)-@crosshair_thickness/2, @crosshair_size*2, @crosshair_thickness, @crosshair_color, 0, :default)
draw_rect((window.width/2)-@crosshair_thickness/2, window.height/2-(@crosshair_size*2), @crosshair_thickness, @crosshair_size*2, @crosshair_color, 0, :default)
@text.draw
end
@@ -94,10 +94,6 @@ class IMICFPS
@camera.update
$window.close if $window.button_down?(Gosu::KbEscape)
$window.number_of_vertices = 0
@delta_time = Gosu.milliseconds
if ARGV.join.include?("--playdemo")
if @demo_data[@demo_index]&.start_with?("tick")
if @demo_tick == @demo_data[@demo_index].split(" ").last.to_i
@@ -108,12 +104,18 @@ class IMICFPS
data = @demo_data[@demo_index].split(" ")
if data.first == "up"
self.button_up(data.last.to_i)
input = InputMapper.get(data.last.to_sym)
key = input.is_a?(Array) ? input.first : input
self.button_up(key)
elsif data.first == "down"
self.button_down(data.last.to_i)
input = InputMapper.get(data.last.to_sym)
key = input.is_a?(Array) ? input.first : input
self.button_down(key)
elsif data.first == "mouse"
@camera.pitch = data[1].to_f
@camera.yaw = data[2].to_f
@player.rotation.y = (data[2].to_f * -1) - 180
else
# hmm
end
@@ -141,6 +143,10 @@ class IMICFPS
end
@demo_tick += 1 if @demo_tick
window.close if window.button_down?(Gosu::KbEscape)
window.number_of_vertices = 0
@delta_time = Gosu.milliseconds
end
def update_text
@@ -158,8 +164,8 @@ Field Of View: #{@camera.field_of_view}
Mouse Sesitivity: #{@camera.mouse_sensitivity}
Last Frame: #{delta_time*1000.0}ms (#{Gosu.fps} fps)
Vertices: #{formatted_number($window.number_of_vertices)}
Faces: #{formatted_number($window.number_of_vertices/3)}
Vertices: #{formatted_number(window.number_of_vertices)}
Faces: #{formatted_number(window.number_of_vertices/3)}
Draw Skydome: #{@draw_skydome}
Debug mode: <c=992200>#{$debug}</c>
@@ -175,8 +181,8 @@ Field Of View: #{@camera.field_of_view}
Mouse Sesitivity: #{@camera.mouse_sensitivity}
Last Frame: #{delta_time*1000.0}ms (#{Gosu.fps} fps)
Vertices: #{formatted_number($window.number_of_vertices)}
Faces: #{formatted_number($window.number_of_vertices/3)}
Vertices: #{formatted_number(window.number_of_vertices)}
Faces: #{formatted_number(window.number_of_vertices/3)}
Draw Skydome: #{@draw_skydome}
Debug mode: <c=992200>#{$debug}</c>
@@ -195,7 +201,7 @@ eos
@demo_last_written_index = @demo_index
@demo_file.puts("tick #{@demo_index}")
end
@demo_file.puts("down #{id}")
@demo_file.puts("down #{InputMapper.action(id)}")
@demo_changed = true
end
InputMapper.keydown(id)
@@ -211,7 +217,7 @@ eos
@demo_last_written_index = @demo_index
@demo_file.puts("tick #{@demo_index}")
end
@demo_file.puts("up #{id}")
@demo_file.puts("up #{InputMapper.action(id)}")
@demo_changed = true
end
InputMapper.keyup(id)

18
lib/states/menu.rb
View File

@@ -24,15 +24,15 @@ class IMICFPS
fill_quad(
0, i*@size,
0, @slope+(i*@size),
$window.width/2, (-@slope)+(i*@size),
$window.width/2, i*@size,
window.width/2, (-@slope)+(i*@size),
window.width/2, i*@size,
Gosu::Color.rgba(@base_color.red-i*@color_step, @base_color.green-i*@color_step, @base_color.blue-i*@color_step, 200)
)
fill_quad(
$window.width, i*@size,
$window.width, @slope+(i*@size),
$window.width/2, (-@slope)+(i*@size),
$window.width/2, i*@size,
window.width, i*@size,
window.width, @slope+(i*@size),
window.width/2, (-@slope)+(i*@size),
window.width/2, i*@size,
Gosu::Color.rgba(@base_color.red-i*@color_step, @base_color.green-i*@color_step, @base_color.blue-i*@color_step, 200)
)
end
@@ -42,8 +42,8 @@ class IMICFPS
# Box
draw_rect(
$window.width/4, 0,
$window.width/2, $window.height,
window.width/4, 0,
window.width/2, window.height,
Gosu::Color.rgba(0, 0, 0, 150)
# Gosu::Color.rgba(@base_color.red+@color_step, @base_color.green+@color_step, @base_color.blue+@color_step, 200)
)
@@ -80,7 +80,7 @@ class IMICFPS
end
def button_up(id)
$window.close if id == Gosu::KbEscape
window.close if id == Gosu::KbEscape
if Gosu::MsLeft
@elements.each do |e|
next unless e.is_a?(Link)