fix dodgy logic in Rect.containsPoint

Author: monkstone

CHANGELOG.md

@@ -1,5 +1,5 @@
 
-**v0.5.1** Mainly corrections.
+**v0.6.0** Some corrections to the Rect and Vec3D contains logic (mea culpa, caued by injudicious refactoring)
 
 **v0.5.0** New version toxiclibs update to use jdk8 syntax, require jdk8 and probably therefore JRubyArt only new MeshToVBO class.
 

README.md

@@ -7,7 +7,7 @@ gem install toxiclibs
 
 ### NB: Use version 0.4 for ruby-processing
 
-Here I have created create a gem to use Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars in JRubyArt. To compile the gem follow the instructions for [JRubyArt][]. Most parts of toxiclibs API is exposed in the latest version, (but only a few examples are included) in principle it should be possible to make all available!!! For this demonstration I have used up to date source code for version 21, since [toxis final release][] may never materialise (he's probably got more interesting things to do). There are reported to be number of outstanding bugs with toxiclibs, if they affect you report it [here][] (or better fix them yourself and submit a pull request). Version 0.5.0 features java code updated to use java lambda (jdk8) and was compiled against processing-3.0.1 core.jar.  Added features are export Mesh to PShape and export Mesh to [povray mesh2](http://www.povray.org/documentation/3.7.0/r3_4.html#r3_4_5_2_4).
+Here I have created create a gem to use Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars in JRubyArt. To compile the gem follow the instructions for [JRubyArt][]. Most parts of toxiclibs API is exposed in the latest version, (but only a few examples are included) in principle it should be possible to make all available!!! For this demonstration I have used up to date source code for version 21, since [toxis final release][] may never materialise (he's probably got more interesting things to do). There are reported to be number of outstanding bugs with toxiclibs, if they affect you report it [here][] (or better fix them yourself and submit a pull request). Version 0.5.0+ features java code updated to use java lambda (jdk8) and was compiled against processing-3.0.1 core.jar.  Added features are export Mesh to PShape and export Mesh to [povray mesh2](http://www.povray.org/documentation/3.7.0/r3_4.html#r3_4_5_2_4).
 
 ![grayscott image](http://4.bp.blogspot.com/-d4MiL4_0Njk/VFJMv6VUicI/AAAAAAAAEgY/fFAfrXDxNXM/s400/grayscott.png)
 

examples/test_rect.rb

@@ -0,0 +1,30 @@
+require 'toxiclibs'
+
+attr_reader :points, :bounds, :gfx
+
+def settings
+  size(400,400)
+end
+
+def setup
+  sketch_title 'Test Rect'
+  @points = []
+  @bounds = Toxi::Rect.new(200, 200, 0, 0)
+  @gfx = Gfx::ToxiclibsSupport.new(self)
+end
+
+def draw
+  background(255)
+  no_fill
+  stroke(0)
+  gfx.rect(bounds)
+  fill(255, 0, 0)
+  no_stroke
+  points.each { |p| gfx.circle(p, 5) }
+end
+
+def mouse_pressed
+  p = TVec2D.new(mouse_x, mouse_y)
+  points << p
+  bounds.grow_to_contain_point(p)
+end

lib/toxiclibs/version.rb

@@ -1,3 +1,3 @@
 module Toxiclibs
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.ruby-processing</groupId>
   <artifactId>toxiclibs</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0</version>
   <packaging>jar</packaging>
   <description>
     toxiclibs-library for JRubyArt

src/toxi/geom/Rect.java

@@ -146,7 +146,7 @@ public boolean containsPoint(ReadonlyVec2D p) {
         if (px < x || px > x + width) {
             return false;
         }
-        return (py >= y || py <= y + height);
+        return (py >= y && py <= y + height);
     }
 
     /**

src/toxi/geom/Vec2D.java

@@ -743,7 +743,7 @@ public boolean isInRectangle(Rect r) {
         if (x < r.x || x > r.x + r.width) {
             return false;
         }
-        return (y >= r.y || y <= r.y + r.height); 
+        return (y >= r.y && y <= r.y + r.height); 
     }
 
     @Override

src/toxi/geom/Vec3D.java

@@ -994,7 +994,7 @@ public boolean isInAABB(Vec3D boxOrigin, Vec3D boxExtent) {
             return false;
         }
         w = boxExtent.z;
-        return (z > boxOrigin.z - w || z < boxOrigin.z + w);
+        return (z >= boxOrigin.z - w && z <= boxOrigin.z + w);
     }
 
     @Override

toxiclibs.gemspec

@@ -17,18 +17,16 @@ Gem::Specification.new do |spec|
   spec.licenses = %w{MIT LGPL-3.0}
   spec.authors = %w{Karsten\ Schmidt Martin\ Prout}
   spec.email = 'martin_p@lineone.net'
-  spec.homepage = 'https://github.com/ruby-processing/toxiclibs'
+  spec.homepage = 'http://ruby-processing.github.io/toxicgem/'
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.files << 'lib/toxiclibs.jar'
   spec.files << 'lib/args4j-2.0.31.jar' 
   spec.require_paths = ['lib']
-  spec.add_dependency 'jruby_art', '~> 1.0' 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.8"
+  spec.add_dependency 'jruby_art', '~> 1.0', '>= 1.0.1' 
+  spec.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
   spec.platform = 'java'
   spec.requirements << 'A decent graphics card'
   spec.requirements << 'java runtime >= 1.8+'
   spec.requirements << 'processing = 3.0.1+'
   spec.requirements << 'maven = 3.3.3'
-  spec.requirements << 'jruby_art = 1.0+'
 end