- new layout of the projectM lib-dir.

- PROJECTM_..._PLUS variable in config-....inc not needed anymore.
- Support for projectM 1.1 (=1.10)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1030 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 58 insertions, 224 deletions

diff --git a/Game/Code/lib/projectM/0.9/projectM.pas b/Game/Code/lib/projectM/projectM-0_9.inc
index 5bf11061..612e92c7 100644
--- a/Game/Code/lib/projectM/0.9/projectM.pas
+++ b/Game/Code/lib/projectM/projectM-0_9.inc
@@ -1,202 +1,15 @@
-unit projectM;
-
-{$IFDEF FPC}
-  {$IFNDEF win32}
-  {$LINKLIB libprojectM}
-  {$ENDIF}
-  {$MODE DELPHI}
-  {$PACKENUM 4}
-  {$PACKRECORDS C}
-{$ENDIF}
-
-interface
-
+{$IFDEF Unix}
 uses
-  SysUtils;
+  baseunix;
+{$ENDIF}
 
 const
-{$IFDEF win32}
-  libprojectM = 'libprojectM';
+{$IFDEF MSWINDOWS}
+  libprojectM = 'libprojectM.dll';
 {$ELSE}
   libprojectM = 'libprojectM.so';
 {$ENDIF}
 
-const
-  PROJECTM_VERSION = '0.99';
-  PROJECTM_TITLE   = 'projectM 0.99';
-
-type
-  // 16bit non-interleaved data
-  TPCM16 = array[0..1, 0..511] of Smallint;
-  PPCM16 = ^TPCM16;
-  // 8bit non-interleaved data
-  TPCM8_512 = array[0..1, 0..511] of byte;
-  PPCM8_512 = ^TPCM8_512;
-
-{ Event types }
-type
-  TProjectMEvent = integer;
-const
-  PROJECTM_KEYUP       = 0;
-  PROJECTM_KEYDOWN     = 1;
-  PROJECTM_VIDEORESIZE = 2;
-  PROJECTM_VIDEOQUIT   = 3;
-  PROJECTM_NONE        = 4;
-
-{ Keycodes }
-type
-  TProjectMKeycode = integer;
-const
-    PROJECTM_K_RETURN    =  0;
-    PROJECTM_K_RIGHT     =  1;
-    PROJECTM_K_LEFT      =  2;
-    PROJECTM_K_UP        =  3;
-    PROJECTM_K_DOWN      =  4;
-    PROJECTM_K_PAGEUP    =  5;
-    PROJECTM_K_PAGEDOWN  =  6;
-    PROJECTM_K_INSERT    =  7;
-    PROJECTM_K_DELETE    =  8;
-    PROJECTM_K_ESCAPE    =  9;
-    PROJECTM_K_LSHIFT    = 10;
-    PROJECTM_K_RSHIFT    = 11;
-    PROJECTM_K_CAPSLOCK  = 12;
-    PROJECTM_K_LCTRL     = 13;
-    PROJECTM_K_HOME      = 14;
-    PROJECTM_K_END       = 15;
-    PROJECTM_K_BACKSPACE = 16;
-
-    PROJECTM_K_F1        = 17;
-    PROJECTM_K_F2        = (PROJECTM_K_F1 +  1);
-    PROJECTM_K_F3        = (PROJECTM_K_F1 +  2);
-    PROJECTM_K_F4        = (PROJECTM_K_F1 +  3);
-    PROJECTM_K_F5        = (PROJECTM_K_F1 +  4);
-    PROJECTM_K_F6        = (PROJECTM_K_F1 +  5);
-    PROJECTM_K_F7        = (PROJECTM_K_F1 +  6);
-    PROJECTM_K_F8        = (PROJECTM_K_F1 +  7);
-    PROJECTM_K_F9        = (PROJECTM_K_F1 +  8);
-    PROJECTM_K_F10       = (PROJECTM_K_F1 +  9);
-    PROJECTM_K_F11       = (PROJECTM_K_F1 + 10);
-    PROJECTM_K_F12       = (PROJECTM_K_F1 + 11);
-
-    PROJECTM_K_0         = 48;
-    PROJECTM_K_1         = (PROJECTM_K_0 + 1);
-    PROJECTM_K_2         = (PROJECTM_K_0 + 2);
-    PROJECTM_K_3         = (PROJECTM_K_0 + 3);
-    PROJECTM_K_4         = (PROJECTM_K_0 + 4);
-    PROJECTM_K_5         = (PROJECTM_K_0 + 5);
-    PROJECTM_K_6         = (PROJECTM_K_0 + 6);
-    PROJECTM_K_7         = (PROJECTM_K_0 + 7);
-    PROJECTM_K_8         = (PROJECTM_K_0 + 8);
-    PROJECTM_K_9         = (PROJECTM_K_0 + 9);
-
-    { Upper case }
-    PROJECTM_K_A_UPPERCASE = 65;
-    PROJECTM_K_B_UPPERCASE = (PROJECTM_K_A_UPPERCASE +  1);
-    PROJECTM_K_C_UPPERCASE = (PROJECTM_K_A_UPPERCASE +  2);
-    PROJECTM_K_D_UPPERCASE = (PROJECTM_K_A_UPPERCASE +  3);
-    PROJECTM_K_E_UPPERCASE = (PROJECTM_K_A_UPPERCASE +  4);
-    PROJECTM_K_F_UPPERCASE = (PROJECTM_K_A_UPPERCASE +  5);
-    PROJECTM_K_G_UPPERCASE = (PROJECTM_K_A_UPPERCASE +  6);
-    PROJECTM_K_H_UPPERCASE = (PROJECTM_K_A_UPPERCASE +  7);
-    PROJECTM_K_I_UPPERCASE = (PROJECTM_K_A_UPPERCASE +  8);
-    PROJECTM_K_J_UPPERCASE = (PROJECTM_K_A_UPPERCASE +  9);
-    PROJECTM_K_K_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 10);
-    PROJECTM_K_L_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 11);
-    PROJECTM_K_M_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 12);
-    PROJECTM_K_N_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 13);
-    PROJECTM_K_O_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 14);
-    PROJECTM_K_P_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 15);
-    PROJECTM_K_Q_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 16);
-    PROJECTM_K_R_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 17);
-    PROJECTM_K_S_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 18);
-    PROJECTM_K_T_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 19);
-    PROJECTM_K_U_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 20);
-    PROJECTM_K_V_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 21);
-    PROJECTM_K_W_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 22);
-    PROJECTM_K_X_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 23);
-    PROJECTM_K_Y_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 24);
-    PROJECTM_K_Z_UPPERCASE = (PROJECTM_K_A_UPPERCASE + 25);
-
-    { Lower case }
-    PROJECTM_K_a_LOWERCASE = 97;
-    PROJECTM_K_b_LOWERCASE = (PROJECTM_K_a_LOWERCASE +  1);
-    PROJECTM_K_c_LOWERCASE = (PROJECTM_K_a_LOWERCASE +  2);
-    PROJECTM_K_d_LOWERCASE = (PROJECTM_K_a_LOWERCASE +  3);
-    PROJECTM_K_e_LOWERCASE = (PROJECTM_K_a_LOWERCASE +  4);
-    PROJECTM_K_f_LOWERCASE = (PROJECTM_K_a_LOWERCASE +  5);
-    PROJECTM_K_g_LOWERCASE = (PROJECTM_K_a_LOWERCASE +  6);
-    PROJECTM_K_h_LOWERCASE = (PROJECTM_K_a_LOWERCASE +  7);
-    PROJECTM_K_i_LOWERCASE = (PROJECTM_K_a_LOWERCASE +  8);
-    PROJECTM_K_j_LOWERCASE = (PROJECTM_K_a_LOWERCASE +  9);
-    PROJECTM_K_k_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 10);
-    PROJECTM_K_l_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 11);
-    PROJECTM_K_m_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 12);
-    PROJECTM_K_n_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 13);
-    PROJECTM_K_o_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 14);
-    PROJECTM_K_p_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 15);
-    PROJECTM_K_q_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 16);
-    PROJECTM_K_r_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 17);
-    PROJECTM_K_s_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 18);
-    PROJECTM_K_t_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 19);
-    PROJECTM_K_u_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 20);
-    PROJECTM_K_v_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 21);
-    PROJECTM_K_w_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 22);
-    PROJECTM_K_x_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 23);
-    PROJECTM_K_y_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 24);
-    PROJECTM_K_z_LOWERCASE = (PROJECTM_K_a_LOWERCASE + 25);
-
-    PROJECTM_K_NONE        = (PROJECTM_K_z_LOWERCASE + 1);
-
-{ Modifiers }
-type
-  TProjectMModifier = integer;
-const
-    PROJECTM_KMOD_LSHIFT = 0;
-    PROJECTM_KMOD_RSHIFT = 1;
-    PROJECTM_KMOD_CAPS   = 2;
-    PROJECTM_KMOD_LCTRL  = 3;
-    PROJECTM_KMOD_RCTRL  = 4;
-
-type  
-  PProjectM = ^TProjectM;
-  TProjectM = class(TObject)
-    private
-      _pm: Pointer;
-    public
-      constructor Create(gx, gy: integer; fps: integer;
-        texsize: integer; width, height: integer;
-        presetsDir, fontsDir: string);
-
-      procedure ResetGL(width, height: Integer);
-      procedure SetTitle(title: string);
-      procedure RenderFrame();
-
-      procedure AddPCMfloat(pcmData: PSingle; samples: integer);
-      procedure AddPCM16(pcmData: PPCM16);
-      procedure AddPCM16Data(pcmData: PSmallint; samples: Smallint);
-      procedure AddPCM8_512(pcmData: PPCM8_512);
-
-      procedure RandomPreset();
-      procedure PreviousPreset();
-      procedure NextPreset();
-      procedure ToggleShowPresetNames();
-
-      procedure KeyHandler(event:    TProjectMEvent;
-                           keycode:  TProjectMKeycode;
-                           modifier: TProjectMModifier);
-
-      destructor Destroy(); override;
-  end;
-
-implementation
-
-uses
-{$IFNDEF win32}
-  baseunix,
-{$ENDIF}
-  OpenGL12;
-
-
 {**************** INTERNAL SECTION ****************}
 
 
@@ -229,7 +42,7 @@ type
     {$endif}
 
     { Opaque pbuffer context and pbuffer }
-    {$ifdef MACOS}
+    {$ifdef DARWIN}
       origContext: Pointer;
       pbufferContext: Pointer;
       pbuffer: Pointer;
@@ -262,12 +75,12 @@ type
 
     fbuffer: PGLubyte;
 
-    {$ifndef Win32}
+    {$IFNDEF MSWINDOWS}
     { The first ticks value of the application }
     startTime: timeval;
-    {$else}
+    {$ELSE}
     startTime: Longint;
-    {$endif Win32}
+    {$ENDIF}
     Time: Single;
 
     { Render target texture ID }
@@ -468,6 +281,14 @@ type
     theta_mesh: PPSingle;
   end;
 
+  PProjectMState = ^TProjectMState;
+  TProjectMState = record
+    fontURLStr: string;
+    presetURLStr: string;
+    titleStr: string;
+    pm: _TProjectM;
+  end;
+
 { projectM.h declarations }
 procedure _projectM_init(pm: _PProjectM); cdecl; external libprojectM name 'projectM_init';
 procedure _projectM_reset(pm: _PProjectM); cdecl; external libprojectM name 'projectM_reset';
@@ -495,43 +316,57 @@ procedure _key_handler(pm: _PProjectM;
 
 constructor TProjectM.Create(gx, gy: integer; fps: integer;
   texsize: integer; width, height: integer;
-  presetsDir, fontsDir: string);
+  const presetsDir, fontsDir: string;
+  const titleFont, menuFont: string);
 var
-  pm: _PProjectM;
+  state: PProjectMState;
 begin
-  New(pm);
-  _pm := pm;
-	_projectM_reset(pm);
-
-  pm^.fullscreen := 0;
-  pm^.renderTarget^.texsize := texsize;
-  pm^.gx := gx;
-  pm^.gy := gy;
-  pm^.fps := fps;
-  pm^.renderTarget^.usePbuffers := 0;
-
-  pm^.fontURL   := PChar(fontsDir);
-  pm^.presetURL := PChar(presetsDir);
-
-	_projectM_init(pm);
+  New(state);
+  data := state;
+
+  with state^ do
+  begin
+    // copy strings (Note: do not use e.g. PChar(presetsDir) directly, it might
+    // be a pointer to local stack data that is invalid after the calling function returns)
+    fontURLStr   := fontsDir;
+    presetURLStr := presetsDir;
+    
+    _projectM_reset(@pm);
+
+    pm.fullscreen := 0;
+    pm.renderTarget^.texsize := texsize;
+    pm.gx := gx;
+    pm.gy := gy;
+    pm.fps := fps;
+    pm.renderTarget^.usePbuffers := 0;
+    pm.fontURL   := PChar(fontURLStr);
+    pm.presetURL := PChar(presetURLStr);
+
+  	_projectM_init(@pm);
+  end;
 end;
 
 procedure TProjectM.ResetGL(width, height: Integer);
 begin
-  _projectM_resetGL(_pm, width, height);
+  _projectM_resetGL(@PProjectMState(data).pm, width, height);
 end;
 
-procedure TProjectM.SetTitle(title: string);
-var pm: _PProjectM;
+procedure TProjectM.SetTitle(const title: string);
+var
+  state: PProjectMState;
 begin
-  pm := _pm;
-  pm^.title := PChar(title);
-  pm^.showtitle := 1;
+  state := PProjectMState(data);
+  with state^ do
+  begin
+    titleStr := title;
+    pm.title := PChar(titleStr);
+    pm.showtitle := 1;
+  end;
 end;
 
 procedure TProjectM.RenderFrame();
 begin
-  _renderFrame(_pm);
+  _renderFrame(@PProjectMState(data).pm);
 end;
 
 procedure TProjectM.AddPCMfloat(pcmData: PSingle; samples: integer);
@@ -558,7 +393,7 @@ procedure TProjectM.KeyHandler(event:    TProjectMEvent;
                                keycode:  TProjectMKeycode;
                                modifier: TProjectMModifier);
 begin
-  _key_handler(_pm, event, keycode, modifier);
+  _key_handler(@PProjectMState(data).pm, event, keycode, modifier);
 end;
 
 procedure TProjectM.RandomPreset();
@@ -583,8 +418,7 @@ end;
 
 destructor TProjectM.Destroy();
 begin
-  Dispose(_PProjectM(_pm));
-  _pm := nil;
+  Dispose(PProjectMState(data));
+  data := nil;
 end;
 
-end.