Commit 18c40790 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Resolved merge conflict.

parents c2f07ab9 121f212e
......@@ -6,7 +6,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<title>Gas</title>
</head>
<body>
<p>A gas is a collection of <a href="objinfo:GasParticle">gasoline particles</a>. Associated with the gas is a <a href="objinfo:GasLJForce">force</a>. To add gas particles rightclick the gas and click on "Create particles".</p>
<p>A gas is a collection of <a href="objinfo:GasParticle">gasoline particles</a>. Associated with the gas is a <a href="objinfo:GasLJForce">force</a>. To add gas particles right-click the gas and click on "Create particles".</p>
<p>For details about the math used to calculate the forces, please refer to the <a href="https://en.wikipedia.org/wiki/Lennard-Jones_potential">Lennard-Jones potential</a>.</p>
</body>
</html>
......@@ -8,7 +8,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<body>
<p>This force simulates the <a href="https://en.wikipedia.org/wiki/Lennard-Jones_potential">Lennard-Jones potential</a>. There are three parameters for this force:</p>
<ul>
<li><b>depth:</b> The minimum value of the Lennard-Jones potential wall</li>
<li><b>depth:</b> The minimum value of the Lennard-Jones potential well</li>
<li><b>rmin:</b> The distance from the origin to the minimum of the potential</li>
<li><b>cutoff:</b> The distance, where the Lennard-Jones (LJ) potential is often truncated to save computational time</li>
</ul>
......
......@@ -6,7 +6,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<title>Linear Motor</title>
</head>
<body>
<p>A linear motor produces a linear force along it's length.</p>
<p>you can set the desired linear force for an object by changing the force value in the properties browser.</p>
<p>A linear motor produces a linear force along its length.</p>
<p>You can set the desired linear force for an object by changing the force value in the properties browser.</p>
</body>
</html>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>Soft body</title>
</head>
<body>
<p>A soft body is a collection of <a href="objinfo:particle">particles</a> connected by <a href="objinfo:spring">springs</a>. This can be used to simulate an <a href="https://en.wikipedia.org/wiki/Elasticity_(physics)">elastic</a> or viscoelastic body.</p>
</body>
</html>
......@@ -6,16 +6,16 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<title>Spring</title>
</head>
<body>
<p>A rigid polygon with a unique name and the following parameters:</p>
<p>A flexible elastic object to store mechanical energy. It has a unique name and the following parameters:</p>
<ul>
<li><b>rest length:</b> </li>
<li><b>length:</b> </li>
<li><b>stiffness:</b> </li>
<li><b>damping:</b> </li>
<li><b>body 1 and 2:</b> </li>
<li><b>local position 1 and 2:</b> </li>
<li><b>position 1 and 2:</b> </li>
<li><b>force:</b> </li>
<li><b>rest length:</b> is the length of the spring as it is not compressed or stretched.</li>
<li><b>length:</b> is the initial spring length</li>
<li><b>stiffness:</b> is the level of spring resistance to compression or stretching</li>
<li><b>damping:</b> is level of spring ability to disperse stored energy, an internal viscosity</li>
<li><b>body 1 and 2:</b> are the bodies to which the spring is fixed</li>
<li><b>local position 1 and 2:</b> are the local positions of the spring ends relative to its center in the non-deformed state</li>
<li><b>position 1 and 2:</b> are the global positions of the spring ends</li>
<li><b>force:</b> is the force that acts along the spring</li>
</ul>
</body>
</html>
\ No newline at end of file
</html>
......@@ -6,6 +6,6 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<title>World</title>
</head>
<body>
<p>This is the world scene. From the objects palette you should pick some items and put them on the canvas. After you set properties of objects you can click on the Simulate button in toolbar and your scene will evolve according to the laws of physics.</p>
<p>This is the world scene. From the objects palette you should pick some items and put them on the canvas. After you set properties of objects you can click on the <b>Simulate</b> button in toolbar and your scene will evolve according to the laws of physics.</p>
</body>
</html>
......@@ -109,7 +109,7 @@ p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Controller&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Create a new controller on the scene.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Click on in with the right mouse button and choose &quot;Configure controller&quot; from the context menu.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Click on it with the right mouse button and choose &quot;Configure controller&quot; from the context menu.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Select mass of the particle1 as the data source, adjust the range and assign keyboard shortcuts.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Now try moving the slider and pressing the selected shortcuts while simulation is active.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</text>
......
......@@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; }
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Angle and angular velocity&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- When the rigid body is selected you see three grey handlers on it. Using them you can change velocity, angle and angular velocity of the body.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</text>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- When the rigid body is selected you see three gray handlers on it. Using them you can change velocity, angle and angular velocity of the body.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</text>
</item>
......
......@@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Quest&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Create graphs to display coordinates of particles in double pendulum.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Create tripple pendulum by attaching one more particle to the particle2 using the stick.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Create triple pendulum by attaching one more particle to the particle2 using the stick.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Remove anchor1 that fixes position of the box and attach a pin to the corner of the box. Try starting the simulation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</text>
</item>
......
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