Added default texture, refactored Texture to cache textures which have a file path

This commit is contained in:
2020-05-10 17:57:46 -05:00
parent cf1e72225c
commit a0f8ce4bfb
2 changed files with 31 additions and 15 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 B

View File

@@ -1,5 +1,6 @@
class IMICFPS
class Texture
DEFAULT_TEXTURE = "#{IMICFPS.assets_path}/base/shared/textures/default.png"
include CommonMethods
CACHE = {}
@@ -10,6 +11,10 @@ class IMICFPS
end
end
def self.from_cache(path, retro)
return CACHE.dig("#{path}?retro=#{retro}")
end
attr_reader :id
def initialize(path: nil, image: nil, retro: false)
raise "keyword :path or :image must be provided!" if path.nil? && image.nil?
@@ -23,33 +28,44 @@ class IMICFPS
end
end
@id = create_from_image(path ? path : image)
@path = path
if @path
unless File.exist?(@path)
warn "Missing texture at: #{@path}" if window.config.get(:debug_options, :stats)
@retro = true # override retro setting
@path = DEFAULT_TEXTURE
end
def from_cache(path)
CACHE[path] = create_from_image(path) unless CACHE[path]
return CACHE[path]
if texture = Texture.from_cache(@path, @retro)
@id = texture.id
puts "Using cached texture: #{@path}" if window.config.get(:debug_options, :stats)
return
end
def create_from_image(path_or_image)
puts "Allocating texture for: #{path_or_image}" if window.config.get(:debug_options, :stats)
texture = nil
if path_or_image.is_a?(Gosu::Image)
texture = path_or_image
puts "Allocating texture for: #{@path}" if window.config.get(:debug_options, :stats)
image = load_image(@path)
@id = create_from_image(image)
else
texture = Gosu::Image.new(path_or_image, retro: false)
puts "Allocating texture for: #{image}" if window.config.get(:debug_options, :stats)
@id = create_from_image(image)
end
end
array_of_pixels = texture.to_blob
def load_image(path)
CACHE["#{path}?retro=#{@retro}"] = self
Gosu::Image.new(path, retro: @retro)
end
def create_from_image(image)
array_of_pixels = image.to_blob
tex_names_buf = ' ' * 4
glGenTextures(1, tex_names_buf)
texture_id = tex_names_buf.unpack('L2').first
glBindTexture(GL_TEXTURE_2D, texture_id)
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture.width, texture.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, array_of_pixels)
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width, image.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, array_of_pixels)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST) if @retro