rays 0.3.15 → 0.4.0

data/src/opengl/texture.cpp

@@ -42,7 +42,7 @@ namespace Rays
 			height      =
 			width_pow2  =
 			height_pow2 = 0;
-			color_space = COLORSPACE_UNKNOWN;
+			color_space = COLORSPACE_NONE;
 			smooth      = false;
 			modified    = false;
 		}
@@ -194,14 +194,14 @@ namespace Rays
 		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);
+		GLenum internalformat, format, type;
+		ColorSpace_get_gl_format_and_type(&internalformat, &format, &type, cs);
 
 		if (npot)
 		{
 			// create non-power-of-two texture
 			glTexImage2D(
-				GL_TEXTURE_2D, 0, format, width, height, 0, format, type,
+				GL_TEXTURE_2D, 0, internalformat, width, height, 0, format, type,
 				bitmap ? bitmap->pixels() : NULL);
 			npot = OpenGL_has_error();
 		}
@@ -274,7 +274,7 @@ namespace Rays
 			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());
+		ColorSpace_get_gl_format_and_type(NULL, &format, &type, bitmap.color_space());
 
 		glBindTexture(GL_TEXTURE_2D, self->id);
 		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, format, type, bitmap.pixels());

data/src/osx/bitmap.mm

@@ -119,7 +119,7 @@ namespace Rays
 			if (pixels) delete [] (uchar*) pixels;
 
 			width = height = 0;
-			color_space = COLORSPACE_UNKNOWN;
+			color_space = COLORSPACE_NONE;
 			pixels      = NULL;
 			context     = NULL;
 			modified    = false;
@@ -282,6 +282,17 @@ namespace Rays
 		return bmp;
 	}
 
+	NSImage*
+	Bitmap_get_nsimage (const Bitmap& bmp)
+	{
+		if (!bmp) return NULL;
+
+		std::shared_ptr<CGImage> cgimage(bmp.self->get_image(), CGImageRelease);
+		return [[[NSImage alloc]
+			initWithCGImage: cgimage.get() size: NSZeroSize]
+			autorelease];
+	}
+
 
 	Bitmap::Bitmap ()
 	{
@@ -322,8 +333,8 @@ namespace Rays
 	{
 		if (!*this)
 		{
-			static const ColorSpace UNKNOWN = COLORSPACE_UNKNOWN;
-			return UNKNOWN;
+			static const ColorSpace NONE = COLORSPACE_NONE;
+			return NONE;
 		}
 		return self->color_space;
 	}

data/src/osx/font.mm

@@ -66,7 +66,7 @@ namespace Rays
 			CFRelease);
 
 		CFAttributedStringPtr attrstr(
-			CFAttributedStringCreate(NULL, Xot::cfstring(str).get(), attr.get()),
+			CFAttributedStringCreate(NULL, Xot::String(str).to_cfstr().get(), attr.get()),
 			CFRelease);
 
 		return CTLinePtr(
@@ -130,7 +130,7 @@ namespace Rays
 	RawFont::RawFont (const char* name, coord size)
 	{
 		self->font = name
-			?	CTFontCreateWithName(Xot::cfstring(name).get(), size, NULL)
+			?	CTFontCreateWithName(Xot::String(name).to_cfstr().get(), size, NULL)
 			:	CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, size, NULL);
 	}
 
@@ -140,7 +140,7 @@ namespace Rays
 		if (path)
 			*this = RawFont_load(path, size);
 		else
-			self->font = CTFontCreateWithName(Xot::cfstring(obj.name()).get(), size, NULL);
+			self->font = CTFontCreateWithName(obj.name().to_cfstr().get(), size, NULL);
 	}
 
 	RawFont::~RawFont ()

data/src/sdl/bitmap.cpp

@@ -9,6 +9,8 @@
 #include <SDL.h>
 #include <xot/util.h>
 #include "rays/exception.h"
+#include "rays/image.h"
+#include "rays/painter.h"
 #include "../font.h"
 #include "../texture.h"
 
@@ -41,7 +43,7 @@ namespace Rays
 			if (surface) SDL_FreeSurface(surface);
 
 			surface     = NULL;
-			color_space = COLORSPACE_UNKNOWN;
+			color_space = COLORSPACE_NONE;
 			modified    = false;
 		}
 
@@ -142,8 +144,8 @@ namespace Rays
 		return strrchr(path, '.');
 	}
 
-	void
-	Bitmap_save (const Bitmap& bmp, const char* path)
+	static void
+	save_bitmap (const Bitmap& bitmap, const char* path)
 	{
 		const char* extension = get_ext(path);
 		if (!extension)
@@ -152,14 +154,14 @@ namespace Rays
 				__FILE__, __LINE__, "invalid image file extension: '%s'", path);
 		}
 
-		const auto& cs = bmp.color_space();
-		int w          = bmp.width();
-		int h          = bmp.height();
+		const auto& cs = bitmap.color_space();
+		int w          = bitmap.width();
+		int h          = bitmap.height();
 		int pitch      = w * cs.Bpp();
 
 		std::unique_ptr<uchar[]> pixels(new uchar[h * pitch]);
 		for (int y = 0; y < h; ++y)
-			memcpy(pixels.get() + pitch * y, bmp.at<uchar>(0, y), pitch);
+			memcpy(pixels.get() + pitch * y, bitmap.at<uchar>(0, y), pitch);
 
 		String ext = extension;
 		ext.downcase();
@@ -180,6 +182,23 @@ namespace Rays
 			rays_error(__FILE__, __LINE__, "failed to save: '%s'", path);
 	}
 
+	void
+	Bitmap_save (const Bitmap& bitmap, const char* path)
+	{
+		Bitmap bmp    = bitmap;
+		ColorSpace cs = bmp.color_space();
+		if (!cs.is_rgb() || (cs.has_alpha() && !cs.is_alpha_last()))
+		{
+			Image img(bmp.width(), bmp.height(), cs.has_alpha() ? RGBA : RGB);
+			Painter p = img.painter();
+			p.begin();
+			p.image(Image(bmp));
+			p.end();
+			bmp = img.bitmap();
+		}
+		save_bitmap(bmp, path);
+	}
+
 	Bitmap
 	Bitmap_load (const char* path)
 	{
@@ -252,8 +271,8 @@ namespace Rays
 	{
 		if (!*this)
 		{
-			static const ColorSpace UNKNOWN = COLORSPACE_UNKNOWN;
-			return UNKNOWN;
+			static const ColorSpace NONE = COLORSPACE_NONE;
+			return NONE;
 		}
 		return self->color_space;
 	}

data/src/texture.h

@@ -26,7 +26,7 @@ namespace Rays
 			Texture ();
 
 			Texture (
-				int width, int height, const ColorSpace& cs = RGBA,
+				int width, int height, const ColorSpace& cs = DEFAULT_COLORSPACE,
 				bool smooth = false);
 
 			Texture (const Bitmap& bitmap, bool smooth = false);

data/src/win32/bitmap.cpp

@@ -7,6 +7,8 @@
 #include <stb_image_write.h>
 
 #include "rays/exception.h"
+#include "rays/image.h"
+#include "rays/painter.h"
 #include "../font.h"
 #include "../texture.h"
 #include "gdi.h"
@@ -44,7 +46,7 @@ namespace Rays
 			if (memdc) memdc = Win32::MemoryDC();
 
 			width = height = pitch = 0;
-			color_space = COLORSPACE_UNKNOWN;
+			color_space = COLORSPACE_NONE;
 			pixels      = NULL;
 			modified    = false;
 		}
@@ -52,6 +54,26 @@ namespace Rays
 	};// Bitmap::Data
 
 
+	static HBITMAP
+	create_hbitmap (const Bitmap& bitmap, const Win32::DC& dc, void** pixels)
+	{
+		Bitmap::Data* self = bitmap.self.get();
+
+		BITMAPINFO bmpinfo;
+		memset(&bmpinfo, 0, sizeof(bmpinfo));
+
+		BITMAPINFOHEADER& header = bmpinfo.bmiHeader;
+		header.biSize        = sizeof(BITMAPINFOHEADER);
+		header.biWidth       =  self->width;
+		header.biHeight      = -self->height;
+		header.biPlanes      = 1;
+		header.biBitCount    = self->color_space.bpp();
+		header.biCompression = BI_RGB;
+
+		return CreateDIBSection(
+			dc.handle(), &bmpinfo, DIB_RGB_COLORS, pixels, NULL, 0);
+	}
+
 	void
 	Bitmap_setup (
 		Bitmap* bitmap, int w, int h, const ColorSpace& cs,
@@ -77,21 +99,8 @@ namespace Rays
 		int padding = 4 - self->pitch % 4;
 		if (padding < 4) self->pitch += padding;
 
-		BITMAPINFO bmpinfo;
-		memset(&bmpinfo, 0, sizeof(bmpinfo));
-
-		BITMAPINFOHEADER& header = bmpinfo.bmiHeader;
-		header.biSize        = sizeof(BITMAPINFOHEADER);
-		header.biWidth       = self->width;
-		header.biHeight      = -self->height;
-		header.biPlanes      = 1;
-		header.biBitCount    = self->color_space.bpp();
-		header.biCompression = BI_RGB;
-
 		Win32::DC dc = Win32::screen_dc();
-
-		HBITMAP hbmp = CreateDIBSection(
-			dc.handle(), &bmpinfo, DIB_RGB_COLORS, (void**) &self->pixels, NULL, 0);
+		HBITMAP hbmp = create_hbitmap(*bitmap, dc, (void**) &self->pixels);
 		if (!hbmp)
 			rays_error(__FILE__, __LINE__);
 
@@ -99,11 +108,10 @@ namespace Rays
 		if (!self->memdc)
 			rays_error(__FILE__, __LINE__);
 
-		size_t size = self->pitch * self->height;
 		if (pixels)
-			memcpy(self->pixels, pixels, size);
+			memcpy(self->pixels, pixels, bitmap->size());
 		else if (clear_pixels)
-			memset(self->pixels, 0, size);
+			memset(self->pixels, 0,      bitmap->size());
 	}
 
 	void
@@ -147,36 +155,36 @@ namespace Rays
 		return strrchr(path, '.');
 	}
 
-	void
-	Bitmap_save (const Bitmap& bmp, const char* path)
+	static void
+	save_bitmap (const Bitmap& bitmap, const char* path)
 	{
-		const char* ext = get_ext(path);
-		if (!ext)
+		const char* extension = get_ext(path);
+		if (!extension)
 		{
 			argument_error(
 				__FILE__, __LINE__, "invalid image file extension: '%s'", path);
 		}
 
-		const auto& cs = bmp.color_space();
-		size_t w       = bmp.width();
-		size_t h       = bmp.height();
+		const auto& cs = bitmap.color_space();
+		size_t w       = bitmap.width();
+		size_t h       = bitmap.height();
 		size_t pitch   = w * cs.Bpp();
 
 		std::unique_ptr<uchar[]> pixels(new uchar[h * pitch]);
 		for (size_t y = 0; y < h; ++y)
-			memcpy(pixels.get() + pitch * y, bmp.at<uchar>(0, y), pitch);
+			memcpy(pixels.get() + pitch * y, bitmap.at<uchar>(0, y), pitch);
+
+		String ext = extension;
+		ext.downcase();
 
 		int ret = 0;
-		if (stricmp(ext, ".bmp") == 0)
+		if      (ext == ".bmp")
 			ret = stbi_write_bmp(path, w, h, cs.Bpp(), pixels.get());
-		else
-		if (stricmp(ext, ".png") == 0)
+		else if (ext == ".png")
 			ret = stbi_write_png(path, w, h, cs.Bpp(), pixels.get(), 0);
-		else
-		if (stricmp(ext, ".jpg") == 0 || stricmp(ext, ".jpeg") == 0)
+		else if (ext == ".jpg" || ext == ".jpeg")
 			ret = stbi_write_jpg(path, w, h, cs.Bpp(), pixels.get(), 90);
-		else
-		if (stricmp(ext, ".tga") == 0)
+		else if (ext == ".tga")
 			ret = stbi_write_tga(path, w, h, cs.Bpp(), pixels.get());
 		else
 			argument_error(__FILE__, __LINE__, "unknown image file type");
@@ -185,6 +193,23 @@ namespace Rays
 			rays_error(__FILE__, __LINE__, "failed to save: '%s'", path);
 	}
 
+	void
+	Bitmap_save (const Bitmap& bitmap, const char* path)
+	{
+		Bitmap bmp    = bitmap;
+		ColorSpace cs = bmp.color_space();
+		if (!cs.is_rgb() || (cs.has_alpha() && !cs.is_alpha_last()))
+		{
+			Image img(bmp.width(), bmp.height(), cs.has_alpha() ? RGBA : RGB);
+			Painter p = img.painter();
+			p.begin();
+			p.image(Image(bmp));
+			p.end();
+			bmp = img.bitmap();
+		}
+		save_bitmap(bmp, path);
+	}
+
 	Bitmap
 	Bitmap_load (const char* path)
 	{
@@ -217,6 +242,19 @@ namespace Rays
 		return bmp;
 	}
 
+	HBITMAP
+	Bitmap_get_hbitmap (const Bitmap& bmp)
+	{
+		if (!bmp) return NULL;
+
+		void* pixels = NULL;
+		HBITMAP hbmp = create_hbitmap(bmp, Win32::screen_dc(), &pixels);
+		if (!hbmp) return NULL;
+
+		memcpy(pixels, bmp.pixels(), bmp.size());
+		return hbmp;
+	}
+
 
 	Bitmap::Bitmap ()
 	{
@@ -257,8 +295,8 @@ namespace Rays
 	{
 		if (!*this)
 		{
-			static const ColorSpace UNKNOWN = COLORSPACE_UNKNOWN;
-			return UNKNOWN;
+			static const ColorSpace NONE = COLORSPACE_NONE;
+			return NONE;
 		}
 		return self->color_space;
 	}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.4.0
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-12 00:00:00.000000000 Z
+date: 2026-08-04 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.14
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.4.0
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []