//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
// and be happy.
FGScenery* scenery = globals->get_scenery();
sgdVec3 start, dir, hit;
- if (MOUSE_BUTTON_DOWN && FGRenderer::getPickInfo(start, dir, x, y) &&
- scenery->get_cart_ground_intersection(start, dir, hit)) {
+ if (!b && updown == MOUSE_BUTTON_DOWN && FGRenderer::getPickInfo(start, dir, x, y)
+ && scenery->get_cart_ground_intersection(start, dir, hit)) {
Point3D geod = sgCartToGeod(Point3D(hit[0], hit[1], hit[2]));
- static SGPropertyNode_ptr lon
- = fgGetNode("/sim/input/click/longitude-deg", true);
- static SGPropertyNode_ptr lat
- = fgGetNode("/sim/input/click/latitude-deg", true);
- static SGPropertyNode_ptr elev_m
- = fgGetNode("/sim/input/click/elevation-m", true);
- static SGPropertyNode_ptr elev_ft
- = fgGetNode("/sim/input/click/elevation-ft", true);
-
- lon->setDoubleValue(geod.lon() * SGD_RADIANS_TO_DEGREES);
- lat->setDoubleValue(geod.lat() * SGD_RADIANS_TO_DEGREES);
- elev_m->setDoubleValue(geod.elev());
- elev_ft->setDoubleValue(geod.elev() * SG_METER_TO_FEET);
+ SGPropertyNode *c = fgGetNode("/sim/input/click", true);
+ c->setDoubleValue("longitude-deg", geod.lon() * SGD_RADIANS_TO_DEGREES);
+ c->setDoubleValue("latitude-deg", geod.lat() * SGD_RADIANS_TO_DEGREES);
+ c->setDoubleValue("elevation-m", geod.elev());
+ c->setDoubleValue("elevation-ft", geod.elev() * SG_METER_TO_FEET);
+
+ fgSetBool("/sim/signals/click", 1);
}
}
}
// Constrain the mouse if requested
if (mode.constrained) {
bool need_warp = false;
- if (x <= 0) {
- x = xsize - 2;
- need_warp = true;
- } else if (x >= (xsize-1)) {
- x = 1;
+ if (x <= (xsize * .25) || x >= (xsize * .75)) {
+ x = int(xsize * .5);
need_warp = true;
}
- if (y <= 0) {
- y = ysize - 2;
- need_warp = true;
- } else if (y >= (ysize-1)) {
- y = 1;
+ if (y <= (ysize * .25) || y >= (ysize * .75)) {
+ y = int(ysize * .5);
need_warp = true;
}