From 99ae19c34d901779f431dafc7b015daa43cdfa01 Mon Sep 17 00:00:00 2001
From: Cyberarm <matthewlikesrobots@gmail.com>
Date: Thu, 30 Jan 2020 22:31:49 -0600
Subject: [PATCH] Fixed bug that prevented Asset Viewer from using shader,
 manifests are now sorted by name, fixed sponza test model manifest

---
 assets/base/sponza/manifest.yaml         | 2 ++
 lib/tools/asset_viewer/lib/main_menu.rb  | 2 ++
 lib/tools/asset_viewer/lib/turn_table.rb | 2 +-
 lib/ui/commands/debug_command.rb         | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/assets/base/sponza/manifest.yaml b/assets/base/sponza/manifest.yaml
index e69de29..ba148dc 100644
--- a/assets/base/sponza/manifest.yaml
+++ b/assets/base/sponza/manifest.yaml
@@ -0,0 +1,2 @@
+name: sponza_demo
+model: sponza.obj
\ No newline at end of file
diff --git a/lib/tools/asset_viewer/lib/main_menu.rb b/lib/tools/asset_viewer/lib/main_menu.rb
index 42e87d3..104ed0d 100644
--- a/lib/tools/asset_viewer/lib/main_menu.rb
+++ b/lib/tools/asset_viewer/lib/main_menu.rb
@@ -16,6 +16,8 @@ class IMICFPS
           end
         end
 
+        @manifests.sort_by! { |m| m.name.downcase }
+
         flow(margin: 10) do
           @manifests.each do |manifest|
             button manifest.name do
diff --git a/lib/tools/asset_viewer/lib/turn_table.rb b/lib/tools/asset_viewer/lib/turn_table.rb
index 4b687e0..4baf009 100644
--- a/lib/tools/asset_viewer/lib/turn_table.rb
+++ b/lib/tools/asset_viewer/lib/turn_table.rb
@@ -8,7 +8,7 @@ class IMICFPS
         window.needs_cursor = false
         @manifest = @options[:manifest]
 
-        if window.config.get(:debug, :use_shaders)
+        if window.config.get(:debug_options, :use_shaders) && !Shader.available?("default")
           Shader.new(
             name: "default",
             includes_dir: "shaders/include",
diff --git a/lib/ui/commands/debug_command.rb b/lib/ui/commands/debug_command.rb
index bba0e15..5738d45 100644
--- a/lib/ui/commands/debug_command.rb
+++ b/lib/ui/commands/debug_command.rb
@@ -13,6 +13,10 @@ class IMICFPS
         $window.config[:debug_options, key] = value
       end
 
+      def get(key)
+        $window.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?