rays 0.3 → 0.3.1

data/src/texture.cpp

@@ -23,7 +23,7 @@ namespace Rays
 
 		ColorSpace color_space;
 
-		bool modified;
+		bool smooth, modified;
 
 		Data ()
 		{
@@ -44,6 +44,7 @@ namespace Rays
 			width_pow2  =
 			height_pow2 = 0;
 			color_space = COLORSPACE_UNKNOWN;
+			smooth      = false;
 			modified    = false;
 		}
 
@@ -110,7 +111,13 @@ namespace Rays
 		size_t width,
 		uchar* dest, size_t dest_stride, const uchar* src, size_t src_stride)
 	{
-		if (!dest || !src || dest_stride <= 0 || src_stride <= 0)
+		if (!dest)
+			argument_error(__FILE__, __LINE__);
+		if (!src)
+			argument_error(__FILE__, __LINE__);
+		if (dest_stride <= 0)
+			argument_error(__FILE__, __LINE__);
+		if ( src_stride <= 0)
 			argument_error(__FILE__, __LINE__);
 
 		while (width--)
@@ -171,7 +178,8 @@ namespace Rays
 
 	static void
 	setup_texture (
-		Texture::Data* self, int width, int height, const ColorSpace& cs,
+		Texture::Data* self,
+		int width, int height, const ColorSpace& cs, bool smooth = false,
 		const Bitmap* bitmap = NULL, bool npot = false)
 	{
 		assert(self && !self->has_id());
@@ -184,7 +192,8 @@ namespace Rays
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);//GL_LINEAR);
+		glTexParameteri(
+			GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, smooth ? GL_LINEAR : GL_NEAREST);
 
 		GLenum format, type;
 		ColorSpace_get_gl_format_and_type(&format, &type, cs);
@@ -216,6 +225,7 @@ namespace Rays
 		self->width       = width;
 		self->height      = height;
 		self->color_space = cs;
+		self->smooth      = smooth;
 		self->modified    = true;
 	}
 
@@ -224,21 +234,25 @@ namespace Rays
 	{
 	}
 
-	Texture::Texture (int width, int height, const ColorSpace& cs)
+	Texture::Texture (int width, int height, const ColorSpace& cs, bool smooth)
 	{
-		if (width <= 0 || height <= 0 || !cs)
+		if (width  <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (height <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (!cs)
 			argument_error(__FILE__, __LINE__);
 
-		setup_texture(self.get(), width, height, cs);
+		setup_texture(self.get(), width, height, cs, smooth);
 	}
 
-	Texture::Texture (const Bitmap& bitmap)
+	Texture::Texture (const Bitmap& bitmap, bool smooth)
 	{
 		if (!bitmap)
 			argument_error(__FILE__, __LINE__);
 
 		setup_texture(
-			self.get(), bitmap.width(), bitmap.height(), bitmap.color_space(),
+			self.get(), bitmap.width(), bitmap.height(), bitmap.color_space(), smooth,
 			&bitmap);
 	}
 
@@ -249,8 +263,10 @@ namespace Rays
 			argument_error(__FILE__, __LINE__);
 
 		int w = bitmap.width(), h = bitmap.height();
-		if (w != width() || h != height())
-			argument_error(__FILE__, __LINE__, "the size of bitmap does not match");
+		if (w != width())
+			argument_error(__FILE__, __LINE__, "the width of bitmap does not match");
+		if (h != height())
+			argument_error(__FILE__, __LINE__, "the height of bitmap does not match");
 
 		GLenum format, type;
 		ColorSpace_get_gl_format_and_type(&format, &type, bitmap.color_space());
@@ -297,6 +313,12 @@ namespace Rays
 		return self->color_space;
 	}
 
+	bool
+	Texture::smooth () const
+	{
+		return self->smooth;
+	}
+
 	GLuint
 	Texture::id () const
 	{

data/src/texture.h

@@ -24,9 +24,11 @@ namespace Rays
 
 			Texture ();
 
-			Texture (int width, int height, const ColorSpace& cs = RGBA);
+			Texture (
+				int width, int height, const ColorSpace& cs = RGBA,
+				bool smooth = false);
 
-			Texture (const Bitmap& bitmap);
+			Texture (const Bitmap& bitmap, bool smooth = false);
 
 			Texture& operator = (const Bitmap& bitmap);
 
@@ -42,6 +44,8 @@ namespace Rays
 
 			const ColorSpace& color_space () const;
 
+			bool smooth () const;
+
 			GLuint id () const;
 
 			void set_modified (bool modified = true);

data/src/win32/bitmap.cpp

@@ -60,7 +60,11 @@ namespace Rays
 		int w, int h, const ColorSpace& cs,
 		const void* pixels = NULL, bool clear_pixels = true, HDC hdc = NULL)
 	{
-		if (w <= 0 || h <= 0 || !cs)
+		if (w <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (h <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (!cs)
 			argument_error(__FILE__, __LINE__);
 
 		Bitmap::Data* self = bitmap->self.get();
@@ -134,7 +138,13 @@ namespace Rays
 	Bitmap_draw_string (
 		Bitmap* bitmap, const RawFont& font, const char* str, coord x, coord y)
 	{
-		if (!bitmap || !*bitmap || !font || !str)
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!*bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!font)
+			argument_error(__FILE__, __LINE__);
+		if (!str)
 			argument_error(__FILE__, __LINE__);
 
 		if (*str == '\0') return;

data/src/win32/font.cpp

@@ -132,7 +132,9 @@ namespace Rays
 
 		HDC hdc = (HDC) context;
 
-		if (!hdc || !str)
+		if (!hdc)
+			argument_error(__FILE__, __LINE__);
+		if (!str)
 			argument_error(__FILE__, __LINE__);
 
 		if (*str == '\0') return;

data/test/test_painter_shape.rb

@@ -8,11 +8,12 @@ class TestPainterShape < Test::Unit::TestCase
   end
 
   def image(fill = 1, stroke = 0, pixel_density = 1, &block)
-    Rays::Image.new(100, 100, Rays::RGBA, pixel_density).paint {|p|
-      p.fill   fill   > 0 ? color(fill)   : nil
-      p.stroke stroke > 0 ? color(stroke) : nil
-      p.instance_eval(&block) if block
-    }
+    Rays::Image.new(100, 100, Rays::RGBA, pixel_density: pixel_density)
+      .paint {|p|
+        p.fill   fill   > 0 ? color(fill)   : nil
+        p.stroke stroke > 0 ? color(stroke) : nil
+        p.instance_eval(&block) if block
+      }
   end
 
   def test_line()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []