Commit `b4979c2`

Nick committed on Jun 23, 2020

Start implementation of nosie macro editor

commit b4979c23b984ae46c1ada82e992fcb9762910c6a parent 7e92e3a

5 changed files +134−197

ModifiedhUGEDriver +1−1

`@@ -1 +1 @@`
1	`Subproject commit 9abc50175246ac84a8e39455678291c97d3d8853`	1	`Subproject commit 0f3e04839b0970add9a5008e5a48ec034773b348`

Modifiedinstruments.pas +1−1

`@@ -14,7 +14,7 @@ type`
14	`TStepWidth = (swFifteen, swSeven);`	14	`TStepWidth = (swFifteen, swSeven);`
15	`TEnvelopeVolume = 0..15;`	15	`TEnvelopeVolume = 0..15;`
16	`TEnvelopeSweepAmount = 0..7;`	16	`TEnvelopeSweepAmount = 0..7;`
17	`TNoiseMacro = array[0..5] of Byte;`	17	`TNoiseMacro = array[0..5] of -31..32;`
18		18
19	`TInstrument = packed record`	19	`TInstrument = packed record`
20	`Type_: TInstrumentType;`	20	`Type_: TInstrumentType;`

Modifiedtracker.lfm +59−137

 object frmTracker: TfrmTracker
-  Left = 433
+  Left = 402
-  Height = 687
+  Height = 806
-  Top = 190
+  Top = 115
-  Width = 1145
+  Width = 1270
   AllowDropFiles = True
   Caption = 'hUGETracker'
-  ClientHeight = 667
+  ClientHeight = 786
-  ClientWidth = 1145
+  ClientWidth = 1270
   KeyPreview = True
   Menu = MainMenu1
   OnCloseQuery = FormCloseQuery
   LCLVersion = '2.0.9.0'
   object TreeView1: TTreeView
     Left = 0
-    Height = 555
+    Height = 669
     Top = 89
     Width = 193
     Align = alLeft
   end
   object Splitter1: TSplitter
     Left = 193
-    Height = 555
+    Height = 669
     Top = 89
     Width = 5
   end
   object Panel1: TPanel
     Left = 198
-    Height = 555
+    Height = 669
     Top = 89
-    Width = 947
+    Width = 1072
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 555
+    ClientHeight = 669
-    ClientWidth = 947
+    ClientWidth = 1072
     ParentFont = False
     TabOrder = 2
     object PageControl1: TPageControl
       Left = 0
-      Height = 555
+      Height = 669
       Top = 0
-      Width = 947
+      Width = 1072
       ActivePage = InstrumentTabSheet
       Align = alClient
       ParentFont = False
       TabOrder = 0
       object GeneralTabSheet: TTabSheet
         Caption = 'General'
-        ClientHeight = 527
+        ClientHeight = 641
-        ClientWidth = 939
+        ClientWidth = 1064
         ParentFont = False
         object SongInformationGroupbox: TGroupBox
           Left = 8
       end
       object InstrumentTabSheet: TTabSheet
         Caption = 'Instruments'
-        ClientHeight = 527
+        ClientHeight = 641
-        ClientWidth = 939
+        ClientWidth = 1064
         ParentFont = False
         object PaintBox1: TPaintBox
           AnchorSideTop.Control = FlowPanel1
           AnchorSideTop.Side = asrBottom
           AnchorSideBottom.Side = asrBottom
           Left = 0
-          Height = 35
+          Height = 149
           Hint = 'Preview of how the resulting waveform will look with envelope applied'
           Top = 492
-          Width = 939
+          Width = 1064
           Align = alClient
           Color = clBlack
           ParentColor = False
           Left = 0
           Height = 492
           Top = 0
-          Width = 939
+          Width = 1064
           Align = alTop
           AutoSize = True
           BevelOuter = bvNone
             Left = 651
             Height = 223
             Top = 262
-            Width = 264
+            Width = 397
             Anchors = []
             BorderSpacing.Left = 7
             BorderSpacing.Top = 7
             BorderSpacing.Bottom = 7
             Caption = 'Noise'
             ClientHeight = 203
-            ClientWidth = 260
+            ClientWidth = 393
             ParentFont = False
             TabOrder = 4
             object SevenBitCounterCheckbox: TCheckBox
               Left = 8
               Height = 19
               Hint = 'Select LFSR width. When checked, output will sound like a tone rather than noise'
-              Top = 80
+              Top = 8
               Width = 215
               Alignment = taLeftJustify
               Caption = '7 bit counter (more tone-like output)'
               ParentFont = False
               TabOrder = 0
             end
-            object Label14: TLabel
+            object Panel6: TPanel
-              Left = 9
+              Left = 8
-              Height = 15
+              Height = 152
-              Top = 51
+              Top = 40
-              Width = 71
+              Width = 376
-              Caption = 'Dividing ratio'
+              BevelOuter = bvLowered
-              ParentColor = False
+              ClientHeight = 152
-              ParentFont = False
+              ClientWidth = 376
-            end
-            object RandomizeNoiseButton: TButton
-              Left = 9
-              Height = 25
-              Hint = 'Randomize the noise instrument parameters to get a random drum-like sound'
-              Top = 112
-              Width = 242
-              Caption = 'Randomize'
-              OnClick = RandomizeNoiseButtonClick
-              ParentFont = False
               TabOrder = 1
-            end
+              object NoiseMacroPaintbox: TPaintBox
-            object Label25: TLabel
+                Left = 1
-              Left = 9
+                Height = 150
-              Height = 15
+                Top = 1
-              Top = 16
+                Width = 374
-              Width = 86
+                Align = alClient
-              Caption = 'Shift clock mask'
+                OnMouseDown = NoiseMacroPaintboxMouseDown
-              ParentColor = False
+                OnMouseMove = NoiseMacroPaintboxMouseMove
-              ParentFont = False
+                OnMouseUp = NoiseMacroPaintboxMouseUp
-            end
+                OnPaint = NoiseMacroPaintboxPaint
-            object ShiftClockTrackbar: TTrackBar
+              end
-              Left = 110
-              Height = 25
-              Top = 16
-              Width = 146
-              Max = 15
-              OnChange = ShiftClockSpinnerChange
-              Position = 0
-              ParentFont = False
-              TabOrder = 2
-            end
-            object DivRatioTrackbar: TTrackBar
-              Left = 110
-              Height = 25
-              Top = 51
-              Width = 146
-              Max = 7
-              OnChange = DivRatioSpinnerChange
-              Position = 0
-              ParentFont = False
-              TabOrder = 3
-            end
-            object Edit1: TEdit
-              Left = 9
-              Height = 23
-              Top = 144
-              Width = 80
-              OnChange = Edit1Change
-              TabOrder = 4
-            end
-            object Edit2: TEdit
-              Left = 96
-              Height = 23
-              Top = 144
-              Width = 80
-              OnChange = Edit1Change
-              TabOrder = 5
-            end
-            object Edit3: TEdit
-              Left = 184
-              Height = 23
-              Top = 144
-              Width = 80
-              OnChange = Edit1Change
-              TabOrder = 6
-            end
-            object Edit4: TEdit
-              Left = 9
-              Height = 23
-              Top = 176
-              Width = 80
-              OnChange = Edit1Change
-              TabOrder = 7
-            end
-            object Edit5: TEdit
-              Left = 96
-              Height = 23
-              Top = 176
-              Width = 80
-              OnChange = Edit1Change
-              TabOrder = 8
-            end
-            object Edit6: TEdit
-              Left = 184
-              Height = 23
-              Top = 176
-              Width = 80
-              OnChange = Edit1Change
-              TabOrder = 9
             end
           end
         end
       end
       object WavesTabSheet: TTabSheet
         Caption = 'Waves'
-        ClientHeight = 502
+        ClientHeight = 641
-        ClientWidth = 939
+        ClientWidth = 1064
         ParentFont = False
         object WaveEditPaintBox: TPaintBox
           AnchorSideTop.Control = WaveEditGroupBox
           AnchorSideTop.Side = asrBottom
           Left = 0
-          Height = 342
+          Height = 481
           Top = 160
-          Width = 939
+          Width = 1064
           Align = alBottom
           Anchors = [akTop, akLeft, akRight, akBottom]
           BorderSpacing.Top = 13
     Left = 0
     Height = 64
     Top = 25
-    Width = 1145
+    Width = 1270
     Align = alTop
     BevelOuter = bvNone
     ClientHeight = 64
-    ClientWidth = 1145
+    ClientWidth = 1270
     ParentFont = False
     TabOrder = 3
     object LEDMeter1: TLEDMeter
       Left = 0
       Height = 32
       Top = 32
-      Width = 357
+      Width = 482
       Anchors = [akTop, akLeft, akRight]
       BevelStyle = bvLowered
       Colors.Border = 2168839
       Left = 0
       Height = 32
       Top = 0
-      Width = 357
+      Width = 482
       Anchors = [akTop, akLeft, akRight]
       BevelStyle = bvLowered
       Colors.Border = 2168839
       Section3Value = 48
     end
     object Duty1Visualizer: TPaintBox
-      Left = 357
+      Left = 482
       Height = 64
       Top = 0
       Width = 197
       OnPaint = Duty1VisualizerPaint
     end
     object Duty2Visualizer: TPaintBox
-      Left = 554
+      Left = 679
       Height = 64
       Top = 0
       Width = 197
       OnPaint = Duty2VisualizerPaint
     end
     object WaveVisualizer: TPaintBox
-      Left = 751
+      Left = 876
       Height = 64
       Top = 0
       Width = 197
       OnPaint = WaveVisualizerPaint
     end
     object NoiseVisualizer: TPaintBox
-      Left = 948
+      Left = 1073
       Height = 64
       Top = 0
       Width = 197
   end
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 23
+    Height = 28
-    Top = 644
+    Top = 758
-    Width = 1145
+    Width = 1270
     AutoHint = True
     Panels = <
       item
     Left = 0
     Height = 25
     Top = 0
-    Width = 1145
+    Width = 1270
     AutoSize = True
     Caption = 'ToolBar1'
     EdgeBorders = [ebBottom]

Modifiedtracker.pas +61−58

   { TfrmTracker }
   TfrmTracker = class(TForm)
-    Edit1: TEdit;
-    Edit2: TEdit;
-    Edit3: TEdit;
-    Edit4: TEdit;
-    Edit5: TEdit;
-    Edit6: TEdit;
     IncrementCurrentInstrumentAction: TAction;
     DecrementCurrentInstrumentAction: TAction;
     GotoGeneralAction: TAction;
     InsertRowForAllAction: TAction;
     InsertRowAction: TAction;
     MenuItem39: TMenuItem;
+    NoiseMacroPaintbox: TPaintBox;
+    Panel6: TPanel;
     StopAction: TAction;
     PlayOrderAction: TAction;
     PlayCursorAction: TAction;
     ImageList2: TImageList;
     GBSaveDialog: TSaveDialog;
     Label13: TLabel;
-    Label25: TLabel;
     MenuItem10: TMenuItem;
     MenuItem16: TMenuItem;
     MenuItem23: TMenuItem;
     TrackerGridPopup: TPopupMenu;
     StartVolTrackbar: TTrackBar;
     EnvChangeTrackbar: TTrackBar;
-    ShiftClockTrackbar: TTrackBar;
-    DivRatioTrackbar: TTrackBar;
     LengthTrackbar: TTrackBar;
     SweepSizeTrackbar: TTrackBar;
     ToolButton5: TToolButton;
     SongInformationGroupbox: TGroupBox;
     Label15: TLabel;
     Label16: TLabel;
-    RandomizeNoiseButton: TButton;
     SevenBitCounterCheckbox: TCheckBox;
     SweepTimeCombobox: TComboBox;
     RoutineSynedit: TSynEdit;
     Label10: TLabel;
     Label11: TLabel;
     Label12: TLabel;
-    Label14: TLabel;
     Label7: TLabel;
     Label8: TLabel;
     Label9: TLabel;
     procedure DeleteRowForAllActionExecute(Sender: TObject);
     procedure DeleteRowForAllActionUpdate(Sender: TObject);
     procedure Duty1VisualizerClick(Sender: TObject);
-    procedure Edit1Change(Sender: TObject);
     procedure FileSaveAs1BeforeExecute(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
     procedure FormDropFiles(Sender: TObject; const FileNames: array of String);
     procedure InsertRowForAllActionUpdate(Sender: TObject);
     procedure MenuItem37Click(Sender: TObject);
     procedure MenuItem38Click(Sender: TObject);
+    procedure NoiseMacroPaintboxMouseDown(Sender: TObject;
+      Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+    procedure NoiseMacroPaintboxMouseMove(Sender: TObject; Shift: TShiftState;
+      X, Y: Integer);
+    procedure NoiseMacroPaintboxMouseUp(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; X, Y: Integer);
+    procedure NoiseMacroPaintboxPaint(Sender: TObject);
     procedure PlayCursorActionExecute(Sender: TObject);
     procedure PlayOrderActionExecute(Sender: TObject);
     procedure ScrollBox1MouseWheelDown(Sender: TObject; Shift: TShiftState;
     procedure ArtistEditChange(Sender: TObject);
     procedure CommentMemoChange(Sender: TObject);
     procedure DirectionComboBoxChange(Sender: TObject);
-    procedure DivRatioSpinnerChange(Sender: TObject);
     procedure DutyComboboxChange(Sender: TObject);
     procedure EnvChangeSpinnerChange(Sender: TObject);
     procedure EnvelopePaintboxPaint(Sender: TObject);
     procedure OctaveSpinEditChange(Sender: TObject);
     procedure RoutineNumberSpinnerChange(Sender: TObject);
     procedure RoutineSyneditChange(Sender: TObject);
-    procedure ShiftClockSpinnerChange(Sender: TObject);
     procedure PlayStartActionExecute(Sender: TObject);
     procedure StepSpinEditChange(Sender: TObject);
     procedure StopActionExecute(Sender: TObject);
     procedure WaveEditPaintBoxMouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure WaveEditPaintBoxPaint(Sender: TObject);
-    procedure RandomizeNoiseButtonClick(Sender: TObject);
     procedure InstrumentTypeComboboxChange(Sender: TObject);
     procedure LengthEnabledCheckboxChange(Sender: TObject);
     procedure PaintBox1Paint(Sender: TObject);
     LoadedFileName: String;
     PreviewingInstrument: Integer;
-    DrawingWave: Boolean;
+    DrawingWave, DrawingMacro: Boolean;
     Playing: Boolean;
     LoadingFile: Boolean;
     SaveSucceeded: Boolean;
     end;
     itNoise: begin
-      ShiftClockTrackbar.Position := CI^.ShiftClockFreq;
+      {ShiftClockTrackbar.Position := CI^.ShiftClockFreq;
       DivRatioTrackbar.Position := CI^.DividingRatio;
       SevenBitCounterCheckbox.Checked := CI^.CounterStep = swSeven;
       Edit3.Text := IntToStr(CI^.NoiseMacro[2]);
       Edit4.Text := IntToStr(CI^.NoiseMacro[3]);
       Edit5.Text := IntToStr(CI^.NoiseMacro[4]);
-      Edit6.Text := IntToStr(CI^.NoiseMacro[5]);
+      Edit6.Text := IntToStr(CI^.NoiseMacro[5]);}
     end;
   end;
   LoadInstrument(CurrentInstrumentBank, InstrumentNumberSpinner.Value);
 end;
-procedure TfrmTracker.RandomizeNoiseButtonClick(Sender: TObject);
-begin
-  ShiftClockTrackbar.Position := 0;
-  DivRatioTrackbar.Position := Random(Round(DivRatioTrackbar.Max));
-  SevenBitCounterCheckbox.Checked := Random <= 0.5;
-  LengthEnabledCheckbox.Checked := Random <= 0.5;
-  LengthTrackbar.Position := Random(Round(LengthTrackbar.Max));
-  PreviewInstrument(NotesToFreqs.KeyData[RandomRange(LOWEST_NOTE, HIGHEST_NOTE)],
-    UnmodInst(CurrentInstrumentBank, InstrumentNumberSpinner.Value));
-end;
 procedure TfrmTracker.FormCreate(Sender: TObject);
 var
   PUI: PtrUint;
   HexWaveEditEditingDone(nil);
 end;
+procedure TfrmTracker.NoiseMacroPaintboxMouseDown(Sender: TObject;
+  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+begin
+  DrawingMacro := True;
+end;
+procedure TfrmTracker.NoiseMacroPaintboxMouseMove(Sender: TObject;
+  Shift: TShiftState; X, Y: Integer);
+var
+  MacroIdx, Val: Integer;
+begin
+  if DrawingMacro then begin
+    MacroIdx := EnsureRange(Trunc((X/NoiseMacroPaintbox.Width) * 6), 0, 5);
+    Val := EnsureRange(Floor((Y/NoiseMacroPaintbox.Height) * 63), 0, 63) - 31;
+    CurrentInstrument^.NoiseMacro[MacroIdx] := Val;
+    NoiseMacroPaintbox.Invalidate;
+  end;
+end;
+procedure TfrmTracker.NoiseMacroPaintboxMouseUp(Sender: TObject;
+  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+begin
+  DrawingMacro := False;
+end;
+procedure TfrmTracker.NoiseMacroPaintboxPaint(Sender: TObject);
+var
+  BarWidth, BarStep: Double;
+  I: Integer;
+begin
+  BarWidth := (NoiseMacroPaintbox.Width / 6); // TODO: change this constant?
+  BarStep := (NoiseMacroPaintbox.Height / 63);
+  with NoiseMacroPaintbox.Canvas do begin
+    Brush.Color := clGameboyBlack;
+    Clear;
+    for I := Low(TNoiseMacro) to High(TNoiseMacro) do begin
+      Brush.Color := clGameboyMidGreen;
+      FillRect(
+        Trunc(I*BarWidth),
+        NoiseMacroPaintbox.Height div 2,
+        Trunc((I+1)*BarWidth),
+        Ceil((NoiseMacroPaintbox.Height / 2) + (CurrentInstrument^.NoiseMacro[I] * BarStep))
+      );
+    end;
+  end;
+end;
 procedure TfrmTracker.PlayCursorActionExecute(Sender: TObject);
 begin
   if GetPreviewReady then begin
   snd[Section.OriginalIndex+1].ChannelOFF := Section.ImageIndex = 0;
 end;
-procedure TfrmTracker.Edit1Change(Sender: TObject);
-begin
-  if Sender = Edit1 then
-    CurrentInstrument^.NoiseMacro[0] := StrToInt(Edit1.Text)
-  else if Sender = Edit2 then
-    CurrentInstrument^.NoiseMacro[1] := StrToInt(Edit2.Text)
-  else if Sender = Edit3 then
-    CurrentInstrument^.NoiseMacro[2] := StrToInt(Edit3.Text)
-  else if Sender = Edit4 then
-    CurrentInstrument^.NoiseMacro[3] := StrToInt(Edit4.Text)
-  else if Sender = Edit5 then
-    CurrentInstrument^.NoiseMacro[4] := StrToInt(Edit5.Text)
-  else if Sender = Edit6 then
-    CurrentInstrument^.NoiseMacro[5] := StrToInt(Edit6.Text)
-  else
-    ShowMessage('couldnt assign macro value');
-end;
 procedure TfrmTracker.PasteActionExecute(Sender: TObject);
 begin
   PostMessage(Screen.ActiveControl.Handle, LM_PASTE, 0, 0);
   Song.Routines[RoutineNumberSpinner.Value] := RoutineSynedit.Text;
 end;
-procedure TfrmTracker.ShiftClockSpinnerChange(Sender: TObject);
-begin
-  CurrentInstrument^.ShiftClockFreq := Round(ShiftClockTrackbar.Position);
-end;
 procedure TfrmTracker.PlayStartActionExecute(Sender: TObject);
 begin
   if GetPreviewReady then begin
   HaltPlayback;
 end;
-procedure TfrmTracker.DivRatioSpinnerChange(Sender: TObject);
-begin
-  CurrentInstrument^.DividingRatio := Round(DivRatioTrackbar.Position);
-end;
 procedure TfrmTracker.DutyComboboxChange(Sender: TObject);
 begin
   CurrentInstrument^.Duty := DutyComboBox.ItemIndex;

Modifiedutils.pas +12−0

   end;
 function Lerp(v0, v1, t: Double): Double;
+function ReMap(Value, Istart, Istop, Ostart, Ostop: Double): Double;
+function IntReMap(Value, Istart, Istop, Ostart, Ostop: Integer): Integer;
 function ConvertWaveform(Waveform: TWave): T4bitWave;
 procedure BlankPattern(Pat: PPattern);
 procedure BlankCell(var Cell: TCell);
   Result := ((1 - t) * v0) + (t * v1);
 end;
+function ReMap(Value, Istart, Istop, Ostart, Ostop: Double): Double;
+begin
+  Result := ostart + ((ostop - ostart) * ((value - istart) / (istop - istart)));
+end;
+function IntReMap(Value, Istart, Istop, Ostart, Ostop: Integer): Integer;
+begin
+  Result := Trunc(ReMap(Value, Istart, Istop, Ostart, Ostop));
+end;
 function ConvertWaveform(Waveform: TWave): T4bitWave;
 var
   I: Integer;

Commit b4979c2

Commit `b4979c2`