From eb8a67cb401606be979f61a2fee5092083f95048 Mon Sep 17 00:00:00 2001 From: monkstone Date: Fri, 13 Jan 2017 11:52:17 +0000 Subject: [PATCH 01/27] tuning --- CHANGELOG.md | 1 + lib/joonsrenderer/version.rb | 2 +- pom.rb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23b5c7f..4b84d7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +**v1.1.2** Use sunflow.util.FloatList and IntList, netbeans profiling suggest it is worth doing (there is a vanilla processing alternative, with a different interface) **v1.1.1** Left out GLASS from fill type switch easily fixed thought diff --git a/lib/joonsrenderer/version.rb b/lib/joonsrenderer/version.rb index 398f942..a1b5122 100644 --- a/lib/joonsrenderer/version.rb +++ b/lib/joonsrenderer/version.rb @@ -1,3 +1,3 @@ module JoonsRenderer - VERSION = '1.1.1' + VERSION = '1.1.2' end diff --git a/pom.rb b/pom.rb index 3f16ad2..8736feb 100644 --- a/pom.rb +++ b/pom.rb @@ -2,11 +2,11 @@ project 'joonsrenderer' do model_version '4.0.0' - id 'joons:joonsrenderer:1.1.1' + id 'joons:joonsrenderer:1.1.2' packaging 'jar' description 'joonsrenderer for propane and JRubyArt' organization 'ruby-processing', 'https://ruby-processing.github.io' - { 'fpsunflower' => 'Christopher Kulla', 'geneome' => 'Not Known', 'joonhyublee' => 'Joon Hyub Lee', 'monkstone' => 'Martin Prout' }.each do |key, value| + { 'fpsunflower' => 'Christopher Kulla', 'geneome' => 'Eugene Reilly', 'joonhyublee' => 'Joon Hyub Lee', 'monkstone' => 'Martin Prout' }.each do |key, value| developer key do name value roles 'developer' From c25bf10482ee33d77d0d57121aa77a8105320fbc Mon Sep 17 00:00:00 2001 From: monkstone Date: Fri, 16 Jun 2017 19:24:35 +0100 Subject: [PATCH 02/27] bump version --- CHANGELOG.md | 4 +++- lib/joonsrenderer/version.rb | 2 +- pom.rb | 4 ++-- pom.xml | 6 +++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b84d7d..23ee1b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ -**v1.1.2** Use sunflow.util.FloatList and IntList, netbeans profiling suggest it is worth doing (there is a vanilla processing alternative, with a different interface) +**v1.1.3** Bump for processing-3.3.4 + +**v1.1.2** Use sunflow.util.FloatList and IntList, netbeans profiling suggest it is worth doing (there is a vanilla processing alternative, with a different interface) **v1.1.1** Left out GLASS from fill type switch easily fixed thought diff --git a/lib/joonsrenderer/version.rb b/lib/joonsrenderer/version.rb index a1b5122..dda5624 100644 --- a/lib/joonsrenderer/version.rb +++ b/lib/joonsrenderer/version.rb @@ -1,3 +1,3 @@ module JoonsRenderer - VERSION = '1.1.2' + VERSION = '1.1.3' end diff --git a/pom.rb b/pom.rb index 8736feb..2173086 100644 --- a/pom.rb +++ b/pom.rb @@ -2,7 +2,7 @@ project 'joonsrenderer' do model_version '4.0.0' - id 'joons:joonsrenderer:1.1.2' + id 'joons:joonsrenderer:1.1.3' packaging 'jar' description 'joonsrenderer for propane and JRubyArt' organization 'ruby-processing', 'https://ruby-processing.github.io' @@ -23,7 +23,7 @@ 'maven.compiler.target' => '1.8', 'janino.version' => '3.0.6', 'jogl.version' => '2.3.2', - 'processing.version' => '3.2.3' + 'processing.version' => '3.3.4' ) jar 'org.processing:core:${processing.version}' diff --git a/pom.xml b/pom.xml index ceb8478..b265e5c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE 4.0.0 joons joonsrenderer - 1.1.1 + 1.1.3 joonsrenderer joonsrenderer for propane and JRubyArt @@ -34,7 +34,7 @@ DO NOT MODIFIY - GENERATED CODE geneome - Not Known + Eugene Reilly developer @@ -63,7 +63,7 @@ DO NOT MODIFIY - GENERATED CODE src ${project.basedir} 1.8 - 3.2.3 + 3.3.4 utf-8 3.0.6 pom.xml From e46306fd2a377ee649562167adf34b3e103e20ba Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 15 Jul 2017 20:50:14 +0100 Subject: [PATCH 03/27] so a_maintest will run netbeans --- src/{test/java => }/a_maintest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) rename src/{test/java => }/a_maintest.java (97%) diff --git a/src/test/java/a_maintest.java b/src/a_maintest.java similarity index 97% rename from src/test/java/a_maintest.java rename to src/a_maintest.java index 8be0adc..827ccd8 100644 --- a/src/test/java/a_maintest.java +++ b/src/a_maintest.java @@ -1,7 +1,7 @@ import processing.core.PApplet; import joons.JoonsRenderer; -@SuppressWarnings("serial") + public class a_maintest extends PApplet { JoonsRenderer jr; @@ -21,12 +21,10 @@ public class a_maintest extends PApplet { float zNear = 5; float zFar = 10000; - @Override public void settings() { size(800, 600, P3D); } - @Override public void setup() { jr = new JoonsRenderer(this); @@ -38,7 +36,6 @@ public void setup() { //jr.setDOF(170, 5); //Set depth of field of camera, (focus distance, lens radius). Larger radius => more blurry. } - @Override public void draw() { jr.beginRecord(); //Make sure to include methods you want rendered. camera(eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ); @@ -116,7 +113,6 @@ public void draw() { /** * Press 'r' key to start rendering. */ - @Override public void keyPressed() { if (key == 'r' || key == 'R') { jr.render(); From a873a2cb0f6910f9b06fb570e362ba0b1d8b350a Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 06:48:41 +0100 Subject: [PATCH 04/27] bump version --- docs/_includes/head.html | 4 ++-- pom.rb | 2 +- src/a_maintest.java | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/_includes/head.html b/docs/_includes/head.html index 42258b4..de1a728 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -9,7 +9,7 @@ {% endif %}{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + - \ No newline at end of file + diff --git a/pom.rb b/pom.rb index 2173086..fbdc6d5 100644 --- a/pom.rb +++ b/pom.rb @@ -23,7 +23,7 @@ 'maven.compiler.target' => '1.8', 'janino.version' => '3.0.6', 'jogl.version' => '2.3.2', - 'processing.version' => '3.3.4' + 'processing.version' => '3.3.5' ) jar 'org.processing:core:${processing.version}' diff --git a/src/a_maintest.java b/src/a_maintest.java index 827ccd8..0d86089 100644 --- a/src/a_maintest.java +++ b/src/a_maintest.java @@ -21,10 +21,12 @@ public class a_maintest extends PApplet { float zNear = 5; float zFar = 10000; + @Override public void settings() { size(800, 600, P3D); } + @Override public void setup() { jr = new JoonsRenderer(this); @@ -36,6 +38,7 @@ public void setup() { //jr.setDOF(170, 5); //Set depth of field of camera, (focus distance, lens radius). Larger radius => more blurry. } + @Override public void draw() { jr.beginRecord(); //Make sure to include methods you want rendered. camera(eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ); @@ -113,6 +116,7 @@ public void draw() { /** * Press 'r' key to start rendering. */ + @Override public void keyPressed() { if (key == 'r' || key == 'R') { jr.render(); From 0396d9f7c3a52b89a34acb43b4d8ae413625b414 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 06:52:14 +0100 Subject: [PATCH 05/27] link to local css --- docs/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/head.html b/docs/_includes/head.html index de1a728..a76ca94 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -9,7 +9,7 @@ {% endif %}{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + From debd58d06c024a22aa6626eb0b2ce7f3fd16de73 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 06:53:58 +0100 Subject: [PATCH 06/27] link to local css --- docs/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/head.html b/docs/_includes/head.html index a76ca94..f86eb46 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -9,7 +9,7 @@ {% endif %}{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + From 3d1948337a3f1e955b67ea399fb4c391e22f6ca6 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 06:58:35 +0100 Subject: [PATCH 07/27] revert to external css --- docs/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/head.html b/docs/_includes/head.html index f86eb46..0da104e 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -9,7 +9,7 @@ {% endif %}{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + From 5817cca556fa7a713414fffa1730389be1a36a63 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 07:50:59 +0100 Subject: [PATCH 08/27] site.github.url css --- docs/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/head.html b/docs/_includes/head.html index 0da104e..f78f3fa 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -9,7 +9,7 @@ {% endif %}{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + From c24a3e7757ec08fd8358622a07cfb64f0613971a Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 07:53:04 +0100 Subject: [PATCH 09/27] site.github.url css --- docs/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/head.html b/docs/_includes/head.html index f78f3fa..e48394e 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -9,7 +9,7 @@ {% endif %}{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + From 680a869cd0b520fbcb60744028cb1d95106ce066 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 07:54:38 +0100 Subject: [PATCH 10/27] site.url/docs/css --- docs/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/head.html b/docs/_includes/head.html index e48394e..6044962 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -9,7 +9,7 @@ {% endif %}{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + From 4b69c75835a6075f2bffaff9bea5378e1b977266 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 07:56:40 +0100 Subject: [PATCH 11/27] no link --- docs/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/head.html b/docs/_includes/head.html index 6044962..ada752b 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -9,7 +9,7 @@ {% endif %}{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + From b149472bf152027756f486a8ba7323e05066c02b Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 08:08:37 +0100 Subject: [PATCH 12/27] last try --- docs/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/head.html b/docs/_includes/head.html index ada752b..e3c8fdb 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -9,7 +9,7 @@ {% endif %}{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + From f8e6b72ba216908f778b3239c725b214bcef31d9 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 08:37:53 +0100 Subject: [PATCH 13/27] experiment --- docs/_includes/top.html | 13 +++++++++++++ docs/_layouts/default.html | 21 ++++++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 docs/_includes/top.html diff --git a/docs/_includes/top.html b/docs/_includes/top.html new file mode 100644 index 0000000..aac2904 --- /dev/null +++ b/docs/_includes/top.html @@ -0,0 +1,13 @@ + + + + + + + {% feed_meta %} + + + + + {% seo %} + diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index e4ab96f..6f38e14 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -1,20 +1,11 @@ - - +{% include top.html %} - {% include head.html %} + + {% include header.html %} - + {{ content }} - {% include header.html %} - -
-
- {{ content }} -
-
- - {% include footer.html %} - - + {% include footer.html %} + From 72208899d072e18c2fa22127b718f27e6cf330b9 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 08:40:51 +0100 Subject: [PATCH 14/27] experiment --- docs/_includes/top.html | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/_includes/top.html b/docs/_includes/top.html index aac2904..988ceb5 100644 --- a/docs/_includes/top.html +++ b/docs/_includes/top.html @@ -5,7 +5,6 @@ {% feed_meta %} - From 1d913ce41c18d9ebfe4ba68e3fa16d63542d08a0 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 08:50:04 +0100 Subject: [PATCH 15/27] seo feed --- docs/Gemfile | 2 ++ docs/_config.yml | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 docs/Gemfile diff --git a/docs/Gemfile b/docs/Gemfile new file mode 100644 index 0000000..6e71ddd --- /dev/null +++ b/docs/Gemfile @@ -0,0 +1,2 @@ +gem 'jekyll-feed' +gem 'jekyll-seo-tag' diff --git a/docs/_config.yml b/docs/_config.yml index 858de65..5c994f8 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -18,3 +18,6 @@ syntax-highlighting: enabled: true # Build settings markdown: kramdown +gems: + - jekyll-feed + - jekyll-seo-tag From d3f3f5dba6d86051d1bfc2c7d436b346378b363d Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 08:52:27 +0100 Subject: [PATCH 16/27] seo feed --- docs/_includes/top.html | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/_includes/top.html b/docs/_includes/top.html index 988ceb5..a0535b1 100644 --- a/docs/_includes/top.html +++ b/docs/_includes/top.html @@ -5,7 +5,6 @@ {% feed_meta %} - {% seo %} From 3b99aae7fb1ea9678676464a606fc9150fbc1704 Mon Sep 17 00:00:00 2001 From: monkstone Date: Sat, 29 Jul 2017 08:57:56 +0100 Subject: [PATCH 17/27] title --- docs/_includes/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 70eff6e..7fc11fe 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -2,7 +2,7 @@
- {{ site.title }} + {{ site.title }}