deploy: 88018f698d14ec549006dc253354db81de84180a
This commit is contained in:
parent
e20423b74f
commit
079b01aaab
@ -691,7 +691,7 @@
|
|||||||
<span class="kw">if</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op"><</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
<span class="kw">if</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op"><</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
||||||
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">></span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">></span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
||||||
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op"><</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
|
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op"><</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
|
||||||
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">></span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">></span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
|
||||||
{
|
{
|
||||||
<span class="comment">// if player.velocity.x < 0.0 {</span>
|
<span class="comment">// if player.velocity.x < 0.0 {</span>
|
||||||
<span class="comment">// player.position.x = i.position.x + i.size.x / 2.0 + player_size;</span>
|
<span class="comment">// player.position.x = i.position.x + i.size.x / 2.0 + player_size;</span>
|
||||||
@ -722,13 +722,13 @@
|
|||||||
<span class="kw">if</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op"><</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
<span class="kw">if</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op"><</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
||||||
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">></span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">></span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
||||||
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op"><</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
|
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op"><</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
|
||||||
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">></span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
|
<span class="op">&&</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">></span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
|
||||||
{
|
{
|
||||||
<span class="kw">if</span> <span class="ident">player</span>.<span class="ident">velocity</span>.<span class="ident">y</span> <span class="op"><</span> <span class="number">0.0</span> {
|
<span class="comment">// if player.velocity.y < 0.0 {</span>
|
||||||
<span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">+</span> <span class="ident">player_size</span>;
|
<span class="comment">// player.position.y = i.position.y + i.size.y / 2.0 + player_size;</span>
|
||||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">player</span>.<span class="ident">velocity</span>.<span class="ident">y</span> <span class="op">></span> <span class="number">0.0</span> {
|
<span class="comment">// } else if player.velocity.y > 0.0 {</span>
|
||||||
<span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">-</span> <span class="ident">player_size</span>;
|
<span class="comment">// player.position.y = i.position.y - i.size.y / 2.0 - player_size;</span>
|
||||||
}
|
<span class="comment">// }</span>
|
||||||
<span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span><span class="op">=</span> <span class="ident">velocity_modifier</span>.<span class="ident">y</span>;
|
<span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span><span class="op">=</span> <span class="ident">velocity_modifier</span>.<span class="ident">y</span>;
|
||||||
<span class="ident">player</span>.<span class="ident">velocity</span>.<span class="ident">y</span> <span class="op">=</span> <span class="number">0.0</span>;
|
<span class="ident">player</span>.<span class="ident">velocity</span>.<span class="ident">y</span> <span class="op">=</span> <span class="number">0.0</span>;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user