assets use dynamic texture loading

Author: shevernitskiy

library/Core.cpp

@@ -1692,7 +1692,6 @@ bool Core::InitSimulationThread()
     }
     std::cerr << "Initializing textures.\n";
     Textures::init(con);
-    Textures::initDynamic(con);
     // create mutex for syncing with interactive tasks
     std::cerr << "Initializing plugins.\n";
     // create plugin manager
@@ -2219,7 +2218,6 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
         }
         break;
     case SC_VIEWSCREEN_CHANGED:
-        Textures::init(out);
         break;
     default:
         break;

library/LuaApi.cpp

@@ -1710,18 +1710,7 @@ static const luaL_Reg dfhack_job_funcs[] = {
 /***** Textures module *****/
 
 static const LuaWrapper::FunctionReg dfhack_textures_module[] = {
-    WRAPM(Textures, getDfhackLogoTexposStart),
-    WRAPM(Textures, getGreenPinTexposStart),
-    WRAPM(Textures, getRedPinTexposStart),
-    WRAPM(Textures, getIconsTexposStart),
-    WRAPM(Textures, getOnOffTexposStart),
-    WRAPM(Textures, getMapUnsuspendTexposStart),
-    WRAPM(Textures, getControlPanelTexposStart),
-    WRAPM(Textures, getThinBordersTexposStart),
-    WRAPM(Textures, getMediumBordersTexposStart),
-    WRAPM(Textures, getBoldBordersTexposStart),
-    WRAPM(Textures, getPanelBordersTexposStart),
-    WRAPM(Textures, getWindowBordersTexposStart),
+    WRAPM(Textures, getAsset),
     { NULL, NULL }
 };
 

library/include/modules/Textures.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "Export.h"
 #include "ColorText.h"
+#include "Export.h"
 
 #include <SDL_surface.h>
 
@@ -29,7 +29,8 @@ DFHACK_EXPORT TexposHandle loadTexture(SDL_Surface* surface);
  * Load tileset from image file.
  * Return vector of handles to obtain valid texposes.
  */
-DFHACK_EXPORT std::vector<TexposHandle> loadTileset(const std::string& file, int tile_px_w, int tile_px_h);
+DFHACK_EXPORT std::vector<TexposHandle> loadTileset(const std::string& file, int tile_px_w,
+                                                    int tile_px_h);
 
 /**
  * Get texpos by handle.
@@ -39,67 +40,21 @@ DFHACK_EXPORT std::vector<TexposHandle> loadTileset(const std::string& file, int
 DFHACK_EXPORT long getTexposByHandle(TexposHandle handle);
 
 /**
- * Call this on DFHack init and on every viewscreen change so we can reload
- * and reindex textures as needed.
+ * Get texpos for static asset with index in tileset.
  */
-void init(DFHack::color_ostream& out);
+DFHACK_EXPORT long getAsset(const std::string asset, size_t index = 0);
 
 /**
- * Call this on DFHack init just once to setup interposed handlers.
+ * Call this on DFHack init just once to setup interposed handlers and
+ * init static assets.
  */
-void initDynamic(DFHack::color_ostream& out);
+void init(DFHack::color_ostream& out);
 
 /**
  * Call this when DFHack is being unloaded.
  *
  */
 void cleanup();
 
-/**
- * Get first texpos for the DFHack logo. This texpos and the next 11 make up the
- * 4x3 grid of logo textures that can be displayed on the UI layer.
- */
-DFHACK_EXPORT long getDfhackLogoTexposStart();
-
-/**
- * Get the first texpos for the UI pin tiles. Each are 2x2 grids.
- */
-DFHACK_EXPORT long getGreenPinTexposStart();
-DFHACK_EXPORT long getRedPinTexposStart();
-
-/**
- * Get the first texpos for the DFHack icons. It's a 5x2 grid.
- */
-DFHACK_EXPORT long getIconsTexposStart();
-
-/**
- * Get the first texpos for the on and off icons. It's a 2x1 grid.
- */
-DFHACK_EXPORT long getOnOffTexposStart();
-
-/**
- * Get the first texpos for the pathable 32x32 sprites. It's a 2x1 grid.
- */
-DFHACK_EXPORT long getMapPathableTexposStart();
-
-/**
- * Get the first texpos for the unsuspend 32x32 sprites. It's a 5x1 grid.
- */
-DFHACK_EXPORT long getMapUnsuspendTexposStart();
-
-/**
- * Get the first texpos for the control panel icons. 10x2 grid.
- */
-DFHACK_EXPORT long getControlPanelTexposStart();
-
-/**
- * Get the first texpos for the DFHack borders. Each is a 7x3 grid.
- */
-DFHACK_EXPORT long getThinBordersTexposStart();
-DFHACK_EXPORT long getMediumBordersTexposStart();
-DFHACK_EXPORT long getBoldBordersTexposStart();
-DFHACK_EXPORT long getPanelBordersTexposStart();
-DFHACK_EXPORT long getWindowBordersTexposStart();
-
-}
-}
+} // namespace Textures
+} // namespace DFHack

library/lua/gui.lua

@@ -913,10 +913,10 @@ local BASE_FRAME = {
 }
 
 local function make_frame(name, double_line)
-    local texpos = dfhack.textures['get'..name..'BordersTexposStart']()
     local tp = function(offset)
+        local texpos = dfhack.textures.getAsset('hack/data/art/border-'..name:lower()..'.png', offset)
         if texpos == -1 then return nil end
-        return texpos + offset
+        return texpos
     end
 
     local frame = copyall(BASE_FRAME)
@@ -951,8 +951,40 @@ BOLD_FRAME = FRAME_BOLD
 INTERIOR_FRAME = FRAME_INTERIOR
 INTERIOR_MEDIUM_FRAME = FRAME_INTERIOR_MEDIUM
 
+-- for compatibility with dynamic textures
+local function choose_frame_style(style)
+    if style == FRAME_WINDOW then return make_frame('Window', true) end
+    if style == FRAME_PANEL then return make_frame('Panel', true) end
+    if style == FRAME_MEDIUM then return make_frame('Medium', true) end
+    if style == FRAME_BOLD then return make_frame('Bold', true) end
+    if style == FRAME_INTERIOR then
+        local frame = make_frame('Thin', true)
+        frame.signature_pen = false
+        return frame
+    end
+    if style == FRAME_INTERIOR_MEDIUM then
+        local frame = make_frame('Medium', true)
+        frame.signature_pen = false
+        return frame
+    end
+    if style == GREY_LINE_FRAME then return make_frame('Panel', true) end
+    if style == WINDOW_FRAME then return make_frame('Window', true) end
+    if style == PANEL_FRAME then return make_frame('Panel', true) end
+    if style == MEDIUM_FRAME then return make_frame('Medium', true) end
+    if style == INTERIOR_FRAME then
+        local frame = make_frame('Thin', true)
+        frame.signature_pen = false
+        return frame
+    end
+    if style == INTERIOR_MEDIUM_FRAME then
+        local frame = make_frame('Medium', true)
+        frame.signature_pen = false
+        return frame
+    end
+end
 
-function paint_frame(dc,rect,style,title,inactive,pause_forced,resizable)
+function paint_frame(dc, rect, style, title, inactive, pause_forced, resizable)
+    style = choose_frame_style(style)
     local pen = style.frame_pen
     local x1,y1,x2,y2 = dc.x1+rect.x1, dc.y1+rect.y1, dc.x1+rect.x2, dc.y1+rect.y2
     dscreen.paintTile(style.lt_frame_pen or pen, x1, y1)