X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fopengl%2Fr_render.pas;h=363093cd5ab7cab025f451473ba406b3c362435b;hb=b75596f7e02fb6399a6d9dd035ec7e9ad58b7f79;hp=6c3729fb2a5596f69f23700ebaf1e47c5c3fb469;hpb=abed90e42988669146ac1f2ecf2f9eef74f336c1;p=d2df-sdl.git

diff --git a/src/game/opengl/r_render.pas b/src/game/opengl/r_render.pas
index 6c3729f..363093c 100644
--- a/src/game/opengl/r_render.pas
+++ b/src/game/opengl/r_render.pas
@@ -17,7 +17,12 @@ unit r_render;
 
 interface
 
-  uses g_base; // TRectWH
+  uses
+    {$IFDEF ENABLE_MENU}
+      g_gui,
+    {$ENDIF}
+    g_base // TRectWH
+  ;
 
   procedure r_Render_Initialize;
   procedure r_Render_Finalize;
@@ -49,6 +54,13 @@ interface
     procedure r_Render_GetKeyRect (key: Integer; out x, y, w, h: Integer; out founded: Boolean);
   {$ENDIF}
 
+  {$IFDEF ENABLE_MENU}
+    procedure r_Render_GetControlSize (ctrl: TGUIControl; out w, h: Integer);
+    procedure r_Render_GetLogoSize (out w, h: Integer);
+    procedure r_Render_GetMaxFontSize (BigFont: Boolean; out w, h: Integer);
+    procedure r_Render_GetStringSize (BigFont: Boolean; str: String; out w, h: Integer);
+  {$ENDIF}
+
   procedure r_Render_DrawLoading (force: Boolean); // !!! remove it
 
 implementation
@@ -61,8 +73,14 @@ implementation
     {$IFDEF ENABLE_GFX}
       r_gfx,
     {$ENDIF}
+    {$IFDEF ENABLE_SYSTEM}
+      g_system,
+    {$ENDIF}
+    {$IFDEF ENABLE_MENU}
+      r_gui,
+    {$ENDIF}
     SysUtils, Classes, Math,
-    e_log, g_system, utils,
+    e_log, utils,
     g_game, g_options, g_console,
     r_window, r_graphics, r_console, r_playermodel, r_textures, r_animations,
     r_weapons, r_items, r_monsters, r_map, r_player, r_game
@@ -217,10 +235,16 @@ implementation
     {$IFDEF ENABLE_GFX}
       r_GFX_Load;
     {$ENDIF}
+    {$IFDEF ENABLE_MENU}
+      r_GUI_Load;
+    {$ENDIF}
   end;
 
   procedure r_Render_Free;
   begin
+    {$IFDEF ENABLE_MENU}
+      r_GUI_Free;
+    {$ENDIF}
     {$IFDEF ENABLE_GFX}
       r_GFX_Free;
     {$ENDIF}
@@ -237,8 +261,10 @@ implementation
 
   procedure r_Render_Initialize;
   begin
-    if sys_SetDisplayMode(gRC_Width, gRC_Height, gBPP, gRC_FullScreen, gRC_Maximized) = False then
-      raise Exception.Create('Failed to set videomode on startup.');
+    {$IFDEF ENABLE_SYSTEM}
+      if sys_SetDisplayMode(gRC_Width, gRC_Height, gBPP, gRC_FullScreen, gRC_Maximized) = False then
+        raise Exception.Create('Failed to set videomode on startup.');
+    {$ENDIF}
     LoadGL;
     r_Window_Initialize;
     r_Console_Init;
@@ -262,6 +288,7 @@ implementation
     r_Map_Update;
     r_PlayerModel_Update;
     r_Console_Update;
+    r_Items_Update;
   end;
 
   procedure r_Render_Draw;
@@ -301,11 +328,13 @@ implementation
 
   procedure r_Render_Apply;
   begin
-    if sys_SetDisplayMode(Max(1, gRC_Width), Max(1, gRC_Height), Max(1, gBPP), gRC_FullScreen, gRC_Maximized) then
-      e_LogWriteln('resolution changed')
-    else
-      e_LogWriteln('resolution not changed');
-    sys_EnableVSync(gVSync)
+    {$IFDEF ENABLE_SYSTEM}
+      if sys_SetDisplayMode(Max(1, gRC_Width), Max(1, gRC_Height), Max(1, gBPP), gRC_FullScreen, gRC_Maximized) then
+        e_LogWriteln('resolution changed')
+      else
+        e_LogWriteln('resolution not changed');
+      sys_EnableVSync(gVSync)
+    {$ENDIF}
   end;
 
   function r_Render_WriteScreenShot (filename: String): Boolean;
@@ -346,6 +375,28 @@ implementation
   end;
 {$ENDIF}
 
+{$IFDEF ENABLE_MENU}
+  procedure r_Render_GetControlSize (ctrl: TGUIControl; out w, h: Integer);
+  begin
+    r_GUI_GetSize(ctrl, w, h)
+  end;
+
+  procedure r_Render_GetLogoSize (out w, h: Integer);
+  begin
+    r_GUI_GetLogoSize(w, h)
+  end;
+
+  procedure r_Render_GetMaxFontSize (BigFont: Boolean; out w, h: Integer);
+  begin
+    r_GUI_GetMaxFontSize(BigFont, w, h)
+  end;
+
+  procedure r_Render_GetStringSize (BigFont: Boolean; str: String; out w, h: Integer);
+  begin
+    r_GUI_GetStringSize(BigFont, str, w, h)
+  end;
+{$ENDIF}
+
   procedure r_Render_DrawLoading (force: Boolean);
   begin
     r_Window_DrawLoading(force)