Merge branch 'master' of D:\Git_New\fgdata
This commit is contained in:
Vivian Meazza
commit
2197dd07fc
10 changed files with 1915 additions and 9 deletions
1341
Aircraft/Instruments-3d/canvas-test/CMDU.ac
Normal file
1341
Aircraft/Instruments-3d/canvas-test/CMDU.ac
Normal file
File diff suppressed because it is too large
Load diff
99
Aircraft/Instruments-3d/canvas-test/canvas-test.nas
Normal file
99
Aircraft/Instruments-3d/canvas-test/canvas-test.nas
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
# ==============================================================================
|
||||
# DEMO
|
||||
# ==============================================================================
|
||||
var canvas_demo = {
|
||||
new: func()
|
||||
{
|
||||
debug.dump("Creating new canvas demo...");
|
||||
|
||||
var m = { parents: [canvas_demo] };
|
||||
|
||||
# create a new canvas...
|
||||
m.canvas = canvas.new({
|
||||
"name": "PFD-Test",
|
||||
"size": [1024, 1024],
|
||||
"view": [768, 1024],
|
||||
"mipmapping": 1
|
||||
});
|
||||
|
||||
# ... and place it on the object called PFD-Screen
|
||||
m.canvas.addPlacement({"node": "PFD-Screen"});
|
||||
m.canvas.setColorBackground(0,0.04,0);
|
||||
|
||||
# and now do something with it
|
||||
m.dt = props.globals.getNode("sim/time/delta-sec");
|
||||
m.gmt = props.globals.getNode("sim/time/gmt");
|
||||
|
||||
var g = m.canvas.createGroup();
|
||||
var g_tf = g.createTransform();
|
||||
g_tf.setRotation(0.1 * math.pi);
|
||||
|
||||
m.text_title =
|
||||
g.createChild("text", "line-title")
|
||||
.setDrawMode(canvas.Text.TEXT + canvas.Text.FILLEDBOUNDINGBOX)
|
||||
.setColor(0,0,0)
|
||||
.setColorFill(0,1,0)
|
||||
.setAlignment("center-top")
|
||||
.setFont("LiberationFonts/LiberationMono-Bold.ttf")
|
||||
.setFontSize(70, 1.5)
|
||||
.setTranslation(384, 5);
|
||||
|
||||
m.dynamic_text =
|
||||
g.createChild("text", "dynamic-text")
|
||||
.setText("Text node created at runtime.")
|
||||
.setFont("Helvetica.txf")
|
||||
.setFontSize(50)
|
||||
.setAlignment("center-center");
|
||||
m.tf = m.dynamic_text.createTransform();
|
||||
m.tf.setTranslation(384, 200);
|
||||
|
||||
m.path =
|
||||
g.createChild("path")
|
||||
.moveTo(25, 12.5)
|
||||
.lineTo(325, 25)
|
||||
.lineTo(150, 200)
|
||||
.cubicTo(150, 225, 50, 225, 50, 200)
|
||||
.close()
|
||||
.setTranslation(200, 70)
|
||||
.setStrokeLineWidth(4)
|
||||
.setStrokeDashArray([10,6,3,3,6])
|
||||
.setColor(0.2,0.3,1);
|
||||
|
||||
m.rot = 0;
|
||||
m.pos = 200;
|
||||
m.move = 50;
|
||||
|
||||
return m;
|
||||
},
|
||||
update: func()
|
||||
{
|
||||
var dt = me.dt.getValue();
|
||||
|
||||
# Change the value of a text element
|
||||
me.text_title.setText(me.gmt.getValue());
|
||||
|
||||
# Animate a text node a bit
|
||||
me.rot += dt * 0.3 * math.pi;
|
||||
me.tf.setRotation(me.rot);
|
||||
|
||||
me.pos += me.move * dt;
|
||||
if( me.pos > 900 )
|
||||
{
|
||||
me.pos = 900;
|
||||
me.move *= -1;
|
||||
}
|
||||
else if( me.pos < 150 )
|
||||
{
|
||||
me.pos = 150;
|
||||
me.move *= -1;
|
||||
}
|
||||
me.tf.setTranslation(384, me.pos);
|
||||
|
||||
settimer(func me.update(), 0);
|
||||
},
|
||||
};
|
||||
|
||||
setlistener("/nasal/canvas/loaded", func {
|
||||
var demo = canvas_demo.new();
|
||||
demo.update();
|
||||
}, 1);
|
||||
BIN
Aircraft/Instruments-3d/canvas-test/screen-test.png
Normal file
BIN
Aircraft/Instruments-3d/canvas-test/screen-test.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 629 B |
20
Aircraft/c172p/Models/c172p-canvas.xml
Normal file
20
Aircraft/c172p/Models/c172p-canvas.xml
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<model>
|
||||
<path>canvas-test.xml</path>
|
||||
</model>
|
||||
|
||||
<model>
|
||||
<path>Aircraft/c172p/Models/c172p.xml</path>
|
||||
<offsets>
|
||||
<x-m> 0.0 </x-m>
|
||||
<y-m> 0.0 </y-m>
|
||||
<z-m> 0.0 </z-m>
|
||||
<roll-deg> 0.0 </roll-deg>
|
||||
<pitch-deg> 0.0 </pitch-deg>
|
||||
<heading-deg> 0.0 </heading-deg>
|
||||
</offsets>
|
||||
</model>
|
||||
</PropertyList>
|
||||
14
Aircraft/c172p/Models/canvas-test.xml
Normal file
14
Aircraft/c172p/Models/canvas-test.xml
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<path>Aircraft/Instruments-3d/canvas-test/CMDU.ac</path>
|
||||
<offsets>
|
||||
<heading-deg>90</heading-deg>
|
||||
<roll-deg>75</roll-deg>
|
||||
<pitch-deg>0</pitch-deg>
|
||||
<x-m>-0.15 </x-m>
|
||||
<y-m>-0.21 </y-m>
|
||||
<z-m>-0.2 </z-m>
|
||||
</offsets>
|
||||
</PropertyList>
|
||||
346
Aircraft/c172p/c172p-canvas-set.xml
Normal file
346
Aircraft/c172p/c172p-canvas-set.xml
Normal file
|
|
@ -0,0 +1,346 @@
|
|||
<?xml version="1.0"?>
|
||||
<!--
|
||||
************************************************************************
|
||||
JSBSim Cessna 172P with 3D cockpit.
|
||||
|
||||
Started October 23 2001 by John Check, fgpanels@rockfish.net
|
||||
************************************************************************
|
||||
-->
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<sim>
|
||||
|
||||
<description>Cessna 172P - Canvas Demo</description>
|
||||
<author>David Megginson</author>
|
||||
<status>early production</status>
|
||||
<rating>
|
||||
<FDM type="int">3</FDM>
|
||||
<systems type="int">4</systems>
|
||||
<model type="int">5</model>
|
||||
<cockpit type="int">4</cockpit>
|
||||
</rating>
|
||||
|
||||
|
||||
<flight-model archive="y">jsb</flight-model>
|
||||
<aero archive="y">c172p</aero>
|
||||
|
||||
<allow-toggle-cockpit type="bool">true</allow-toggle-cockpit>
|
||||
<model>
|
||||
<path archive="y">Aircraft/c172p/Models/c172p-canvas.xml</path>
|
||||
|
||||
<livery>
|
||||
<file type="string">n301dp</file>
|
||||
<index type="int">0</index>
|
||||
</livery>
|
||||
|
||||
<liverytail>
|
||||
<file type="string">n301dp</file>
|
||||
<index type="int">0</index>
|
||||
</liverytail>
|
||||
|
||||
<liverywing>
|
||||
<file type="string">n301dp</file>
|
||||
<index type="int">0</index>
|
||||
</liverywing>
|
||||
|
||||
<c172p>
|
||||
<immat type="bool">false</immat>
|
||||
<fairing1 type="bool">true</fairing1>
|
||||
<fairing2 type="bool">false</fairing2>
|
||||
<fairing3 type="bool">false</fairing3>
|
||||
</c172p>
|
||||
|
||||
<hide-yoke type="bool">false</hide-yoke>
|
||||
</model>
|
||||
|
||||
<startup>
|
||||
<splash-texture>Aircraft/c172p/splash.png</splash-texture>
|
||||
</startup>
|
||||
|
||||
<!-- hide the 2D panel -->
|
||||
|
||||
<panel>
|
||||
<visibility type="bool" archive="y">false</visibility>
|
||||
</panel>
|
||||
|
||||
<!-- position the pilot viewpoint and angle -->
|
||||
|
||||
<view>
|
||||
<internal type="bool" archive="y">true</internal>
|
||||
<config>
|
||||
<x-offset-m archive="y" type="double">-0.21</x-offset-m>
|
||||
<y-offset-m archive="y" type="double">0.235</y-offset-m>
|
||||
<z-offset-m archive="y" type="double">0.36</z-offset-m>
|
||||
<pitch-offset-deg type="double">-12</pitch-offset-deg>
|
||||
</config>
|
||||
</view>
|
||||
|
||||
<systems>
|
||||
<autopilot>
|
||||
<path>Aircraft/c172p/Systems/KAP140.xml</path>
|
||||
</autopilot>
|
||||
<property-rule n="100">
|
||||
<name>FiltersOnly</name>
|
||||
<path>Aircraft/c172p/Systems/NAVandGSfilters.xml</path>
|
||||
</property-rule>
|
||||
<electrical>
|
||||
<!-- null electrical system path here so we can use a nasal based -->
|
||||
<!-- model defined later in the nasal section of this file. -->
|
||||
<path></path>
|
||||
</electrical>
|
||||
</systems>
|
||||
|
||||
<sound>
|
||||
<path archive="y">Aircraft/c172p/c172-sound.xml</path>
|
||||
</sound>
|
||||
|
||||
<help include="c172-help.xml"/>
|
||||
|
||||
<tutorials include="Tutorials/c172-tutorials.xml"/>
|
||||
|
||||
<dimensions>
|
||||
<radius-m type="double">5</radius-m>
|
||||
</dimensions>
|
||||
<aircraft-class type="string">ga</aircraft-class>
|
||||
<aircraft-operator type="string">NONE</aircraft-operator>
|
||||
|
||||
<multiplay>
|
||||
<chat_display>1</chat_display>
|
||||
<generic>
|
||||
<float n="0" alias="/sim/model/door-positions/rightDoor/position-norm"/>
|
||||
<float n="1" alias="/sim/model/door-positions/leftDoor/position-norm"/>
|
||||
<float n="2" alias="/sim/model/door-positions/baggageDoor/position-norm"/>
|
||||
<int type="int">0</int>
|
||||
<int type="int">0</int>
|
||||
<int type="int">0</int>
|
||||
<int type="int">0</int>
|
||||
<int type="int">0</int>
|
||||
<int type="int">0</int>
|
||||
</generic>
|
||||
</multiplay>
|
||||
|
||||
<flight-recorder>
|
||||
<replay-config type="int">0</replay-config>
|
||||
<config n="0" include="/Aircraft/Generic/flightrecorder/generic-piston-propeller-1.xml">
|
||||
<name type="string">C172p Flight Recorder</name>
|
||||
</config>
|
||||
</flight-recorder>
|
||||
|
||||
<menubar include="Dialogs/c172p-menu.xml"/>
|
||||
<instrumentation n="0">
|
||||
<path>Aircraft/c172p/Systems/instrumentation.xml</path>
|
||||
</instrumentation>
|
||||
</sim>
|
||||
|
||||
<!-- trim for level cruise -->
|
||||
|
||||
<controls>
|
||||
<flight>
|
||||
<aileron-trim type="double">0.027</aileron-trim>
|
||||
<rudder-trim type="double">0.0</rudder-trim>
|
||||
</flight>
|
||||
<engines>
|
||||
<engine n="0">
|
||||
<magnetos type="int">3</magnetos>
|
||||
<master-bat type="bool">true</master-bat>
|
||||
<master-alt type="bool">true</master-alt>
|
||||
</engine>
|
||||
</engines>
|
||||
<lighting>
|
||||
<landing-lights type="bool">false</landing-lights>
|
||||
<taxi-light type="bool">false</taxi-light>
|
||||
<strobe type="bool">false</strobe>
|
||||
<beacon type="bool">false</beacon>
|
||||
<nav-lights type="bool">false</nav-lights>
|
||||
</lighting>
|
||||
<switches>
|
||||
<master-avionics type="bool">true</master-avionics>
|
||||
<starter type="bool">false</starter>
|
||||
</switches>
|
||||
<engines>
|
||||
<engine>
|
||||
<master-bat type="bool">true</master-bat>
|
||||
<master-alt type="bool">true</master-alt>
|
||||
</engine>
|
||||
</engines>
|
||||
</controls>
|
||||
|
||||
<autopilot>
|
||||
<KAP140>
|
||||
<settings>
|
||||
<auto-pitch-trim type="bool">true</auto-pitch-trim>
|
||||
</settings>
|
||||
</KAP140>
|
||||
</autopilot>
|
||||
|
||||
<consumables>
|
||||
<fuel>
|
||||
<tank n="0">
|
||||
<level-gal_us type="double">20</level-gal_us>
|
||||
<selected type="bool">true</selected>
|
||||
</tank>
|
||||
<tank n="1">
|
||||
<level-gal_us type="double">20</level-gal_us>
|
||||
<selected type="bool">true</selected>
|
||||
</tank>
|
||||
</fuel>
|
||||
</consumables>
|
||||
|
||||
<instrumentation>
|
||||
<kma20 include="Aircraft/Instruments-3d/kma20/kma20init.xml"/>
|
||||
<attitude-indicator>
|
||||
<config>
|
||||
<tumble-flag archive="y" type="bool">true</tumble-flag>
|
||||
</config>
|
||||
</attitude-indicator>
|
||||
<encoder>
|
||||
<serviceable type="bool">true</serviceable>
|
||||
</encoder>
|
||||
<adf n="0">
|
||||
<ident-audible type="bool">false</ident-audible>
|
||||
<volume type="double">0.7</volume>
|
||||
</adf>
|
||||
<nav n="0">
|
||||
<volume type="double">0.7</volume>
|
||||
</nav>
|
||||
<nav n="1">
|
||||
<volume type="double">0.7</volume>
|
||||
</nav>
|
||||
</instrumentation>
|
||||
|
||||
<engines>
|
||||
<engine>
|
||||
<rpm type="double">0</rpm>
|
||||
<magnetos type="int">0</magnetos>
|
||||
<mixture type="double">0</mixture>
|
||||
<running type="bool">false</running>
|
||||
</engine>
|
||||
</engines>
|
||||
|
||||
<nasal>
|
||||
|
||||
<c172p>
|
||||
<file>Aircraft/c172p/Nasal/liveries.nas</file>
|
||||
<file>Aircraft/c172p/Nasal/immat.nas</file>
|
||||
<file>Aircraft/c172p/Nasal/doors.nas</file>
|
||||
<file>Aircraft/c172p/Nasal/light.nas</file>
|
||||
<file>Aircraft/c172p/Nasal/tanks.nas</file>
|
||||
<file>Aircraft/c172p/Nasal/kma20.nas</file>
|
||||
<file>Aircraft/c172p/Nasal/ki266.nas</file>
|
||||
<script><![CDATA[
|
||||
ki266.new(0);
|
||||
aircraft.data.add( "engines/engine[0]/egt-bug-norm" );
|
||||
]]></script>
|
||||
</c172p>
|
||||
|
||||
<electrical>
|
||||
<file>Aircraft/c172p/Nasal/c172-electrical.nas</file>
|
||||
</electrical>
|
||||
<kap140>
|
||||
<file>Aircraft/Generic/kap140.nas</file>
|
||||
<!-- We can set some variables that might be
|
||||
aircraft specific. We must do it after the file
|
||||
to override the ones that are in the .nas file.-->
|
||||
<script><![CDATA[
|
||||
headingNeedleDeflection = "/instrumentation/nav/heading-needle-deflection";
|
||||
gsNeedleDeflection = "/instrumentation/nav/gs-needle-deflection-norm";
|
||||
staticPressure = "systems/static/pressure-inhg";
|
||||
]]>
|
||||
</script>
|
||||
</kap140>
|
||||
<kr87>
|
||||
<file>Aircraft/c172p/Nasal/kr87.nas</file>
|
||||
</kr87>
|
||||
<canvas_demo>
|
||||
<file>Aircraft/Instruments-3d/canvas-test/canvas-test.nas</file>
|
||||
</canvas_demo>
|
||||
</nasal>
|
||||
<payload>
|
||||
<weight>
|
||||
<name type="string">Pilot</name>
|
||||
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]"/>
|
||||
<min-lb type="double">0.0</min-lb>
|
||||
<max-lb type="double">300.0</max-lb>
|
||||
</weight>
|
||||
<weight>
|
||||
<name type="string">Co-Pilot</name>
|
||||
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]"/>
|
||||
<min-lb type="double">0.0</min-lb>
|
||||
<max-lb type="double">300.0</max-lb>
|
||||
</weight>
|
||||
<weight>
|
||||
<name type="string">Left Passenger</name>
|
||||
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]"/>
|
||||
<min-lb type="double">0.0</min-lb>
|
||||
<max-lb type="double">300.0</max-lb>
|
||||
</weight>
|
||||
<weight>
|
||||
<name type="string">Right Passenger</name>
|
||||
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]"/>
|
||||
<min-lb type="double">0.0</min-lb>
|
||||
<max-lb type="double">300.0</max-lb>
|
||||
</weight>
|
||||
<weight>
|
||||
<name type="string">Baggage</name>
|
||||
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[4]"/>
|
||||
<min-lb type="double">0.0</min-lb>
|
||||
<max-lb type="double">150.0</max-lb> <!-- WARNING: Max baggage "by the book" is 120lbs or less! -->
|
||||
</weight>
|
||||
</payload>
|
||||
<limits>
|
||||
<mass-and-balance>
|
||||
<maximum-ramp-mass-lbs>2407</maximum-ramp-mass-lbs>
|
||||
<maximum-takeoff-mass-lbs>2400</maximum-takeoff-mass-lbs>
|
||||
<maximum-landing-mass-lbs>2400</maximum-landing-mass-lbs>
|
||||
</mass-and-balance>
|
||||
</limits>
|
||||
|
||||
<input>
|
||||
<keyboard>
|
||||
<key n="76">
|
||||
<name>L</name>
|
||||
<desc>Decrease Panel lighting</desc>
|
||||
<repeatable type="bool">true</repeatable>
|
||||
<binding>
|
||||
<command>property-adjust</command>
|
||||
<property>controls/lighting/instruments-norm</property>
|
||||
<step>-0.1</step>
|
||||
<min>0</min>
|
||||
<max>1.0</max>
|
||||
<wrap>0</wrap>
|
||||
</binding>
|
||||
</key>
|
||||
<key n="108">
|
||||
<name>l</name>
|
||||
<desc>Increase Panel lighting</desc>
|
||||
<repeatable type="bool">true</repeatable>
|
||||
<binding>
|
||||
<command>property-adjust</command>
|
||||
<property>controls/lighting/instruments-norm</property>
|
||||
<step>0.1</step>
|
||||
<min>0</min>
|
||||
<max>1.0</max>
|
||||
<wrap>0</wrap>
|
||||
</binding>
|
||||
</key>
|
||||
<key n="115">
|
||||
<name>s</name>
|
||||
<desc>Toggle Starter Switch</desc>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>/controls/switches/starter</property>
|
||||
<value >1</value>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>/controls/switches/starter</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</mod-up>
|
||||
</key>
|
||||
</keyboard>
|
||||
</input>
|
||||
|
||||
</PropertyList>
|
||||
|
|
@ -180,7 +180,9 @@ property-interpolate - assign a value to a property, interpolated
|
|||
value: the new value for the property; or
|
||||
property[1]: the name of the property holding the new value.
|
||||
time: the time in seconds it takes for the transition from the
|
||||
old value to the new value of property[0]
|
||||
old value to the new value of property[0]; or
|
||||
rate: the ammount of change per second the value of property[0] changes
|
||||
to transition to the new value
|
||||
|
||||
property-adjust - adjust the value of a property
|
||||
property: the name of the property to increment or decrement
|
||||
|
|
|
|||
|
|
@ -1042,7 +1042,6 @@
|
|||
</equals>
|
||||
</condition>
|
||||
<name>Marsh</name>
|
||||
<name>Littoral</name>
|
||||
<name>FloodLand</name>
|
||||
<name>SaltMarsh</name>
|
||||
<name>HerbWetlandCover</name>
|
||||
|
|
@ -1060,6 +1059,25 @@
|
|||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>sim/startup/season</property>
|
||||
<value>summer</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<name>Littoral</name>
|
||||
<texture>Terrain/tidal.png</texture>
|
||||
<xsize>2000</xsize>
|
||||
<ysize>2000</ysize>
|
||||
<solid>1</solid>
|
||||
<light-coverage>40000000.0</light-coverage>
|
||||
<friction-factor>0.8</friction-factor>
|
||||
<rolling-friction>0.3</rolling-friction>
|
||||
<bumpiness>0.2</bumpiness>
|
||||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
<condition>
|
||||
<equals>
|
||||
|
|
@ -1815,7 +1833,6 @@
|
|||
</equals>
|
||||
</condition>
|
||||
<name>Marsh</name>
|
||||
<name>Littoral</name>
|
||||
<name>FloodLand</name>
|
||||
<name>SaltMarsh</name>
|
||||
<name>HerbWetlandCover</name>
|
||||
|
|
@ -1833,6 +1850,25 @@
|
|||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>sim/startup/season</property>
|
||||
<value>winter</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<name>Littoral</name>
|
||||
<texture>Terrain/tidal.png</texture>
|
||||
<xsize>2000</xsize>
|
||||
<ysize>2000</ysize>
|
||||
<solid>1</solid>
|
||||
<light-coverage>40000000.0</light-coverage>
|
||||
<friction-factor>0.8</friction-factor>
|
||||
<rolling-friction>0.3</rolling-friction>
|
||||
<bumpiness>0.2</bumpiness>
|
||||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
<condition>
|
||||
<equals>
|
||||
|
|
|
|||
|
|
@ -1144,7 +1144,6 @@
|
|||
|
||||
<material include="Materials/regions/european.xml">
|
||||
<name>Marsh</name>
|
||||
<name>Littoral</name>
|
||||
<name>FloodLand</name>
|
||||
<name>SaltMarsh</name>
|
||||
<name>HerbWetlandCover</name>
|
||||
|
|
@ -1162,6 +1161,19 @@
|
|||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material include="Materials/regions/european.xml">
|
||||
<name>Littoral</name>
|
||||
<texture>Terrain/tidal.png</texture>
|
||||
<xsize>2000</xsize>
|
||||
<ysize>2000</ysize>
|
||||
<solid>1</solid>
|
||||
<light-coverage>40000000.0</light-coverage>
|
||||
<friction-factor>0.8</friction-factor>
|
||||
<rolling-friction>0.3</rolling-friction>
|
||||
<bumpiness>0.2</bumpiness>
|
||||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material include="Materials/regions/european.xml">
|
||||
<effect>Effects/crop</effect>
|
||||
<name>MixedCropPastureCover</name>
|
||||
|
|
@ -1728,7 +1740,6 @@
|
|||
</equals>
|
||||
</condition>
|
||||
<name>Marsh</name>
|
||||
<name>Littoral</name>
|
||||
<name>FloodLand</name>
|
||||
<name>SaltMarsh</name>
|
||||
<name>HerbWetlandCover</name>
|
||||
|
|
@ -1746,6 +1757,25 @@
|
|||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>sim/startup/season</property>
|
||||
<value>summer</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<name>Littoral</name>
|
||||
<texture>Terrain/tidal.png</texture>
|
||||
<xsize>2000</xsize>
|
||||
<ysize>2000</ysize>
|
||||
<solid>1</solid>
|
||||
<light-coverage>40000000.0</light-coverage>
|
||||
<friction-factor>0.8</friction-factor>
|
||||
<rolling-friction>0.3</rolling-friction>
|
||||
<bumpiness>0.2</bumpiness>
|
||||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
<condition>
|
||||
<equals>
|
||||
|
|
@ -2522,7 +2552,6 @@
|
|||
</equals>
|
||||
</condition>
|
||||
<name>Marsh</name>
|
||||
<name>Littoral</name>
|
||||
<name>FloodLand</name>
|
||||
<name>SaltMarsh</name>
|
||||
<name>HerbWetlandCover</name>
|
||||
|
|
@ -2540,6 +2569,25 @@
|
|||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>sim/startup/season</property>
|
||||
<value>winter</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<name>Littoral</name>
|
||||
<texture>Terrain/tidal.png</texture>
|
||||
<xsize>2000</xsize>
|
||||
<ysize>2000</ysize>
|
||||
<solid>1</solid>
|
||||
<light-coverage>40000000.0</light-coverage>
|
||||
<friction-factor>0.8</friction-factor>
|
||||
<rolling-friction>0.3</rolling-friction>
|
||||
<bumpiness>0.2</bumpiness>
|
||||
<load-resistance>1e30</load-resistance>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
<condition>
|
||||
<equals>
|
||||
|
|
|
|||
|
|
@ -575,7 +575,7 @@ var Path = {
|
|||
if( size(coords) != num_coords )
|
||||
debug.warn
|
||||
(
|
||||
"Invalid number of arguments (expected " ~ (num_coords + 1) ~ ")"
|
||||
"Invalid number of arguments (expected " ~ num_coords ~ ")"
|
||||
);
|
||||
else
|
||||
{
|
||||
|
|
@ -608,8 +608,8 @@ var Path = {
|
|||
quadTo: func me.addSegment(me.VG_SQUAD_TO_ABS, arg),
|
||||
quad: func me.addSegment(me.VG_SQUAD_TO_REL, arg),
|
||||
# Add a smooth cubic Bézier curve
|
||||
cubicTo: func me.addSegment(me.VG_SCUBIC_TO_ABS, arg),
|
||||
cubic: func me.addSegment(me.VG_SCUBIC_TO_REL, arg),
|
||||
scubicTo: func me.addSegment(me.VG_SCUBIC_TO_ABS, arg),
|
||||
scubic: func me.addSegment(me.VG_SCUBIC_TO_REL, arg),
|
||||
# Draw an elliptical arc (shorter counter-clockwise arc)
|
||||
arcSmallCCWTo: func me.addSegment(me.VG_SCCWARC_TO_ABS, arg),
|
||||
arcSmallCCW: func me.addSegment(me.VG_SCCWARC_TO_REL, arg),
|
||||
|
|
|
|||
Loading…
Reference in a new issue