rays 0.1.3 → 0.1.4

data/src/point.cpp

@@ -0,0 +1,52 @@
+#include "rays/point.h"
+
+
+namespace Rays
+{
+
+
+	Point::Point (coord value)
+	{
+		set(value);
+	}
+
+	Point::Point (coord x, coord y, coord z)
+	{
+		set(x, y, z);
+	}
+
+	Point
+	Point::dup () const
+	{
+		return *this;
+	}
+
+	Point&
+	Point::set (coord value)
+	{
+		return set(value, value, 0);
+	}
+
+	Point&
+	Point::set (coord x, coord y, coord z)
+	{
+		this->x = x;
+		this->y = y;
+		this->z = z;
+		return *this;
+	}
+
+	coord*
+	Point::array ()
+	{
+		return (coord*) this;
+	}
+
+	const coord*
+	Point::array () const
+	{
+		return const_cast<Point*>(this)->array();
+	}
+
+
+}// Rays

data/src/texture.cpp

@@ -329,16 +329,28 @@ namespace Rays
 		return self->height;
 	}
 
+	float
+	Texture::s (float x) const
+	{
+		return x / (float) self->bitmap.width();
+	}
+
+	float
+	Texture::t (float y) const
+	{
+		return y / (float) self->bitmap.height();
+	}
+
 	float
 	Texture::s_max () const
 	{
-		return (float) self->width / (float) self->bitmap.width();
+		return s(self->width);
 	}
 
 	float
 	Texture::t_max () const
 	{
-		return (float) self->height / (float) self->bitmap.height();
+		return t(self->height);
 	}
 
 	const Bitmap&

data/src/win32/bitmap.cpp

@@ -77,7 +77,7 @@ namespace Rays
 		BITMAPINFOHEADER& header = bmpinfo.bmiHeader;
 		header.biSize        = sizeof(BITMAPINFOHEADER);
 		header.biWidth       = self->width;
-		header.biHeight      = self->height;
+		header.biHeight      = -self->height;
 		header.biPlanes      = 1;
 		header.biBitCount    = self->colorspace.bpp();
 		header.biCompression = BI_RGB;
@@ -159,7 +159,7 @@ namespace Rays
 	const void*
 	Bitmap::data () const
 	{
-		return const_cast<Bitmap*>(this)->data();
+		return const_cast<This*>(this)->data();
 	}
 
 	Bitmap::operator bool () const

data/src/win32/gdi.cpp

@@ -266,18 +266,19 @@ namespace Rays
 		calc_size (
 			coord* width, coord* height, HDC hdc, const char* str)
 		{
-			if ((!width && !height) || !hdc || !str) return false;
+			if (!width || !height || !hdc || !str) return false;
+
+			bool empty = *str == '\0';
+			if (empty) str = " ";
 
 			RECT rect = {0, 0, 0, 0};
-			BOOL ret = DrawTextA(
-				hdc, str, (int) strlen(str), &rect,
+			int ret = DrawTextA(
+				hdc, str, -1, &rect,
 				DT_EXPANDTABS | DT_NOPREFIX | DT_CALCRECT);
-
 			if (!ret) return false;
 
-			if (width)  *width  = rect.right  - rect.left;
-			if (height) *height = rect.bottom - rect.top;
-
+			*width  = empty ? 0 : rect.right  - rect.left;
+			*height =             rect.bottom - rect.top;
 			return true;
 		}
 
@@ -285,17 +286,25 @@ namespace Rays
 		Font::get_extent (
 			coord* width, coord* height, const char* str, HDC hdc)
 		{
-			if (!*this || (!width && !height) || !str)
+			if (!*this || (!width && !height))
 				return false;
 
+			if (width)  *width  = 0;
+			if (height) *height = 0;
+
 			DC dc = hdc ? DC(hdc) : screen_dc();
 			if (!dc) return false;
 
+			coord w = 0, h = 0;
+
 			Font old = dc.font();
 			dc.set_font(*this);
-			bool ret = calc_size(width, height, dc.handle(), str);
+			bool ret = calc_size(&w, &h, dc.handle(), str);
 			dc.set_font(old);
 
+			if (width)  *width  = w;
+			if (height) *height = h;
+
 			return ret;
 		}
 
@@ -427,19 +436,19 @@ namespace Rays
 
 			HPEN hpen;
 
-			 Pen  pen;
+			Pen pen;
 
 			HBRUSH hbrush;
 
-			 Brush  brush;
+			Brush brush;
 
 			HFONT hfont;
 
-			 Font  font;
+			Font font;
 
 			HBITMAP hbitmap;
 
-			 Bitmap  bitmap;
+			Bitmap bitmap;
 
 			COLORREF textcolor, backcolor;
 

data/src/win32/gdi.h

@@ -5,8 +5,8 @@
 
 
 #include <windows.h>
+#include <xot/pimpl.h>
 #include <rays/defs.h>
-#include <rays/helpers.h>
 
 
 namespace Rays
@@ -38,7 +38,7 @@ namespace Rays
 
 				struct Data;
 
-				Impl<Data> self;
+				Xot::PImpl<Data, true> self;
 
 		};// Pen
 
@@ -64,7 +64,7 @@ namespace Rays
 
 				struct Data;
 
-				Impl<Data> self;
+				Xot::PImpl<Data, true> self;
 
 		};// Brush
 
@@ -95,7 +95,7 @@ namespace Rays
 
 				struct Data;
 
-				Impl<Data> self;
+				Xot::PImpl<Data, true> self;
 
 		};// Font
 
@@ -123,7 +123,7 @@ namespace Rays
 
 				struct Data;
 
-				Impl<Data> self;
+				Xot::PImpl<Data, true> self;
 
 		};// Bitmap
 
@@ -181,7 +181,7 @@ namespace Rays
 
 				struct Data;
 
-				Impl<Data> self;
+				Xot::PImpl<Data, true> self;
 
 		};// DC
 
@@ -209,7 +209,7 @@ namespace Rays
 
 				struct Data;
 
-				Impl<Data> self;
+				Xot::PImpl<Data, true> self;
 
 		};// MemoryDC
 

data/test/helpers.rb

@@ -1,11 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-%w[ext lib].each do |dir|
-  paths = ["..", dir]
-  $: << File.expand_path(File.join File.dirname(__FILE__), *paths)
-end
-
+require 'bundler/setup'
 require 'test/unit'
 require 'rays'
 

data/test/test_bitmap.rb

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helpers'
+
+
+class TestBitmap < Test::Unit::TestCase
+
+end# TestBitmap

data/test/test_bounds.rb

@@ -0,0 +1,246 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helpers'
+
+
+class TestBounds < Test::Unit::TestCase
+
+  def bounds (*args)
+    Rays::Bounds.new *args
+  end
+
+  def point (*args)
+    Rays::Point.new *args
+  end
+
+  def test_initialize ()
+    assert_equal bounds(0, 0, 0, 0, 0, 0), bounds()
+    assert_equal bounds(0, 0, 0, 1, 1, 0), bounds(1)
+    assert_equal bounds(0, 0, 0, 1, 2, 0), bounds(1, 2)
+    assert_equal bounds(0, 0, 0, 1, 2, 3), bounds(1, 2, 3)
+    assert_equal bounds(1, 2, 0, 3, 4, 0), bounds(1, 2, 3, 4)
+    assert_equal bounds(1, 2, 3, 4, 5, 6), bounds(1, 2, 3, 4, 5, 6)
+    assert_raise(ArgumentError) {bounds(1, 2, 3, 4, 5)}
+    assert_raise(ArgumentError) {bounds(1, 2, 3, 4, 5, 6, 7)}
+  end
+
+  def test_get_xyzwhd ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal 1, o.x
+    assert_equal 2, o.y
+    assert_equal 3, o.z
+    assert_equal 4, o.w
+    assert_equal 5, o.h
+    assert_equal 6, o.d
+    assert_equal 4, o.width
+    assert_equal 5, o.height
+    assert_equal 6, o.depth
+  end
+
+  def test_set_xyzwhd ()
+    o = bounds
+    o.x = 1
+    assert_equal [1, 0, 0, 0, 0, 0], o.to_a(3)
+    o.y = 2
+    assert_equal [1, 2, 0, 0, 0, 0], o.to_a(3)
+    o.z = 3
+    assert_equal [1, 2, 3, 0, 0, 0], o.to_a(3)
+    o.w = 4
+    assert_equal [1, 2, 3, 4, 0, 0], o.to_a(3)
+    o.h = 5
+    assert_equal [1, 2, 3, 4, 5, 0], o.to_a(3)
+    o.d = 6
+    assert_equal [1, 2, 3, 4, 5, 6], o.to_a(3)
+    o.width  = 7
+    assert_equal [1, 2, 3, 7, 5, 6], o.to_a(3)
+    o.height = 8
+    assert_equal [1, 2, 3, 7, 8, 6], o.to_a(3)
+    o.depth  = 9
+    assert_equal [1, 2, 3, 7, 8, 9], o.to_a(3)
+  end
+
+  def test_get_ltbrbf ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal 1, o.left
+    assert_equal 2, o.top
+    assert_equal 3, o.back
+    assert_equal 4, o.right
+    assert_equal 6, o.bottom
+    assert_equal 8, o.front
+  end
+
+  def test_set_ltbrbf ()
+    o = bounds
+    o.left   = -1
+    assert_equal [-1,  0,  0,  1,  0,  0], o.to_a(3)
+    o.top    = -2
+    assert_equal [-1, -2,  0,  1,  2,  0], o.to_a(3)
+    o.back   = -3
+    assert_equal [-1, -2, -3,  1,  2,  3], o.to_a(3)
+    o.right  = 11
+    assert_equal [-1, -2, -3, 13,  2,  3], o.to_a(3)
+    o.bottom = 22
+    assert_equal [-1, -2, -3, 13, 25,  3], o.to_a(3)
+    o.front  = 33
+    assert_equal [-1, -2, -3, 13, 25, 37], o.to_a(3)
+  end
+
+  def test_position ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal [ 1,  2,  3], o.position.to_a(3)
+    o.position = point 7, 8, 9
+    assert_equal [ 7,  8,  9], o.position.to_a(3)
+    o.pos = point 10, 11, 12
+    assert_equal [10, 11, 12], o.position.to_a(3)
+    assert_equal [10, 11, 12], o.pos.to_a(3)
+  end
+
+  def test_size ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal point(4, 5, 6), o.size
+    o.size = point 7, 8, 9
+    assert_equal point(7, 8, 9), o.size
+  end
+
+  def test_move_to ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal bounds(7, 7, 3, 4, 5, 6), o.move_to(7)
+    assert_equal bounds(7, 8, 3, 4, 5, 6), o.move_to(7, 8)
+    assert_equal bounds(7, 8, 9, 4, 5, 6), o.move_to(7, 8, 9)
+    assert_raise(ArgumentError) {o.move_to()}
+    assert_raise(ArgumentError) {o.move_to(7, 8, 9, 10)}
+
+    o0 = o.dup
+    o1 = o0.move_to 7, 8, 9
+    assert_equal bounds(1, 2, 3, 4, 5, 6), o0
+    assert_equal bounds(7, 8, 9, 4, 5, 6), o1
+    o0.move_to! 10, 11, 12
+    assert_equal bounds(10, 11, 12, 4, 5, 6), o0
+    assert_equal bounds( 7,  8,  9, 4, 5, 6), o1
+  end
+
+  def test_move_by ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal bounds( 8,  9,  3, 4, 5, 6), o.move_by(7)
+    assert_equal bounds( 8, 10,  3, 4, 5, 6), o.move_by(7, 8)
+    assert_equal bounds( 8, 10, 12, 4, 5, 6), o.move_by(7, 8, 9)
+    assert_equal bounds(-6, -5,  3, 4, 5, 6), o.move_by(-7)
+    assert_equal bounds(-6, -6,  3, 4, 5, 6), o.move_by(-7, -8)
+    assert_equal bounds(-6, -6, -6, 4, 5, 6), o.move_by(-7, -8, -9)
+    assert_raise(ArgumentError) {o.move_by()}
+    assert_raise(ArgumentError) {o.move_by(7, 8, 9, 10)}
+
+    o0 = o.dup
+    o1 = o0.move_by 7, 8, 9
+    assert_equal bounds(1,  2,  3, 4, 5, 6), o0
+    assert_equal bounds(8, 10, 12, 4, 5, 6), o1
+    o0.move_by! 10, 11, 12
+    assert_equal bounds(11, 13, 15, 4, 5, 6), o0
+    assert_equal bounds( 8, 10, 12, 4, 5, 6), o1
+  end
+
+  def test_resize_to ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal bounds(1, 2, 3, 7, 7, 6), o.resize_to(7)
+    assert_equal bounds(1, 2, 3, 7, 8, 6), o.resize_to(7, 8)
+    assert_equal bounds(1, 2, 3, 7, 8, 9), o.resize_to(7, 8, 9)
+    assert_raise(ArgumentError) {o.resize_to()}
+    assert_raise(ArgumentError) {o.resize_to(7, 8, 9, 10)}
+
+    o0 = o.dup
+    o1 = o0.resize_to 7, 8, 9
+    assert_equal bounds(1, 2, 3, 4, 5, 6), o0
+    assert_equal bounds(1, 2, 3, 7, 8, 9), o1
+    o0.resize_to! 10, 11, 12
+    assert_equal bounds(1, 2, 3, 10, 11, 12), o0
+    assert_equal bounds(1, 2, 3,  7,  8,  9), o1
+  end
+
+  def test_resize_by ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal bounds(1, 2, 3, 11, 12,  6), o.resize_by(7)
+    assert_equal bounds(1, 2, 3, 11, 13,  6), o.resize_by(7, 8)
+    assert_equal bounds(1, 2, 3, 11, 13, 15), o.resize_by(7, 8, 9)
+    assert_equal bounds(1, 2, 3, -3, -2,  6), o.resize_by(-7)
+    assert_equal bounds(1, 2, 3, -3, -3,  6), o.resize_by(-7, -8)
+    assert_equal bounds(1, 2, 3, -3, -3, -3), o.resize_by(-7, -8, -9)
+    assert_raise(ArgumentError) {o.resize_by()}
+    assert_raise(ArgumentError) {o.resize_by(7, 8, 9, 10)}
+
+    o0 = o.dup
+    o1 = o0.resize_by 7, 8, 9
+    assert_equal bounds(1, 2, 3,  4,  5,  6), o0
+    assert_equal bounds(1, 2, 3, 11, 13, 15), o1
+    o0.resize_by! 10, 11, 12
+    assert_equal bounds(1, 2, 3, 14, 16, 18), o0
+    assert_equal bounds(1, 2, 3, 11, 13, 15), o1
+  end
+
+  def test_inset_by ()
+    o = bounds 1, 2, 3, 20, 30, 40
+    assert_equal bounds(8,  9,  3, 6, 16, 40), o.inset_by(7)
+    assert_equal bounds(8, 10,  3, 6, 14, 40), o.inset_by(7, 8)
+    assert_equal bounds(8, 10, 12, 6, 14, 22), o.inset_by(7, 8, 9)
+    assert_raise(ArgumentError) {o.inset_by()}
+    assert_raise(ArgumentError) {o.inset_by(7, 8, 9, 10)}
+
+    o0 = o.dup
+    o1 = o0.inset_by 7, 8, 9
+    assert_equal bounds(1,  2,  3, 20, 30, 40), o0
+    assert_equal bounds(8, 10, 12,  6, 14, 22), o1
+    o0.inset_by! 10, 11, 12
+    assert_equal bounds(11, 13, 15, 0,  8, 16), o0
+    assert_equal bounds( 8, 10, 12, 6, 14, 22), o1
+  end
+
+  def test_to_a ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal [1, 2, 4, 5],       o.to_a
+    assert_equal [1, 4],             o.to_a(1)
+    assert_equal [1, 2, 4, 5],       o.to_a(2)
+    assert_equal [1, 2, 3, 4, 5, 6], o.to_a(3)
+    assert_raise(ArgumentError) {o.to_a(-1)}
+    assert_raise(ArgumentError) {o.to_a(0)}
+    assert_raise(ArgumentError) {o.to_a(4)}
+  end
+
+  def test_index ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert_equal point(1, 2, 3), o[0]
+    assert_equal point(4, 6, 8), o[1]
+    assert_raise(IndexError) {o[-1]}
+    assert_raise(IndexError) {o[2]}
+  end
+
+  def test_index_assign ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    o[0] = point 7, 8, 9
+    assert_equal bounds(7, 8, 9, -2, -1, 0), o
+    o[1] = point 10, 11, 12
+    assert_equal bounds(7, 8, 9, 4, 4, 4), o
+    assert_raise(IndexError) {o[-1]}
+    assert_raise(IndexError) {o[2]}
+  end
+
+  def test_compare ()
+    o = bounds 1, 2, 3, 4, 5, 6
+    assert o == bounds(1, 2, 3, 4, 5, 6)
+    assert !(o != bounds(1, 2, 3, 4, 5, 6))
+
+    assert o < bounds(2, 2, 3, 4, 5, 6)
+    assert o < bounds(1, 3, 3, 4, 5, 6)
+    assert o < bounds(1, 2, 4, 4, 5, 6)
+    assert o < bounds(1, 2, 3, 5, 5, 6)
+    assert o < bounds(1, 2, 3, 4, 6, 6)
+    assert o < bounds(1, 2, 3, 4, 5, 7)
+
+    assert o > bounds(0, 2, 3, 4, 5, 6)
+    assert o > bounds(1, 1, 3, 4, 5, 6)
+    assert o > bounds(1, 2, 2, 4, 5, 6)
+    assert o > bounds(1, 2, 3, 3, 5, 6)
+    assert o > bounds(1, 2, 3, 4, 4, 6)
+    assert o > bounds(1, 2, 3, 4, 5, 5)
+  end
+
+end# TestBounds