rays 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66614f6ea052aeafe775d0bd3096b06103ea8dbc08a94ee60c7172f726ff745
-  data.tar.gz: c6020c9ccf843bbf051660d851ed494d032a9a4db564d774de94ab67d906ad44
+  metadata.gz: '08301b38ff9f9f8b19bec9b0e1f992cb518707ec4755546e82babb633c63cecb'
+  data.tar.gz: 136b8d6f28ddf9675383d835682c6da199336a47d1d70b849d390dfadf9b785f
 SHA512:
-  metadata.gz: a3f366d4930acff032af41d0eb8bd96cc3e57f6e48028a2279b6f40d0cee9773bd6fb596c0a5131cad07abc4f7fe1373fecd9297133c11e3ae889988e291f845
-  data.tar.gz: 2fd35000dbdb686a54f09653a4a97ed599ac16432b1ab801f0bfb7c07bcfd1d36a19bb39393b78a4c6b09d1fd8c48a81aec2a7f4140816a4f26ffca35ca7365f
+  metadata.gz: 90064f04b08bdcb490fa256c716d6c9d9d4da0011d03bb6eb18d092f088339f0fc8aa255255be539c1791394c1445bfb91ddb70b09e703747d98a9eb6113af07
+  data.tar.gz: 2942ac5c8c9acb2753d77c05037ce67f99539ddaf92d699d665757483b8d34b74dc46add410906d7251bc9fb1598c62261f16ba3603e17b35210ec4983cfce2c

data/ChangeLog.md

@@ -1,6 +1,16 @@
 # rays ChangeLog
 
 
+## [v0.3.7] - 2025-05-11
+
+- Use std::clamp() instead of Xot::clip()
+
+
+## [v0.3.6] - 2025-04-08
+
+- Update dependencies: xot, rucy
+
+
 ## [v0.3.5] - 2025-03-24
 
 - Add PULL_REQUEST_TEMPLATE.md

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.7

data/include/rays/color.h

@@ -4,7 +4,7 @@
 #define __RAYS_COLOR_H__
 
 
-#include <xot/util.h>
+#include <algorithm>
 #include <rays/defs.h>
 #include <rays/coord.h>
 
@@ -53,7 +53,7 @@ namespace Rays
 
 		static uchar float2uchar (float value)
 		{
-			return (uchar) Xot::clip(0.f, 255.f, value * 255);
+			return (uchar) std::clamp(value * 255, 0.f, 255.f);
 		}
 
 		static float uchar2float (int value)

data/rays.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',  '~> 0.3.5', '>= 0.3.5'
-  s.add_dependency 'rucy', '~> 0.3.5', '>= 0.3.5'
+  s.add_dependency 'xot',  '~> 0.3.7', '>= 0.3.7'
+  s.add_dependency 'rucy', '~> 0.3.7', '>= 0.3.7'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/color.cpp

@@ -2,7 +2,7 @@
 
 
 #include <limits.h>
-#include <xot/util.h>
+#include <algorithm>
 #include "rays/exception.h"
 #include "rays/color_space.h"
 #include "glm.h"
@@ -171,7 +171,7 @@ namespace Rays
 	static uint
 	to_gray (const float* c, uint max)
 	{
-		return Xot::clip<uint>(0, max, to_gray(c) * max);
+		return std::clamp<uint>(to_gray(c) * max, 0, max);
 	}
 
 	static void

data/src/ios/bitmap.mm

@@ -4,12 +4,12 @@
 
 #import <ImageIO/CGImageDestination.h>
 #import <MobileCoreServices/UTCoreTypes.h>
+#include <xot/util.h>
 #include "rays/exception.h"
 #include "../color_space.h"
 #include "../font.h"
 #include "../texture.h"
 #include "../frame_buffer.h"
-#include "helper.h"
 
 
 namespace Rays
@@ -261,7 +261,7 @@ namespace Rays
 
 		std::shared_ptr<CGImageDestination> dest(
 			CGImageDestinationCreateWithURL((CFURLRef) url, type, 1, NULL),
-			safe_cfrelease);
+			Xot::safe_cfrelease);
 		if (!dest)
 			rays_error(__FILE__, __LINE__, "CGImageDestinationCreateWithURL() failed.");
 

data/src/ios/font.mm

@@ -5,8 +5,9 @@
 #include <memory>
 #import <CoreGraphics/CGContext.h>
 #import <CoreText/CoreText.h>
+#include <xot/string.h>
+#include <xot/util.h>
 #include "rays/exception.h"
-#include "helper.h"
 
 
 namespace Rays
@@ -66,7 +67,7 @@ namespace Rays
 			CFRelease);
 
 		CFAttributedStringPtr attrstr(
-			CFAttributedStringCreate(NULL, cfstring(str).get(), attr.get()),
+			CFAttributedStringCreate(NULL, Xot::cfstring(str).get(), attr.get()),
 			CFRelease);
 
 		return CTLinePtr(
@@ -128,7 +129,7 @@ namespace Rays
 	RawFont::RawFont (const char* name, coord size)
 	{
 		self->font = name
-			?	CTFontCreateWithName(cfstring(name).get(), size, NULL)
+			?	CTFontCreateWithName(Xot::cfstring(name).get(), size, NULL)
 			:	CTFontCreateUIFontForLanguage(kCTFontSystemFontType, size, NULL);
 	}
 
@@ -138,7 +139,7 @@ namespace Rays
 		if (path)
 			*this = RawFont_load(path, size);
 		else
-			self->font = CTFontCreateWithName(cfstring(obj.name()).get(), size, NULL);
+			self->font = CTFontCreateWithName(Xot::cfstring(obj.name()).get(), size, NULL);
 	}
 
 	RawFont::~RawFont ()
@@ -189,14 +190,8 @@ namespace Rays
 	{
 		if (!*this) return "";
 
-		CFStringPtr str(CTFontCopyFullName(self->font), CFRelease);
-
-		enum {BUFSIZE = 2048};
-		char buf[BUFSIZE + 1];
-		if (!CFStringGetCString(str.get(), buf, BUFSIZE, kCFStringEncodingUTF8))
-			buf[0] = '\0';
-
-		return buf;
+		Xot::CFStringPtr str(CTFontCopyFullName(self->font), CFRelease);
+		return Xot::to_s(str);
 	}
 
 	coord

data/src/osx/bitmap.mm

@@ -3,12 +3,12 @@
 
 
 #import <Cocoa/Cocoa.h>
+#include <xot/util.h>
 #include "rays/exception.h"
 #include "../color_space.h"
 #include "../font.h"
 #include "../texture.h"
 #include "../frame_buffer.h"
-#include "helper.h"
 
 
 namespace Rays
@@ -260,7 +260,7 @@ namespace Rays
 
 		std::shared_ptr<CGImageDestination> dest(
 			CGImageDestinationCreateWithURL((CFURLRef) url, type, 1, NULL),
-			safe_cfrelease);
+			Xot::safe_cfrelease);
 		if (!dest)
 			rays_error(__FILE__, __LINE__, "CGImageDestinationCreateWithURL() failed.");
 

data/src/osx/font.mm

@@ -5,8 +5,8 @@
 #include <memory>
 #import <ApplicationServices/ApplicationServices.h>
 #import <AppKit/AppKit.h>
+#include <xot/string.h>
 #include "rays/exception.h"
-#include "helper.h"
 
 
 namespace Rays
@@ -66,7 +66,7 @@ namespace Rays
 			CFRelease);
 
 		CFAttributedStringPtr attrstr(
-			CFAttributedStringCreate(NULL, cfstring(str).get(), attr.get()),
+			CFAttributedStringCreate(NULL, Xot::cfstring(str).get(), attr.get()),
 			CFRelease);
 
 		return CTLinePtr(
@@ -130,7 +130,7 @@ namespace Rays
 	RawFont::RawFont (const char* name, coord size)
 	{
 		self->font = name
-			?	CTFontCreateWithName(cfstring(name).get(), size, NULL)
+			?	CTFontCreateWithName(Xot::cfstring(name).get(), size, NULL)
 			:	CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, size, NULL);
 	}
 
@@ -140,7 +140,7 @@ namespace Rays
 		if (path)
 			*this = RawFont_load(path, size);
 		else
-			self->font = CTFontCreateWithName(cfstring(obj.name()).get(), size, NULL);
+			self->font = CTFontCreateWithName(Xot::cfstring(obj.name()).get(), size, NULL);
 	}
 
 	RawFont::~RawFont ()
@@ -189,14 +189,8 @@ namespace Rays
 	{
 		if (!*this) return "";
 
-		CFStringPtr str(CTFontCopyFullName(self->font), CFRelease);
-
-		enum {BUFSIZE = 2048};
-		char buf[BUFSIZE + 1];
-		if (!CFStringGetCString(str.get(), buf, BUFSIZE, kCFStringEncodingUTF8))
-			buf[0] = '\0';
-
-		return buf;
+		Xot::CFStringPtr str(CTFontCopyFullName(self->font), CFRelease);
+		return Xot::to_s(str);
 	}
 
 	coord

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 2025-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []
@@ -200,8 +200,6 @@ files:
 - src/ios/bitmap.mm
 - src/ios/camera.mm
 - src/ios/font.mm
-- src/ios/helper.h
-- src/ios/helper.mm
 - src/ios/opengl.mm
 - src/ios/rays.mm
 - src/matrix.cpp
@@ -212,8 +210,6 @@ files:
 - src/osx/bitmap.mm
 - src/osx/camera.mm
 - src/osx/font.mm
-- src/osx/helper.h
-- src/osx/helper.mm
 - src/osx/opengl.mm
 - src/osx/rays.mm
 - src/painter.cpp

data/src/ios/helper.h

@@ -1,26 +0,0 @@
-// -*- c++ -*-
-#pragma once
-#ifndef __RAYS_SRC_IOS_HELPER_H__
-#define __RAYS_SRC_IOS_HELPER_H__
-
-
-#include <memory>
-#include <CoreFoundation/CoreFoundation.h>
-
-
-namespace Rays
-{
-
-
-	void safe_cfrelease (CFTypeRef ref);
-
-
-	typedef std::shared_ptr<const __CFString> CFStringPtr;
-
-	CFStringPtr cfstring (const char* str);
-
-
-}// Rays
-
-
-#endif//EOH

data/src/ios/helper.mm

@@ -1,25 +0,0 @@
-// -*- objc -*-
-#include "helper.h"
-
-
-namespace Rays
-{
-
-
-	void
-	safe_cfrelease (CFTypeRef ref)
-	{
-		if (ref) CFRelease(ref);
-	}
-
-
-	CFStringPtr
-	cfstring (const char* str)
-	{
-		CFStringRef ref = CFStringCreateWithCString(
-			kCFAllocatorDefault, str, kCFStringEncodingUTF8);
-		return CFStringPtr(ref, safe_cfrelease);
-	}
-
-
-}// Rays

data/src/osx/helper.h

@@ -1,26 +0,0 @@
-// -*- c++ -*-
-#pragma once
-#ifndef __RAYS_SRC_OSX_HELPER_H__
-#define __RAYS_SRC_OSX_HELPER_H__
-
-
-#include <memory>
-#include <CoreFoundation/CoreFoundation.h>
-
-
-namespace Rays
-{
-
-
-	void safe_cfrelease (CFTypeRef ref);
-
-
-	typedef std::shared_ptr<const __CFString> CFStringPtr;
-
-	CFStringPtr cfstring (const char* str);
-
-
-}// Rays
-
-
-#endif//EOH

data/src/osx/helper.mm

@@ -1,25 +0,0 @@
-// -*- objc -*-
-#include "helper.h"
-
-
-namespace Rays
-{
-
-
-	void
-	safe_cfrelease (CFTypeRef ref)
-	{
-		if (ref) CFRelease(ref);
-	}
-
-
-	CFStringPtr
-	cfstring (const char* str)
-	{
-		CFStringRef ref = CFStringCreateWithCString(
-			kCFAllocatorDefault, str, kCFStringEncodingUTF8);
-		return CFStringPtr(ref, safe_cfrelease);
-	}
-
-
-}// Rays