Remove overload

neurolabusc · Nov 11, 2020 · 7bc511a · 7bc511a
1 parent 7f3702e
commit 7bc511a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 76 deletions.
diff --git a/matmath.pas b/matmath.pas
@@ -28,7 +28,6 @@ interface
  function vectorSame(pt1, pt2: TPoint3f): boolean;
  function matrixMult(a, b: TMat33): TMat33; overload;
  function matrixMult(a, b: TMat44): TMat44; overload;
- //function matrixEye: TMat33; overload;
  function matrixEye: TMat44; overload;
  function matrixSet(a,b,c, d,e,f, g,h,i: single): TMat33; overload;
  function matrixSet(r1c1, r1c2, r1c3, r1c4, r2c1, r2c2, r2c3, r2c4, r3c1, r3c2, r3c3, r3c4: single): TMat44; overload;
@@ -411,7 +410,7 @@ function matrixSet(r1c1, r1c2, r1c3, r1c4, r2c1, r2c2, r2c3, r2c4, r3c1, r3c2, r
  result[4,1]:=0; result[4,2]:=0; result[4,3]:=0; result[4,4]:=1;
 end;
 
-function matrixEye: TMat44; overload;
+function matrixEye: TMat44;
 begin
      result := matrixSet(1,0,0,0, 0,1,0,0, 0,0,1,0);
 end;
@@ -423,11 +422,6 @@ function matrixSet(a,b,c, d,e,f, g,h,i: single): TMat33; overload;
      result[3,1]:=g; result[3,2]:=h; result[3,3]:=i;
 end; // matrixSet()
 
-function matrixEye: TMat33; overload;
-begin
-     result := matrixSet(1,0,0, 0,1,0, 0,0,1);
-end;
-
 function matrixMult(a, b: TMat44): TMat44; overload;
 var i,j: integer;
 begin

diff --git a/opts.inc b/opts.inc
@@ -12,5 +12,4 @@
 //{$DEFINE HEMISSAO}  //for hemispherical SSAO - requires shaders that save surface normal - see hemiAO3 and hemiAO
 {$DEFINE CTM} //support OpenCTM format, requires LZMA decoding
 //{$DEFINE TUBES}
-{$DEFINE MATCAP}
-//{$DEFINE TIMER} //report load times
+{$DEFINE MATCAP}
diff --git a/surfice.lpr b/surfice.lpr
@@ -17,7 +17,7 @@
   Application.Title:='Surf Ice';
   Application.Initialize;
   Application.CreateForm(TGLForm1, GLForm1);
-  //ConstrainTrackBars(); //if unpatched: https://bugs.freepascal.org/view.php?id=35861
+  ConstrainTrackBars(); //if unpatched: https://bugs.freepascal.org/view.php?id=35861
   Application.Run;
   //Windows: if you get an error "Can't find object file" you can copy the 'static' folder from
   //  https://github.com/synopse/mORMot

diff --git a/surfice.lps b/surfice.lps
@@ -69,11 +69,10 @@
       </Unit6>
       <Unit7>
         <Filename Value="track.pas"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="90"/>
         <CursorPos X="12" Y="106"/>
         <UsageCount Value="89"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit7>
       <Unit8>
@@ -198,7 +197,8 @@
       <Unit23>
         <Filename Value="matmath.pas"/>
         <EditorIndex Value="-1"/>
-        <CursorPos X="12" Y="16"/>
+        <TopLine Value="410"/>
+        <CursorPos X="28" Y="413"/>
         <UsageCount Value="98"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit23>
@@ -265,127 +265,87 @@
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit31>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="20" HistoryIndex="19">
       <Position1>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="6412" Column="102" TopLine="6387"/>
+        <Caret Line="1606" Column="98" TopLine="1585"/>
       </Position1>
       <Position2>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="6417" Column="129" TopLine="6392"/>
+        <Caret Line="2405" Column="65" TopLine="2384"/>
       </Position2>
       <Position3>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="1603" Column="97" TopLine="1585"/>
+        <Caret Line="2409" Column="125" TopLine="2384"/>
       </Position3>
       <Position4>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="1606" Column="98" TopLine="1585"/>
+        <Caret Line="2412" Column="65" TopLine="2396"/>
       </Position4>
       <Position5>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="2405" Column="65" TopLine="2384"/>
+        <Caret Line="1580" Column="23" TopLine="1569"/>
       </Position5>
       <Position6>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="2409" Column="125" TopLine="2384"/>
+        <Caret Line="1573" Column="8" TopLine="1569"/>
       </Position6>
       <Position7>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="2412" Column="65" TopLine="2396"/>
+        <Caret Line="6418" Column="129" TopLine="6412"/>
       </Position7>
       <Position8>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="1580" Column="23" TopLine="1569"/>
+        <Caret Line="81" Column="14" TopLine="67"/>
       </Position8>
       <Position9>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="1573" Column="8" TopLine="1569"/>
+        <Caret Line="328" Column="12" TopLine="304"/>
       </Position9>
       <Position10>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="6418" Column="129" TopLine="6412"/>
+        <Caret Line="336" Column="22" TopLine="312"/>
       </Position10>
       <Position11>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="81" Column="14" TopLine="67"/>
+        <Caret Line="440" Column="55" TopLine="416"/>
       </Position11>
       <Position12>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="328" Column="12" TopLine="304"/>
+        <Caret Line="1203" Column="14" TopLine="1185"/>
       </Position12>
       <Position13>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="336" Column="22" TopLine="312"/>
+        <Caret Line="1188" Column="2" TopLine="1185"/>
       </Position13>
       <Position14>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="440" Column="55" TopLine="416"/>
+        <Caret Line="4282" Column="65" TopLine="4280"/>
       </Position14>
       <Position15>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="1203" Column="14" TopLine="1185"/>
+        <Caret Line="4616" Column="35" TopLine="4593"/>
       </Position15>
       <Position16>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="1188" Column="2" TopLine="1185"/>
+        <Caret Line="5296" Column="33" TopLine="5272"/>
       </Position16>
       <Position17>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="4282" Column="65" TopLine="4280"/>
+        <Caret Line="5297" Column="20" TopLine="5273"/>
       </Position17>
       <Position18>
-        <Filename Value="mainunit.pas"/>
-        <Caret Line="4616" Column="35" TopLine="4593"/>
-      </Position18>
-      <Position19>
-        <Filename Value="mainunit.pas"/>
-        <Caret Line="5296" Column="33" TopLine="5272"/>
-      </Position19>
-      <Position20>
-        <Filename Value="mainunit.pas"/>
-        <Caret Line="5297" Column="20" TopLine="5273"/>
-      </Position20>
-      <Position21>
         <Filename Value="mesh.pas"/>
         <Caret Line="5" Column="137"/>
-      </Position21>
-      <Position22>
-        <Filename Value="track.pas"/>
-        <Caret Line="2339" Column="10" TopLine="2334"/>
-      </Position22>
-      <Position23>
-        <Filename Value="track.pas"/>
-        <Caret Line="86" Column="20" TopLine="72"/>
-      </Position23>
-      <Position24>
-        <Filename Value="track.pas"/>
-        <Caret Line="76" Column="73" TopLine="74"/>
-      </Position24>
-      <Position25>
-        <Filename Value="track.pas"/>
-        <Caret Line="86" Column="20" TopLine="72"/>
-      </Position25>
-      <Position26>
-        <Filename Value="track.pas"/>
-        <Caret Line="88" Column="17" TopLine="72"/>
-      </Position26>
-      <Position27>
-        <Filename Value="track.pas"/>
-        <Caret Line="91" Column="15" TopLine="72"/>
-      </Position27>
-      <Position28>
-        <Filename Value="track.pas"/>
-        <Caret Line="106" Column="11" TopLine="90"/>
-      </Position28>
-      <Position29>
+      </Position18>
+      <Position19>
         <Filename Value="mesh.pas"/>
         <Caret Line="10" Column="36" TopLine="2"/>
-      </Position29>
-      <Position30>
+      </Position19>
+      <Position20>
         <Filename Value="mesh.pas"/>
         <Caret Line="204" Column="27" TopLine="180"/>
-      </Position30>
+      </Position20>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>