From 1170681f83ea7923ba2c52c6bc201f349a7b9930 Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Wed, 9 Jun 2021 16:05:09 +0300 Subject: [PATCH] render: move e_texture -> r_texture --- src/game/Doom2DF.lpr | 2 +- src/game/g_game.pas | 2 +- src/game/g_holmes.pas | 2 +- src/game/g_map.pas | 2 +- src/game/g_menu.pas | 2 +- src/game/g_monsters.pas | 2 +- src/game/g_options.pas | 2 +- src/game/g_panel.pas | 2 +- src/game/opengl/r_graphics.pas | 2 +- src/{engine/e_texture.pas => game/opengl/r_texture.pas} | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) rename src/{engine/e_texture.pas => game/opengl/r_texture.pas} (99%) diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr index 5e76038..f577743 100644 --- 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 e182e26..f43827b 100644 --- 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 7b1463b..b31ead3 100644 --- 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 549247e..6cc1e90 100644 --- 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 fd336ed..4ad532c 100644 --- 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 11c98da..84cf3ce 100644 --- 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 ecfa4e7..308751b 100644 --- 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 734e4cf..f8a252e 100644 --- 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 cb568b4..d82ad0e 100644 --- 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 58ae4cd..7a311a3 100644 --- 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 . *) -{$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 -- 2.29.2