From a0f8ce4bfbbbff89db0abf81e7f349436ca68618 Mon Sep 17 00:00:00 2001
From: Cyberarm <matthewlikesrobots@gmail.com>
Date: Sun, 10 May 2020 17:57:46 -0500
Subject: [PATCH] Added default texture, refactored Texture to cache textures
 which have a file path

---
 assets/base/shared/textures/default.png | Bin 0 -> 681 bytes
 lib/texture.rb                          |  46 ++++++++++++++++--------
 2 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 assets/base/shared/textures/default.png

diff --git a/assets/base/shared/textures/default.png b/assets/base/shared/textures/default.png
new file mode 100644
index 0000000000000000000000000000000000000000..37e027f0f94143a7868873dc1c66d42feb7d6e33
GIT binary patch
literal 681
zcmV;a0#^NrP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm001r{
z001r{0eGc9b^rhX2XskIMF-;q1pzY-j7ztE0000PbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAV*0}P*;Ht7XSbPBS}O-RCwC$n>|*;Fbsedzh0mRVe#VxoPx0n3=E9kI<ff(
zOc`?l4p8R4%-n$YSeTj0f{StE#&NAk!P1n*Nh*Do<o{;3T_4~_w!15+LEau-kJrs^
zyFR>p-9e4gY6}V~7Xc97u-1aLHu}O?IhCa7HS~-MA27y%F=p^%W95`$j2Sh4NOuVV
z0Z_S|^aEUcxR`RW6D#MG1jBqVrhBU`tfnTDxeWJ}O@W@G*U&R6=Ov1)o})*~JFIhn
zt9{H$kXAqdR4yy5rl?dB#ZJOS0fcQXx4yz`AyCrzR@-F(C^<@W#$!T2@qiMw9~zAX
z0VN3z^~+1ReXA{Odczk0M$KbGSiuZp_j(-Ob)W3!B_YfLAjNn9I5ElxQrh*|^aP#p
zRd$7`jhC?iHGq`l`0oIOZchzCQ5eq&f}*N<E)W!j@th#2_oq+vKhbAKh?EdMo;!RG
z&<Vq1N(k8i{H5mD(zKp1H$Vj;8^GAYh0d55q39W2G#H94T<8nDq4TaE?-$q#XokB-
z&;YpF_v61`z)WzF5Exo|cE5XLPCOw8%w~p^&~yL?tXk8|J;UxbZa<)}bzx*l5M~(*
zaE2f=LIOYl2mk>f00e*l5CHzDF1F2u>uHe`-D2gFPK<Eg^_9EHTS7np2!OwF;*y1b
z>cY<v;XO`CFsAQ0-6x$G`Hx8ubxx4Gpw9^|L7EQWczpi07OQW5*Pp%t4wN17{qZRG
P00000NkvXXu0mjf7?mIw

literal 0
HcmV?d00001

diff --git a/lib/texture.rb b/lib/texture.rb
index c43e2bf..b92471e 100644
--- a/lib/texture.rb
+++ b/lib/texture.rb
@@ -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)
-    end
+      @path = path
 
-    def from_cache(path)
-      CACHE[path] = create_from_image(path) unless CACHE[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
 
-      return CACHE[path]
-    end
+        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