From fdec2c22a805354084c745fd93a535b66d8e3475 Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Tue, 8 Jun 2021 13:14:19 +0300 Subject: [PATCH] render: e_graphics -> r_graphics --- src/game/Doom2DF.lpr | 2 +- src/game/g_game.pas | 2 +- src/game/g_gui.pas | 2 +- src/game/g_holmes.pas | 2 +- src/game/g_main.pas | 2 +- src/game/g_map.pas | 2 +- src/game/g_menu.pas | 2 +- src/game/g_monsters.pas | 2 +- src/game/g_netmsg.pas | 2 +- src/game/g_options.pas | 2 +- src/game/g_phys.pas | 2 +- src/game/g_player.pas | 2 +- src/game/g_playermodel.pas | 2 +- src/game/g_textures.pas | 2 +- src/game/g_window.pas | 2 +- src/game/opengl/r_console.pas | 2 +- src/game/opengl/r_game.pas | 4 ++-- src/game/opengl/r_gfx.pas | 2 +- .../opengl/r_graphics.pas} | 18 +++++++++--------- src/game/opengl/r_items.pas | 4 ++-- src/game/opengl/r_map.pas | 2 +- src/game/opengl/r_monsters.pas | 2 +- src/game/opengl/r_netmaster.pas | 2 +- src/game/opengl/r_panel.pas | 2 +- src/game/opengl/r_player.pas | 2 +- src/game/opengl/r_playermodel.pas | 2 +- src/game/opengl/r_weapons.pas | 2 +- src/game/sdl/g_system.pas | 2 +- src/game/sdl2/g_system.pas | 2 +- src/game/sdl2/g_touch.pas | 2 +- 30 files changed, 40 insertions(+), 40 deletions(-) rename src/{engine/e_graphics.pas => game/opengl/r_graphics.pas} (99%) diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr index b02f8f9..3c93584 100644 --- a/src/game/Doom2DF.lpr +++ b/src/game/Doom2DF.lpr @@ -99,7 +99,6 @@ uses {$ENDIF} ENet in '../lib/enet/enet.pp', - e_graphics in '../engine/e_graphics.pas', e_input in '../engine/e_input.pas', e_log in '../engine/e_log.pas', e_sound in '../engine/e_sound.pas', @@ -156,6 +155,7 @@ uses r_console in 'opengl/r_console.pas', r_game in 'opengl/r_game.pas', r_gfx in 'opengl/r_gfx.pas', + r_graphics in 'opengl/r_graphics.pas', r_items in 'opengl/r_items.pas', r_map in 'opengl/r_map.pas', r_monsters in 'opengl/r_monsters.pas', diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 62628e7..4ef072c 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -20,7 +20,7 @@ interface uses SysUtils, Classes, MAPDEF, - g_basic, g_player, e_graphics, g_res_downloader, + g_basic, g_player, r_graphics, g_res_downloader, g_sound, g_gui, utils, md5, mempool, xprofiler, g_touch, g_weapons; diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas index 5ed507d..3ec8c0d 100644 --- a/src/game/g_gui.pas +++ b/src/game/g_gui.pas @@ -19,7 +19,7 @@ interface uses {$IFDEF USE_MEMPOOL}mempool,{$ENDIF} - e_graphics, e_input, e_log, g_playermodel, g_basic, g_touch, MAPDEF, utils; + r_graphics, e_input, e_log, g_playermodel, g_basic, g_touch, MAPDEF, utils; const MAINMENU_HEADER_COLOR: TRGB = (R:255; G:255; B:255); diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas index c173bd0..7b1463b 100644 --- a/src/game/g_holmes.pas +++ b/src/game/g_holmes.pas @@ -20,7 +20,7 @@ interface uses mempool, geom, e_log, e_input, - g_textures, g_basic, e_graphics, g_phys, g_grid, g_player, g_monsters, + g_textures, g_basic, r_graphics, g_phys, g_grid, g_player, g_monsters, g_window, g_map, g_triggers, g_items, g_game, g_panel, g_console, g_gfx, xprofiler, sdlcarcass, diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 4b227e0..fe0a24d 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.pas @@ -67,7 +67,7 @@ uses SDL2, {$ENDIF} wadreader, e_log, g_window, - e_graphics, e_input, g_game, g_console, g_gui, + r_graphics, e_input, g_game, g_console, g_gui, e_sound, g_options, g_sound, g_player, g_basic, g_weapons, SysUtils, g_triggers, MAPDEF, g_map, e_res, g_menu, g_language, g_net, g_touch, g_system, g_res_downloader, diff --git a/src/game/g_map.pas b/src/game/g_map.pas index d9c7711..ca7a64a 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -20,7 +20,7 @@ interface uses SysUtils, Classes, mempool, - e_graphics, g_basic, MAPDEF, g_textures, + r_graphics, g_basic, MAPDEF, g_textures, g_phys, utils, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec; type diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas index 1af2cbd..7491b72 100644 --- a/src/game/g_menu.pas +++ b/src/game/g_menu.pas @@ -43,7 +43,7 @@ var implementation uses - g_gui, g_textures, e_graphics, g_main, g_window, g_game, g_map, + g_gui, g_textures, r_graphics, g_main, g_window, g_game, g_map, 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, diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas index 5aa8bdc..711ecc0 100644 --- a/src/game/g_monsters.pas +++ b/src/game/g_monsters.pas @@ -23,7 +23,7 @@ uses SysUtils, Classes, mempool, MAPDEF, - g_basic, e_graphics, g_phys, g_textures, g_grid, + g_basic, r_graphics, g_phys, g_textures, g_grid, g_saveload, g_panel, xprofiler; const diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas index 73c65e3..3a0d9d9 100644 --- a/src/game/g_netmsg.pas +++ b/src/game/g_netmsg.pas @@ -284,7 +284,7 @@ function IsValidFilePath(const S: String): Boolean; implementation uses - Math, ENet, e_input, e_graphics, e_log, + Math, ENet, e_input, r_graphics, e_log, g_textures, g_gfx, g_sound, g_console, g_basic, g_options, g_main, g_game, g_player, g_map, g_panel, g_items, g_weapons, g_phys, g_gui, g_language, g_monsters, g_netmaster, utils, wadreader, MAPDEF; diff --git a/src/game/g_options.pas b/src/game/g_options.pas index 6fb6434..420ef52 100644 --- a/src/game/g_options.pas +++ b/src/game/g_options.pas @@ -84,7 +84,7 @@ uses {$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_items, wadreader, e_graphics, g_touch, envvars, g_system; + g_items, wadreader, r_graphics, g_touch, envvars, g_system; var machine: Integer; diff --git a/src/game/g_phys.pas b/src/game/g_phys.pas index af569ea..81bdb78 100644 --- a/src/game/g_phys.pas +++ b/src/game/g_phys.pas @@ -18,7 +18,7 @@ unit g_phys; interface uses - e_graphics; + r_graphics; type PObj = ^TObj; diff --git a/src/game/g_player.pas b/src/game/g_player.pas index c082c00..0370927 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -21,7 +21,7 @@ interface uses SysUtils, Classes, {$IFDEF USE_MEMPOOL}mempool,{$ENDIF} - e_graphics, g_playermodel, g_basic, g_textures, + r_graphics, g_playermodel, g_basic, g_textures, g_weapons, g_phys, g_sound, g_saveload, MAPDEF, g_panel; diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas index 40a3489..a436aa1 100644 --- a/src/game/g_playermodel.pas +++ b/src/game/g_playermodel.pas @@ -19,7 +19,7 @@ unit g_playermodel; interface uses - MAPDEF, g_textures, g_basic, g_weapons, e_graphics, utils, g_gfx, + MAPDEF, g_textures, g_basic, g_weapons, r_graphics, utils, g_gfx, ImagingTypes, Imaging, ImagingUtility; const diff --git a/src/game/g_textures.pas b/src/game/g_textures.pas index 7d8ad75..b8ebfa0 100644 --- a/src/game/g_textures.pas +++ b/src/game/g_textures.pas @@ -20,7 +20,7 @@ interface uses SysUtils, Classes, {$IFDEF USE_MEMPOOL}mempool,{$ENDIF} - e_graphics, MAPDEF, ImagingTypes, Imaging, ImagingUtility; + r_graphics, MAPDEF, ImagingTypes, Imaging, ImagingUtility; type TLevelTexture = record diff --git a/src/game/g_window.pas b/src/game/g_window.pas index b5e3674..7a719b6 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -39,7 +39,7 @@ uses {$ENDIF} {$INCLUDE ../nogl/noGLuses.inc} SysUtils, Classes, MAPDEF, Math, - e_graphics, e_log, e_texture, g_main, + r_graphics, e_log, e_texture, g_main, g_console, r_console, e_input, g_options, g_game, r_game, g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net, g_map, g_gfx, g_monsters, xprofiler, diff --git a/src/game/opengl/r_console.pas b/src/game/opengl/r_console.pas index 78eccc9..3904841 100644 --- a/src/game/opengl/r_console.pas +++ b/src/game/opengl/r_console.pas @@ -25,7 +25,7 @@ implementation uses SysUtils, Classes, Math, - e_log, e_graphics, + e_log, r_graphics, conbuf, g_main, g_console, g_game, g_menu, g_textures ; diff --git a/src/game/opengl/r_game.pas b/src/game/opengl/r_game.pas index d181179..991995d 100644 --- a/src/game/opengl/r_game.pas +++ b/src/game/opengl/r_game.pas @@ -29,7 +29,7 @@ implementation g_holmes, {$ENDIF} SysUtils, Classes, Math, - e_graphics, + r_graphics, g_system, g_touch, MAPDEF, xprofiler, utils, wadreader, g_textures, e_input, e_sound, @@ -823,7 +823,7 @@ begin else e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0); end; -procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect); +procedure DrawMinimap(p: TPlayer; RenderRect: TRect); var a, aX, aY, aX2, aY2, Scale, ScaleSz: Integer; diff --git a/src/game/opengl/r_gfx.pas b/src/game/opengl/r_gfx.pas index 6b27ec3..f15a802 100644 --- a/src/game/opengl/r_gfx.pas +++ b/src/game/opengl/r_gfx.pas @@ -25,7 +25,7 @@ implementation {$INCLUDE ../nogl/noGLuses.inc} SysUtils, Classes, Math, utils, - e_graphics, + r_graphics, g_game, g_gfx ; diff --git a/src/engine/e_graphics.pas b/src/game/opengl/r_graphics.pas similarity index 99% rename from src/engine/e_graphics.pas rename to src/game/opengl/r_graphics.pas index 0f691ae..b16bd6f 100644 --- a/src/engine/e_graphics.pas +++ b/src/game/opengl/r_graphics.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_graphics; +{$INCLUDE ../../shared/a_modes.inc} +unit r_graphics; interface @@ -57,7 +57,7 @@ type //------------------------------------------------------------------ -// ïðîòîòèïû ôóíêöèé +// прототипы функций //------------------------------------------------------------------ procedure e_InitGL(); procedure e_SetViewPort(X, Y, Width, Height: Word); @@ -211,7 +211,7 @@ var //function e_getTextGLId (ID: DWORD): GLuint; begin result := e_Textures[ID].tx.id; end; //------------------------------------------------------------------ -// Èíèöèàëèçèðóåò OpenGL +// Инициализирует OpenGL //------------------------------------------------------------------ procedure e_InitGL(); begin @@ -268,7 +268,7 @@ begin end; //------------------------------------------------------------------ -// Èùåò ñâîáîäíûé ýëåìåíò â ìàññèâå òåêñòóð +// Ищет свободный элемент в массиве текстур //------------------------------------------------------------------ function FindTexture(): DWORD; var @@ -295,7 +295,7 @@ begin end; //------------------------------------------------------------------ -// Ñîçäàåò òåêñòóðó +// Создает текстуру //------------------------------------------------------------------ function e_CreateTexture(FileName: String; var ID: DWORD): Boolean; var @@ -1122,7 +1122,7 @@ begin end; //------------------------------------------------------------------ -// Óäàëÿåò òåêñòóðó èç ìàññèâà +// Удаляет текстуру из массива //------------------------------------------------------------------ procedure e_DeleteTexture(ID: DWORD); begin @@ -1134,7 +1134,7 @@ begin end; //------------------------------------------------------------------ -// Óäàëÿåò âñå òåêñòóðû +// Удаляет все текстуры //------------------------------------------------------------------ procedure e_RemoveAllTextures(); var @@ -1148,7 +1148,7 @@ begin end; //------------------------------------------------------------------ -// Óäàëÿåò äâèæîê +// Удаляет движок //------------------------------------------------------------------ procedure e_ReleaseEngine(); begin diff --git a/src/game/opengl/r_items.pas b/src/game/opengl/r_items.pas index a738b4d..19599f0 100644 --- a/src/game/opengl/r_items.pas +++ b/src/game/opengl/r_items.pas @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *) -{$INCLUDE ../shared/a_modes.inc} +{$INCLUDE ../../shared/a_modes.inc} unit r_items; interface @@ -24,7 +24,7 @@ implementation uses SysUtils, Classes, Math, - e_graphics, + r_graphics, MAPDEF, g_basic, g_game, g_items diff --git a/src/game/opengl/r_map.pas b/src/game/opengl/r_map.pas index d7d3a85..eed9df9 100644 --- a/src/game/opengl/r_map.pas +++ b/src/game/opengl/r_map.pas @@ -30,7 +30,7 @@ implementation uses {$INCLUDE ../nogl/noGLuses.inc} SysUtils, Classes, Math, - e_graphics, + r_graphics, g_basic, g_game, g_options, g_panel, g_map, r_panel diff --git a/src/game/opengl/r_monsters.pas b/src/game/opengl/r_monsters.pas index fe822be..9d65d47 100644 --- a/src/game/opengl/r_monsters.pas +++ b/src/game/opengl/r_monsters.pas @@ -24,7 +24,7 @@ implementation uses SysUtils, Classes, Math, - e_graphics, + r_graphics, MAPDEF, g_basic, g_game, g_phys, g_monsters diff --git a/src/game/opengl/r_netmaster.pas b/src/game/opengl/r_netmaster.pas index c014443..e82db08 100644 --- a/src/game/opengl/r_netmaster.pas +++ b/src/game/opengl/r_netmaster.pas @@ -25,7 +25,7 @@ implementation uses SysUtils, Classes, Math, - e_graphics, + r_graphics, g_basic, g_language, g_game, g_menu ; diff --git a/src/game/opengl/r_panel.pas b/src/game/opengl/r_panel.pas index f6cc7cb..43682f8 100644 --- a/src/game/opengl/r_panel.pas +++ b/src/game/opengl/r_panel.pas @@ -27,7 +27,7 @@ implementation uses {$INCLUDE ../nogl/noGLuses.inc} SysUtils, Classes, Math, utils, - e_graphics, + r_graphics, g_basic, g_textures, g_game ; diff --git a/src/game/opengl/r_player.pas b/src/game/opengl/r_player.pas index 03c3d10..e143227 100644 --- a/src/game/opengl/r_player.pas +++ b/src/game/opengl/r_player.pas @@ -17,7 +17,7 @@ unit r_player; interface - uses g_player, e_graphics; // TPlayer, TRGB + uses g_player, r_graphics; // TPlayer, TRGB procedure r_Player_DrawAll; procedure r_Player_DrawDebug (p: TPlayer); diff --git a/src/game/opengl/r_playermodel.pas b/src/game/opengl/r_playermodel.pas index a9447d5..b11ac28 100644 --- a/src/game/opengl/r_playermodel.pas +++ b/src/game/opengl/r_playermodel.pas @@ -28,7 +28,7 @@ implementation uses SysUtils, Classes, Math, MAPDEF, - e_graphics, + r_graphics, g_basic, g_map, g_weapons, g_textures, g_main ; diff --git a/src/game/opengl/r_weapons.pas b/src/game/opengl/r_weapons.pas index 3b1f085..974d744 100644 --- a/src/game/opengl/r_weapons.pas +++ b/src/game/opengl/r_weapons.pas @@ -24,7 +24,7 @@ implementation uses SysUtils, Classes, Math, MAPDEF, - e_graphics, + r_graphics, g_basic, g_game, g_weapons ; diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas index 9f56262..dd65f61 100644 --- a/src/game/sdl/g_system.pas +++ b/src/game/sdl/g_system.pas @@ -48,7 +48,7 @@ implementation {$ENDIF} SysUtils, SDL, Math, {$INCLUDE ../nogl/noGLuses.inc} - e_log, e_graphics, e_input, e_sound, + e_log, r_graphics, e_input, e_sound, g_options, g_window, g_console, g_game, g_menu, g_gui, g_main, g_basic; const diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas index 6f48d28..3ab85d2 100644 --- a/src/game/sdl2/g_system.pas +++ b/src/game/sdl2/g_system.pas @@ -41,7 +41,7 @@ implementation uses SysUtils, SDL2, Math, ctypes, - e_log, e_graphics, e_input, e_sound, + e_log, r_graphics, e_input, e_sound, {$INCLUDE ../nogl/noGLuses.inc} {$IFDEF ENABLE_HOLMES} g_holmes, sdlcarcass, fui_ctls, diff --git a/src/game/sdl2/g_touch.pas b/src/game/sdl2/g_touch.pas index 3f999ed..c6a9e23 100644 --- a/src/game/sdl2/g_touch.pas +++ b/src/game/sdl2/g_touch.pas @@ -36,7 +36,7 @@ implementation uses SysUtils, - e_log, e_graphics, e_input, g_options, g_game, g_main, g_gui, g_weapons, g_console, g_window; + e_log, r_graphics, e_input, g_options, g_game, g_main, g_gui, g_weapons, g_console, g_window; var angleFire: Boolean; -- 2.29.2