Reversed the numTracker tryout to accomodate the secondary Tracker: the user-interface was confusing.

Now, the 1st Tracker overwrites the values, if the same axis were selected in both trackers.

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@196 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

1 files changed, 95 insertions, 77 deletions

diff --git a/bin/Settings/ArmA.ini b/bin/Settings/ArmA.ini
index 350c6ec7..482d579e 100644
--- a/bin/Settings/ArmA.ini
+++ b/bin/Settings/ArmA.ini
@@ -25,40 +25,8 @@ powCurve=5
 maxSmooth=70

 

 [GameProtocol]

-Selection=2

 DLL=FTNoIR_Protocol_FT.dll

-

-[Curves]

-Roll_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\b\0\0\0\0\0\0)

-Roll_point2=@Variant(\0\0\0\x1a@R\xc0\0\0\0\0\0@A\x80\0\0\0\0\0)

-Roll_point3=@Variant(\0\0\0\x1a@e`\0\0\0\0\0@G\0\0\0\0\0\0)

-Roll_point4=@Variant(\0\0\0\x1a@e`\0\0\0\0\0@I\0\0\0\0\0\0)

-Yaw_point1=@Variant(\0\0\0\x1a@ \0\0\0\0\0\0@&\0\0\0\0\0\0)

-Yaw_point2="@Variant(\0\0\0\x1a@@\x80\0\0\0\0\0@;\0\0\0\0\0\0)"

-Yaw_point3=@Variant(\0\0\0\x1a@L\x80\0\0\0\0\0@C\0\0\0\0\0\0)

-Yaw_point4=@Variant(\0\0\0\x1a@U\0\0\0\0\0\0@I\0\0\0\0\0\0)

-Pitch_point1=@Variant(\0\0\0\x1a@\x1c\0\0\0\0\0\0@ \0\0\0\0\0\0)

-Pitch_point2=@Variant(\0\0\0\x1a@D\0\0\0\0\0\0@?\0\0\0\0\0\0)

-Pitch_point3=@Variant(\0\0\0\x1a@P@\0\0\0\0\0@D\x80\0\0\0\0\0)

-Pitch_point4=@Variant(\0\0\0\x1a@T\x80\0\0\0\0\0@I\0\0\0\0\0\0)

-X_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0)

-X_point2=@Variant(\0\0\0\x1a@Z@\0\0\0\0\0@1\0\0\0\0\0\0)

-X_point3=@Variant(\0\0\0\x1a@a@\0\0\0\0\0@?\0\0\0\0\0\0)

-X_point4=@Variant(\0\0\0\x1a@d\xa0\0\0\0\0\0@I\0\0\0\0\0\0)

-Y_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0)

-Y_point2=@Variant(\0\0\0\x1a@F\x80\0\0\0\0\0@E\0\0\0\0\0\0)

-Y_point3=@Variant(\0\0\0\x1a@6\0\0\0\0\0\0@9\0\0\0\0\0\0)

-Y_point4=@Variant(\0\0\0\x1a@P@\0\0\0\0\0@I\0\0\0\0\0\0)

-Z_point1=@Variant(\0\0\0\x1a\0\0\0\0\0\0\0\0@&\0\0\0\0\0\0)

-Z_point2=@Variant(\0\0\0\x1a@1\0\0\0\0\0\0@H\x80\0\0\0\0\0)

-Z_point3=@Variant(\0\0\0\x1a@6\0\0\0\0\0\0@D\x80\0\0\0\0\0)

-Z_point4=@Variant(\0\0\0\x1a@K\x80\0\0\0\0\0@I\0\0\0\0\0\0)

-fixup_mx=0

-fixup_my=0

-fixup_mz=0

-fixup_x=0

-fixup_y=0

-fixup_z=0

+Selection=2

 

 [KB_Shortcuts]

 Keycode_Center=199

@@ -95,65 +63,115 @@ MouseKey_StartStop=0
 MouseKey_Inhibit=0

 

 [TrackerSource]

-Selection=2

+Selection=0

 DLL=FTNoIR_Tracker_SM.dll

+2ndDLL=None

+

+[FTIR]

+useTIRViews=false

+useDummyExe=true

+

+[SMTracker]

+FilterLevel=1

+

+[Filter]

+DLL=FTNoIR_Filter_Accela.dll

 

 [Curves-Yaw]

-point-count=1

-point-0-x=44.7297297297297

-point-0-y=134.357142857143

+point-count=2

+point-0-x=25

+point-0-y=90

+point-1-x=50

+point-1-y=180

 

 [Curves-PitchUp]

-point-count=1

-point-0-x=45.2702702702703

-point-0-y=169.714285714286

-point-1-x=22.1621621621622

-point-1-y=164.571428571429

-point-2-x=32.027027027027

-point-2-y=118.285714285714

-point-3-x=37.8378378378378

-point-3-y=150.428571428571

+point-count=2

+point-0-x=25

+point-0-y=90

+point-1-x=50

+point-1-y=180

 

 [Curves-PitchDown]

 point-count=1

-point-0-x=47.2972972972973

-point-0-y=169.714285714286

-point-1-x=24.4594594594595

-point-1-y=70.7142857142857

-point-2-x=25.1351351351351

-point-2-y=137.571428571429

+point-0-x=19

+point-0-y=63

+point-1-x=50

+point-1-y=180

 

 [Curves-Roll]

-point-count=1

-point-0-x=37.7027027027027

-point-0-y=135

+point-count=2

+point-0-x=25

+point-0-y=90

+point-1-x=50

+point-1-y=180

 

 [Curves-X]

-point-count=1

-point-0-x=37.4324324324324

-point-0-y=83.5714285714286

+point-count=2

+point-0-x=11.75

+point-0-y=108

+point-1-x=29.75

+point-1-y=149

 

 [Curves-Y]

-point-count=1

-point-0-x=34.1891891891892

-point-0-y=82.9285714285714

+point-count=2

+point-0-x=25

+point-0-y=90

+point-1-x=50

+point-1-y=180

 

 [Curves-Z]

-point-count=1

-point-0-x=34.3243243243243

-point-0-y=75.2142857142857

+point-count=2

+point-0-x=25

+point-0-y=90

+point-1-x=50

+point-1-y=180

 

-[FTIR]

-useTIRViews=false

-useDummyExe=true

-

-[FaceDetectTracker]

-RedetectMs=500

-CameraId=0

-VideoWidget=1

-

-[SMTracker]

-FilterLevel=1

+[Curves-Accela-Scaling-Rotation]

+point-count=12

+point-0-x=0

+point-0-y=0

+point-1-x=0.308900523560209

+point-1-y=0.0666666666666667

+point-2-x=0.565445026178011

+point-2-y=0.226666666666667

+point-3-x=0.769633507853403

+point-3-y=0.506666666666667

+point-4-x=0.994764397905759

+point-4-y=1

+point-5-x=1.23560209424084

+point-5-y=1.61333333333333

+point-6-x=1.47643979057592

+point-6-y=2.37333333333333

+point-7-x=1.66492146596859

+point-7-y=3.12

+point-8-x=1.80628272251309

+point-8-y=3.92

+point-9-x=1.91623036649215

+point-9-y=4.70666666666667

+point-10-x=2.00523560209424

+point-10-y=5.44

+point-11-x=2.07329842931937

+point-11-y=6

 

-[Filter]

-DLL=FTNoIR_Filter_EWMA2.dll

+[Curves-Accela-Scaling-Translation]

+point-count=10

+point-0-x=0

+point-0-y=0

+point-1-x=0.282722513089005

+point-1-y=0.08

+point-2-x=0.492146596858639

+point-2-y=0.306666666666667

+point-3-x=0.764397905759162

+point-3-y=0.84

+point-4-x=1.00523560209424

+point-4-y=1.62666666666667

+point-5-x=1.17277486910995

+point-5-y=2.78666666666667

+point-6-x=1.25130890052356

+point-6-y=3.6

+point-7-x=1.31937172774869

+point-7-y=4.29333333333333

+point-8-x=1.38219895287958

+point-8-y=4.90666666666667

+point-9-x=1.43455497382199

+point-9-y=5.65333333333333