X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=bfd4377830c271bc278fe5480357782093cec5f7;hb=d0936017ccb8a078d1b03f55478af284bb015bbc;hp=c4d1b0fb73a7984ce18686733833b6189abbac3e;hpb=c7a5223f1e2520ab13b480b937af1e208201de15;p=d2df-sdl.git

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index c4d1b0f..bfd4377 100644
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -25,7 +25,6 @@ procedure ResetTimer ();
 procedure ProcessLoading (forceUpdate: Boolean=false);
 
 var
-  gwin_dump_extensions: Boolean = false;
   gwin_has_stencil: Boolean = false;
   gwin_k8_enable_light_experiments: Boolean = false;
   g_dbg_aimline_on: Boolean = false;
@@ -38,84 +37,113 @@ uses
 {$IFDEF ENABLE_HOLMES}
   g_holmes, sdlcarcass, fui_ctls,
 {$ENDIF}
-{$INCLUDE ../nogl/noGLuses.inc}
-  SysUtils, Classes, MAPDEF, Math,
-  e_graphics, e_log, e_texture, g_main,
-  g_console, e_input, g_options, g_game,
+  SysUtils, Classes, MAPDEF, Math, r_graphics,
+  r_window, e_log, r_game,
+  g_console, r_console, e_input, g_options, g_game,
   g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
   g_map, g_gfx, g_monsters, xprofiler,
   g_touch, g_gui, g_system, g_netmaster;
 
-
-const
-  ProgressUpdateMSecs = 35; //1;//100;
-
 var
   Time, Time_Delta, Time_Old: Int64;
   Frame: Int64;
   flag: Boolean;
   wNeedTimeReset: Boolean = false;
-  wMinimized: Boolean = false;
   wLoadingQuit: Boolean = false;
 
-procedure ResetTimer ();
+procedure Update ();
 begin
-  wNeedTimeReset := true;
+  // remember old mobj positions, prepare for update
+  g_Game_PreUpdate();
+  // server: receive client commands for new frame
+  // client: receive game state changes from server
+       if (NetMode = NET_SERVER) then g_Net_Host_Update()
+  else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
+  // think
+  g_Game_Update();
+  // server: send any accumulated outgoing data to clients
+  if NetMode = NET_SERVER then g_Net_Flush();
 end;
 
-{$IFNDEF HEADLESS}
-var
-  prevLoadingUpdateTime: UInt64 = 0;
-{$ENDIF}
 
-procedure ProcessLoading (forceUpdate: Boolean=false);
-{$IFNDEF HEADLESS}
+procedure Draw ();
+begin
+  r_Game_Draw();
+end;
+
+
+procedure Init();
 var
-  stt: UInt64;
-{$ENDIF}
+  NoSound: Boolean;
 begin
-  if sys_HandleInput() = True then
-    Exit;
+  Randomize;
 
-{$IFNDEF HEADLESS}
-  if not wMinimized then
+{$IFDEF HEADLESS}
+ {$IFDEF USE_SDLMIXER}
+  NoSound := False; // hope env has set SDL_AUDIODRIVER to dummy
+ {$ELSE}
+  NoSound := True; // FMOD backend will sort it out
+ {$ENDIF}
+{$ELSE}
+  NoSound := False;
+{$ENDIF}
+
+  g_Touch_Init;
+
+(*
+  if (e_JoysticksAvailable > 0) then
+    e_WriteLog('Input: Joysticks available.', TMsgType.Notify)
+  else
+    e_WriteLog('Input: No Joysticks.', TMsgType.Notify);
+*)
+
+  if (not gNoSound) then
   begin
-    if not forceUpdate then
-    begin
-      stt := getTimeMilli();
-      forceUpdate := (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= ProgressUpdateMSecs);
-    end;
+    e_WriteLog('Initializing sound system', TMsgType.Notify);
+    e_InitSoundSystem(NoSound);
+  end;
 
-    if forceUpdate then
-    begin
-      e_SetRendertarget(True);
-      e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
+  e_WriteLog('Init game', TMsgType.Notify);
+  g_Game_Init();
 
-      DrawMenuBackground('INTER');
-      e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-      DrawLoadingStat();
-      g_Console_Draw(True);
+//  FillChar(charbuff, sizeof(charbuff), ' ');
+end;
 
-      e_SetRendertarget(False);
-      e_SetViewPort(0, 0, gWinSizeX, gWinSizeY);
-      e_BlitFramebuffer(gWinSizeX, gWinSizeY);
+procedure Release();
+begin
+  e_WriteLog('Releasing engine', TMsgType.Notify);
+  e_ReleaseEngine();
 
-      sys_Repaint;
-      prevLoadingUpdateTime := getTimeMilli();
-    end;
+  e_WriteLog('Releasing input', TMsgType.Notify);
+  e_ReleaseInput();
+
+  if not gNoSound then
+  begin
+    e_WriteLog('Releasing sound', TMsgType.Notify);
+    e_ReleaseSoundSystem();
   end;
+end;
+
+procedure ResetTimer ();
+begin
+  wNeedTimeReset := true;
+end;
+
+procedure ProcessLoading (forceUpdate: Boolean=false);
+begin
+  if sys_HandleInput() = True then
+    Exit;
+
+{$IFNDEF HEADLESS}
+  r_Window_DrawLoading(forceUpdate);
 {$ENDIF}
 
   e_SoundUpdate();
 
   if NetMode = NET_SERVER then
-  begin
-    g_Net_Host_Update();
-  end
-  else
-  begin
-    if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading();
-  end;
+    g_Net_Host_Update()
+  else if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then
+    g_Net_Client_UpdateWhileLoading();
 end;
 
 
@@ -145,15 +173,9 @@ begin
   begin
     flag := true;
     for i := 1 to t do
-    begin
-           if (NetMode = NET_SERVER) then g_Net_Host_Update()
-      else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
       Update();
-    end;
   end;
 
-  if NetMode = NET_SERVER then g_Net_Flush();
-
   g_Map_ProfilersEnd();
   g_Mons_ProfilersEnd();
 
@@ -179,15 +201,12 @@ begin
 
   if flag then
   begin
-    if (not wMinimized) then
-    begin
-      if gPause or not gLerpActors then
-        gLerpFactor := 1.0
-      else
-        gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
-      Draw;
-      sys_Repaint
-    end;
+    if gPause or (not gLerpActors) or (gState = STATE_FOLD) then
+      gLerpFactor := 1.0
+    else
+      gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
+    Draw;
+    sys_Repaint;
     Frame := Time
   end
   else
@@ -196,54 +215,6 @@ begin
   e_SoundUpdate();
 end;
 
-function GLExtensionList (): SSArray;
-var
-  s: PChar;
-  i, j, num: GLint;
-begin
-  result := nil;
-  s := glGetString(GL_EXTENSIONS);
-  if s <> nil then
-  begin
-    num := 0;
-    i := 0;
-    j := 0;
-    while (s[i] <> #0) and (s[i] = ' ') do Inc(i);
-    while (s[i] <> #0) do
-    begin
-      while (s[i] <> #0) and (s[i] <> ' ') do Inc(i);
-      SetLength(result, num+1);
-      result[num] := Copy(s, j+1, i-j);
-      while (s[i] <> #0) and (s[i] = ' ') do Inc(i);
-      j := i;
-      Inc(num);
-    end;
-  end;
-end;
-
-function GLExtensionSupported (ext: AnsiString): Boolean;
-var
-  exts: SSArray;
-  e: AnsiString;
-begin
-  result := false;
-  exts := GLExtensionList();
-  for e in exts do
-  begin
-    //writeln('<', e, '> : [', ext, '] = ', strEquCI1251(e, ext));
-    if (strEquCI1251(e, ext)) then begin result := true; exit; end;
-  end;
-end;
-
-procedure PrintGLSupportedExtensions;
-begin
-  e_LogWritefln('GL Vendor: %s', [glGetString(GL_VENDOR)]);
-  e_LogWritefln('GL Renderer: %s', [glGetString(GL_RENDERER)]);
-  e_LogWritefln('GL Version: %s', [glGetString(GL_VERSION)]);
-  e_LogWritefln('GL Shaders: %s', [glGetString(GL_SHADING_LANGUAGE_VERSION)]);
-  e_LogWritefln('GL Extensions: %s', [glGetString(GL_EXTENSIONS)]);
-end;
-
 function SDLMain (): Integer;
 var
   idx: Integer;
@@ -254,16 +225,12 @@ var
   valres: Word;
   {$ENDIF}
 begin
-{$IFDEF HEADLESS}
-  e_NoGraphics := true;
-{$ENDIF}
 
   idx := 1;
   while (idx <= ParamCount) do
   begin
     arg := ParamStr(idx);
     Inc(idx);
-    if arg = '--opengl-dump-exts' then gwin_dump_extensions := true;
     //if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
     if arg = '--jah' then g_profile_history_size := 100;
     if arg = '--no-particles' then gpart_dbg_enabled := false;
@@ -350,24 +317,7 @@ begin
     end;
   end;
 
-{$IFNDEF USE_SYSSTUB}
-  PrintGLSupportedExtensions;
-  glLegacyNPOT := not (GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot'));
-{$ELSE}
-  glLegacyNPOT := False;
-  glRenderToFBO := False;
-{$ENDIF}
-  if glNPOTOverride and glLegacyNPOT then
-  begin
-    glLegacyNPOT := true;
-    e_logWriteln('NPOT texture emulation: FORCED');
-  end
-  else
-  begin
-    if (glLegacyNPOT) then e_logWriteln('NPOT texture emulation: enabled')
-    else e_logWriteln('NPOT texture emulation: disabled');
-  end;
-  gwin_dump_extensions := false;
+  r_Window_Initialize;
 
   Init;
   Time_Old := sys_GetTicks();