Updated gems, fix issues caused by the removal of $window from cyberarm_engine

This commit is contained in:
2022-07-16 06:59:47 -05:00
parent 07c8dfa45b
commit 580c9d79ce
14 changed files with 49 additions and 51 deletions

View File

@@ -12,20 +12,20 @@ class IMICFPS
end
def set(key, value)
$window.config[:debug_options, key] = value
CyberarmEngine::Window.instance.config[:debug_options, key] = value
end
def get(key)
$window.config.get(:debug_options, key)
CyberarmEngine::Window.instance.config.get(:debug_options, key)
end
def setup
set(:boundingboxes, false) if $window.config.get(:debug_options, :boundingboxes).nil?
set(:wireframe, false) if $window.config.get(:debug_options, :wireframe).nil?
set(:stats, false) if $window.config.get(:debug_options, :stats).nil?
set(:skydome, true) if $window.config.get(:debug_options, :skydome).nil?
set(:use_shaders, true) if $window.config.get(:debug_options, :use_shaders).nil?
set(:opengl_error_panic, false) if $window.config.get(:debug_options, :opengl_error_panic).nil?
set(:boundingboxes, false) if CyberarmEngine::Window.instance.config.get(:debug_options, :boundingboxes).nil?
set(:wireframe, false) if CyberarmEngine::Window.instance.config.get(:debug_options, :wireframe).nil?
set(:stats, false) if CyberarmEngine::Window.instance.config.get(:debug_options, :stats).nil?
set(:skydome, true) if CyberarmEngine::Window.instance.config.get(:debug_options, :skydome).nil?
set(:use_shaders, true) if CyberarmEngine::Window.instance.config.get(:debug_options, :use_shaders).nil?
set(:opengl_error_panic, false) if CyberarmEngine::Window.instance.config.get(:debug_options, :opengl_error_panic).nil?
subcommand(:boundingboxes, :boolean)
subcommand(:wireframe, :boolean)

View File

@@ -19,12 +19,12 @@ class IMICFPS
case arguments.last
when "", nil
console.stdin("#{Console::Style.highlight('fps')}: #{$window.config.get(:options, :fps)}")
console.stdin("#{Console::Style.highlight('fps')}: #{CyberarmEngine::Window.instance.config.get(:options, :fps)}")
when "on"
var = $window.config[:options, :fps] = true
var = CyberarmEngine::Window.instance.config[:options, :fps] = true
console.stdin("fps => #{Console::Style.highlight(var)}")
when "off"
var = $window.config[:options, :fps] = false
var = CyberarmEngine::Window.instance.config[:options, :fps] = false
console.stdin("fps => #{Console::Style.highlight(var)}")
else
console.stdin("Invalid argument for #{Console::Style.highlight(command.to_s)}, got #{Console::Style.error(arguments.last)} expected #{Console::Style.notice('on')}, or #{Console::Style.notice('off')}.")

View File

@@ -12,7 +12,7 @@ class IMICFPS
end
def setup
$window.config[:options, :hud] = true if $window.config.get(:options, :hud).nil?
CyberarmEngine::Window.instance.config[:options, :hud] = true if CyberarmEngine::Window.instance.config.get(:options, :hud).nil?
end
def handle(arguments, console)
@@ -23,12 +23,12 @@ class IMICFPS
case arguments.last
when "", nil
console.stdin("#{Console::Style.highlight(command.to_s)}: #{$window.config.get(:options, command)}")
console.stdin("#{Console::Style.highlight(command.to_s)}: #{CyberarmEngine::Window.instance.config.get(:options, command)}")
when "on"
var = $window.config[:options, command] = true
var = CyberarmEngine::Window.instance.config[:options, command] = true
console.stdin("#{command} => #{Console::Style.highlight(var)}")
when "off"
var = $window.config[:options, command] = false
var = CyberarmEngine::Window.instance.config[:options, command] = false
console.stdin("#{command} => #{Console::Style.highlight(var)}")
else
console.stdin("Invalid argument for #{Console::Style.highlight(command.to_s)}, got #{Console::Style.error(arguments.last)} expected #{Console::Style.notice('on')}, or #{Console::Style.notice('off')}.")

View File

@@ -5,20 +5,20 @@ class IMICFPS
include CommonMethods
def self.set_defaults
if $window.config.get(:options, :audio, :volume_master).nil?
$window.config[:options, :audio, :volume_master] = 1.0
if CyberarmEngine::Window.instance.config.get(:options, :audio, :volume_master).nil?
CyberarmEngine::Window.instance.config[:options, :audio, :volume_master] = 1.0
end
if $window.config.get(:options, :audio, :volume_sound_effects).nil?
$window.config[:options, :audio, :volume_sound_effects] = 1.0
if CyberarmEngine::Window.instance.config.get(:options, :audio, :volume_sound_effects).nil?
CyberarmEngine::Window.instance.config[:options, :audio, :volume_sound_effects] = 1.0
end
if $window.config.get(:options, :audio, :volume_music).nil?
$window.config[:options, :audio, :volume_music] = 0.7
if CyberarmEngine::Window.instance.config.get(:options, :audio, :volume_music).nil?
CyberarmEngine::Window.instance.config[:options, :audio, :volume_music] = 0.7
end
if $window.config.get(:options, :audio, :volume_dialogue).nil?
$window.config[:options, :audio, :volume_dialogue] = 0.7
if CyberarmEngine::Window.instance.config.get(:options, :audio, :volume_dialogue).nil?
CyberarmEngine::Window.instance.config[:options, :audio, :volume_dialogue] = 0.7
end
end