1
0
mirror of https://github.com/moparisthebest/Simba synced 2024-12-23 07:48:50 -05:00

Fix + comments

git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@95 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Wizzup? 2009-09-29 21:44:38 +00:00
parent 950bf6cfa9
commit b852563368
2 changed files with 72 additions and 98 deletions

View File

@ -7,7 +7,7 @@
<TargetFileExt Value=""/>
<Title Value="Mufasa Stand Alone"/>
<UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="8"/>
<ActiveEditorIndexAtStart Value="9"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
@ -171,8 +171,8 @@
<ResourceBaseClass Value="Form"/>
<UnitName Value="TestUnit"/>
<CursorPos X="37" Y="115"/>
<TopLine Value="83"/>
<EditorIndex Value="10"/>
<TopLine Value="84"/>
<EditorIndex Value="8"/>
<UsageCount Value="109"/>
<Loaded Value="True"/>
</Unit18>
@ -304,7 +304,7 @@
<UnitName Value="Client"/>
<CursorPos X="25" Y="17"/>
<TopLine Value="1"/>
<EditorIndex Value="4"/>
<EditorIndex Value="3"/>
<UsageCount Value="108"/>
<Loaded Value="True"/>
</Unit37>
@ -314,7 +314,7 @@
<UnitName Value="MufasaTypes"/>
<CursorPos X="69" Y="25"/>
<TopLine Value="1"/>
<EditorIndex Value="3"/>
<EditorIndex Value="2"/>
<UsageCount Value="108"/>
<Loaded Value="True"/>
</Unit38>
@ -339,7 +339,7 @@
<UnitName Value="Window"/>
<CursorPos X="24" Y="84"/>
<TopLine Value="75"/>
<EditorIndex Value="12"/>
<EditorIndex Value="10"/>
<UsageCount Value="108"/>
<Loaded Value="True"/>
</Unit41>
@ -355,7 +355,7 @@
<UnitName Value="CompTypes"/>
<CursorPos X="59" Y="545"/>
<TopLine Value="524"/>
<EditorIndex Value="16"/>
<EditorIndex Value="14"/>
<UsageCount Value="18"/>
<Loaded Value="True"/>
</Unit43>
@ -364,7 +364,7 @@
<UnitName Value="windowutil"/>
<CursorPos X="86" Y="19"/>
<TopLine Value="1"/>
<EditorIndex Value="13"/>
<EditorIndex Value="11"/>
<UsageCount Value="36"/>
<Loaded Value="True"/>
</Unit44>
@ -373,7 +373,7 @@
<UnitName Value="Input"/>
<CursorPos X="32" Y="251"/>
<TopLine Value="220"/>
<EditorIndex Value="5"/>
<EditorIndex Value="4"/>
<UsageCount Value="16"/>
<Loaded Value="True"/>
</Unit45>
@ -381,9 +381,9 @@
<Filename Value="../../Units/MMLCore/finder.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="finder"/>
<CursorPos X="70" Y="304"/>
<TopLine Value="272"/>
<EditorIndex Value="11"/>
<CursorPos X="1" Y="354"/>
<TopLine Value="390"/>
<EditorIndex Value="9"/>
<UsageCount Value="101"/>
<Loaded Value="True"/>
</Unit46>
@ -414,7 +414,7 @@
<UnitName Value="mmlpsthread"/>
<CursorPos X="46" Y="167"/>
<TopLine Value="157"/>
<EditorIndex Value="7"/>
<EditorIndex Value="6"/>
<UsageCount Value="97"/>
<Loaded Value="True"/>
</Unit50>
@ -523,11 +523,9 @@
</Unit65>
<Unit66>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<CursorPos X="54" Y="17"/>
<CursorPos X="31" Y="13"/>
<TopLine Value="1"/>
<EditorIndex Value="8"/>
<UsageCount Value="28"/>
<Loaded Value="True"/>
</Unit66>
<Unit67>
<Filename Value="../../../FPC/FPCCheckout/rtl/win/tthread.inc"/>
@ -697,9 +695,9 @@
<Filename Value="../../Units/MMLCore/colour_conv.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="colour_conv"/>
<CursorPos X="53" Y="27"/>
<TopLine Value="9"/>
<EditorIndex Value="2"/>
<CursorPos X="11" Y="148"/>
<TopLine Value="140"/>
<EditorIndex Value="1"/>
<UsageCount Value="69"/>
<Loaded Value="True"/>
</Unit92>
@ -720,7 +718,7 @@
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<EditorIndex Value="9"/>
<EditorIndex Value="7"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit95>
@ -869,7 +867,7 @@
<UnitName Value="colourpicker"/>
<CursorPos X="27" Y="34"/>
<TopLine Value="13"/>
<EditorIndex Value="6"/>
<EditorIndex Value="5"/>
<UsageCount Value="40"/>
<Loaded Value="True"/>
</Unit117>
@ -878,7 +876,7 @@
<UnitName Value="CompDragger"/>
<CursorPos X="101" Y="26"/>
<TopLine Value="26"/>
<EditorIndex Value="14"/>
<EditorIndex Value="12"/>
<UsageCount Value="17"/>
<Loaded Value="True"/>
</Unit118>
@ -898,7 +896,7 @@
<UnitName Value="windowselector"/>
<CursorPos X="76" Y="83"/>
<TopLine Value="65"/>
<EditorIndex Value="15"/>
<EditorIndex Value="13"/>
<UsageCount Value="30"/>
<Loaded Value="True"/>
</Unit120>
@ -920,9 +918,7 @@
<UnitName Value="cthreads"/>
<CursorPos X="28" Y="1077"/>
<TopLine Value="1070"/>
<EditorIndex Value="1"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit123>
<Unit124>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/inc/threadh.inc"/>
@ -931,7 +927,7 @@
<UsageCount Value="10"/>
</Unit124>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<JumpHistory Count="24" HistoryIndex="23">
<Position1>
<Filename Value="testunit.pas"/>
<Caret Line="25" Column="37" TopLine="25"/>
@ -957,101 +953,77 @@
<Caret Line="7" Column="10" TopLine="1"/>
</Position6>
<Position7>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/unix/cthreads.pp"/>
<Caret Line="12" Column="46" TopLine="1"/>
</Position7>
<Position8>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/unix/cthreads.pp"/>
<Caret Line="313" Column="20" TopLine="294"/>
</Position8>
<Position9>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/unix/cthreads.pp"/>
<Caret Line="321" Column="31" TopLine="294"/>
</Position9>
<Position10>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/unix/cthreads.pp"/>
<Caret Line="327" Column="31" TopLine="294"/>
</Position10>
<Position11>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/unix/cthreads.pp"/>
<Caret Line="343" Column="18" TopLine="324"/>
</Position11>
<Position12>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/unix/cthreads.pp"/>
<Caret Line="346" Column="12" TopLine="324"/>
</Position12>
<Position13>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/unix/cthreads.pp"/>
<Caret Line="1077" Column="28" TopLine="1070"/>
</Position13>
<Position14>
<Filename Value="testunit.pas"/>
<Caret Line="92" Column="29" TopLine="73"/>
</Position14>
<Position15>
</Position7>
<Position8>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="11" Column="86" TopLine="2"/>
</Position15>
<Position16>
</Position8>
<Position9>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="32" Column="38" TopLine="2"/>
</Position16>
<Position17>
</Position9>
<Position10>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="307" Column="52" TopLine="269"/>
</Position17>
<Position18>
</Position10>
<Position11>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="48" Column="71" TopLine="10"/>
</Position18>
<Position19>
</Position11>
<Position12>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="238" Column="59" TopLine="233"/>
</Position19>
<Position20>
</Position12>
<Position13>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="33" Column="65" TopLine="13"/>
</Position20>
<Position21>
</Position13>
<Position14>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="285" Column="5" TopLine="253"/>
</Position14>
<Position15>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="134" Column="22" TopLine="108"/>
</Position15>
<Position16>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
<Caret Line="16" Column="12" TopLine="1"/>
</Position16>
<Position17>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="134" Column="22" TopLine="108"/>
</Position17>
<Position18>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="112" Column="19" TopLine="79"/>
</Position18>
<Position19>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="176" Column="20" TopLine="151"/>
</Position19>
<Position20>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="134" Column="24" TopLine="115"/>
</Position20>
<Position21>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="176" Column="7" TopLine="146"/>
</Position21>
<Position22>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="134" Column="22" TopLine="108"/>
<Caret Line="179" Column="71" TopLine="157"/>
</Position22>
<Position23>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
<Caret Line="16" Column="12" TopLine="1"/>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="302" Column="15" TopLine="283"/>
</Position23>
<Position24>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="134" Column="22" TopLine="108"/>
<Filename Value="../../Units/MMLCore/colour_conv.pas"/>
<Caret Line="19" Column="19" TopLine="4"/>
</Position24>
<Position25>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="112" Column="19" TopLine="79"/>
</Position25>
<Position26>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="176" Column="20" TopLine="151"/>
</Position26>
<Position27>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="134" Column="24" TopLine="115"/>
</Position27>
<Position28>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="176" Column="7" TopLine="146"/>
</Position28>
<Position29>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="179" Column="71" TopLine="157"/>
</Position29>
<Position30>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="15" Column="95" TopLine="1"/>
</Position30>
</JumpHistory>
</ProjectOptions>
<CompilerOptions>

View File

@ -295,6 +295,8 @@ begin
end;
2:
// Can be optimized a lot... RGBToHSL isn't really inline,
// and hueMod * tol is also calculated every time.
begin
for yy := y1 to y2 do
for xx := x1 to x2 do
@ -348,7 +350,7 @@ begin
begin
for xx := xs to xe do
begin
if ((abs(clR-Ptr^.R) <= Tol) and (abs(clG-Ptr^.G) <= Tol) and (Abs(clG-Ptr^.B) <= Tol)) then
if ((abs(clB-Ptr^.B) <= Tol) and (abs(clG-Ptr^.G) <= Tol) and (Abs(clR-Ptr^.R) <= Tol)) then
begin;
ClientTPA[c].x := xx;
ClientTPA[c].y := yy;