Skip to content

Commit ad7a5d6

Browse files
committed
fix liquid to fence conversions java
1 parent e3e2017 commit ad7a5d6

10 files changed

Lines changed: 45 additions & 35 deletions

File tree

docs/_methods/processing_to_world.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Because of the peculiar choice by the processing guys down is up (dimensions in
1010

1111
The java code ([PBox2D][pbox2d] inherits this from [Box2DProcessing][pbox2d])
1212
### public Vec2 processingToWorld(float worldX, float worldY) ###
13-
{% highlight java %}
13+
```java
1414
public Vec2 processingToWorld(float pixelX, float pixelY) {
1515
float worldX = map(pixelX, parent.width / 2, parent.width / 2 + scaleFactor, 0f, 1f);
1616
float worldY = map(pixelY, parent.height / 2, parent.height / 2 + scaleFactor, 1f, 0f);

docs/_methods/scale_to_processing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ From sketch to physics world and vice versa
77

88
The java code ([PBox2D][pbox2d] inherits this from [Box2DProcessing][pbox2d])
99
### public float scaleToProcessing(float val) ###
10-
{% highlight java %}
10+
```java
1111
public float scaleToProcessing(float val) {
1212
return val * scaleFactor;
1313
}

docs/_methods/scale_to_world.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Because of the peculiar choice by the processing guys down is up (dimensions in
1010

1111
The java code ([PBox2D][pbox2d] inherits this from [Box2DProcessing][pbox2d])
1212
### public Vec2 scaleToWorld(float worldX, float worldY) ###
13-
{% highlight java %}
13+
```java
1414
public Vec2 scaleToWorld(float pixelX, float pixelY) {
1515
float worldX = map(pixelX, parent.width / 2, parent.width / 2 + scaleFactor, 0f, 1f);
1616
float worldY = map(pixelY, parent.height / 2, parent.height / 2 + scaleFactor, 1f, 0f);

docs/_methods/world_to_processing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Because of the peculiar choice by the processing guys down is up (dimensions in
1111

1212
The java code ([PBox2D][pbox2d] inherits this from [Box2DProcessing][pbox2d])
1313
### public Vec2 worldToProcessing(float worldX, float worldY) ###
14-
{% highlight java %}
14+
```java
1515
public Vec2 worldToProcessing(float worldX, float worldY) {
1616
float pixelX = map(worldX, 0f, 1f, parent.width / 2, parent.width / 2 + scaleFactor);
1717
float pixelY = map(worldY, 1f, 0f, parent.height / 2, parent.height / 2 + scaleFactor);

docs/_site/methods/init_options/index.html

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,28 +72,30 @@
7272

7373
<header class="post-header">
7474
<h1 class="post-title">init_options</h1>
75-
<p class="post-meta">Oct 14, 2016</p>
75+
<p class="post-meta">Jan 1, 2017</p>
7676
</header>
7777

7878
<article class="post-content">
7979
<h3 id="initoptions-method">init_options method</h3>
8080
<p>Need not called directly if using <a href="/modules/world_builder/">WorldBuilder</a></p>
81-
82-
<figure class="highlight"><pre><code class="language-ruby" data-lang="ruby"><span class="k">def</span> <span class="nf">init_options</span><span class="p">(</span><span class="n">args</span> <span class="o">=</span> <span class="p">{})</span>
81+
<div class="language-ruby highlighter-rouge"><pre class="highlight"><code><span class="k">def</span> <span class="nf">init_options</span><span class="p">(</span><span class="n">args</span> <span class="o">=</span> <span class="p">{})</span>
8382
<span class="n">args</span> <span class="o">=</span> <span class="n">defaults</span><span class="p">.</span><span class="nf">merge</span><span class="p">(</span><span class="n">args</span><span class="p">)</span>
8483
<span class="n">set_options</span><span class="p">(</span><span class="n">args</span><span class="p">[</span><span class="ss">:scale</span><span class="p">],</span>
8584
<span class="n">args</span><span class="p">[</span><span class="ss">:gravity</span><span class="p">].</span><span class="nf">to_java</span><span class="p">(</span><span class="no">Java</span><span class="o">::</span><span class="n">float</span><span class="p">),</span>
8685
<span class="n">args</span><span class="p">[</span><span class="ss">:warm</span><span class="p">],</span>
8786
<span class="n">args</span><span class="p">[</span><span class="ss">:continuous</span><span class="p">]</span>
8887
<span class="p">)</span>
89-
<span class="k">end</span></code></pre></figure>
88+
<span class="k">end</span>
89+
</code></pre>
90+
</div>
9091

9192
<h3 id="related-default-options">related default options</h3>
9293
<p>Provides defaults for init_options</p>
93-
94-
<figure class="highlight"><pre><code class="language-ruby" data-lang="ruby"><span class="k">def</span> <span class="nf">defaults</span>
94+
<div class="language-ruby highlighter-rouge"><pre class="highlight"><code><span class="k">def</span> <span class="nf">defaults</span>
9595
<span class="p">{</span> <span class="ss">scale: </span><span class="mi">10</span><span class="o">.</span><span class="mi">0</span><span class="p">,</span> <span class="ss">gravity: </span><span class="p">[</span><span class="mi">0</span><span class="p">,</span> <span class="o">-</span><span class="mi">10</span><span class="p">],</span> <span class="ss">warm: </span><span class="kp">true</span><span class="p">,</span> <span class="ss">continuous: </span><span class="kp">true</span> <span class="p">}</span>
96-
<span class="k">end</span></code></pre></figure>
96+
<span class="k">end</span>
97+
</code></pre>
98+
</div>
9799

98100

99101
</article>

docs/_site/methods/processing_to_world/index.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272

7373
<header class="post-header">
7474
<h1 class="post-title">processing_to_world</h1>
75-
<p class="post-meta">Oct 14, 2016</p>
75+
<p class="post-meta">Jan 1, 2017</p>
7676
</header>
7777

7878
<article class="post-content">
@@ -82,17 +82,19 @@ <h1 class="post-title">processing_to_world</h1>
8282

8383
<p>The java code (<a href="/classes/pbox2d/">PBox2D</a> inherits this from <a href="/classes/pbox2d/">Box2DProcessing</a>)</p>
8484
<h3 id="public-vec2-processingtoworldfloat-worldx-float-worldy">public Vec2 processingToWorld(float worldX, float worldY)</h3>
85-
86-
<figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="n">Vec2</span> <span class="nf">processingToWorld</span><span class="o">(</span><span class="kt">float</span> <span class="n">pixelX</span><span class="o">,</span> <span class="kt">float</span> <span class="n">pixelY</span><span class="o">)</span> <span class="o">{</span>
85+
<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="n">Vec2</span> <span class="nf">processingToWorld</span><span class="o">(</span><span class="kt">float</span> <span class="n">pixelX</span><span class="o">,</span> <span class="kt">float</span> <span class="n">pixelY</span><span class="o">)</span> <span class="o">{</span>
8786
<span class="kt">float</span> <span class="n">worldX</span> <span class="o">=</span> <span class="n">map</span><span class="o">(</span><span class="n">pixelX</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">width</span> <span class="o">/</span> <span class="mi">2</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">width</span> <span class="o">/</span> <span class="mi">2</span> <span class="o">+</span> <span class="n">scaleFactor</span><span class="o">,</span> <span class="mi">0</span><span class="n">f</span><span class="o">,</span> <span class="mi">1</span><span class="n">f</span><span class="o">);</span>
8887
<span class="kt">float</span> <span class="n">worldY</span> <span class="o">=</span> <span class="n">map</span><span class="o">(</span><span class="n">pixelY</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">height</span> <span class="o">/</span> <span class="mi">2</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">height</span> <span class="o">/</span> <span class="mi">2</span> <span class="o">+</span> <span class="n">scaleFactor</span><span class="o">,</span> <span class="mi">1</span><span class="n">f</span><span class="o">,</span> <span class="mi">0</span><span class="n">f</span><span class="o">);</span>
8988
<span class="k">return</span> <span class="k">new</span> <span class="nf">Vec2</span><span class="o">(</span><span class="n">worldX</span><span class="o">,</span> <span class="n">worldY</span><span class="o">);</span>
90-
<span class="o">}</span></code></pre></figure>
89+
<span class="o">}</span>
90+
</code></pre>
91+
</div>
9192

9293
<h3 id="ruby-usage">Ruby usage</h3>
9394
<p>Use camel case</p>
94-
95-
<figure class="highlight"><pre><code class="language-ruby" data-lang="ruby"><span class="n">processing_to_world</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">)</span> <span class="c1"># returns new Vec2 instance (in the PBox2D world)</span></code></pre></figure>
95+
<div class="language-ruby highlighter-rouge"><pre class="highlight"><code><span class="n">processing_to_world</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">)</span> <span class="c1"># returns new Vec2 instance (in the PBox2D world)</span>
96+
</code></pre>
97+
</div>
9698

9799

98100
</article>

docs/_site/methods/scale_to_processing/index.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,25 @@
7272

7373
<header class="post-header">
7474
<h1 class="post-title">scale_to_processing</h1>
75-
<p class="post-meta">Oct 14, 2016</p>
75+
<p class="post-meta">Jan 1, 2017</p>
7676
</header>
7777

7878
<article class="post-content">
7979
<p>From sketch to physics world and vice versa</p>
8080

8181
<p>The java code (<a href="/classes/pbox2d/">PBox2D</a> inherits this from <a href="/classes/pbox2d/">Box2DProcessing</a>)</p>
8282
<h3 id="public-float-scaletoprocessingfloat-val">public float scaleToProcessing(float val)</h3>
83-
84-
<figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kt">float</span> <span class="nf">scaleToProcessing</span><span class="o">(</span><span class="kt">float</span> <span class="n">val</span><span class="o">)</span> <span class="o">{</span>
83+
<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kt">float</span> <span class="nf">scaleToProcessing</span><span class="o">(</span><span class="kt">float</span> <span class="n">val</span><span class="o">)</span> <span class="o">{</span>
8584
<span class="k">return</span> <span class="n">val</span> <span class="o">*</span> <span class="n">scaleFactor</span><span class="o">;</span>
86-
<span class="o">}</span></code></pre></figure>
85+
<span class="o">}</span>
86+
</code></pre>
87+
</div>
8788

8889
<h3 id="ruby-usage">Ruby usage</h3>
8990
<p>Use camel case</p>
90-
91-
<figure class="highlight"><pre><code class="language-ruby" data-lang="ruby"><span class="n">scale_to_processing</span><span class="p">(</span><span class="n">val</span><span class="p">)</span></code></pre></figure>
91+
<div class="language-ruby highlighter-rouge"><pre class="highlight"><code><span class="n">scale_to_processing</span><span class="p">(</span><span class="n">val</span><span class="p">)</span>
92+
</code></pre>
93+
</div>
9294

9395

9496
</article>

docs/_site/methods/scale_to_world/index.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272

7373
<header class="post-header">
7474
<h1 class="post-title">scale_to_world</h1>
75-
<p class="post-meta">Oct 14, 2016</p>
75+
<p class="post-meta">Jan 1, 2017</p>
7676
</header>
7777

7878
<article class="post-content">
@@ -82,17 +82,19 @@ <h1 class="post-title">scale_to_world</h1>
8282

8383
<p>The java code (<a href="/classes/pbox2d/">PBox2D</a> inherits this from <a href="/classes/pbox2d/">Box2DProcessing</a>)</p>
8484
<h3 id="public-vec2-scaletoworldfloat-worldx-float-worldy">public Vec2 scaleToWorld(float worldX, float worldY)</h3>
85-
86-
<figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="n">Vec2</span> <span class="nf">scaleToWorld</span><span class="o">(</span><span class="kt">float</span> <span class="n">pixelX</span><span class="o">,</span> <span class="kt">float</span> <span class="n">pixelY</span><span class="o">)</span> <span class="o">{</span>
85+
<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="n">Vec2</span> <span class="nf">scaleToWorld</span><span class="o">(</span><span class="kt">float</span> <span class="n">pixelX</span><span class="o">,</span> <span class="kt">float</span> <span class="n">pixelY</span><span class="o">)</span> <span class="o">{</span>
8786
<span class="kt">float</span> <span class="n">worldX</span> <span class="o">=</span> <span class="n">map</span><span class="o">(</span><span class="n">pixelX</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">width</span> <span class="o">/</span> <span class="mi">2</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">width</span> <span class="o">/</span> <span class="mi">2</span> <span class="o">+</span> <span class="n">scaleFactor</span><span class="o">,</span> <span class="mi">0</span><span class="n">f</span><span class="o">,</span> <span class="mi">1</span><span class="n">f</span><span class="o">);</span>
8887
<span class="kt">float</span> <span class="n">worldY</span> <span class="o">=</span> <span class="n">map</span><span class="o">(</span><span class="n">pixelY</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">height</span> <span class="o">/</span> <span class="mi">2</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">height</span> <span class="o">/</span> <span class="mi">2</span> <span class="o">+</span> <span class="n">scaleFactor</span><span class="o">,</span> <span class="mi">1</span><span class="n">f</span><span class="o">,</span> <span class="mi">0</span><span class="n">f</span><span class="o">);</span>
8988
<span class="k">return</span> <span class="k">new</span> <span class="nf">Vec2</span><span class="o">(</span><span class="n">worldX</span><span class="o">,</span> <span class="n">worldY</span><span class="o">);</span>
90-
<span class="o">}</span></code></pre></figure>
89+
<span class="o">}</span>
90+
</code></pre>
91+
</div>
9192

9293
<h3 id="ruby-usage">Ruby usage</h3>
9394
<p>Use camel case</p>
94-
95-
<figure class="highlight"><pre><code class="language-ruby" data-lang="ruby"><span class="n">scale_to_world</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">)</span> <span class="c1"># returns new Vec2 instance (in the PBox2D world)</span></code></pre></figure>
95+
<div class="language-ruby highlighter-rouge"><pre class="highlight"><code><span class="n">scale_to_world</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">)</span> <span class="c1"># returns new Vec2 instance (in the PBox2D world)</span>
96+
</code></pre>
97+
</div>
9698

9799

98100
</article>

docs/_site/methods/step_options/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272

7373
<header class="post-header">
7474
<h1 class="post-title">step_options</h1>
75-
<p class="post-meta">Oct 14, 2016</p>
75+
<p class="post-meta">Jan 1, 2017</p>
7676
</header>
7777

7878
<article class="post-content">

docs/_site/methods/world_to_processing/index.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,19 @@ <h1 class="post-title">world_to_processing</h1>
8282

8383
<p>The java code (<a href="/classes/pbox2d/">PBox2D</a> inherits this from <a href="/classes/pbox2d/">Box2DProcessing</a>)</p>
8484
<h3 id="public-vec2-worldtoprocessingfloat-worldx-float-worldy">public Vec2 worldToProcessing(float worldX, float worldY)</h3>
85-
86-
<figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="n">Vec2</span> <span class="nf">worldToProcessing</span><span class="o">(</span><span class="kt">float</span> <span class="n">worldX</span><span class="o">,</span> <span class="kt">float</span> <span class="n">worldY</span><span class="o">)</span> <span class="o">{</span>
85+
<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="n">Vec2</span> <span class="nf">worldToProcessing</span><span class="o">(</span><span class="kt">float</span> <span class="n">worldX</span><span class="o">,</span> <span class="kt">float</span> <span class="n">worldY</span><span class="o">)</span> <span class="o">{</span>
8786
<span class="kt">float</span> <span class="n">pixelX</span> <span class="o">=</span> <span class="n">map</span><span class="o">(</span><span class="n">worldX</span><span class="o">,</span> <span class="mi">0</span><span class="n">f</span><span class="o">,</span> <span class="mi">1</span><span class="n">f</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">width</span> <span class="o">/</span> <span class="mi">2</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">width</span> <span class="o">/</span> <span class="mi">2</span> <span class="o">+</span> <span class="n">scaleFactor</span><span class="o">);</span>
8887
<span class="kt">float</span> <span class="n">pixelY</span> <span class="o">=</span> <span class="n">map</span><span class="o">(</span><span class="n">worldY</span><span class="o">,</span> <span class="mi">1</span><span class="n">f</span><span class="o">,</span> <span class="mi">0</span><span class="n">f</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">height</span> <span class="o">/</span> <span class="mi">2</span><span class="o">,</span> <span class="n">parent</span><span class="o">.</span><span class="na">height</span> <span class="o">/</span> <span class="mi">2</span> <span class="o">+</span> <span class="n">scaleFactor</span><span class="o">);</span>
8988
<span class="k">return</span> <span class="k">new</span> <span class="nf">Vec2</span><span class="o">(</span><span class="n">pixelX</span><span class="o">,</span> <span class="n">pixelY</span><span class="o">);</span>
90-
<span class="o">}</span></code></pre></figure>
89+
<span class="o">}</span>
90+
</code></pre>
91+
</div>
9192

9293
<h3 id="ruby-usage">Ruby usage</h3>
9394
<p>Use camel case</p>
94-
95-
<figure class="highlight"><pre><code class="language-ruby" data-lang="ruby"><span class="n">world_to_processing</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">)</span> <span class="c1"># returns new Vec2 instance (in processing world)</span></code></pre></figure>
95+
<div class="language-ruby highlighter-rouge"><pre class="highlight"><code><span class="n">world_to_processing</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">)</span> <span class="c1"># returns new Vec2 instance (in processing world)</span>
96+
</code></pre>
97+
</div>
9698

9799

98100
</article>

0 commit comments

Comments
 (0)