diff --git a/Aircraft/Generic/Formations/formation_1.xml b/Aircraft/Generic/Formations/formation_1.xml new file mode 100644 index 000000000..2f096a665 --- /dev/null +++ b/Aircraft/Generic/Formations/formation_1.xml @@ -0,0 +1,27 @@ + + + + + + + Echelon Stbd + 2 + + -75 + 75 + 0 + + + -150 + 150 + 0 + + + -75 + 75 + 0 + + + + + diff --git a/Aircraft/Generic/Formations/formation_2.xml b/Aircraft/Generic/Formations/formation_2.xml new file mode 100644 index 000000000..556dddb1a --- /dev/null +++ b/Aircraft/Generic/Formations/formation_2.xml @@ -0,0 +1,27 @@ + + + + + + + Echelon Port + 3 + + -75 + -75 + 0 + + + -150 + -150 + 0 + + + -75 + -75 + 0 + + + + + diff --git a/Aircraft/Generic/Formations/formation_3.xml b/Aircraft/Generic/Formations/formation_3.xml new file mode 100644 index 000000000..889b6154a --- /dev/null +++ b/Aircraft/Generic/Formations/formation_3.xml @@ -0,0 +1,27 @@ + + + + + + + Diamond + 4 + + -75 + -75 + 0 + + + -75 + 75 + 0 + + + -75 + -75 + 0 + + + + + diff --git a/Aircraft/Generic/Formations/formation_4.xml b/Aircraft/Generic/Formations/formation_4.xml new file mode 100644 index 000000000..533993a9e --- /dev/null +++ b/Aircraft/Generic/Formations/formation_4.xml @@ -0,0 +1,27 @@ + + + + + + + Finger + 5 + + -100 + -100 + 0 + + + -100 + 100 + 0 + + + -100 + 100 + 0 + + + + + diff --git a/Aircraft/Generic/Formations/formation_5.xml b/Aircraft/Generic/Formations/formation_5.xml new file mode 100644 index 000000000..b3f50a0cc --- /dev/null +++ b/Aircraft/Generic/Formations/formation_5.xml @@ -0,0 +1,27 @@ + + + + + + + Echelon Stbd Step Up + 6 + + -75 + 75 + 30 + + + -150 + 150 + 60 + + + -75 + 75 + 30 + + + + + diff --git a/Aircraft/Generic/Formations/formation_6.xml b/Aircraft/Generic/Formations/formation_6.xml new file mode 100644 index 000000000..79ccf949b --- /dev/null +++ b/Aircraft/Generic/Formations/formation_6.xml @@ -0,0 +1,27 @@ + + + + + + + Take Off + 7 + + -50 + -50 + 0 + + + -300 + 0 + 0 + + + -50 + -50 + 0 + + + + + diff --git a/Aircraft/Generic/Formations/formation_7.xml b/Aircraft/Generic/Formations/formation_7.xml new file mode 100644 index 000000000..ca380bca4 --- /dev/null +++ b/Aircraft/Generic/Formations/formation_7.xml @@ -0,0 +1,27 @@ + + + + + + + Carrier Launch + 1 + + -15 + -65 + 0 + + + -200 + 0 + 0 + + + -15 + -63 + 0 + + + + + diff --git a/Aircraft/Generic/Formations/formation_8.xml b/Aircraft/Generic/Formations/formation_8.xml new file mode 100644 index 000000000..979facff8 --- /dev/null +++ b/Aircraft/Generic/Formations/formation_8.xml @@ -0,0 +1,27 @@ + + + + + + + Swan + 6 + + -225 + -75 + 0 + + + -150 + + 0 + + + -75 + 75 + 0 + + + + + diff --git a/Aircraft/Generic/formation.nas b/Aircraft/Generic/formation.nas new file mode 100644 index 000000000..cc84ebb1b --- /dev/null +++ b/Aircraft/Generic/formation.nas @@ -0,0 +1,96 @@ +##################################################################################### +# # +# this script runs the foramation selection utility # +# # +##################################################################################### + +# ================================ Initalize ====================================== +# Make sure all needed properties are present and accounted +# for, and that they have sane default values. + + +for(var i = 0; i < 3; i = i + 1){ + setprop("/sim/model/formation/position[" ~ i ~ "]/x-offset", 0); + setprop("/sim/model/formation/position[" ~ i ~ "]/y-offset", 0); + setprop("/sim/model/formation/position[" ~ i ~ "]/z-offset", 0); +} + +formation_variant_Node = props.globals.getNode("sim/formation/variant", 1); +formation_variant_Node.setIntValue(0); + +formation_index_Node = props.globals.getNode("sim/formation/index", 1); +formation_index_Node.setIntValue(0); + +tgt_x_offset_Node = props.globals.getNode("ai/models/wingman/position/tgt-x-offset",1); +tgt_y_offset_Node = props.globals.getNode("ai/models/wingman/position/tgt-y-offset",1); +tgt_z_offset_Node = props.globals.getNode("ai/models/wingman/position/tgt-z-offset",1); +tgt_x_offset_1_Node = props.globals.getNode("ai/models/wingman[1]/position/tgt-x-offset",1); +tgt_y_offset_1_Node = props.globals.getNode("ai/models/wingman[1]/position/tgt-y-offset",1); +tgt_z_offset_1_Node = props.globals.getNode("ai/models/wingman[1]/position/tgt-z-offset",1); +tgt_x_offset_2_Node = props.globals.getNode("ai/models/wingman[2]/position/tgt-x-offset",1); +tgt_y_offset_2_Node = props.globals.getNode("ai/models/wingman[2]/position/tgt-y-offset",1); +tgt_z_offset_2_Node = props.globals.getNode("ai/models/wingman[2]/position/tgt-z-offset",1); + +props.globals.getNode("/sim/model/formation/position/x-offset",1); + +var formation_dialog = nil; + +initialize = func { + + print("Initializing formation ..."); + + # initialise dialogs + aircraft.data.add("sim/model/formation/variant"); + formation_dialog = gui.OverlaySelector.new("Select Formation", + "Aircraft/Generic/Formations", + "sim/model/formation/variant", nil, func(no) { + formation_variant_Node.setIntValue(no); + tgt_x_offset_Node.setDoubleValue(getprop("/sim/model/formation/position/x-offset")); + tgt_y_offset_Node.setDoubleValue(getprop("/sim/model/formation/position/y-offset")); + tgt_z_offset_Node.setDoubleValue(getprop("/sim/model/formation/position/z-offset")); + tgt_x_offset_1_Node.setDoubleValue(getprop("/sim/model/formation/position[1]/x-offset")); + tgt_y_offset_1_Node.setDoubleValue(getprop("/sim/model/formation/position[1]/y-offset")); + tgt_z_offset_1_Node.setDoubleValue(getprop("/sim/model/formation/position[1]/z-offset")); + tgt_x_offset_2_Node.setDoubleValue(getprop("/sim/model/formation/position[2]/x-offset")); + tgt_y_offset_2_Node.setDoubleValue(getprop("/sim/model/formation/position[2]/y-offset")); + tgt_z_offset_2_Node.setDoubleValue(getprop("/sim/model/formation/position[2]/z-offset")); + } + ); + + + #set listeners + + setlistener("/sim/model/formation/variant", func { + print("formation listener: ", getprop("/sim/model/formation/position/x-offset")); + if (tgt_x_offset_Node != nil){ + print("formation listener getting", getprop("/sim/model/formation/position/x-offset")); + tgt_x_offset_Node.setDoubleValue(getprop("/sim/model/formation/position/x-offset")); + tgt_y_offset_Node.setDoubleValue(getprop("/sim/model/formation/position/y-offset")); + tgt_z_offset_Node.setDoubleValue(getprop("/sim/model/formation/position/z-offset")); + } + if (tgt_x_offset_1_Node != nil){ + tgt_x_offset_1_Node.setDoubleValue(getprop("/sim/model/formation/position[1]/x-offset")); + tgt_y_offset_1_Node.setDoubleValue(getprop("/sim/model/formation/position[1]/y-offset")); + tgt_z_offset_1_Node.setDoubleValue(getprop("/sim/model/formation/position[1]/z-offset")); + } + if (tgt_x_offset_2_Node != nil){ + tgt_x_offset_2_Node.setDoubleValue(getprop("/sim/model/formation/position[2]/x-offset")); + tgt_y_offset_2_Node.setDoubleValue(getprop("/sim/model/formation/position[2]/y-offset")); + tgt_z_offset_2_Node.setDoubleValue(getprop("/sim/model/formation/position[2]/z-offset")); + } + }, + 0, + 1); + +} # end func + +### +# ====================== end Initialization ======================================== +### + + +# Fire it up + +setlistener("sim/signals/fdm-initialized", initialize); + +# end diff --git a/Effects/water.eff b/Effects/water.eff index 248950cb6..94a6cff6c 100644 --- a/Effects/water.eff +++ b/Effects/water.eff @@ -10,13 +10,6 @@ repeat normalized - - Textures/Water/water-refraction.png - linear-mipmap-linear - repeat - repeat - normalized - Textures/Water/water-normalmap.png linear-mipmap-linear @@ -84,16 +77,6 @@ texture[0]/internal-format - - 1 - texture[1]/image - texture[1]/filter - texture[1]/wrap-s - texture[1]/wrap-t - - texture[1]/internal-format - - 2 texture[2]/image @@ -124,11 +107,6 @@ 0 - water_refraction - sampler-2d - 1 - - water_normalmap sampler-2d 2 diff --git a/Nasal/contrail.nas b/Nasal/contrail.nas index 167759324..c9e93572c 100644 --- a/Nasal/contrail.nas +++ b/Nasal/contrail.nas @@ -26,8 +26,8 @@ updateContrail = func{ ### Contrail -print ("init contrail"); _setlistener("/sim/signals/nasal-dir-initialized", func { + printlog ("debug", "init contrail"); props.globals.initNode("environment/pressure-inhg", 1, "DOUBLE"); props.globals.initNode("environment/temperature-degc", 1, "DOUBLE"); props.globals.initNode("environment/contrail", 1, "BOOL"); diff --git a/Nasal/seaport.nas b/Nasal/seaport.nas index 5d9cb7fdb..81786fd55 100644 --- a/Nasal/seaport.nas +++ b/Nasal/seaport.nas @@ -1,11 +1,13 @@ -_setlistener("/sim/presets/latitude-deg", func { - print("*** NEW LOCATION ***"); - settimer(func { - var typ = getprop("/sim/type"); - var lat = getprop("/position/latitude-deg"); - var lon = getprop("/position/longitude-deg"); - var g = geodinfo(lat, lon); - if ((g != nil and g[1] != nil and g[1].solid) and (typ == "seaplane") ) - fgcommand("dialog-show", props.Node.new({ "dialog-name": "seaport" })); - }, 8); -}, 1); +_setlistener("/sim/signals/nasal-dir-initialized", func { + _setlistener("/sim/presets/latitude-deg", func { + printlog("info", "*** NEW LOCATION ***"); + settimer(func { + var typ = getprop("/sim/type"); + var lat = getprop("/position/latitude-deg"); + var lon = getprop("/position/longitude-deg"); + var g = geodinfo(lat, lon); + if ((g != nil and g[1] != nil and g[1].solid) and (typ == "seaplane") ) + fgcommand("dialog-show", props.Node.new({ "dialog-name": "seaport" })); + }, 8); + }, 1); +}); diff --git a/gui/dialogs/formation.xml b/gui/dialogs/formation.xml index 6171a11a0..4cf76a276 100644 --- a/gui/dialogs/formation.xml +++ b/gui/dialogs/formation.xml @@ -119,32 +119,32 @@ left - - 75 - 25 - -180 - 180 - /ai/models/wingman/controls/break-deg-rel - - dialog-apply - - - nasal - - - + + 75 + 25 + -180 + 180 + /ai/models/wingman/controls/break-deg-rel + + dialog-apply + + + nasal + + + left - + - + @@ -156,15 +156,8 @@ - - - - - - - hbox @@ -182,6 +175,26 @@ + + hbox + + + left + + + + + + + true diff --git a/gui/dialogs/model-cockpit-view.xml b/gui/dialogs/model-cockpit-view.xml new file mode 100644 index 000000000..be118d10b --- /dev/null +++ b/gui/dialogs/model-cockpit-view.xml @@ -0,0 +1,90 @@ + + + + model-cockpit-view + 5 + 3 + hbox + 0 + + + false + 0 + 0 + 0 + 0 + + + + + + + + 6 + + + + 0 + 1 + /sim/current-view/model-cockpit-view + + 1 + 1 + 1 + 1 + + + HELVETICA_14 + + + + + diff --git a/materials.xml b/materials.xml index 5f990123f..e3f79bf99 100644 --- a/materials.xml +++ b/materials.xml @@ -1313,9 +1313,9 @@ Shared parameters for various materials. Models/Buildings/red-barn.ac Models/Buildings/horse-stable.ac Models/Buildings/cow-stable.ac - Models/Buildings/farmhouse1.ac - Models/Buildings/farmhouse2.ac - Models/Buildings/farmhouse3.ac + Models/Agriculture/farmhouse1.ac + Models/Agriculture/farmhouse2.ac + Models/Agriculture/farmhouse3.ac 750000 random @@ -1376,9 +1376,9 @@ Shared parameters for various materials. Models/Buildings/red-barn.ac Models/Buildings/horse-stable.ac Models/Buildings/cow-stable.ac - Models/Buildings/farmhouse1.ac - Models/Buildings/farmhouse2.ac - Models/Buildings/farmhouse3.ac + Models/Agriculture/farmhouse1.ac + Models/Agriculture/farmhouse2.ac + Models/Agriculture/farmhouse3.ac 750000 random @@ -1437,9 +1437,9 @@ Shared parameters for various materials. Models/Buildings/red-barn.ac Models/Buildings/horse-stable.ac Models/Buildings/cow-stable.ac - Models/Buildings/farmhouse1.ac - Models/Buildings/farmhouse2.ac - Models/Buildings/farmhouse3.ac + Models/Agriculture/farmhouse1.ac + Models/Agriculture/farmhouse2.ac + Models/Agriculture/farmhouse3.ac 750000 random @@ -2133,9 +2133,9 @@ Shared parameters for various materials. Models/Buildings/red-barn.ac Models/Buildings/horse-stable.ac Models/Buildings/cow-stable.ac - Models/Buildings/farmhouse1.ac - Models/Buildings/farmhouse2.ac - Models/Buildings/farmhouse3.ac + Models/Agriculture/farmhouse1.ac + Models/Agriculture/farmhouse2.ac + Models/Agriculture/farmhouse3.ac 750000 random @@ -2195,9 +2195,9 @@ Shared parameters for various materials. Models/Buildings/red-barn.ac Models/Buildings/horse-stable.ac Models/Buildings/cow-stable.ac - Models/Buildings/farmhouse1.ac - Models/Buildings/farmhouse2.ac - Models/Buildings/farmhouse3.ac + Models/Agriculture/farmhouse1.ac + Models/Agriculture/farmhouse2.ac + Models/Agriculture/farmhouse3.ac 750000 random @@ -2257,9 +2257,9 @@ Shared parameters for various materials. Models/Buildings/red-barn.ac Models/Buildings/horse-stable.ac Models/Buildings/cow-stable.ac - Models/Buildings/farmhouse1.ac - Models/Buildings/farmhouse2.ac - Models/Buildings/farmhouse3.ac + Models/Agriculture/farmhouse1.ac + Models/Agriculture/farmhouse2.ac + Models/Agriculture/farmhouse3.ac 750000 random