render: move e_texture -> r_texture

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 5e7603888fe9295e5d1412fc3ea1890326a82287..f5777431142eddc94321b8b8e56c2da016b8daf3 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -100,7 +100,6 @@ uses
   e_input in '../engine/e_input.pas',
   e_log in '../engine/e_log.pas',
   e_sound in '../engine/e_sound.pas',
-  e_texture in '../engine/e_texture.pas',
   e_msg in '../engine/e_msg.pas',
   e_res in '../engine/e_res.pas',
   utils in '../shared/utils.pas',
@@ -162,6 +161,7 @@ uses
   r_panel in 'opengl/r_panel.pas',
   r_player in 'opengl/r_player.pas',
   r_playermodel in 'opengl/r_playermodel.pas',
+  r_texture in 'opengl/r_texture.pas',
   r_weapons in 'opengl/r_weapons.pas',
   r_window in 'opengl/r_window.pas',
 

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index e182e26c9abc6122b2b81bbba1a59b9b66591716..f43827b7a3bbb47e55fe6418496798f114c6172f 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -445,7 +445,7 @@ uses
 {$IFDEF ENABLE_HOLMES}
   g_holmes,
 {$ENDIF}
-  e_texture, e_res, g_textures, g_window, g_menu,
+  e_res, g_textures, g_window, g_menu,
   e_input, e_log, g_console, r_console, g_items, g_map, g_panel,
   g_playermodel, g_gfx, g_options, Math,
   g_triggers, g_monsters, e_sound, CONFIG,

diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 7b1463be9619c519e59d1dbb4c93e4ecec6cac65..b31ead3b2da0b03712af63801a5f2ba2da972dbb 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
@@ -48,7 +48,7 @@ implementation
 
 uses
   {$INCLUDE ../nogl/noGLuses.inc}
-  {rttiobj,} typinfo, e_texture, e_res,
+  {rttiobj,} typinfo, e_res,
   SysUtils, Classes, SDL2,
   MAPDEF, g_main, g_options,
   utils, hashtable, xparser;

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 549247e9fc45d4b0220f6e0596b78c491e3be58e..6cc1e90273033dbdbc925b27daad7c0bd258db4e 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -247,7 +247,7 @@ var
 implementation
 
 uses
-  e_input, g_main, e_log, e_texture, e_res, g_items, g_gfx, g_console,
+  e_input, g_main, e_log, e_res, g_items, g_gfx, g_console,
   g_weapons, g_game, g_sound, e_sound, CONFIG,
   g_options, g_triggers, g_player,
   Math, g_monsters, g_saveload, g_language, g_netmsg,

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index fd336edb334710dc45ca6db6b252d1d38a369628..4ad532c9da32dd64027cfdc7eceb06c19788919d 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -47,7 +47,7 @@ uses
   g_base, g_basic, g_console, g_sound, g_gfx, g_player, g_options, g_weapons,
   e_log, SysUtils, CONFIG, g_playermodel, DateUtils,
   MAPDEF, Math, g_saveload,
-  e_texture, g_language, e_res,
+  g_language, e_res,
   g_net, g_netmsg, g_netmaster, g_items, e_input, g_touch,
   utils, wadreader, g_system, r_game;
 

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index 11c98dab8a4fadd8f0f16fe4d7f506d92d942955..84cf3ce30a07d23e6d2504a7269be609d5a5aa5c 100644 (file)
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -488,7 +488,7 @@ var
 implementation
 
 uses
-  e_log, e_texture, g_main, g_sound, g_gfx, g_player, g_game,
+  e_log, g_main, g_sound, g_gfx, g_player, g_game,
   g_weapons, g_triggers, g_items, g_options,
   g_console, g_map, Math, g_menu, wadreader,
   g_language, g_netmsg, idpool, utils, xstreams;

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index ecfa4e79b62909d8a68a7fb066c1bec4ed86fcc4..308751bd1ee0907a5f3553e636d9a4fbeaf43ed1 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -92,7 +92,7 @@ uses
     SDL2,
   {$ENDIF}
   e_log, e_input, g_console, g_window, g_sound, g_gfx, g_player, Math,
-  g_map, g_net, g_netmaster, SysUtils, CONFIG, g_game, g_main, e_texture,
+  g_map, g_net, g_netmaster, SysUtils, CONFIG, g_game, g_main,
   g_items, wadreader, g_touch, envvars, g_system;
 
   var

diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index 734e4cf01f9bd9d98ed95efef057bd66109e7845..f8a252edf80374a6abc32a59f229d7986f42f046 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
@@ -228,7 +228,7 @@ var
 implementation
 
 uses
-  e_texture, g_basic, g_map, g_game, g_gfx, g_weapons, g_triggers, g_items,
+  g_basic, g_map, g_game, g_gfx, g_weapons, g_triggers, g_items,
   g_console, g_language, g_monsters, g_player, g_grid, e_log, geom, utils, xstreams;
 
 const

diff --git a/src/game/opengl/r_graphics.pas b/src/game/opengl/r_graphics.pas
index cb568b418977456013691eff26848e0c7fa01265..d82ad0e513860308eb24bcca3af525f13fd18fd7 100644 (file)
--- a/src/game/opengl/r_graphics.pas
+++ b/src/game/opengl/r_graphics.pas
@@ -22,7 +22,7 @@ uses
   {$IFDEF USE_SDL2}
     SDL2,
   {$ENDIF}
-  SysUtils, Classes, Math, e_log, e_texture, g_base,
+  SysUtils, Classes, Math, e_log, r_texture, g_base,
   MAPDEF, ImagingTypes, Imaging, ImagingUtility;
 
 type

diff --git a/src/engine/e_texture.pas b/src/game/opengl/r_texture.pas
similarity index 99%
rename from src/engine/e_texture.pas
rename to src/game/opengl/r_texture.pas
index 58ae4cdb44369d4bc7a7af4f7c14501aa7e1d977..7a311a3eea80c6b2b6b66a71e02dc50e42d697fa 100644 (file)
--- a/src/engine/e_texture.pas
+++ b/src/game/opengl/r_texture.pas
@@ -12,8 +12,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE ../shared/a_modes.inc}
-unit e_texture;
+{$INCLUDE ../../shared/a_modes.inc}
+unit r_texture;
 
 { This unit provides interface to load 24-bit and 32-bit uncompressed images
   from Truevision Targa (TGA) graphic files, and create OpenGL textures