rays 0.1.12 → 0.1.13

data/src/texture.h

@@ -0,0 +1,65 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_SRC_TEXTURE_H__
+#define __RAYS_SRC_TEXTURE_H__
+
+
+#include <xot/pimpl.h>
+#include <rays/defs.h>
+#include <rays/color_space.h>
+#include "opengl.h"
+
+
+namespace Rays
+{
+
+
+	class Bitmap;
+
+
+	class Texture
+	{
+
+		public:
+
+			Texture ();
+
+			Texture (int width, int height, const ColorSpace& cs = RGBA);
+
+			Texture (const Bitmap& bitmap);
+
+			~Texture ();
+
+			int          width () const;
+
+			int reserved_width () const;
+
+			int          height () const;
+
+			int reserved_height () const;
+
+			const ColorSpace& color_space () const;
+
+			Context context () const;
+
+			GLuint id () const;
+
+			void set_modified (bool modified = true);
+
+			bool     modified () const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+	};// Texture
+
+
+}// Rays
+
+
+#endif//EOH

data/src/win32/bitmap.cpp

@@ -1,6 +1,7 @@
-#include "rays/bitmap.h"
+#include "../bitmap.h"
 
 
+#include "font.h"
 #include "gdi.h"
 
 
@@ -19,10 +20,10 @@ namespace Rays
 
 		Win32::MemoryDC memdc;
 
-		bool dirty;
+		bool modified;
 
 		Data ()
-		:	pixels(NULL), dirty(true)
+		:	pixels(NULL), modified(true)
 		{
 		}
 
@@ -56,7 +57,7 @@ namespace Rays
 	}
 
 	static bool
-	setup (Bitmap* bmp, int w, int h, const ColorSpace& cs, HDC hdc = NULL)
+	setup_bitmap (Bitmap* bmp, int w, int h, const ColorSpace& cs, HDC hdc = NULL)
 	{
 		if (w <= 0 || h <= 0 || !cs || !bmp || *bmp)
 			return false;
@@ -94,6 +95,59 @@ namespace Rays
 		return init_bitmap_pixels(bmp);
 	}
 
+	static void
+	setup_bitmap (Bitmap* this_, const Texture& tex)
+	{
+		not_implement_error(__FILE__, __LINE__);
+	}
+
+	Bitmap
+	Bitmap_from (const Texture& texture)
+	{
+		Bitmap bmp;
+		setup_bitmap(&bmp, texture);
+		return bmp;
+	}
+
+	void
+	Bitmap_draw_string (
+		Bitmap* bitmap, const RawFont& font, const char* str, coord x, coord y)
+	{
+		if (!bitmap || !*bitmap || !font || !str)
+			argument_error(__FILE__, __LINE__);
+
+		if (*str == '\0') return;
+
+		font.draw_string(bitmap->self->memdc.handle(), bitmap->height(), str, x, y);
+		Bitmap_set_modified(bitmap);
+	}
+
+	void
+	Bitmap_set_modified (Bitmap* bitmap, bool modified)
+	{
+		assert(bitmap);
+
+		bitmap->self->modified = modified;
+	}
+
+	bool
+	Bitmap_get_modified (const Bitmap& bitmap)
+	{
+		return bitmap.self->modified;
+	}
+
+	bool
+	Bitmap_save (const Bitmap& bitmap, const char* path)
+	{
+		return false;
+	}
+
+	bool
+	Bitmap_load (Bitmap* bitmap, const char* path)
+	{
+		return false;
+	}
+
 
 	Bitmap::Bitmap ()
 	{
@@ -101,7 +155,7 @@ namespace Rays
 
 	Bitmap::Bitmap (int width, int height, const ColorSpace& cs)
 	{
-		setup(this, width, height, cs);
+		setup_bitmap(this, width, height, cs);
 	}
 
 	Bitmap::~Bitmap ()
@@ -138,28 +192,16 @@ namespace Rays
 		return pitch() * height();
 	}
 
-	bool
-	Bitmap::dirty () const
-	{
-		return self->dirty;
-	}
-
-	void
-	Bitmap::set_dirty (bool b)
-	{
-		self->dirty = b;
-	}
-
 	void*
-	Bitmap::data ()
+	Bitmap::pixels ()
 	{
 		return self->pixels;
 	}
 
 	const void*
-	Bitmap::data () const
+	Bitmap::pixels () const
 	{
-		return const_cast<This*>(this)->data();
+		return const_cast<This*>(this)->pixels();
 	}
 
 	Bitmap::operator bool () const
@@ -177,36 +219,4 @@ namespace Rays
 	}
 
 
-	bool
-	load_bitmap (Bitmap* bitmap, const char* path)
-	{
-		return false;
-	}
-
-	bool
-	save_bitmap (const Bitmap& bitmap, const char* path)
-	{
-		return false;
-	}
-
-
-	bool draw_string (
-		HDC, coord, const char*, coord, coord, const Font&);
-
-	bool
-	draw_string (
-		Bitmap* bmp, const char* str, coord x, coord y, const Font& font)
-	{
-		if (!bmp || !*bmp || !str || !font) return false;
-
-		if (*str == '\0') return true;
-
-		if (!draw_string(bmp->self->memdc.handle(), bmp->height(), str, x, y, font))
-			return false;
-
-		bmp->set_dirty();
-		return true;
-	}
-
-
 }// Rays

data/src/win32/font.cpp

@@ -1,7 +1,4 @@
-#include "rays/font.h"
-
-
-#include "gdi.h"
+#include "font.h"
 
 
 namespace Rays
@@ -67,23 +64,23 @@ namespace Rays
 	}
 
 
-	bool
-	draw_string (
-		HDC hdc, coord context_height,
-		const char* str, coord x, coord y, const Font& font)
+	void
+	Font_draw_string (
+		const Font& font, HDC hdc, coord context_height,
+		const char* str, coord x, coord y)
 	{
 		using namespace Win32;
 
-		if (!hdc || !str || !font) return false;
+		if (!font || !hdc || !str)
+			argument_error(__FILE__, __LINE__);
 
-		if (*str == '\0') return true;
+		if (*str == '\0') return;
 
 		coord width = 0, height = 0;
 		if (!font.get_extent(&width, &height, str))
-			return false;
+			rays_error(__FILE__, __LINE__, "getting font extent failed.");
 
 		DC dc = hdc;
-
 		RECT rect = {x, y, x + (int) width, y + (int) height};
 		FillRect(dc.handle(), &rect, Brush(0, 0, 0).handle());
 
@@ -92,7 +89,8 @@ namespace Rays
 		BOOL ret = TextOutA(dc.handle(), x, y, str, strlen(str));
 		dc.set_font(old);
 
-		return ret != FALSE;
+		if (ret == FALSE)
+			rays_error(__FILE__, __LINE__, "drawing text failed.");
 	}
 
 

data/src/win32/font.h

@@ -0,0 +1,24 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_SRC_WIN32_FONT_H__
+#define __RAYS_SRC_WIN32_FONT_H__
+
+
+#include <rays/defs.h>
+#include <rays/font.h>
+#include "gdi.h"
+
+
+namespace Rays
+{
+
+
+	bool RawFont_draw_string (
+		const RawFont& font, HDC hdc, coord context_height,
+		const char* str, coord x, coord y);
+
+
+}// Rays
+
+
+#endif//EOH

data/src/win32/gdi.h

@@ -38,7 +38,7 @@ namespace Rays
 
 				struct Data;
 
-				Xot::PImpl<Data, true> self;
+				Xot::PSharedImpl<Data> self;
 
 		};// Pen
 
@@ -64,7 +64,7 @@ namespace Rays
 
 				struct Data;
 
-				Xot::PImpl<Data, true> self;
+				Xot::PSharedImpl<Data> self;
 
 		};// Brush
 
@@ -95,7 +95,7 @@ namespace Rays
 
 				struct Data;
 
-				Xot::PImpl<Data, true> self;
+				Xot::PSharedImpl<Data> self;
 
 		};// Font
 
@@ -123,7 +123,7 @@ namespace Rays
 
 				struct Data;
 
-				Xot::PImpl<Data, true> self;
+				Xot::PSharedImpl<Data> self;
 
 		};// Bitmap
 
@@ -181,7 +181,7 @@ namespace Rays
 
 				struct Data;
 
-				Xot::PImpl<Data, true> self;
+				Xot::PSharedImpl<Data> self;
 
 		};// DC
 
@@ -209,7 +209,7 @@ namespace Rays
 
 				struct Data;
 
-				Xot::PImpl<Data, true> self;
+				Xot::PSharedImpl<Data> self;
 
 		};// MemoryDC
 

data/test/helper.rb

@@ -15,6 +15,3 @@ include Xot::Test
 unless $RAYS_NOAUTOINIT
   def Rays.fin! () end
 end
-
-
-Rays.init_offscreen_context

data/test/test_bitmap.rb

@@ -9,19 +9,43 @@ class TestBitmap < Test::Unit::TestCase
   W = 32
   H = 16
 
-  def bmp (w = W, h = H)
+  def bitmap (w = W, h = H)
     Rays::Bitmap.new w, h
   end
 
+  def color (*args)
+    Rays::Color.new *args
+  end
+
   def test_initialize ()
-    assert_equal W, bmp.width
-    assert_equal H, bmp.height
+    assert_equal W, bitmap.width
+    assert_equal H, bitmap.height
+  end
+
+  def test_dup ()
+    o          = bitmap
+    assert_equal color(0, 0, 0, 0), o[0, 0]
+    o[0, 0]    = color(1, 0, 0, 0)
+    assert_equal color(1, 0, 0, 0), o[0, 0]
+    x          = o.dup
+    assert_equal color(1, 0, 0, 0), x[0, 0]
+    x[0, 0]    = color(0, 1, 0, 0)
+    assert_equal color(0, 1, 0, 0), x[0, 0]
+    assert_equal color(1, 0, 0, 0), o[0, 0]
+  end
+
+  def test_at ()
+    o       = bitmap
+    assert_equal color(0, 0, 0, 0), o[0, 0]
+    o[0, 0] = 1
+    assert_equal color(1, 1, 1, 1), o[0, 0]
   end
 
-  def test_to_texture ()
-    assert_equal Rays::Texture, bmp.to_texture.class
-    assert_equal W, bmp.to_texture.width
-    assert_equal H, bmp.to_texture.height
+  def test_to_a ()
+    colors = %w[#f00 #0f0 #00f #ff0].map {|s| color s}
+    bmp = bitmap 2, 2
+    bmp[0, 0], bmp[1, 0], bmp[0, 1], bmp[1, 1] = colors
+    assert_equal colors, bmp.to_a
   end
 
 end# TestBitmap

data/test/test_bounds.rb

@@ -25,6 +25,18 @@ class TestBounds < Test::Unit::TestCase
     assert_raise(ArgumentError) {bounds(1, 2, 3, 4, 5, 6, 7)}
   end
 
+  def test_dup ()
+    o   = bounds
+    assert_equal bounds(0, 0, 0, 0, 0, 0), o
+    o.x = 1
+    assert_equal bounds(1, 0, 0, 0, 0, 0), o
+    x   = o.dup
+    assert_equal bounds(1, 0, 0, 0, 0, 0), x
+    x.x = 2
+    assert_equal bounds(2, 0, 0, 0, 0, 0), x
+    assert_equal bounds(1, 0, 0, 0, 0, 0), o
+  end
+
   def test_intersect? ()
     assert     bounds(10, 20, 30, 100, 100, 100).intersect?(bounds 50, 60, 70, 100, 100, 100)
     assert_not bounds(10, 20, 30,  10,  10,  10).intersect?(bounds 50, 60, 70, 100, 100, 100)
@@ -35,6 +47,16 @@ class TestBounds < Test::Unit::TestCase
     assert_not bounds(10, 20, 30,  10,  10,  10).include?(point 50, 60)
   end
 
+  def test_valid? ()
+    assert     bounds(0, 0, 0,  0,  0,  0).valid?
+    assert     bounds(0, 0, 0,  1,  0,  0).valid?
+    assert     bounds(0, 0, 0,  0,  1,  0).valid?
+    assert     bounds(0, 0, 0,  0,  0,  1).valid?
+    assert_not bounds(0, 0, 0, -1,  0,  0).valid?
+    assert_not bounds(0, 0, 0,  0, -1,  0).valid?
+    assert_not bounds(0, 0, 0,  0,  0, -1).valid?
+  end
+
   def test_get_xyzwhd ()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal 1, o.x
@@ -285,8 +307,22 @@ class TestBounds < Test::Unit::TestCase
   def test_operators ()
     assert_equal bounds(50, 60, 70,  60,  60,  60), bounds(10, 20, 30, 100, 100, 100) & bounds(50, 60, 70, 100, 100, 100)
     assert_equal bounds(10, 20, 30, 140, 140, 140), bounds(10, 20, 30, 100, 100, 100) | bounds(50, 60, 70, 100, 100, 100)
+    assert_equal bounds(10, 20, 30,  20,  20,  20), bounds(20, 30, 40, 10, 10, 10)    | point(10, 20, 30)
+    assert_equal bounds(10, 20, 30,  30,  30,  30), bounds(10, 20, 30, 10, 10, 10)    | point(40, 50, 60)
 
     assert_equal point(0), (bounds(10, 20, 30, 10, 10, 10) & bounds(50, 60, 70, 10, 10, 10)).size
   end
 
+  def test_invalid ()
+    o = Rays::Bounds.invalid
+    assert_not o.valid?
+
+    o |= point(1, 2)
+    assert o.valid?
+    assert_equal bounds(1, 2, 0, 0), o
+
+    o |= point(10, 20)
+    assert_equal bounds(1, 2, 9, 18), o
+  end
+
 end# TestBounds