1
0
Fork 0
Commit graph

7756 commits

Author SHA1 Message Date
Thomas Geymayer
ec73c62da5 Canvas: Fix stupid off-by-one error 2012-08-13 20:29:08 +02:00
Thomas Geymayer
875b59952b Canvas: Bugfixes
- Fix dependency cycle
 - Correctly forward mouse release event
2012-08-13 14:11:26 +02:00
Thomas Geymayer
624522b426 Canvas: Don't crash if texture not available 2012-08-12 20:23:31 +02:00
Frederic Bouvier
e6cb846ad3 Don't let the cloud alpha value change the lighting buffer 2012-08-12 19:06:41 +02:00
Thomas Geymayer
948d87e561 Canvas: Basic support for window stacking 2012-08-11 23:38:04 +02:00
Frederic Bouvier
b7b4553db6 Add forgotten uniforms to the display stage (Rembrandt) 2012-08-11 12:19:44 +02:00
Thomas Geymayer
544784ca85 Canvas: Forward mouse events to elements.
- Use bounding box intersections to determine which element is
   hit.
 - Transform mouse coordinates to local coordinates.
 - Try to get osgText bounding box correct (or at least better)
2012-08-10 13:11:06 +02:00
Thomas Geymayer
288e7fa5ca Canvas: default image element dimensions to texture size 2012-08-09 21:58:55 +02:00
Thomas Geymayer
83bbd9e45c Canvas: Image/Window unifying and allow using canvas inside canvas.
- Refactor and unify common functionality of canvas::Window and
   canvas::Image
 - Make canvas::Image actually work
 - Allow using canvases inside canvas::Image
   * Use new canvas:// "protocol" to allow using canvases in
     place of images
 - Prepare for categorizing canvases:
   * Move canvases to /canvas/by-index
   * Later support linking to other nodes in subbranches of
     /canvas
2012-08-09 16:13:38 +02:00
Thomas Geymayer
350d508324 Clean up
- Replace deprecated boost::shared_static_cast with
   boost::static_pointer_cast
 - Use boost::ends_with in favor of own implementation.
2012-08-09 13:22:48 +02:00
James Turner
310ddbf8c5 Initial work on Image element for Canvas. 2012-08-05 22:43:01 +01:00
James Turner
4593c3521f Fix a crash with the native menubar.
http://code.google.com/p/flightgear-bugs/issues/detail?id=821
2012-08-05 21:30:15 +01:00
James Turner
bd0a5d825d Cocoa clipboard implementation.
Fix OS-X build by supplying a Cocoa clipboard implementation.
2012-08-05 21:00:05 +01:00
Thomas Geymayer
052d578483 Canvas: Fully remove Window drawable if destroyed 2012-08-05 18:06:56 +02:00
Thomas Geymayer
d6a5a911bc Complete X11 clipboard support.
- Now ClipboarX11 also supports writing to the clipboard and
   sending the data to another application if requested.
2012-08-05 11:19:24 +02:00
Thomas Geymayer
aa9d0e3a8a Basic clipboard access from Nasal.
- Add platform independent clipboard layer for Nasal access
   to clipboard (thanks to Hooray for basic code)
 - Add Windows clipboard access
 - Add partial X11 clipboard access (only reading from clipboard)
 - Add fallback clipboard for application internal clipboard if
   platform not supported
 - Add some helper functions to FGNasalSys
2012-08-04 17:33:48 +02:00
Tim Moore
6110139197 Merge branch 'timoore/optimization' into next 2012-08-03 20:20:01 +02:00
Tim Moore
f2762d0be7 use DeletionManager 2012-08-03 20:18:11 +02:00
James Turner
f94b2d127b Avoid a naming clash on 'canvas' 2012-08-03 10:21:26 +01:00
Frederic Bouvier
c3de8851f8 Fix incorrectly hardcoded effect in last Rembrandt stage 2012-08-02 23:00:20 +02:00
James Turner
f703882ffa Skeleton Nasal-Canvas integration.
This code is non-functional, but contains most of the stubs to show what's required to add property get/set access, convert to from ghost & C++ types, and manage ownership. Element derived classes & inheritance (e.g., methods on image/path/map elements) will follow, along with some actual functionality!
2012-08-02 12:18:38 +01:00
Frederic Bouvier
64a8924035 Add some predefined uniforms to Rembrandt stages 2012-08-01 22:42:00 +02:00
Thomas Geymayer
e980178213 Canvas: Fix warning and rename file. 2012-08-01 10:57:15 +02:00
Frederic Bouvier
766014883c Fix Win32 build - No GLUT please \! 2012-08-01 08:53:40 +02:00
Thomas Geymayer
8a6a234653 Canvas: First version of new Canvas GUI system.
- Refactor CanvasMgr into PropertyBasedMgr to be also used
   for the Canvas GUI system.
 - Get rid of tied properties in the Canvas system.
 - Add new placement type 'window' for placing canvases onto
   windows
 - Pass mouse events to Window class (only if cursor is over
   window)
 - Refactor canvas placement clean up
2012-07-31 23:19:23 +02:00
Thomas Geymayer
5f08e10c0a Canvas: Support for text selection.
- Expose nearest hit for text/character selection
 - Fix culling
2012-07-31 23:19:23 +02:00
Thomas Geymayer
91c3f63110 Canvas: UTF-8 support and more settings exposed.
- Allow hiding objects
 - Use UTF-8 encoding for text elements
 - Add paramter max-width to text elements
 - Support stroke-linecap for path elements
 - Fix mouse coords
 - Set better mipmap filter
2012-07-31 23:19:23 +02:00
Thomas Geymayer
e81db175f4 Canvas: Add new element type map for geo mapping.
- The new map element automatically transforms geo coordinates
   (lat, lon) to the according screen coordinates.
 - Currently one type of projection is supported
   (Sanson-Flamsteed projection)
2012-07-31 23:19:23 +02:00
Thomas Geymayer
a876ff93e1 NasalPositioned: Expose actual postion of parkings 2012-07-31 23:19:22 +02:00
Thomas Geymayer
373d511c69 Canvas: Allow using canvases as PUI widgets.
- Add new widget type canvas
 - Set canvas view dimension from the gui xml.
 - Expose mouse events to canvas widget properties.
2012-07-31 23:19:22 +02:00
James Turner
36fe51c7f0 Add property to disable native menu on Mac. 2012-07-30 17:05:01 +01:00
Mathias Froehlich
86e61cfd78 autopilot: Introduce virtual dtor.
Introduce a virtual destructor to make deleting
FunctorBase instances ComponentForge::~ComponentForge
work reliable.
2012-07-29 17:59:38 +02:00
Mathias Froehlich
a131589a6c hla: Convert to the new callback system. 2012-07-29 17:30:24 +02:00
James Turner
909ed99332 Ensure WSAStartup is called for metar.exe 2012-07-27 17:51:04 +01:00
Markus Pargmann
ecfbb951ae Remove most compile warnings 2012-07-26 11:10:27 +01:00
Thomas Geymayer
e4fed256b7 Remove hardcoded update intervals for radar. 2012-07-26 10:48:16 +01:00
Frederic Bouvier
b44b8005b8 Don't stop displaying the sky dome in Rembrandt at any visibility 2012-07-22 18:09:47 +02:00
Frederic Bouvier
359b67cf43 Remove a redundant line 2012-07-22 17:43:27 +02:00
jberndt
1d33664067 Fixed a bug where a structural to Body frame conversion was being doen twice for tanks. 2012-07-20 00:18:35 +02:00
Stuart Buchanan
5e3ec6209c Add command to reload materials definitions. Note that this explicitly
does not attempt to delete the old materials definitions, as they
may be in use at the time.
2012-07-19 22:06:08 +01:00
ThorstenB
a2bd520a3b ATISMgr clean-up / improvements
Adds serviceable/operable properties to comm radio.
Obey comm radio power source (no power => no radio => no ATIS).
Also further clean-up to stuff belonging to former ATCmgr module.
2012-07-17 19:32:12 +02:00
ThorstenB
ec739a17c2 Fix compiler warning
(access beyond array bounds)
2012-07-17 19:32:05 +02:00
ThorstenB
0b9adf8854 ADF: code clean-up/documentation 2012-07-17 19:31:57 +02:00
ThorstenB
d50aa8999d ADF: add "operable" property
Add same property as for nav radio, to provide a property to cockpit models
whether the ADF is active (serviceable/switched on/power ok/...). Useful
to enable/disable displays (i.e. KR87).
2012-07-17 19:31:49 +02:00
Frederic Bouvier
9db625af79 Add a node mask bit for permanent lights (needed by Rembrandt) and select it in the lighting stage 2012-07-16 20:07:59 +02:00
ThorstenB
e4c3b77f15 Restore ATIS reception with nav receivers.
nav radios can be used for comm reception - mainly to receive ATIS. This
had worked with FG 2.6, but was lost in the ATCMgr->ATISMgr conversion.
2012-07-15 19:02:05 +02:00
ThorstenB
d5c56cdffa #798: Betrand Coconnier: Fix setting initial vertical speed with JSBSim 2012-07-15 15:23:46 +02:00
ThorstenB
831662fca8 Option to restore defaults and enable/disable random buildings+vegetation
fgfs can fail to start when random buildings is set to an excessive level,
so you can't even reach the GUI setting to reduce/disable again.
2012-07-15 10:56:59 +02:00
ThorstenB
df4ccc3b88 Debug message about loaded AI models. 2012-07-15 10:15:53 +02:00
Frederic Bouvier
735b6d43ec OSG 3.0.1 has no osg::Node::asCamera method 2012-07-15 10:03:19 +02:00
Frederic Bouvier
7e90968c4e Make the point light non permanent in Rembrandt 2012-07-15 08:13:05 +02:00
Frederic Bouvier
7b4287e151 Restore 2D panels in Rembrandt 2012-07-15 00:09:05 +02:00
Frederic Bouvier
a72caad8bc Restore point light in Rembrandt 2012-07-14 21:30:18 +02:00
Frederic Bouvier
c1137f371d Rembrandt: Add debugging properties and fix transparency issues. Side effect: light are not fogged (may be added in the light shader later) and depth buffer precision issues on light are more visible due to near plane really near (0.1m) 2012-07-14 13:07:41 +02:00
ThorstenB
00fe1e3445 #803: apply hotfix to revive "--carrier" option. 2012-07-14 10:01:29 +02:00
ThorstenB
39a7caae15 Proper error checks for generic protocol.
Drop FGGeneric instances which failed to initialize to avoid run-time
issues.
2012-07-13 20:33:36 +02:00
Thomas Geymayer
26aeb84399 Canvas: Calculate bounding box for path elements.
- Add an update callback to calculate a bounding box for every
   path to ensure correct culling of paths.
 - Ensure OpenVG get's initialized even if elements are subject to
   culling.
2012-07-13 11:11:33 +01:00
Thomas Geymayer
580891f181 Rename tf elements for easier handling. 2012-07-13 11:11:29 +01:00
Thomas Geymayer
c5695f6f88 Fix setting global path options per path 2012-07-13 11:11:22 +01:00
James Turner
e226983835 Revised patch from Yves to fix Mac 10.5 compilation
NSMenuDelegate is an informal protocol before 10.6, so declare it locally in that case.
2012-07-10 08:39:11 +01:00
ThorstenB
7edbf8a8c9 #798: climb rate cannot be higher than the true speed
Don't set vertical-speed on sim reset, unless the user intentionally
requested this as a start-up property.
2012-07-08 11:40:24 +02:00
Thomas Geymayer
0934ba859f Fix canvas clean up.
On clean up there are no parents any more and therefore the assertion
was triggered.
2012-07-03 16:29:44 +02:00
Thomas Geymayer
948dd2ab95 Add missing glx.h include and fix some warnings. 2012-07-03 15:58:05 +02:00
James Turner
2a276ae5d1 Disable panel-extent drawing in hot-spots mode.
To keep the tutorial looking nice, switch off the panel extent outlines for the 2.8 release. Longer-term I should remove the code, or add a separate property if this feature is actually useful.
2012-07-02 11:44:34 +01:00
Stuart Buchanan
60af52707c Reduce severity of a failure to create a marker beacon due to an unknown runway from ALERT to WARN. Not particularly relevant error message for most users. 2012-06-30 20:50:57 +01:00
Frederic Bouvier
398936d08c Working 'noshadow' animation 2012-06-30 16:26:42 +02:00
Frederic Bouvier
6d0cacc0a3 Get rid of TexGen magic and do the projective texturing for shadow mapping ourself 2012-06-27 19:38:04 +02:00
James Turner
20071b66af Fix an edge case in flight-plan inserts.
When inserting with an invalid index, ensure we return the leg based on the fixed-up index, not the original one. Thanks to Matthias Götz for the catch!
2012-06-26 15:16:03 +01:00
James Turner
08e72f8bfc Issue 790, restore hiding of 2D panel by view.
Restore previous behaviour where the 2D panel is automatically hidden when the current view is != 0. Also add two property controls to alter this behaviour, and the 'autohide' behaviour at runtime. (Requires an fgdata update to get matching preferences.xml)

https://code.google.com/p/flightgear-bugs/issues/detail?id=790
2012-06-26 11:24:10 +01:00
James Turner
18469f0059 SafeTexFont is unused, remove from build & Git 2012-06-21 12:00:52 +02:00
ThorstenB
b14401df66 #769: fix glideslope reception
Add missing frequency update.
2012-06-19 00:41:52 +02:00
ThorstenB
aabea95d19 #769: fix glideslope reception
The glideslope station was only searched once whenever the NAV station
changed. However, sometimes a mismatching G/S station is found, since
another G/S station is still closer when the NAV station changes.
When this happened, the G/S station was never updated again (while the
NAV station stayed in range), resulting in the NAV receiver providing
correct localizer, but bad G/S data (data matching another, remote station).
Issue is fixed by alternating between searching NAV and G/S stations.
2012-06-18 22:57:22 +02:00
James Turner
a8fbfb17b4 Fix OS-X compilation. 2012-06-17 21:14:04 +01:00
Thomas Geymayer
569042acbd Allow filling paths and do some clean up/fixing. 2012-06-17 21:14:00 +01:00
Thomas Geymayer
c8e1433a5c Add ShivaVG sources 2012-06-17 21:13:54 +01:00
Thomas Geymayer
df768766d9 Canvas: basic support for OpenVG (path with stroke and pattern)
- Bugfix: Don't access children by index as it's not unique
2012-06-17 21:13:47 +01:00
Frederic Bouvier
a360653eb6 Fix indentation 2012-06-16 17:29:03 +02:00
Frederic Bouvier
608520d932 Don't invalidate Rembrandt buffers when the window is iconified 2012-06-16 17:20:56 +02:00
Frederic Bouvier
622c10b8f9 The terrain branch can contain models having lights 2012-06-11 09:14:23 +02:00
Frederic Bouvier
d84f48cc0c Get more fps in Rembrandt: don't redraw the terrain in the lighting stage. Should also fix the green z-fight that occurs on terrain with some camera directions. 2012-06-10 22:29:16 +02:00
Frederic Bouvier
cd06896b2d Reset pointers in menus 2012-06-10 22:25:58 +02:00
James Turner
5fc98e4ed0 Fix another case-sensitivity issue in the NavDisplay. 2012-06-10 11:11:42 +01:00
ThorstenB
a237fa6a4c Harald JOHNSEN: Prevent a crash during startup. 2012-06-08 15:13:04 +02:00
ThorstenB
b79e9ca1c8 Fixed compiler warning
about incorrect init order.
2012-06-08 13:32:12 +02:00
ThorstenB
db09e11ba0 Fix inconsistent NAV receiver gs-inrange behaviour.
Make sure gs-inrange and deflection outputs have same behaviour, no matter
which out-of-range condition applies (i.e. aircraft moved out of range,
frequency changed, ...).
2012-06-08 13:28:08 +02:00
ThorstenB
805c4cbba1 Performance optimization
Throttle instruments not requiring the fast FDM simulation rate.
2012-06-08 13:20:39 +02:00
Erik Hofman
1575fad886 Merge branch 'next' of gitorious.org:fg/flightgear into next 2012-06-03 10:14:25 +02:00
Thomas Geymayer
023021a879 Expose character-aspect-ratio and do some clean up
- Fix stupid memory corruption bug
 - Fix bounding box calculations
 - Fix docs
 - Fix text size
 - Expose setting background color
 - Expose trigger for updating elements
 - Untie nodes if deleting according element
 - Allow deleting canvas, text and group elements
 - Allow creating groups as children of groups
2012-05-31 22:04:19 +02:00
James Turner
17ec3278ed Remove platform-specific code in favour of simgear::Dir wrappers. 2012-05-31 08:57:22 +01:00
Erik Hofman
10e6c6eea7 change file permissions 2012-05-30 08:42:47 +02:00
Erik Hofman
642735ab18 sync with JSB JSBSim CVS 2012-05-30 08:39:04 +02:00
Frederic Bouvier
115324af4f Fix multi screen in a single window issue in Rembrandt 2012-05-23 09:09:14 +02:00
Frederic Bouvier
fad7181a2d Remove hard-coded lighting stage 2012-05-20 00:36:42 +02:00
Frederic Bouvier
3e7b8e57b6 Add world viewer position in cartesian and geodesic coordinate as shader uniforms 2012-05-19 23:50:35 +02:00
Frederic Bouvier
a5dff11f13 Make Rembrandt compatible with multi screen 2012-05-19 15:43:49 +02:00
James Turner
2c640b0329 Another Win32/Canvas fix. 2012-05-18 08:56:17 +01:00
James Turner
b5283fafb1 Fix Win32 build, hopefully. 2012-05-18 07:45:30 +01:00
Thomas Geymayer
d82fd7cc5f Basic 2D canvas implementation.
Support text and transformations for the moment, more
features to follow in due course.
2012-05-18 07:05:37 +01:00
James Turner
fe0a703a19 Fix a dumb bug in NavDisplay text-enable. 2012-05-18 06:49:18 +01:00
James Turner
9b4c2def75 Merge commit 'refs/merge-requests/28' of git://gitorious.org/fg/flightgear into merge-requests/28 2012-05-17 17:33:58 +01:00