rays 0.3.9 → 0.3.11

data/src/ios/bitmap.mm

@@ -6,10 +6,8 @@
 #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"
 
 
 namespace Rays
@@ -76,7 +74,7 @@ namespace Rays
 			clear();
 		}
 
-		CGContextRef get_context ()
+		CGContextRef get_context (bool smooth = true)
 		{
 			if (context) return context;
 
@@ -95,6 +93,17 @@ namespace Rays
 			context = CGBitmapContextCreate(
 				pixels, width, height, bpc, pitch, cgcs, make_bitmapinfo(color_space));
 			CGColorSpaceRelease(cgcs);
+
+			if (!smooth)
+			{
+				CGContextSetShouldAntialias(            context, false);
+				CGContextSetShouldSmoothFonts(          context, false);
+				CGContextSetInterpolationQuality(       context, kCGInterpolationNone);
+				CGContextSetAllowsFontSmoothing(        context, false);
+				CGContextSetShouldSubpixelPositionFonts(context, false);
+				CGContextSetShouldSubpixelQuantizeFonts(context, true);
+			}
+
 			return context;
 		}
 
@@ -120,11 +129,10 @@ namespace Rays
 	};// Bitmap::Data
 
 
-	static void
-	setup_bitmap (
-		Bitmap* bitmap,
-		int w, int h, const ColorSpace& cs,
-		const void* pixels = NULL, bool clear_pixels = true)
+	void
+	Bitmap_setup (
+		Bitmap* bitmap, int w, int h, const ColorSpace& cs,
+		const void* pixels, bool clear_pixels)
 	{
 		if (w <= 0)
 			argument_error(__FILE__, __LINE__);
@@ -151,30 +159,6 @@ namespace Rays
 			memset(self->pixels, 0, size);
 	}
 
-	Bitmap
-	Bitmap_from (const Texture& tex)
-	{
-		if (!tex)
-			argument_error(__FILE__, __LINE__);
-
-		Bitmap bmp;
-		setup_bitmap(
-			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
-
-		GLenum format, type;
-		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
-
-		FrameBuffer fb(tex);
-		FrameBufferBinder binder(fb.id());
-
-		for (int y = 0; y < bmp.height(); ++y)
-		{
-			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
-			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
-		}
-
-		return bmp;
-	}
 
 	void
 	Bitmap_draw_image (
@@ -201,7 +185,8 @@ namespace Rays
 
 	void
 	Bitmap_draw_string (
-		Bitmap* bitmap, const RawFont& font, const char* str, coord x, coord y)
+		Bitmap* bitmap, const RawFont& font,
+		const char* str, coord x, coord y, bool smooth)
 	{
 		if (!bitmap)
 			argument_error(__FILE__, __LINE__);
@@ -214,7 +199,7 @@ namespace Rays
 
 		if (*str == '\0') return;
 
-		font.draw_string(bitmap->self->get_context(), bitmap->height(), str, x, y);
+		font.draw_string(bitmap->self->get_context(smooth), bitmap->height(), str, x, y);
 		Bitmap_set_modified(bitmap);
 	}
 
@@ -306,7 +291,7 @@ namespace Rays
 	Bitmap::Bitmap (
 		int width, int height, const ColorSpace& color_space, const void* pixels)
 	{
-		setup_bitmap(this, width, height, color_space, pixels);
+		Bitmap_setup(this, width, height, color_space, pixels);
 	}
 
 	Bitmap::~Bitmap ()

data/src/ios/rays.mm

@@ -4,7 +4,7 @@
 
 #import <Foundation/Foundation.h>
 #include "rays/exception.h"
-#include "../opengl.h"
+#include "../renderer.h"
 
 
 namespace Rays
@@ -29,7 +29,7 @@ namespace Rays
 
 		global::pool = [[NSAutoreleasePool alloc] init];
 
-		OpenGL_init();
+		Renderer_init();
 	}
 
 	void
@@ -38,7 +38,7 @@ namespace Rays
 		if (!global::pool)
 			rays_error(__FILE__, __LINE__, "not initialized.");
 
-		OpenGL_fin();
+		Renderer_fin();
 
 		[global::pool release];
 		global::pool = nil;

data/src/opengl/bitmap.cpp

@@ -0,0 +1,41 @@
+#include "../bitmap.h"
+
+
+#include "rays/exception.h"
+#include "../texture.h"
+#include "opengl.h"
+#include "color_space.h"
+#include "frame_buffer.h"
+
+
+namespace Rays
+{
+
+
+	Bitmap
+	Bitmap_from (const Texture& tex)
+	{
+		if (!tex)
+			argument_error(__FILE__, __LINE__);
+
+		Bitmap bmp;
+		Bitmap_setup(
+			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
+
+		GLenum format, type;
+		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
+
+		FrameBuffer fb(tex);
+		FrameBufferBinder binder(fb.id());
+
+		for (int y = 0; y < bmp.height(); ++y)
+		{
+			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
+			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
+		}
+
+		return bmp;
+	}
+
+
+}// Rays

data/src/opengl/color_space.cpp

@@ -0,0 +1,51 @@
+#include "color_space.h"
+
+
+#include "rays/exception.h"
+
+
+namespace Rays
+{
+
+
+	void
+	ColorSpace_get_gl_format_and_type (
+		GLenum* format, GLenum* type, const ColorSpace& cs)
+	{
+		if (!format && !type)
+			argument_error(__FILE__, __LINE__);
+
+		if (!cs)
+			invalid_state_error(__FILE__, __LINE__);
+
+		if (format)
+		{
+			     if (cs.is_rgb())   *format = cs.has_alpha() ? GL_RGBA  : GL_RGB;
+		#ifndef IOS
+			else if (cs.is_bgr())   *format = cs.has_alpha() ? GL_BGRA  : GL_BGR;
+		#endif
+			else if (cs.is_gray())  *format = GL_LUMINANCE;
+			else if (cs.is_alpha()) *format = GL_ALPHA;
+			else
+				rays_error(__FILE__, __LINE__, "invalid color space.");
+		}
+
+		if (type)
+		{
+			if (cs.is_float())
+				*type = GL_FLOAT;
+			else switch (cs.bpc())
+			{
+				case 8:  *type = GL_UNSIGNED_BYTE; break;
+				case 16: *type = GL_UNSIGNED_SHORT; break;
+			#ifndef IOS
+				case 32: *type = GL_UNSIGNED_INT; break;
+			#endif
+				default:
+					rays_error(__FILE__, __LINE__, "invalid bpc.");
+			}
+		}
+	}
+
+
+}// Rays

data/src/{color_space.h → opengl/color_space.h}

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_SRC_COLOR_SPACE_H__
-#define __RAYS_SRC_COLOR_SPACE_H__
+#ifndef __RAYS_SRC_OPENGL_COLOR_SPACE_H__
+#define __RAYS_SRC_OPENGL_COLOR_SPACE_H__
 
 
 #include "rays/color_space.h"

data/src/{frame_buffer.cpp → opengl/frame_buffer.cpp}

@@ -105,7 +105,7 @@ namespace Rays
 		FrameBufferBinder binder(id());
 
 		glFramebufferTexture2D(
-			GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.id(), 0);
+			GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, Texture_get_id(texture), 0);
 		OpenGL_check_error(__FILE__, __LINE__);
 
 		self->texture = texture;

data/src/{frame_buffer.h → opengl/frame_buffer.h}

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_SRC_FRAME_BUFFER_H__
-#define __RAYS_SRC_FRAME_BUFFER_H__
+#ifndef __RAYS_SRC_OPENGL_FRAME_BUFFER_H__
+#define __RAYS_SRC_OPENGL_FRAME_BUFFER_H__
 
 
 #include <xot/pimpl.h>

data/src/{ios → opengl/ios}/opengl.mm

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#include "../opengl.h"
+#include "../../renderer.h"
 
 
 #import <OpenGLES/EAGL.h>
@@ -22,13 +22,13 @@ namespace Rays
 
 
 	void
-	OpenGL_init ()
+	Renderer_init ()
 	{
 		activate_offscreen_context();
 	}
 
 	void
-	OpenGL_fin ()
+	Renderer_fin ()
 	{
 	}
 

data/src/{opengl.h → opengl/opengl.h}

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_SRC_OPENGL_H__
-#define __RAYS_SRC_OPENGL_H__
+#ifndef __RAYS_SRC_OPENGL_OPENGL_H__
+#define __RAYS_SRC_OPENGL_OPENGL_H__
 
 
 #if defined(OSX)
@@ -10,7 +10,7 @@
 #elif defined(IOS)
 	#include <OpenGLES/ES3/gl.h>
 	#include <OpenGLES/ES3/glext.h>
-#elif defined(WIN32)
+#else
 	#include <GL/glew.h>
 #endif
 
@@ -21,10 +21,6 @@ namespace Rays
 {
 
 
-	void OpenGL_init ();
-
-	void OpenGL_fin ();
-
 	bool OpenGL_has_error ();
 
 	void OpenGL_check_error (const char* file, int line);

data/src/{osx → opengl/osx}/opengl.mm

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#include "../opengl.h"
+#include "../../renderer.h"
 
 
 #import <AppKit/AppKit.h>
@@ -39,13 +39,13 @@ namespace Rays
 
 
 	void
-	OpenGL_init ()
+	Renderer_init ()
 	{
 		activate_offscreen_context();
 	}
 
 	void
-	OpenGL_fin ()
+	Renderer_fin ()
 	{
 	}