p38192567
/
followme_e-tron
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Models: Major updates to the UV

This commit is contained in:
Sidi Liang 2020-06-17 16:42:11 +08:00
parent bfdf3b29ae
commit fabb3104d0
No known key found for this signature in database
GPG Key ID: 79F0A6B20B72F42F
55 changed files with 70712 additions and 70844 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Models/Limo/followmewheel_limo.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 358 KiB

After

Width:  |  Height:  |  Size: 360 KiB

BIN
Models/Liveries/Ambulance/ambulance.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 141 KiB

11
Models/Liveries/Ambulance/ambulance.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">ambulance</name>
<texture-fuse>Liveries/ambulance.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/07_Camouflage.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 448 KiB

11
Models/Liveries/FollowmeEV/07_Camouflage.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">07 Camouflage</name>
<texture-fuse>Liveries/FollowmeEV/07_Camouflage.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/FGPRC.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 119 KiB

11
Models/Liveries/FollowmeEV/FGPRC.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">FGPRC</name>
<texture-fuse>Liveries/FollowmeEV/FGPRC.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/Mint Green.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

11
Models/Liveries/FollowmeEV/Mint Green.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Mint Green</name>
<texture-fuse>Liveries/FollowmeEV/Mint Green.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/Orange.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 194 B

11
Models/Liveries/FollowmeEV/Orange.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Orange</name>
<texture-fuse>Liveries/FollowmeEV/Orange.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/Silver.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 162 KiB

11
Models/Liveries/FollowmeEV/Silver.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Silver</name>
<texture-fuse>Liveries/FollowmeEV/Silver.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/Yellow(Default).png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 70 KiB

11
Models/Liveries/FollowmeEV/Yellow.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Yellow(Default)</name>
<texture-fuse>Liveries/FollowmeEV/Yellow(Default).png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/black.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

11
Models/Liveries/FollowmeEV/black.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Black</name>
<texture-fuse>Liveries/FollowmeEV/black.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/blue.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 446 KiB

11
Models/Liveries/FollowmeEV/blue.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Blue</name>
<texture-fuse>Liveries/FollowmeEV/blue.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/carbon_fiber.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 MiB

11
Models/Liveries/FollowmeEV/carbon_fiber.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Carbon fiber</name>
<texture-fuse>Liveries/FollowmeEV/carbon_fiber.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/carbon_fiber_blue.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 MiB

11
Models/Liveries/FollowmeEV/carbon_fiber_blue.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Carbon fiber Blue</name>
<texture-fuse>Liveries/FollowmeEV/carbon_fiber_blue.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/carbon_fiber_white.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 MiB

11
Models/Liveries/FollowmeEV/carbon_fiber_white.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Carbon fiber White</name>
<texture-fuse>Liveries/FollowmeEV/carbon_fiber_white.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/cream.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 194 B

11
Models/Liveries/FollowmeEV/cream.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Creamy White</name>
<texture-fuse>Liveries/FollowmeEV/cream.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/dark blue.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 527 KiB

11
Models/Liveries/FollowmeEV/dark blue.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">Dark Blue</name>
<texture-fuse>Liveries/FollowmeEV/dark blue.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/gold.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 521 KiB

11
Models/Liveries/FollowmeEV/gold.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">gold</name>
<texture-fuse>Liveries/FollowmeEV/gold.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/green.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

11
Models/Liveries/FollowmeEV/green.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">green</name>
<texture-fuse>Liveries/FollowmeEV/green.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/marble-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

11
Models/Liveries/FollowmeEV/marble-blue.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">marble-blue</name>
<texture-fuse>Liveries/FollowmeEV/marble-blue.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/military.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

11
Models/Liveries/FollowmeEV/military.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">military</name>
<texture-fuse>Liveries/FollowmeEV/military.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/purple.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 450 KiB

11
Models/Liveries/FollowmeEV/purple.xml Executable file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">purple</name>
<texture-fuse>Liveries/FollowmeEV/purple.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/FollowmeEV/red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 282 KiB

11
Models/Liveries/FollowmeEV/red.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<PropertyList>
<sim>
<model>
<livery>
<name type="string">red</name>
<texture-fuse>Liveries/FollowmeEV/red.png</texture-fuse>
</livery>
</model>
</sim>
</PropertyList>

BIN
Models/Liveries/Limo/limo-black.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
Models/Liveries/Limo/limo-dark gray.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Models/Liveries/Limo/limo-fgprc.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
Models/Liveries/Limo/limo-white.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

104711
Models/followme-limo.ac Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

36578
Models/followme.ac Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

8
Nasal/Liveries/EV.nas Normal file
View File

@ -0,0 +1,8 @@
#### Sidi Liang ####
io.include("../library.nas");
var displayPath = props.getNode("sim/aircraft-dir").getValue()~"/Models/Messages/";
var displaySelector = TextureSelector.new(name: "Message-Selector", path: displayPath, fileType: ".xml", textureProp: "texture", enableMultiplayer: 1, multiplayerProperty:"/sim/multiplay/generic/string[18]", defaultValue: "Blanco");
var liveryPath = props.getNode("sim/aircraft-dir").getValue()~"/Models/Liveries/FollowmeEV/";
var liverySelector = TextureSelector.new(name: "Livery-Selector", path: liveryPath, fileType: ".xml", textureProp: "texture-fuse", enableMultiplayer: 1, defaultValue: "Yellow(Default)");

6
Nasal/Liveries/limo.nas Normal file
View File

@ -0,0 +1,6 @@
#### Sidi Liang ####
io.include("../library.nas");
var liveryPath = props.getNode("sim/aircraft-dir").getValue()~"/Models/Liveries/Limo/";
var liverySelector = TextureSelector.new(name: "Livery-Selector-Limo", path: liveryPath, fileType: ".png", enableMultiplayer: 1, texturePrePath: "Liveries/Limo/", defaultValue: "limo-fgprc");

5
Nasal/systems.nas
View File

@ -7,11 +7,6 @@ io.include("library.nas");
props.getNode("/sim/gui/dialogs/vehicle_config/dialog",1);
var configDialog = gui.Dialog.new("/sim/gui/dialogs/vehicle_config/dialog", "Aircraft/followme_e-tron/gui/dialogs/config-dialog.xml");
var displayPath = props.getNode("sim/aircraft-dir").getValue()~"/Models/Messages/";
var displaySelector = TextureSelector.new(name: "Message-Selector", path: displayPath, fileType: ".xml", textureProp: "texture", enableMultiplayer: 1, multiplayerProperty:"/sim/multiplay/generic/string[18]", defaultValue: "Blanco");
var liveryPath = props.getNode("sim/aircraft-dir").getValue()~"/Models/Liveries/";
var liverySelector = TextureSelector.new(name: "Livery-Selector", path: liveryPath, fileType: ".xml", textureProp: "texture-fuse", enableMultiplayer: 1, defaultValue: "Yellow(Default)");
var tyreSmoke_0 = aircraft.tyresmoke.new(0, auto = 1, diff_norm = 0.4, check_vspeed = 0);
var tyreSmoke_1 = aircraft.tyresmoke.new(1, auto = 1, diff_norm = 0.4, check_vspeed = 0);
var tyreSmoke_2 = aircraft.tyresmoke.new(2, auto = 1, diff_norm = 0.4, check_vspeed = 0);

16
Nasal/texture-selector.nas
View File

@ -3,8 +3,8 @@
#//Texture Selector for Followme EV
#//Quick start:
#//Aircraft liveries with dedicated selection dialog: (The same applies to any texture defined in PropertyList XML):
#// var liveryPath = props.getNode("sim/aircraft-dir").getValue()~"/Models/Liveries/";
#// var liverySelector = TextureSelector.new(path: liveryPath, fileType: ".xml", textureProp: "texture-fuse", enableMultiplayer: 1, defaultValue: "Yellow(Default)");
#// var liveryPath = props.getNode("sim/aircraft-dir").getValue()~"/Models/Liveries/FollowmeEV/";
#// var liverySelector = TextureSelector.new(name: "Livery-Selector", path: liveryPath, fileType: ".xml", textureProp: "texture-fuse", enableMultiplayer: 1, defaultValue: "Yellow(Default)");
#//Pure texture, custom dialog(without multiplayer):
#// var path = props.getNode("/",1).getValue("sim/aircraft-dir") ~ '/Models/plate/texture';
#// var plateSelector = TextureSelector.new(path, ".png", 1, 1, "sim/gui/dialogs/vehicle_config/dialog", "group[4]/combo/");
@ -13,7 +13,8 @@
var TextureSelector = { #//Tmp Note: path MUST end with "/"
new: func(name, path, fileType = nil, enableNone = 0, customDialog = 0, customDialogBase = "",
customDialogPosition = "", texturePropertyBase = "sim/model/livery/", textureProp = "livery", textureNameProp = "name",
textureDataNode = nil, enableMultiplayer = 0, multiplayerProperty = "/sim/multiplay/generic/string[19]", defaultValue = ""){
textureDataNode = nil, enableMultiplayer = 0, multiplayerProperty = "/sim/multiplay/generic/string[19]",
texturePrePath = "", defaultValue = ""){
var m = {parents:[TextureSelector]};
if(customDialog == 1){
@ -33,14 +34,16 @@ var TextureSelector = { #//Tmp Note: path MUST end with "/"
m.dialogCustom = customDialogPosition;
m.texturePropertyBase = texturePropertyBase;
m.textureProp = textureProp;
m.texturePrePath = texturePrePath;#//Tmp Node: must end with /
m.textureNameProp = textureNameProp;
m.textureDataNode = textureDataNode;
m.defaultValue = defaultValue;
m.enableMultiplayer = enableMultiplayer;
m.multiplayerProperty = multiplayerProperty;
m.updateList();
if(defaultValue) m.setTextureByNameXML(defaultValue);
if(enableMultiplayer) props.getNode(multiplayerProperty, 1).alias(props.getNode(m.texturePropertyBase).getNode(m.textureProp));
if(defaultValue and me.fileType == ".xml") m.setTextureByNameXML(defaultValue);
else if(defaultValue) props.getNode(m.texturePropertyBase, 1).getNode(m.textureProp, 1).setValue(m.texturePrePath ~ defaultValue ~ m.fileType);
if(enableMultiplayer) props.getNode(multiplayerProperty, 1).alias(props.getNode(m.texturePropertyBase, 1).getNode(m.textureProp, 1));
return m;
},
path: "", #//path containing texture file
@ -124,7 +127,8 @@ var TextureSelector = { #//Tmp Note: path MUST end with "/"
var selected = me.dialog.result.getValue();
if(selected != "none"){
me.current = selected;
me.setTextureByNameXML(selected);
if(me.fileType == ".xml") me.setTextureByNameXML(selected);
else props.getNode(me.texturePropertyBase, 1).getNode(me.textureProp, 1).setValue(me.texturePrePath ~ me.current ~ me.fileType);
}else{
#fileNode.setValue(nameNode.getValue());
}

3
followme_e-tron-limo-set.xml
View File

@ -311,6 +311,9 @@
</controls>
<nasal>
<liveries>
<file>Aircraft/followme_e-tron/Nasal/Liveries/limo.nas</file>
</liveries>
</nasal>
</PropertyList>

2
followme_e-tron-main.xml
View File

@ -53,7 +53,7 @@
<label>Select Livery</label>
<binding>
<command>nasal</command>
<script>followme.liverySelector.dialog.open()</script>
<script>liveries.liverySelector.dialog.open()</script>
</binding>
</item>
<item>

3
followme_e-tron-set.xml
View File

@ -446,6 +446,9 @@
</controls>
<nasal>
<liveries>
<file>Aircraft/followme_e-tron/Nasal/Liveries/EV.nas</file>
</liveries>
</nasal>
</PropertyList>

4
gui/dialogs/config-dialog.xml
View File

@ -196,7 +196,7 @@
<pref-height>28</pref-height>
<binding>
<command>nasal</command>
<script>followme.liverySelector.dialog.open()</script>
<script>liveries.liverySelector.dialog.open()</script>
</binding>
</button>
<button>
@ -206,7 +206,7 @@
<pref-height>28</pref-height>
<binding>
<command>nasal</command>
<script>followme.displaySelector.dialog.open()</script>
<script>liveries.displaySelector.dialog.open()</script>
</binding>
</button>
</group>