[FsTrack]

- improved cam tilt and pitch

git-svn-id: http://moon:8086/svn/software/trunk/projects/FsTrack@355 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
2017-06-16 00:13:53 +00:00
parent 23146c8733
commit fd05a8501a
2 changed files with 11 additions and 3 deletions
+9 -1
View File
@@ -129,16 +129,24 @@ XmlElement* Kml::createNetworkLinkControl()
pCamera->createNewChildElement("altitude")->addTextElement(String(m_flightData.alt_meter+m_cameraAlt)); pCamera->createNewChildElement("altitude")->addTextElement(String(m_flightData.alt_meter+m_cameraAlt));
if (m_cameraAutoHeading) if (m_cameraAutoHeading)
{
pCamera->createNewChildElement("heading")->addTextElement(String(m_flightData.hdgTrue_deg)); pCamera->createNewChildElement("heading")->addTextElement(String(m_flightData.hdgTrue_deg));
}
else else
{
pCamera->createNewChildElement("heading")->addTextElement("0"); pCamera->createNewChildElement("heading")->addTextElement("0");
}
pCamera->createNewChildElement("tilt")->addTextElement(String(m_cameraTilt)); pCamera->createNewChildElement("tilt")->addTextElement(String(90.0 - (m_flightData.pitch_deg + m_cameraTilt)));
if (m_cameraAutoRoll) if (m_cameraAutoRoll)
{
pCamera->createNewChildElement("roll")->addTextElement(String(m_flightData.bank_deg)); pCamera->createNewChildElement("roll")->addTextElement(String(m_flightData.bank_deg));
}
else else
{
pCamera->createNewChildElement("roll")->addTextElement("0"); pCamera->createNewChildElement("roll")->addTextElement("0");
}
pCamera->createNewChildElement("altitudeMode")->addTextElement(m_altitudeModeString); pCamera->createNewChildElement("altitudeMode")->addTextElement(m_altitudeModeString);
+2 -2
View File
@@ -57,7 +57,7 @@ MainComponent::MainComponent (String const &homeDir, String const &hostIp)
addAndMakeVisible (m_CameraTilt = new Slider ("Camera Tilt")); addAndMakeVisible (m_CameraTilt = new Slider ("Camera Tilt"));
m_CameraTilt->setTooltip (TRANS("Camera Tilt")); m_CameraTilt->setTooltip (TRANS("Camera Tilt"));
m_CameraTilt->setRange (0, 90, 5); m_CameraTilt->setRange (-90, 90, 5);
m_CameraTilt->setSliderStyle (Slider::LinearHorizontal); m_CameraTilt->setSliderStyle (Slider::LinearHorizontal);
m_CameraTilt->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); m_CameraTilt->setTextBoxStyle (Slider::NoTextBox, false, 80, 20);
m_CameraTilt->addListener (this); m_CameraTilt->addListener (this);
@@ -420,7 +420,7 @@ BEGIN_JUCER_METADATA
textBoxHeight="20" skewFactor="1"/> textBoxHeight="20" skewFactor="1"/>
<SLIDER name="Camera Tilt" id="4993af2027f11be1" memberName="m_CameraTilt" <SLIDER name="Camera Tilt" id="4993af2027f11be1" memberName="m_CameraTilt"
virtualName="" explicitFocusOrder="0" pos="24 64 144 24" tooltip="Camera Tilt" virtualName="" explicitFocusOrder="0" pos="24 64 144 24" tooltip="Camera Tilt"
min="0" max="90" int="5" style="LinearHorizontal" textBoxPos="NoTextBox" min="-90" max="90" int="5" style="LinearHorizontal" textBoxPos="NoTextBox"
textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/> textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>
<TOGGLEBUTTON name="Camera Auto Heading" id="97a6fc7c399da63d" memberName="m_cameraAutoHeadingEnable" <TOGGLEBUTTON name="Camera Auto Heading" id="97a6fc7c399da63d" memberName="m_cameraAutoHeadingEnable"
virtualName="" explicitFocusOrder="0" pos="24 112 176 24" tooltip="Camera Auto Heading" virtualName="" explicitFocusOrder="0" pos="24 112 176 24" tooltip="Camera Auto Heading"