Commit `3e8ad4c`

Nick committed on Mar 30, 2020

Merge pull request #9 from RichardULZ/hUGETracker

DrawEnvelope function and GB colored scopes.

commit 3e8ad4cd0353e1f038987322e86e8f6a3b11bdf0 parent 277566bparent dd1d5eb

2 changed files Diffed against the first of 2 parents. +173−103

Modifiedtracker.lfm +108−101

 object frmTracker: TfrmTracker
-  Left = 1872
+  Left = 434
-  Height = 726
+  Height = 661
-  Top = 301
+  Top = 645
-  Width = 1180
+  Width = 1145
   AllowDropFiles = True
   Caption = 'hUGETracker'
-  ClientHeight = 706
+  ClientHeight = 641
-  ClientWidth = 1180
+  ClientWidth = 1145
   KeyPreview = True
   Menu = MainMenu1
   OnClose = FormClose
   LCLVersion = '2.0.6.0'
   object TreeView1: TTreeView
     Left = 0
-    Height = 563
+    Height = 530
-    Top = 120
+    Top = 88
     Width = 193
     Align = alLeft
     ParentFont = False
   end
   object Splitter1: TSplitter
     Left = 193
-    Height = 563
+    Height = 530
-    Top = 120
+    Top = 88
     Width = 5
   end
   object Panel1: TPanel
     Left = 198
-    Height = 563
+    Height = 530
-    Top = 120
+    Top = 88
-    Width = 982
+    Width = 947
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 563
+    ClientHeight = 530
-    ClientWidth = 982
+    ClientWidth = 947
     ParentFont = False
     TabOrder = 2
     object PageControl1: TPageControl
       Left = 0
-      Height = 563
+      Height = 530
       Top = 0
-      Width = 982
+      Width = 947
-      ActivePage = InstrumentTabSheet
+      ActivePage = CommentsTabSheet
       Align = alClient
       ParentFont = False
-      TabIndex = 2
+      TabIndex = 4
       TabOrder = 0
       object GeneralTabSheet: TTabSheet
         Caption = 'General'
-        ClientHeight = 452
+        ClientHeight = 502
-        ClientWidth = 974
+        ClientWidth = 939
         ParentFont = False
         object SongInformationGroupbox: TGroupBox
           Left = 8
       end
       object PatternTabSheet: TTabSheet
         Caption = 'Patterns'
-        ClientHeight = 535
+        ClientHeight = 502
-        ClientWidth = 974
+        ClientWidth = 939
         ParentFont = False
         object Panel3: TPanel
           Left = 224
-          Height = 535
+          Height = 502
           Top = 0
-          Width = 750
+          Width = 715
           Align = alClient
-          ClientHeight = 535
+          ClientHeight = 502
-          ClientWidth = 750
+          ClientWidth = 715
           ParentFont = False
           TabOrder = 0
           object HeaderControl1: THeaderControl
             Height = 30
             Hint = 'Left click to mute, right click to solo'
             Top = 1
-            Width = 748
+            Width = 713
             DragReorder = False
             Images = ImageList2
             Sections = <
           end
           object ScrollBox1: TScrollBox
             Left = 1
-            Height = 503
+            Height = 470
             Top = 31
-            Width = 748
+            Width = 713
             HorzScrollBar.Increment = 1
             HorzScrollBar.Page = 1
             HorzScrollBar.Smooth = True
         end
         object OrderEditStringGrid: TStringGrid
           Left = 0
-          Height = 535
+          Height = 502
           Top = 0
           Width = 224
           Align = alLeft
       end
       object InstrumentTabSheet: TTabSheet
         Caption = 'Instruments'
-        ClientHeight = 535
+        ClientHeight = 502
-        ClientWidth = 974
+        ClientWidth = 939
         ParentFont = False
         object PaintBox1: TPaintBox
           AnchorSideTop.Control = FlowPanel1
           AnchorSideTop.Side = asrBottom
           AnchorSideBottom.Side = asrBottom
           Left = 0
-          Height = 97
+          Height = 64
           Hint = 'Preview of how the resulting waveform will look with envelope applied'
           Top = 438
-          Width = 974
+          Width = 939
           Align = alClient
           Color = clBlack
           ParentColor = False
           Left = 0
           Height = 438
           Top = 0
-          Width = 974
+          Width = 939
           Align = alTop
           AutoSize = True
           BevelOuter = bvNone
               Max = 63
               OnChange = LengthSpinnerChange
               Position = 0
+              Enabled = False
               ParentFont = False
               TabOrder = 7
             end
             Left = 292
             Height = 136
             Top = 7
-            Width = 659
+            Width = 582
             Anchors = []
             BorderSpacing.Left = 7
             BorderSpacing.Top = 7
             BorderSpacing.Bottom = 7
             Caption = 'Envelope'
             ClientHeight = 116
-            ClientWidth = 655
+            ClientWidth = 578
             ParentFont = False
             TabOrder = 1
             object Label4: TLabel
             end
             object Panel5: TPanel
               Left = 300
-              Height = 105
+              Height = 104
               Top = 0
-              Width = 346
+              Width = 270
               BevelOuter = bvLowered
-              ClientHeight = 105
+              ClientHeight = 104
-              ClientWidth = 346
+              ClientWidth = 270
               ParentFont = False
               TabOrder = 1
               object EnvelopePaintbox: TPaintBox
                 Left = 1
-                Height = 103
+                Height = 102
                 Hint = 'Preview of the volume envelope'
                 Top = 1
-                Width = 344
+                Width = 268
                 Align = alClient
                 ParentFont = False
                 OnPaint = EnvelopePaintboxPaint
       end
       object WavesTabSheet: TTabSheet
         Caption = 'Waves'
-        ClientHeight = 452
+        ClientHeight = 502
-        ClientWidth = 974
+        ClientWidth = 939
         ParentFont = False
         object WaveEditPaintBox: TPaintBox
           AnchorSideTop.Control = WaveEditGroupBox
           AnchorSideTop.Side = asrBottom
           Left = 0
-          Height = 292
+          Height = 342
           Top = 160
-          Width = 974
+          Width = 939
           Align = alBottom
           Anchors = [akTop, akLeft, akRight, akBottom]
           BorderSpacing.Top = 13
       end
       object CommentsTabSheet: TTabSheet
         Caption = 'Comments'
-        ClientHeight = 414
+        ClientHeight = 502
-        ClientWidth = 960
+        ClientWidth = 939
         ParentFont = False
         object CommentMemo: TMemo
           AnchorSideTop.Control = Label17
           AnchorSideTop.Side = asrBottom
           Left = 0
-          Height = 378
+          Height = 466
           Hint = 'The comments section for your song. Greetings/links/etc'
           Top = 36
-          Width = 960
+          Width = 939
           Align = alBottom
           Anchors = [akTop, akLeft, akRight, akBottom]
           BorderSpacing.Top = 13
       end
       object RoutinesTabSheet: TTabSheet
         Caption = 'Routines'
-        ClientHeight = 414
+        ClientHeight = 502
-        ClientWidth = 960
+        ClientWidth = 939
         ParentFont = False
         inline RoutineSynedit: TSynEdit
           AnchorSideTop.Control = Label19
           AnchorSideTop.Side = asrBottom
           Left = 0
-          Height = 286
+          Height = 374
           Top = 128
-          Width = 960
+          Width = 939
           Align = alBottom
           BorderSpacing.Top = 13
           Anchors = [akTop, akLeft, akRight, akBottom]
   end
   object Panel2: TPanel
     Left = 0
-    Height = 95
+    Height = 63
     Top = 25
-    Width = 1180
+    Width = 1145
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 95
+    ClientHeight = 63
-    ClientWidth = 1180
+    ClientWidth = 1145
     ParentFont = False
     TabOrder = 3
     object LEDMeter1: TLEDMeter
       AnchorSideRight.Control = Duty1Visualizer
       Left = 0
-      Height = 47
+      Height = 31
-      Top = 48
+      Top = 32
-      Width = 392
+      Width = 357
       Anchors = [akTop, akLeft, akRight]
       BevelStyle = bvLowered
-      Colors.Border = clBlack
+      Colors.Border = 2168839
-      Colors.Section1 = clLime
+      Colors.Section1 = 5269552
-      Colors.Section2 = clYellow
+      Colors.Section2 = 7127174
-      Colors.Section3 = clRed
+      Colors.Section3 = 13629664
       FallbackDelay = 0
       LEDContrast = 9
-      Max = 100
+      Max = 50
       Min = 0
-      NumDigits = 30
+      NumDigits = 32
       PeakHoldTime = 0
       Position = 0
       SingleLED = False
-      Section2Value = 60
+      Section2Value = 3
-      Section3Value = 80
+      Section3Value = 48
     end
     object LEDMeter2: TLEDMeter
       AnchorSideRight.Control = Duty1Visualizer
       Left = 0
-      Height = 48
+      Height = 32
       Top = 0
-      Width = 392
+      Width = 357
       Anchors = [akTop, akLeft, akRight]
       BevelStyle = bvLowered
-      Colors.Border = clBlack
+      Colors.Border = 2168839
-      Colors.Section1 = clLime
+      Colors.Section1 = 5269552
-      Colors.Section2 = clYellow
+      Colors.Section2 = 7127174
-      Colors.Section3 = clRed
+      Colors.Section3 = 13629664
       FallbackDelay = 0
       LEDContrast = 9
-      Max = 100
+      Max = 50
       Min = 0
-      NumDigits = 30
+      NumDigits = 32
       PeakHoldTime = 0
       Position = 0
       SingleLED = False
-      Section2Value = 60
+      Section2Value = 3
-      Section3Value = 80
+      Section3Value = 48
     end
     object Duty1Visualizer: TPaintBox
-      Left = 392
+      Left = 357
-      Height = 95
+      Height = 63
       Top = 0
       Width = 197
       Align = alRight
       OnPaint = Duty1VisualizerPaint
     end
     object Duty2Visualizer: TPaintBox
-      Left = 589
+      Left = 554
-      Height = 95
+      Height = 63
       Top = 0
       Width = 197
       Align = alRight
       OnPaint = Duty2VisualizerPaint
     end
     object WaveVisualizer: TPaintBox
-      Left = 786
+      Left = 751
-      Height = 95
+      Height = 63
       Top = 0
       Width = 197
       Align = alRight
       OnPaint = WaveVisualizerPaint
     end
     object NoiseVisualizer: TPaintBox
-      Left = 983
+      Left = 948
-      Height = 95
+      Height = 63
       Top = 0
       Width = 197
       Align = alRight
   object StatusBar1: TStatusBar
     Left = 0
     Height = 23
-    Top = 683
+    Top = 618
-    Width = 1180
+    Width = 1145
     AutoHint = True
     Panels = <
       item
     Left = 0
     Height = 25
     Top = 0
-    Width = 1180
+    Width = 1145
     AutoSize = True
     Caption = 'ToolBar1'
     EdgeBorders = [ebBottom]
       Style = tbsDivider
     end
     object ToolButton7: TToolButton
-      Left = 1122
+      Left = 1097
       Height = 22
       Top = 0
       Caption = 'ToolButton7'
       Height = 23
       Hint = 'The octave offset for entering new notes'
       Top = 0
-      Width = 90
+      Width = 65
       MaxValue = 5
       OnChange = OctaveSpinEditChange
       ParentFont = False
     end
     object Label22: TLabel
       Left = 620
-      Height = 15
+      Height = 22
       Top = 0
       Width = 43
+      AutoSize = False
       Caption = 'Octave  '
+      Layout = tlCenter
       ParentColor = False
       ParentFont = False
     end
     object Label23: TLabel
-      Left = 753
+      Left = 728
-      Height = 15
+      Height = 22
       Top = 0
       Width = 70
+      AutoSize = False
       Caption = '  Instrument  '
+      Layout = tlCenter
       ParentColor = False
       ParentFont = False
     end
     object InstrumentComboBox: TComboBox
-      Left = 823
+      Left = 798
       Height = 23
       Hint = 'The selected instrument for new notes'
       Top = 0
       Text = '(no instrument)'
     end
     object Label24: TLabel
-      Left = 1037
+      Left = 1012
-      Height = 15
+      Height = 22
       Top = 0
       Width = 35
+      AutoSize = False
       Caption = '  Step  '
+      Layout = tlCenter
       ParentColor = False
       ParentFont = False
     end
     object StepSpinEdit: TSpinEdit
-      Left = 1072
+      Left = 1047
       Height = 23
       Hint = 'How many rows to step down after entering a new note'
       Top = 0

Modifiedtracker.pas +65−2

     function CheckUnsavedChanges: Boolean;
     procedure DrawWaveform(PB: TPaintBox; Wave: TWave);
+    procedure DrawEnvelope(PB: TPaintBox);
     procedure DrawVizualizer(PB: TPaintBox; Channel: Integer);
     procedure PreviewInstrument(Freq: Integer; Instr: Integer; SquareOnCh2: Boolean = False); overload;
   end;
 end;
+procedure TfrmTracker.DrawEnvelope(PB: TPaintBox);
+var
+  Interval, HInterval: Integer;
+  I: Integer;
+  W, H, V, S, L: Integer;
+begin
+  W := PB.Width;
+  H := PB.Height-3;
+  V := CurrentInstrument^.InitialVolume;
+  S := CurrentInstrument^.VolSweepAmount*2;
+  case CurrentInstrument^.LengthEnabled of
+    True:   L := (64-CurrentInstrument^.Length) div 2;
+    False:  L := 400;
+  end;
+  Interval := 1 {W div 260};
+  HInterval := H div 15;
+  With PB.Canvas do begin
+    Brush.Color := TColor($211807);  // Gameboy Black
+    Clear;
+    Pen.Color := TColor($6CC086);   // Gameboy Mid Green
+    Pen.Width := 3;
+    MoveTo(0, H-V*HInterval); // Start volume
+    if S{weep} = 0 then begin
+       LineTo(L*Interval, H-V*HInterval); // no sweep
+       MoveTo(L*Interval, H-(V*HInterval));
+       LineTo(L*Interval, H);
+    end
+    else begin
+      case CurrentInstrument^.VolSweepDirection of
+        Down: begin  // Envelope down, check length cut
+           For I := 0 to V do
+              LineTo( Min(I*S,L)*Interval, H-(V-I)*HInterval);
+           LineTo(W, H);
+           MoveTo(Trunc(L*Interval), 0);
+           LineTo(Trunc(L*Interval), H);
+           end;
+        Up: begin    // Envelope up, check length cut
+            For I := 0 to 15-V do
+                LineTo( Min(I*S,L)*Interval, (15-V-I)*HInterval+9);
+            LineTo(L*Interval, H-15*HInterval);
+            MoveTo(L*Interval, 0);
+            LineTo(L*Interval, H);
+            end;
+        end;
+    end;
+    // Width = 64th/sec sweep or 256th/sec length,
+    // Envelope = sweep length(0-7 * volume(0-15) * 1/64. max 105 (1.64 sec)
+    // Length = Length(0-63) / 1/256, max .25 sec.
+    // for simplicity, Sweep is mult 2, length is div 2, both 1/128 sec.
+  end;
+end;
 procedure TfrmTracker.DrawVizualizer(PB: TPaintBox; Channel: Integer);
 var
   I, J, X: Integer;
   with VisualizerBuffer.Canvas do begin
     MoveTo(0, PB.Height div 2);
-    Brush.Color := clBlack;
+    Brush.Color := TColor($211807); // Gameboy Black
     Clear;
     Pen.Color := clGray;
     Pen.Width := 2;
     if not snd[Channel].ChannelOFF then begin
-      Pen.Color := clLime;
+      Pen.Color := TColor($6CC086); // Gameboy Mid Green
       X := 0;
       I := 0;
 procedure TfrmTracker.StartVolSpinnerChange(Sender: TObject);
 begin
   CurrentInstrument^.InitialVolume := Round(StartVolTrackbar.Position);
+  DrawEnvelope(EnvelopePaintBox);
 end;
 procedure TfrmTracker.SweepDirectionComboboxChange(Sender: TObject);
     'Up': CurrentInstrument^.SweepIncDec := Up;
     'Down': CurrentInstrument^.SweepIncDec := Down;
   end;
+  DrawEnvelope(EnvelopePaintBox);
 end;
 procedure TfrmTracker.SweepSizeSpinnerChange(Sender: TObject);
     'Up': CurrentInstrument^.VolSweepDirection := Up;
     'Down': CurrentInstrument^.VolSweepDirection := Down;
   end;
+  DrawEnvelope(EnvelopePaintBox);
 end;
 procedure TfrmTracker.CommentMemoChange(Sender: TObject);
 procedure TfrmTracker.EnvChangeSpinnerChange(Sender: TObject);
 begin
   CurrentInstrument^.VolSweepAmount := Round(EnvChangeTrackbar.Position);
+  DrawEnvelope(EnvelopePaintBox);
 end;
 procedure TfrmTracker.EnvelopePaintboxPaint(Sender: TObject);
     Brush.Color := clBlack;
     Clear;
   end;
+  DrawEnvelope(EnvelopePaintBox);
 end;
 procedure TfrmTracker.InstrumentNameEditChange(Sender: TObject);
 procedure TfrmTracker.LengthSpinnerChange(Sender: TObject);
 begin
   CurrentInstrument^.Length := Round(LengthTrackbar.Position);
+  DrawEnvelope(EnvelopePaintBox);
 end;
 procedure TfrmTracker.DebugPlayNoteButtonClick(Sender: TObject);
 begin
   LengthTrackbar.Enabled := LengthEnabledCheckbox.Checked;
   CurrentInstrument^.LengthEnabled := LengthEnabledCheckbox.Checked;
+  DrawEnvelope(EnvelopePaintBox);
 end;
 end.

Commit 3e8ad4c

Commit `3e8ad4c`