Commit 5b6e931d authored by Valérie Maquil's avatar Valérie Maquil
Browse files

inclination instead of angle for bike scenario

parent 0cdac2b6
Scenarios/assets/asphalt10.png

144 KB | W: | H:

Scenarios/assets/asphalt10.png

139 KB | W: | H:

Scenarios/assets/asphalt10.png
Scenarios/assets/asphalt10.png
Scenarios/assets/asphalt10.png
Scenarios/assets/asphalt10.png
  • 2-up
  • Swipe
  • Onion skin
Scenarios/assets/asphalt20.png

144 KB | W: | H:

Scenarios/assets/asphalt20.png

144 KB | W: | H:

Scenarios/assets/asphalt20.png
Scenarios/assets/asphalt20.png
Scenarios/assets/asphalt20.png
Scenarios/assets/asphalt20.png
  • 2-up
  • Swipe
  • Onion skin
Scenarios/assets/wood10.png

309 KB | W: | H:

Scenarios/assets/wood10.png

306 KB | W: | H:

Scenarios/assets/wood10.png
Scenarios/assets/wood10.png
Scenarios/assets/wood10.png
Scenarios/assets/wood10.png
  • 2-up
  • Swipe
  • Onion skin
Scenarios/assets/wood20.png

311 KB | W: | H:

Scenarios/assets/wood20.png

309 KB | W: | H:

Scenarios/assets/wood20.png
Scenarios/assets/wood20.png
Scenarios/assets/wood20.png
Scenarios/assets/wood20.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -28,19 +28,19 @@ ...@@ -28,19 +28,19 @@
<scene> <scene>
<name>FlatWood</name> <name>FlatWood</name>
<image>assets/wood0.png</image> <image>assets/wood0.png</image>
<triggerCondition>Inclination == 0 &amp;&amp; Ground == 0.4</triggerCondition> <triggerCondition>Inclination == 0 &amp;&amp; Ground == 0.3</triggerCondition>
<drawPriority>7</drawPriority> <drawPriority>7</drawPriority>
</scene> </scene>
<scene> <scene>
<name>10Wood</name> <name>10Wood</name>
<image>assets/wood10.png</image> <image>assets/wood10.png</image>
<triggerCondition>Inclination == 10 &amp;&amp; Ground == 0.4</triggerCondition> <triggerCondition>Inclination == 10 &amp;&amp; Ground == 0.3</triggerCondition>
<drawPriority>8</drawPriority> <drawPriority>8</drawPriority>
</scene> </scene>
<scene> <scene>
<name>20Wood</name> <name>20Wood</name>
<image>assets/wood20.png</image> <image>assets/wood20.png</image>
<triggerCondition>Inclination == 20 &amp;&amp; Ground == 0.4</triggerCondition> <triggerCondition>Inclination == 20 &amp;&amp; Ground == 0.3</triggerCondition>
<drawPriority>9</drawPriority> <drawPriority>9</drawPriority>
</scene> </scene>
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
<stepSize>10</stepSize> <stepSize>10</stepSize>
<variable> <variable>
<name>Inclination</name> <name>Inclination</name>
<unit>°</unit> <unit>%</unit>
<value>-10</value> <value>-10</value>
</variable> </variable>
<modifyValueOnRotation>True</modifyValueOnRotation> <modifyValueOnRotation>True</modifyValueOnRotation>
...@@ -1098,7 +1098,8 @@ ...@@ -1098,7 +1098,8 @@
<unit>Gear</unit> <unit>Gear</unit>
</parameter> </parameter>
</parameters> </parameters>
<invoke>Math.floor((74 * 10 * (Ground + Math.sin(Inclination/180 * 3.14))) * ( (37*(5+((PedalGear-1)*2.5))) / ((5-((-(WheelGear)-1)*0.35))*17)));</invoke> <!-- <invoke>Math.floor((74 * 10 * (Ground + Math.sin(Inclination/180 * 3.14))) * ( (37*(5+((PedalGear-1)*2.5))) / ((5-((-(WheelGear)-1)*0.35))*17) ));</invoke> -->
<invoke>Math.floor((74 * 10 * (Ground + Inclination/100)) * ( (37*(5+((PedalGear-1)*2.5))) / ((5-((-(WheelGear)-1)*0.35))*17) ));</invoke>
<results> <results>
<result> <result>
<name>ForceOnPedal</name> <name>ForceOnPedal</name>
...@@ -1112,7 +1113,7 @@ ...@@ -1112,7 +1113,7 @@
<parameters> <parameters>
<parameter> <parameter>
<name>Inclination</name> <name>Inclination</name>
<unit>°</unit> <unit>%</unit>
</parameter> </parameter>
<parameter> <parameter>
<name>Ground</name> <name>Ground</name>
...@@ -1123,7 +1124,8 @@ ...@@ -1123,7 +1124,8 @@
<unit>km</unit> <unit>km</unit>
</parameter> </parameter>
</parameters> </parameters>
<invoke>Math.floor((74 * 10 * (Ground + Math.sin(Inclination/180 * 3.14))) * Distance)</invoke> <invoke>Math.floor((74 * 10 * (Ground + Inclination/100)) * Distance)</invoke>
<!-- <invoke>Math.floor((74 * 10 * (Ground + Math.sin(Inclination/180 * 3.14))) * Distance)</invoke>-->
<results> <results>
<result> <result>
<name>Energy</name> <name>Energy</name>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment