From 1b309deda4c39f383acac21c768c3fffa3d8f398 Mon Sep 17 00:00:00 2001 From: Vivian Meazza Date: Tue, 12 Oct 2010 20:35:47 +0100 Subject: [PATCH 1/5] Add generic formations. Signed-off-by: Vivian Meazza --- Aircraft/Generic/Formations/formation_1.xml | 27 +++++++++++++++++++++ Aircraft/Generic/Formations/formation_2.xml | 27 +++++++++++++++++++++ Aircraft/Generic/Formations/formation_3.xml | 27 +++++++++++++++++++++ Aircraft/Generic/Formations/formation_4.xml | 27 +++++++++++++++++++++ Aircraft/Generic/Formations/formation_5.xml | 27 +++++++++++++++++++++ Aircraft/Generic/Formations/formation_6.xml | 27 +++++++++++++++++++++ Aircraft/Generic/Formations/formation_7.xml | 27 +++++++++++++++++++++ Aircraft/Generic/Formations/formation_8.xml | 27 +++++++++++++++++++++ 8 files changed, 216 insertions(+) create mode 100644 Aircraft/Generic/Formations/formation_1.xml create mode 100644 Aircraft/Generic/Formations/formation_2.xml create mode 100644 Aircraft/Generic/Formations/formation_3.xml create mode 100644 Aircraft/Generic/Formations/formation_4.xml create mode 100644 Aircraft/Generic/Formations/formation_5.xml create mode 100644 Aircraft/Generic/Formations/formation_6.xml create mode 100644 Aircraft/Generic/Formations/formation_7.xml create mode 100644 Aircraft/Generic/Formations/formation_8.xml 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 + + + + + From 996a5a94ee27b2cbc9e4a7982e4c55411cd2e25a Mon Sep 17 00:00:00 2001 From: Vivian Meazza Date: Tue, 12 Oct 2010 20:37:10 +0100 Subject: [PATCH 2/5] Add generic formation selector script. Signed-off-by: Vivian Meazza --- Aircraft/Generic/formation.nas | 96 ++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 Aircraft/Generic/formation.nas 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 From b020b3e0d110efe74ac958201a06d6b1c587b4d6 Mon Sep 17 00:00:00 2001 From: Vivian Meazza Date: Tue, 12 Oct 2010 20:42:05 +0100 Subject: [PATCH 3/5] Add Formation Selector Signed-off-by: Vivian Meazza --- gui/dialogs/formation.xml | 71 +++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 29 deletions(-) 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 From 37e42d60b042ecbf693a333982dbbb2e97279cea Mon Sep 17 00:00:00 2001 From: Vivian Meazza Date: Tue, 12 Oct 2010 23:17:35 +0100 Subject: [PATCH 4/5] Add model cockpit view dialog. Signed-off-by: Vivian Meazza --- gui/dialogs/model-cockpit-view.xml | 90 ++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 gui/dialogs/model-cockpit-view.xml 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 + + + + + From 755a6a4d1abd48f80ac03bf0d12c1ec68f74cd7c Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Wed, 13 Oct 2010 08:14:20 +0200 Subject: [PATCH 5/5] Remove reference to inexistant texture --- Effects/water.eff | 22 ---------------------- 1 file changed, 22 deletions(-) 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