fix: read notes

- WaspClient can now login with username+password
- some work on the misc form
- some tweaks to the recorder
- recorder panel in the misco form done
- added the ability to scale and rotate models permanently (changing self)

Author: Torwent

examples/misc_form.simba

@@ -5,7 +5,7 @@ var
   tab: TLazTabSheet;
 begin
   form.Setup();
+  form.CreateMiscTab();
   tab := form.CreateTab('My Settings');
-  form.CreateAntibanTab();
   form.Run();
 end.

osrs.simba

@@ -13,7 +13,6 @@ less confusing way.
 ```pascal
 {$DEFINE WL_DEBUG_MOUSE}
 {$DEFINE WL_DISABLE_FAKE_INPUT}
-{$DEFINE WL_DISABLE_WASPINPUT}
 {$DEFINE WL_KEYBINDS_DEBUG}
 {$DEFINE WL_DEBUG_UPTEXT}
 {$DEFINE WL_DEBUG_INTERFACES}

osrs/interfaces/setup.simba

@@ -116,6 +116,8 @@ begin
     raise GetDebugLn('WaspLib', 'Failed to create path: ' + WLEnv.LogsDir);
   if not DirCreate(WLEnv.AssetsDir) then
     raise GetDebugLn('WaspLib', 'Failed to create path: ' + WLEnv.AssetsDir);
+  if not DirCreate(WLEnv.VideosDir) then
+    raise GetDebugLn('WaspLib', 'Failed to create path: ' + WLEnv.VideosDir);
 
   WaspClient.Setup();
   WLAssets.Update();

osrs/miscform.simba

@@ -23,6 +23,10 @@ mentioned on this page because they are internal methods you shouldn't touch.
 Do feel free to read the source code though if you so desire.
 *)
   TMiscFormHelper = record
+    LoginPanel, ClientPanel: TLazPanel;
+    EmailEdit, PasswordEdit: TLazEdit;
+    RecorderLength: TLazSpinEdit;
+    RecorderLengthLbl1, RecorderLengthLbl2: TLazLabel;
     Config: TConfigJSON;
   end;
 
@@ -31,6 +35,163 @@ begin
   Self.Config.Setup('misc' + PATH_SEP + ToStr(ProfileIndex));
 end;
 
+
+procedure TMiscFormHelper.OnLogin(sender: TLazObject);
+begin
+  WaspClient.Login(Self.EmailEdit.Text, Self.PasswordEdit.Text);
+
+  if WaspClient.LoggedIn then
+    TLazButton(sender).Parent.Hide();
+end;
+
+procedure TMiscFormHelper.OnLogout(sender: TLazObject);
+begin
+  WaspClient.Login(Self.EmailEdit.Text, Self.PasswordEdit.Text);
+
+  if WaspClient.LoggedIn then
+    TLazButton(sender).Parent.Hide();
+end;
+
+
+procedure TMiscFormHelper.SetupLoginPanel(parent: TLazComponent);
+var
+  panel: TLazPanel;
+  info: TLazLabel;
+  btn: TLazButton;
+begin
+  Self.LoginPanel := TLazPanel.CreateEx(parent, TLazTabSheet(parent).Width div 2 - 240, 20, 480, 220);
+  Self.LoginPanel.BevelWidth := 0;
+
+  info := TLazLabel.CreateEx(Self.LoginPanel, '', '', 60, 20, 0, 90);
+  info.Caption := 'You are currently not logged into WaspScripts.' + LINE_SEP + LINE_SEP +
+                  'To submit stats you can either login below' + LINE_SEP +
+                  'or relaunch the script from wasp-launcher.';
+  info.Alignment := ELazAlignment.Center;
+  info.Font.Name := 'Courier New';
+
+  Self.EmailEdit := TLazEdit.CreateEx(Self.LoginPanel, 'Email:', 'Username to login to WaspScripts', 20, info.Bottom + 20, 200);
+  Self.PasswordEdit := TLazEdit.CreateEx(Self.LoginPanel, 'Password:', 'Password to login to WaspScripts', Self.EmailEdit.Right + 20, Self.EmailEdit.Top, 200);
+  Self.PasswordEdit.PasswordChar := '*';
+
+  btn := TLazButton.CreateEx(Self.LoginPanel, 'Login', '', Self.LoginPanel.Width div 2 - 100, Self.EmailEdit.Bottom + 20, 200);
+  btn.OnClick := @Self.OnLogin;
+
+  if WaspClient.LoggedIn then
+    Self.LoginPanel.Hide();
+end;
+
+procedure TMiscFormHelper.SetupClientPanel(parent: TLazComponent);
+var
+  panel: TLazPanel;
+  info: TLazLabel;
+  btn: TLazButton;
+begin
+  Self.ClientPanel := TLazPanel.CreateEx(parent, TLazTabSheet(parent).Width div 2 - 240, 20, 480, 220);
+  Self.ClientPanel.BevelWidth := 0;
+
+  info := TLazLabel.CreateEx(Self.ClientPanel, 'You are logged in as ' + WaspClient.User.Username, '', 60, 20, 0, 90);
+  info.Alignment := ELazAlignment.Center;
+  info.Font.Name := 'Courier New';
+
+  btn := TLazButton.CreateEx(Self.LoginPanel, 'Login', '', Self.LoginPanel.Width div 2 - 100, Self.EmailEdit.Bottom + 20, 200);
+  btn.OnClick := @Self.OnLogout;
+
+  if WaspClient.LoggedIn then
+    Self.LoginPanel.Hide();
+end;
+
+
+
+procedure TMiscFormHelper.OnRecorderEnabledChange(sender: TLazObject);
+begin
+  if TLazCheckBox(sender).IsChecked() then
+  begin
+    SimbaRecorder.Enabled := True;
+    Self.RecorderLengthLbl1.Enabled := True;
+    Self.RecorderLength.Enabled := True;
+    Self.RecorderLengthLbl2.Enabled := True;
+    SimbaRecorder.BufferSeconds := Self.RecorderLength.Value;
+  end
+  else
+  begin
+    SimbaRecorder.Enabled := False;
+    Self.RecorderLengthLbl1.Enabled := False;
+    Self.RecorderLength.Enabled := False;
+    Self.RecorderLengthLbl2.Enabled := False;
+  end;
+
+  if Self.Config.Data.Has('recorder_enabled') then
+    Self.Config.Data.Item['recorder_enabled'].AsBool := SimbaRecorder.Enabled
+  else
+    Self.Config.Data.AddBool('recorder_enabled', SimbaRecorder.Enabled);
+  Self.Config.Save();
+end;
+
+procedure TMiscFormHelper.OnRecorderLengthChange(sender: TLazObject);
+begin
+  SimbaRecorder.BufferSeconds := TLazSpinEdit(sender).Value;
+  if Self.Config.Data.Has('recorder_length') then
+    Self.Config.Data.Item['recorder_length'].AsInt := SimbaRecorder.BufferSeconds
+  else
+    Self.Config.Data.AddInt('recorder_length', SimbaRecorder.BufferSeconds);
+  Self.Config.Save();
+end;
+
+
+procedure TMiscFormHelper.SetupRecorderPanel(parent: TLazComponent);
+var
+  panel: TLazPanel;
+  check: TLazCheckBox;
+begin
+  panel := TLazPanel.CreateEx(parent, TLazTabSheet(parent).Width div 2 - 120, 320, 240, 100);
+  panel.BevelWidth := 0;
+
+  check := TLazCheckBox.CreateEx(panel, 'Record crashes', '', 20, 0);
+  check.Hint := 'Simba recorder records the last X seconds of a script running.' + LINE_SEP +
+                'This is great to analyze crashes and issues that shut down scripts' + LINE_SEP +
+                'but uses a lot of RAM and will use more the longer the recording is.';
+  check.ShowHint := True;
+  check.OnChange := @Self.OnRecorderEnabledChange;
+
+  Self.RecorderLengthLbl1 := TLazLabel.CreateEx(panel, 'Record last', '', 20, 40);
+  Self.RecorderLength := TLazSpinEdit.CreateEx(panel);
+  Self.RecorderLength.AnchorHorizontally(Self.RecorderLengthLbl1, 10);
+  Self.RecorderLength.Hint := check.Hint;
+  Self.RecorderLength.ShowHint := True;
+  Self.RecorderLength.Increment := 5;
+  if Self.Config.Data.Has('recorder_length') then
+  begin
+    SimbaRecorder.BufferSeconds := Self.Config.Data.Item['recorder_length'].AsInt;
+    Self.RecorderLength.Value := Self.Config.Data.Item['recorder_length'].AsInt;
+  end
+  else
+  begin
+    SimbaRecorder.BufferSeconds := 30;
+    Self.RecorderLength.Value := 30;
+  end;
+  Self.RecorderLength.MinValue := 10;
+  Self.RecorderLength.OnChange := @Self.OnRecorderLengthChange;
+
+  Self.RecorderLengthLbl2 := TLazLabel.CreateEx(panel, 'seconds');
+  Self.RecorderLengthLbl2.AnchorHorizontally(Self.RecorderLength, 10);
+
+  if Self.Config.Data.Has('recorder_enabled')  then
+  begin
+    check.SetChecked(Self.Config.Data.Item['recorder_enabled'].AsBool);
+    Self.RecorderLengthLbl1.Enabled := Self.Config.Data.Item['recorder_enabled'].AsBool;
+    Self.RecorderLength.Enabled     := Self.Config.Data.Item['recorder_enabled'].AsBool;
+    Self.RecorderLengthLbl2.Enabled := Self.Config.Data.Item['recorder_enabled'].AsBool;
+  end
+  else
+  begin
+    check.SetChecked(False);
+    Self.RecorderLengthLbl1.Enabled := False;
+    Self.RecorderLength.Enabled     := False;
+    Self.RecorderLengthLbl2.Enabled := False;
+  end;
+end;
+
+
 var
 (*
 ## MiscForm variable
@@ -65,4 +226,7 @@ begin
   Result := Self.CreateTab('Misc');
 
   MiscForm.Setup();
+  MiscForm.SetupLoginPanel(Result);
+  MiscForm.SetupRecorderPanel(Result);
+  MiscForm.Setup();
 end;

osrs/projection/model.simba

@@ -13,6 +13,7 @@ type
     Materials: TColorArray;
     Alphas: TByteArray;
     Width, Depth, Height: Single;
+    Center: TVector3;
   end;
 
 procedure TModel.LoadMTL(fileName: string);
@@ -127,6 +128,7 @@ begin
   Self.Width := x2-x1;
   Self.Depth := y2-y1;
   Self.Height := z2-z1;
+  Self.Center := [x1+Self.Width/2, y1+Self.Depth/2, z1+Self.Height/2];
 end;
 
 
@@ -138,6 +140,37 @@ begin
 end;
 
 
+procedure TModel.Scale(factor: Single);
+var
+  i: Integer;
+begin
+  for i := 0 to High(Self.Vertices) do
+  begin
+    Self.Vertices[i].X := Self.Vertices[i].X * factor;
+    Self.Vertices[i].Y := Self.Vertices[i].Y * factor;
+    Self.Vertices[i].Z := Self.Vertices[i].Z * factor;
+  end;
+
+  Self.Width := Self.Width * factor;
+  Self.Depth := Self.Depth * factor;
+  Self.Height := Self.Height * factor;
+
+  Self.Center.X := Self.Center.X * factor;
+  Self.Center.Y := Self.Center.Y * factor;
+  Self.Center.Z := Self.Center.Z * factor;
+end;
+
+procedure TModel.Rotate(radians: Single);
+var
+  i: Integer;
+  center: TVector2;
+begin
+  center := Self.Center.ToVec2();
+  for i := 0 to High(Self.Vertices) do
+    Self.Vertices[i] := Self.Vertices[i].Rotate(radians, center);
+end;
+
+
 function TModel.ProjectEx(minimapCoord: TVector3; heights: array [0..3] of Single; rotation, radians: Single): TPointArray;
 var
   i: Integer;

osrs/walker.simba

@@ -32,10 +32,10 @@ begin
 end;
 ```
 *)
-  TRSWalkerEvent            = procedure(walker: PRSWalker; position, destination: TPoint) of object;
+  TRSWalkerEvent          = procedure(walker: PRSWalker; position, destination: TPoint) of object;
   TWalkerPositionFunction = function (): TPoint of object;
   TWalkerHeightFunction   = function (pt: TPoint = [0,0]; global: Boolean = True): Single of object;
-  TWalkerGetLocalFunction  = function (pt: TPoint; offset: TPoint = [0,0]): TPoint of object;
+  TWalkerGetLocalFunction = function (pt: TPoint; offset: TPoint = [0,0]): TPoint of object;
 
 (*
 ## TRSWalker

utils.simba

@@ -27,8 +27,8 @@
 {$IFNDEF WL_WORLDFETCHER_INCLUDED}    {$INCLUDE_ONCE WaspLib/utils/worldfetcher.simba}
 {$IFNDEF WL_PROFILES_INCLUDED}        {$INCLUDE_ONCE utils/profiles.simba}
 {$IFNDEF WL_PROFILE_FORM_INCLUDED}    {$INCLUDE_ONCE utils/forms/profile_form.simba}
-{$IFNDEF WL_SCRIPTFORM_INCLUDED}      {$INCLUDE_ONCE utils/forms/scriptform.simba}
 {$IFNDEF WL_RECORDER_INCLUDED}        {$INCLUDE_ONCE utils/recorder.simba}
+{$IFNDEF WL_SCRIPTFORM_INCLUDED}      {$INCLUDE_ONCE utils/forms/scriptform.simba}
 {$IFNDEF WL_CONVERSIONS_INCLUDED}     {$INCLUDE_ONCE utils/math/conversions.simba}
 
 {$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}{$ENDIF}

utils/env.simba

@@ -13,6 +13,7 @@ WLEnv = record
   const CacheDir:   String = SimbaEnv.DataPath  + 'Cache'   + PATH_SEP;
   const AssetsDir:  String = SimbaEnv.DataPath  + 'Assets'  + PATH_SEP;
   const LogsDir:    String = SimbaEnv.DataPath  + 'Logs'    + PATH_SEP;
+  const VideosDir:  String = SimbaEnv.SimbaPath + 'Videos'  + PATH_SEP;
 end;
 ```
 *)
@@ -22,4 +23,5 @@ type
     const CacheDir:   String = SimbaEnv.DataPath  + 'Cache'   + PATH_SEP;
     const AssetsDir:  String = SimbaEnv.DataPath  + 'Assets'  + PATH_SEP;
     const LogsDir:    String = SimbaEnv.DataPath  + 'Logs'    + PATH_SEP;
+    const VideosDir:  String = SimbaEnv.SimbaPath + 'Videos'  + PATH_SEP;
   end;

utils/forms/formutils.simba

@@ -499,7 +499,7 @@ begin
   Result.Parent := TLazComponent(owner);
 end;
 
-function TLazPanel.CreateEx(owner: Pointer; top, left, width, height: Integer): TLazPanel; static; overload;
+function TLazPanel.CreateEx(owner: Pointer; left, top, width, height: Integer): TLazPanel; static; overload;
 begin
   Result := TLazPanel.CreateEx(owner);
 
@@ -516,7 +516,7 @@ begin
   Result.Parent := TLazComponent(owner);
 end;
 
-function TLazPageControl.CreateEx(owner: Pointer; top, left, width, height: Integer): TLazPageControl; static; overload;
+function TLazPageControl.CreateEx(owner: Pointer; left, top, width, height: Integer): TLazPageControl; static; overload;
 begin
   Result := TLazPageControl.CreateEx(owner);
 

utils/forms/scriptform.simba

@@ -111,6 +111,9 @@ begin
     else
       Self.ConfigData.AddInt('goal_level', Self.Goals.Level.Value);
   end;
+
+  if SimbaRecorder.Enabled then
+    SimbaRecorder.Start();
 end;
 {$H+}