diff options
| author | Wim Vriend <facetracknoir@gmail.com> | 2012-11-19 20:35:21 +0000 |
|---|---|---|
| committer | Wim Vriend <facetracknoir@gmail.com> | 2012-11-19 20:35:21 +0000 |
| commit | 4eb3dd795deb3fb605524e72f67fbdd8e161f4e1 (patch) | |
| tree | 983466c3b4bf34ef1582fb3dfe6e661e9dc4a21b /FaceTrackNoIR | |
| parent | b3d3a1f1d4f9739a506990edefcd2d81502368d4 (diff) | |
Changed defaults for AltPitch
git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@193 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
Diffstat (limited to 'FaceTrackNoIR')
| -rw-r--r-- | FaceTrackNoIR/FaceTrackNoIR.cpp | 2 | ||||
| -rw-r--r-- | FaceTrackNoIR/tracker.cpp | 2 | ||||
| -rw-r--r-- | FaceTrackNoIR/tracker.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp index 4d59b85b..cee7d7b9 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.cpp +++ b/FaceTrackNoIR/FaceTrackNoIR.cpp @@ -478,7 +478,7 @@ void FaceTrackNoIR::loadSettings() { // Put the filename in the window-title.
//
QFileInfo pathInfo ( currentFile );
- setWindowTitle ( "FaceTrackNoIR (1.7 alpha 5) - " + pathInfo.fileName() );
+ setWindowTitle ( "FaceTrackNoIR (1.7 alpha 6) - " + pathInfo.fileName() );
//
// Get a List of all the INI-files in the (currently active) Settings-folder.
diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp index 363a7776..71f47f36 100644 --- a/FaceTrackNoIR/tracker.cpp +++ b/FaceTrackNoIR/tracker.cpp @@ -97,7 +97,7 @@ T6DOF Tracker::target_camera(0,0,0,0,0,0); T6DOF Tracker::new_camera(0,0,0,0,0,0);
T6DOF Tracker::output_camera(0,0,0,0,0,0); // Position sent to game protocol
-THeadPoseDOF Tracker::Pitch("PitchUp", "PitchDown", 50, 180); // One structure for each of 6DOF's
+THeadPoseDOF Tracker::Pitch("PitchUp", "PitchDown", 50, 180, 50, 90); // One structure for each of 6DOF's
THeadPoseDOF Tracker::Yaw("Yaw", "", 50, 180);
THeadPoseDOF Tracker::Roll("Roll", "", 50, 180);
THeadPoseDOF Tracker::X("X","", 50, 180);
diff --git a/FaceTrackNoIR/tracker.h b/FaceTrackNoIR/tracker.h index e6d6a14d..fa5bf7ca 100644 --- a/FaceTrackNoIR/tracker.h +++ b/FaceTrackNoIR/tracker.h @@ -94,15 +94,15 @@ class FaceTrackNoIR; // pre-define parent-class to avoid circular includes class THeadPoseDOF {
public:
- THeadPoseDOF(QString primary, QString secondary = "", int maxInput = 50, int maxOutput = 180) {
+ THeadPoseDOF(QString primary, QString secondary = "", int maxInput1 = 50, int maxOutput1 = 180, int maxInput2 = 50, int maxOutput2 = 90) {
QSettings settings("Abbequerque Inc.", "FaceTrackNoIR"); // Registry settings (in HK_USER)
QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();
QSettings iniFile( currentFile, QSettings::IniFormat ); // Application settings (in INI-file)
- curvePtr = new FunctionConfig(primary, maxInput, maxOutput); // Create the Function-config for input-output translation
+ curvePtr = new FunctionConfig(primary, maxInput1, maxOutput1); // Create the Function-config for input-output translation
curvePtr->loadSettings(iniFile); // Load the settings from the INI-file
if (secondary != "") {
- curvePtrAlt = new FunctionConfig(secondary, maxInput, maxOutput);
+ curvePtrAlt = new FunctionConfig(secondary, maxInput2, maxOutput2);
curvePtrAlt->loadSettings(iniFile);
}
|