Commit `856f311`

Nick committed on Oct 29, 2020

Use render directory instead of polluting hUGEDriver. Thanks toxa!

commit 856f311d89415ffb64242fc5e133f9e7a81791a2 parent dc71a8f

3 changed files +28−29

Modifiedcodegen.pas +25−23

   begin
     Proc.Executable := 'rgbasm';
     Proc.Parameters.Clear;
+    Proc.Parameters.Add('-i' + 'render');
+    Proc.Parameters.Add('-i' + 'hUGEDriver');
     Proc.Parameters.Add('-o' + OutFile);
     for Define in Defines do
       Proc.Parameters.Add('-D' + Define);
   Song := OptimizeSong(Song);
   FilePath := Filename;
-  Filename := ExtractFileNameWithoutExt(ExtractFileNameOnly(Filename));
+  Filename := 'render/' + ExtractFileNameWithoutExt(ExtractFileNameOnly(Filename));
-  WriteHTT('./hUGEDriver/wave.htt', RenderWaveforms(Song.Waves));
+  WriteHTT('./render/wave.htt', RenderWaveforms(Song.Waves));
-  WriteHTT('./hUGEDriver/order.htt', RenderOrderTable(Song.OrderMatrix));
+  WriteHTT('./render/order.htt', RenderOrderTable(Song.OrderMatrix));
-  WriteHTT('./hUGEDriver/duty_instrument.htt',  RenderInstruments(Song.Instruments.Duty));
+  WriteHTT('./render/duty_instrument.htt',  RenderInstruments(Song.Instruments.Duty));
-  WriteHTT('./hUGEDriver/wave_instrument.htt',  RenderInstruments(Song.Instruments.Wave));
+  WriteHTT('./render/wave_instrument.htt',  RenderInstruments(Song.Instruments.Wave));
-  WriteHTT('./hUGEDriver/noise_instrument.htt', RenderInstruments(Song.Instruments.Noise));
+  WriteHTT('./render/noise_instrument.htt', RenderInstruments(Song.Instruments.Noise));
   for I := Low(TRoutineBank) to High(TRoutineBank) do
-    WriteHTT('./hUGEDriver/routine'+IntToStr(I)+'.htt', Song.Routines[I]);
+    WriteHTT('./render/routine'+IntToStr(I)+'.htt', Song.Routines[I]);
-  AssignFile(OutFile, './hUGEDriver/pattern.htt');
+  AssignFile(OutFile, './render/pattern.htt');
   Rewrite(OutFile);
   // TODO: Are keys and data defined to be aligned? Seems like they are but
   CloseFile(OutFile);
   // Build the file
-  Chdir('hUGEDriver');
   OutSL := TStringList.Create;
   Proc := TProcess.Create(nil);
   Proc.Options := Proc.Options + [poWaitOnExit, poUsePipes, poStdErrToOutput, poNoConsole];
   // Assemble
   if Mode = emPreview then
   begin
-    if Assemble(Filename + '_driver.obj', 'hUGEDriver.asm', ['PREVIEW_MODE']) <> 0 then
+    if Assemble(Filename + '_driver.obj', 'hUGEDriver/hUGEDriver.asm', ['PREVIEW_MODE']) <> 0 then
       goto AssemblyError;
   end
   else
   begin
-    if Assemble(Filename + '_driver.obj', 'hUGEDriver.asm', []) <> 0 then
+    if Assemble(Filename + '_driver.obj', 'hUGEDriver/hUGEDriver.asm', []) <> 0 then
       goto AssemblyError;
   end;
   if Assemble(Filename + '_song.obj',
-              'song.asm',
+              'hUGEDriver/song.asm',
               ['SONG_DESCRIPTOR=song', 'TICKS='+IntToStr(Song.TicksPerRow)]) <> 0 then
     goto AssemblyError;
   if Mode = emGBS then
   begin
     if Assemble(
-          Filename + '_gbs.obj', 'gbs.asm',
+          Filename + '_gbs.obj', 'hUGEDriver/gbs.asm',
           ['SONG_DESCRIPTOR=song',
            'GBS_TITLE='+PadRight(Song.Name, 32),
            'GBS_AUTHOR='+PadRight(Song.Artist, 32),
   end
   else
   begin
-    if Assemble(Filename + '_player.obj', 'player.asm', ['SONG_DESCRIPTOR=song']) <> 0 then
+    if Assemble(Filename + '_player.obj', 'hUGEDriver/player.asm', ['SONG_DESCRIPTOR=song']) <> 0 then
       goto AssemblyError;
   end;
   // Link
   if Mode = emGBS then
   begin
-    if Link(Filename + '.gbs', [Filename + '_driver.obj', Filename +
+    if Link(Filename + '.gbs',
-      '_song.obj', Filename + '_gbs.obj']) <> 0 then
+            [Filename + '_driver.obj',
-      goto AssemblyError;
+             Filename + '_song.obj',
+             Filename + '_gbs.obj']) <> 0 then goto AssemblyError;
   end
   else
   begin
-    if Link(Filename + '.gb', [Filename + '_driver.obj', Filename +
+    if Link(Filename + '.gb',
-      '_song.obj', Filename + '_player.obj'], Filename + '.map', Filename +
+            [Filename + '_driver.obj',
-      '.sym') <> 0 then
+             Filename + '_song.obj',
-      goto AssemblyError;
+             Filename + '_player.obj'],
+            Filename + '.map',
+            Filename + '.sym') <> 0 then goto AssemblyError;
   end;
   // Fix
   // as its argument.
   Proc.Free;
   OutSL.Free;
-  Chdir('..');
 end;
 end.

Modifiedrendertowave.pas +1−4

   enablesound;
   FDCallback := nil;
-  load('hUGEDriver/preview.gb');
+  load('render/preview.gb');
-  chdir('hUGEDriver');
   if format = rfWave then begin
     OutStream := TFileStream.Create(Filename, fmCreate);
   finally
     EndWritingSoundToStream;
-    Chdir('..');
     try
       if Format = rfMP3 then begin
         OutStream.Seek(0, soFromBeginning);

Modifiedtracker.pas +2−2

`@@ -939,11 +939,11 @@ var`
939	`begin`	939	`begin`
940	`if RenderPreviewROM(Song) then begin`	940	`if RenderPreviewROM(Song) then begin`
941	`// Load the new symbol table`	941	`// Load the new symbol table`
942	`ParseSymFile('hUGEDriver/preview.sym');`	942	`ParseSymFile('render/preview.sym');`
943		943
944	`// Start emulation on the rendered preview binary`	944	`// Start emulation on the rendered preview binary`
945	`LockPlayback;`	945	`LockPlayback;`
946	`GetROMReady('hUGEDriver/preview.gb');`	946	`GetROMReady('render/preview.gb');`
947		947
948	`for I := 1 to 4 do`	948	`for I := 1 to 4 do`
949	`snd[I].ChannelOFF := HeaderControl1.Sections[I].ImageIndex = 0;`	949	`snd[I].ChannelOFF := HeaderControl1.Sections[I].ImageIndex = 0;`

Commit 856f311

Commit `856f311`