1
0
Fork 0
Commit graph

9667 commits

Author SHA1 Message Date
Stuart Buchanan
3e3593119c WS30: Shader change to use texture atlas
These changes use the generated Texture2DArray for
texture lookup, supporting arbritary sets of material
textures.
2020-12-05 13:11:59 +00:00
Stuart Buchanan
d73b9d8128 WS30 Add transparency to primary material textures
The texture array used by WS30 requires that all
component textures be the same size and format.

This commit adds an alpha channel to those
png file used as primary textures in materials.xml
files which did not have one.
2020-12-05 12:46:06 +00:00
Erik Hofman
908c60a6aa Add a description of the red channel 2020-12-04 09:27:23 +01:00
Fernando García Liñán
3f489619c5 Fix landmass geometry shader errors
It was using features from GLSL 120 and 150. Only use 120 features for now.
2020-12-03 23:24:40 +01:00
Fernando García Liñán
6a15207b42 Fix taxiway flickering at lower shader quality levels 2020-12-03 19:25:01 +01:00
James Turner
3943fcb9cc Data files for graphics-presets 2020-11-30 15:15:16 +00:00
Yves Tolosa-Joas
60de4470cd Removed fligts to EGEL (Helicopter only in FG outdated APT DAT) 2020-11-30 10:54:02 +00:00
Eatdirt
f8fd14b257 Install a GalacticJet(TM) supercharger kit on the UFO to have a better look to the moon 2020-11-30 10:53:15 +00:00
Eatdirt
b005ac0b5a Import slightly larger moon texture 2020-11-30 10:53:09 +00:00
Stuart Buchanan
2fdb17a214 Checklist: <and> multiple entries in <condition>
Previously a <condition> block was assumed to contain
a single child, and other children were ignored, largely due to the PUI code.

Most developers would expect multiple children to be evaluated
as if surrounded by an <and> block, which is how the tutorial code
behaves.

This change wraps the children in an <and> making it consistent.
2020-11-29 19:39:20 +00:00
Stuart Buchanan
78f72a5ec3 WS30: Landclass to material map in materials.xml
Initial mapping of landclass to material names based
on CORINE.
2020-11-29 19:31:31 +00:00
Yves Tolosa-Joas
27ac97de24 Added European Air Transport Leipzig traffic file by Stefan 2020-11-29 16:03:05 +00:00
Julian Smith
536275fa38 gui/dialogs/about.xml: improved Help-About-Copy to Clipboard.
Copy all properties mentioned in the dialogue, e.g. including OSG version, and
also include full property path.
2020-11-25 22:46:38 +00:00
Julian Smith
da01eab6c1 Grey-out CompositeView menu items if CompositeView not enabled.
Thanks to Michael Danilov for explanation of how to do this.

Also removed spurious hot-key text from CompositeView menu items.
2020-11-24 13:39:21 +00:00
Scott Giese
5512934374 Photoscenery: patch to fix missed merge items.
Author: Nathaniel Warner
2020-11-23 20:55:30 -06:00
Scott Giese
76f7f1b698 Photoscenery: Initial commit
Author: Nathaniel Warner
2020-11-23 19:48:01 -06:00
Erik Hofman
580e1d4859 Keep the Köppen climate class in the red channel and add the ground eleveation in the green channel. 2020-11-22 15:02:40 +01:00
Julian Smith
6db71f789c Added -h help text for --composite-viewer option. 2020-11-22 08:22:44 +00:00
Stuart Buchanan
2a30377124 WS3.0: Remove Effect dependence on ALS.
For the moment, as we have only one technique, stop it from
only being active if ALS is active.
2020-11-21 22:07:40 +00:00
Chris Frey
4a4e9089c1 Docs: fixed incorrect terragear URL in FlightGear-FAQ.html 2020-11-21 21:35:40 +00:00
Chris Frey
50c76ec338 Docs: fixed incorrect terragear URL in README.scenery 2020-11-21 21:35:25 +00:00
Julian Smith
f280f0a423 Added support to View menu for CompositeViewer. 2020-11-21 12:18:18 +00:00
Julian Smith
eebf07d9f6 Add user control of whether mouse controls elevator when left button is down.
defaults.xml
    Set new property /sim/mouse/mouse-rudder-elevator to false, but with
    userarchive="y".
gui/dialogs/input-config.xml
    Added checkbox to control /sim/mouse/mouse-rudder-elevator.
mice.xml:
    Allow mouse control of elevator with button 0 down if
    /sim/mouse/mouse-rudder-elevator is true.
2020-11-21 12:18:18 +00:00
Scott Giese
a150e89e9b Index out of range (-1) 2020-11-21 02:12:39 -06:00
Scott Giese
c874567679 Local weather: setprop() passed a NaN in local_weather/weather_tiles.nas, line 2795
Tiecket: #2423
2020-11-21 02:12:02 -06:00
James Turner
f125b75429 Joystick-config: fix ToggleButton, add AP-DISC
Fix the created binding for toggle buttons.

Add autopilotDisconnect helper to controls.nas, and expose the new
function in the joystick configurator dialog. 

Fixes from Henning Stahlke
2020-11-19 21:17:51 +00:00
Stuart Buchanan
d315d69530 Make ufo invisible over MP again
Before fallback models were introduced, the ufo
was invisible to other MP pilots that were not in a
ufo themselves.

When fallback models were introduced, at long range
the ufo was replaced by the glider model, and so became
visible.

This change makes it invisible again by using the ufo as its
own fallback model.  This is safe because the ufo model is
very lightweight and also shipped with fgdata.
2020-11-19 19:34:45 +00:00
Stuart Buchanan
a56d13640d Hide pilot model when walker enabled.
Previously pilot models would stay visible when the
walker was active.  Which is a bit unrealistic given
the walker is supposed to be "you" in some way.

So now the internal pilot is hidden when the walker
is active outside the aircraft.

Fix provided by Benedikt Hallinger
2020-11-19 19:03:07 +00:00
Stuart Buchanan
010bd8c145 Fix props.condition
Previously props.condition threw an error if any of the
properties in the condition were not defines.  This is
contrary to the behaviour of SGCondition, which it seeks
to emulate, which considers such undefined properties as
having the value 0.0.

Now this is the case.

This function only appears to be used by tutorials.nas,
where this behaviour was seen as discrepancy between
the checklist <condition> behaviour and the tutorial
<condition> behaviour.

See https://sourceforge.net/p/flightgear/codetickets/2394/?page=1
2020-11-19 18:44:00 +00:00
Stuart Buchanan
37110ad34a TREE_LIST documentation updates
Thanks to Rick Gruber-Riemer for proof-reading.
2020-11-19 14:22:58 +00:00
Pablo Barrio
dbc7fc7827 Translate missing items from the main menu to Spanish 2020-11-18 10:30:32 +00:00
Stuart Buchanan
255717d812 TREE_LIST STG Verb 2020-11-17 21:19:15 +00:00
Julian Smith
c79f3f0551 gui/dialogs/rendering.xml: added checkbox for shadows.
Has a note saying 'May need restart to take affect' because it seems that
shadows never work unless enabled on startup. Note that the property setting is
persisted.
2020-11-17 20:15:43 +00:00
Stuart Buchanan
6f52d094a5 Document new STG range noun 2020-11-17 20:00:26 +00:00
Fernando García Liñán
7c16104149 Add the possibility to use shadow mapping on model-interior 2020-11-17 17:21:01 +01:00
Fernando García Liñán
d2e5ad9d60 Remove unused fallback Effect 2020-11-17 15:28:01 +01:00
Fernando García Liñán
9b589f8061 Change shadow fallback technique index to -10
Canvas displays stop working with a technique index of 1000. There is no apparent reason for this, but changing it to 0 or a lower value fixes the issue. There doesn't seem to be any negative consequences from doing this.
2020-11-17 15:28:01 +01:00
Richard Harrison
32266ba928 Add comments for props.UpdateManager methods 2020-11-17 11:59:29 +01:00
Fernando García Liñán
ed3cbf96ff Make model-interior use a separate vertex shader
generic-ALS-base.vert uses shadows, while model-interior does not.
2020-11-17 00:57:56 +01:00
Fernando García Liñán
fc33a8d71a Fix non-ALS runway shader not implementing shadows 2020-11-17 00:41:02 +01:00
Fernando García Liñán
d35c160a50 Add a dummy technique with index 7 to model-combined
This keeps backwards compatibility with aircraft that implement technique 7 from Rembrandt.
2020-11-17 00:15:09 +01:00
Fernando García Liñán
a3a8f9123e Make Compositor default
- Remove all Compositor Effects and Shaders.
- Unify the low-spec and ALS pipelines in a single pipeline called 'Classic'.
- Readd shadow mapping.
- Move the WS30 Effect and fragment shader out of the Compositor-specific directories.
2020-11-16 13:46:30 +01:00
Stuart Buchanan
8cb0faef60 FG1000: Enable mipmapping to
Reduces aliasing artifacts.
2020-11-15 19:33:15 +00:00
Erik Hofman
5dde54d43b Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/fgdata into next 2020-11-15 09:32:41 +01:00
Erik Hofman
69c9f31ab5 Show the name of the region where the clicked material is stored. 2020-11-15 09:32:14 +01:00
Stuart Buchanan
3cace276d2 WS3.0: Add tile_level, tile_width, tile_height
Add Uniforms to WS3.0 fragment shader to provide
LoD information and make sampling of adjacent points
in the landclass texture easier.
2020-11-14 21:04:30 +00:00
Stuart Buchanan
605f0e3c74 WS3.0: Add forest texture to shader
Interm shader update until texture array support available.
2020-11-12 20:47:08 +00:00
Erik Hofman
7f66257bfb Add climate selection options to set the environment and weather based on climate data. Setting the weather is not yet implemented in the code but eventually it will be. 2020-11-09 11:44:08 +01:00
Stuart Buchanan
4aff635cdb WS3.0: Initial commit of WS3.0 rendering 2020-11-08 22:44:34 +00:00
Erik Hofman
35b432f28c Add a Köppen-Geiger climate database 2020-11-03 11:51:27 +01:00