rays 0.2.1 → 0.3.1

data/src/osx/bitmap.mm

@@ -2,7 +2,6 @@
 #import "bitmap.h"
 
 
-#include <assert.h>
 #import <Cocoa/Cocoa.h>
 #include "rays/exception.h"
 #include "../color_space.h"
@@ -60,7 +59,7 @@ namespace Rays
 
 		ColorSpace color_space;
 
-		void* pixels = NULL;
+		void* pixels         = NULL;
 
 		CGContextRef context = NULL;
 
@@ -122,37 +121,44 @@ namespace Rays
 
 	static void
 	setup_bitmap (
-		Bitmap* this_,
+		Bitmap* bitmap,
 		int w, int h, const ColorSpace& cs,
-		const void* pixels_ = NULL, bool clear_pixels = true)
+		const void* pixels = NULL, bool clear_pixels = true)
 	{
-		if (!this_ || 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();
 
-		this_->self->clear();
+		self->clear();
 
-		this_->self->width       = w;
-		this_->self->height      = h;
-		this_->self->color_space = cs;
-		this_->self->modified    = true;
+		self->width       = w;
+		self->height      = h;
+		self->color_space = cs;
+		self->modified    = true;
 
 		size_t size = w * h * cs.Bpp();
-		this_->self->pixels = new uchar[size];
+		self->pixels = new uchar[size];
 
-		if (pixels_)
-			memcpy(this_->self->pixels, pixels_, size);
+		if (pixels)
+			memcpy(self->pixels, pixels, size);
 		else if (clear_pixels)
-			memset(this_->self->pixels, 0, size);
+			memset(self->pixels, 0, size);
 	}
 
-	static void
-	setup_bitmap (Bitmap* this_, const Texture& tex)
+	Bitmap
+	Bitmap_from (const Texture& tex)
 	{
-		if (!this_ || !tex)
+		if (!tex)
 			argument_error(__FILE__, __LINE__);
 
+		Bitmap bmp;
 		setup_bitmap(
-			this_, tex.width(), tex.height(), tex.color_space(), NULL, false);
+			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
 
 		GLenum format, type;
 		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
@@ -160,18 +166,12 @@ namespace Rays
 		FrameBuffer fb(tex);
 		FrameBufferBinder binder(fb.id());
 
-		for (int y = 0; y < this_->height(); ++y)
+		for (int y = 0; y < bmp.height(); ++y)
 		{
-			GLvoid* ptr = (GLvoid*) this_->at<uchar>(0, y);
-			glReadPixels(0, y, this_->width(), 1, format, type, ptr);
+			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
+			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
 		}
-	}
 
-	Bitmap
-	Bitmap_from (const Texture& texture)
-	{
-		Bitmap bmp;
-		setup_bitmap(&bmp, texture);
 		return bmp;
 	}
 
@@ -182,7 +182,9 @@ namespace Rays
 	{
 		if (width == 0 || height == 0) return;
 
-		if (!bitmap || !image)
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!image)
 			argument_error(__FILE__, __LINE__);
 
 		CGContextRef context = bitmap->self->get_context();
@@ -200,21 +202,24 @@ 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;
 
 		font.draw_string(bitmap->self->get_context(), bitmap->height(), str, x, y);
-
 		Bitmap_set_modified(bitmap);
 	}
 
 	void
 	Bitmap_set_modified (Bitmap* bitmap, bool modified)
 	{
-		assert(bitmap);
-
 		bitmap->self->modified = modified;
 	}
 
@@ -267,7 +272,9 @@ namespace Rays
 	Bitmap
 	Bitmap_load (const char* path_)
 	{
-		if (!path_ || path_[0] == '\0')
+		if (!path_)
+			argument_error(__FILE__, __LINE__);
+		if (path_[0] == '\0')
 			argument_error(__FILE__, __LINE__);
 
 		NSString* path = [NSString stringWithUTF8String: path_];

data/src/osx/font.mm

@@ -154,11 +154,16 @@ namespace Rays
 	{
 		CGContextRef context = (CGContextRef) context_;
 
-		if (!*this || !context || !str)
+		if (!context)
+			argument_error(__FILE__, __LINE__);
+		if (!str)
 			argument_error(__FILE__, __LINE__);
 
 		if (*str == '\0') return;
 
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
 		CTLinePtr line = make_line(self->font, str);
 		if (!line)
 			rays_error(__FILE__, __LINE__, "creating CTLineRef failed.");

data/src/osx/rays.mm

@@ -25,7 +25,7 @@ namespace Rays
 	init ()
 	{
 		if (global::pool)
-			rays_error(__FILE__, __LINE__, "Rays::init(): already initialized.");
+			rays_error(__FILE__, __LINE__, "already initialized.");
 
 		global::pool = [[NSAutoreleasePool alloc] init];
 
@@ -36,7 +36,7 @@ namespace Rays
 	fin ()
 	{
 		if (!global::pool)
-			rays_error(__FILE__, __LINE__, "Rays::fin(): not initialized.");
+			rays_error(__FILE__, __LINE__, "not initialized.");
 
 		OpenGL_fin();
 

data/src/painter.cpp

@@ -2,6 +2,7 @@
 
 
 #include <math.h>
+#include <string.h>
 #include <assert.h>
 #include <memory>
 #include <vector>
@@ -331,7 +332,9 @@ namespace Rays
 			const TextureInfo* texinfo = NULL,
 			const Shader* shader       = NULL)
 		{
-			if (!points || npoints <= 0)
+			if (!points)
+				argument_error(__FILE__, __LINE__);
+			if (npoints <= 0)
 				argument_error(__FILE__, __LINE__);
 
 			if (!painting)

data/src/point.cpp

@@ -159,7 +159,11 @@ namespace Rays
 	Point&
 	Point::operator /= (const This& rhs)
 	{
-		if (rhs.x == 0 || rhs.y == 0 || rhs.z == 0)
+		if (rhs.x == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.y == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.z == 0)
 			argument_error(__FILE__, __LINE__);
 
 		to_glm(*this) /= to_glm(rhs);
@@ -235,7 +239,11 @@ namespace Rays
 	Point
 	operator / (coord lhs, const Point& rhs)
 	{
-		if (rhs.x == 0 || rhs.y == 0 || rhs.z == 0)
+		if (rhs.x == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.y == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.z == 0)
 			argument_error(__FILE__, __LINE__);
 
 		return to_rays<Point>(lhs / to_glm(rhs));
@@ -253,7 +261,11 @@ namespace Rays
 	Point
 	operator / (const Point& lhs, const Point& rhs)
 	{
-		if (rhs.x == 0 || rhs.y == 0 || rhs.z == 0)
+		if (rhs.x == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.y == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.z == 0)
 			argument_error(__FILE__, __LINE__);
 
 		return to_rays<Point>(to_glm(lhs) / to_glm(rhs));

data/src/polygon.cpp

@@ -70,12 +70,10 @@ namespace Rays
 				if (!points_)
 					argument_error(__FILE__, __LINE__);
 
-				if (
-					!points.empty() &&
-					(!colors_ != !pcolors || !texcoords_ != !ptexcoords))
-				{
+				if (!points.empty() && !colors_ != !pcolors)
+					argument_error(__FILE__, __LINE__);
+				if (!points.empty() && !texcoords_ != !ptexcoords)
 					argument_error(__FILE__, __LINE__);
-				}
 
 				segments.emplace_back(points.size(), 0, polyline.hole());
 				points.insert(points.end(), points_, points_ + polyline.size());

data/src/render_buffer.cpp

@@ -25,16 +25,24 @@ namespace Rays
 
 		void create (int width_, int height_)
 		{
-			if (width_ <= 0 || height_ <= 0)
+			if (width_  <= 0)
+				argument_error(__FILE__, __LINE__);
+			if (height_ <= 0)
 				argument_error(__FILE__, __LINE__);
 
 			if (is_valid())
 			{
-				if (width != width_ || height == height_)
+				if (width  != width_)
+				{
+					argument_error(__FILE__, __LINE__,
+						"RenderBuffer is already created and "
+						"width parameters is not same as current width.");
+				}
+				if (height != height_)
 				{
 					argument_error(__FILE__, __LINE__,
 						"RenderBuffer is already created and "
-						"width/height parameters is not same as current width/height.");
+						"height parameters is not same as current height.");
 				}
 				return;
 			}

data/src/shader.cpp

@@ -156,6 +156,9 @@ namespace Rays
 			// restore premultiplied rgb values
 			"  vec3 rgb__   = col__.a != 0.0 ? col__.rgb / col__.a : col__.rgb;\n"
 			"  gl_FragColor = " + V_COLOR + " * vec4(rgb__, col__.a);\n"
+			#elif defined(WIN32)
+			"  float a__    = (col__.r + col__.g + col__.b) / 3.0;\n"
+			"  gl_FragColor = " + V_COLOR + " * vec4(1.0, 1.0, 1.0, a__);\n"
 			#else
 			"  gl_FragColor = " + V_COLOR + " * col__;\n"
 			#endif

data/src/shader_program.cpp

@@ -99,42 +99,50 @@ namespace Rays
 	};// UniformValueT
 
 
-	template <> void UniformValueT<int, 1>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<int, 1>::apply_value (GLint location) const
 	{
 		glUniform1iv(location, 1, array);
 	}
 
-	template <> void UniformValueT<int, 2>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<int, 2>::apply_value (GLint location) const
 	{
 		glUniform2iv(location, 1, array);
 	}
 
-	template <> void UniformValueT<int, 3>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<int, 3>::apply_value (GLint location) const
 	{
 		glUniform3iv(location, 1, array);
 	}
 
-	template <> void UniformValueT<int, 4>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<int, 4>::apply_value (GLint location) const
 	{
 		glUniform4iv(location, 1, array);
 	}
 
-	template <> void UniformValueT<float, 1>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<float, 1>::apply_value (GLint location) const
 	{
 		glUniform1fv(location, 1, array);
 	}
 
-	template <> void UniformValueT<float, 2>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<float, 2>::apply_value (GLint location) const
 	{
 		glUniform2fv(location, 1, array);
 	}
 
-	template <> void UniformValueT<float, 3>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<float, 3>::apply_value (GLint location) const
 	{
 		glUniform3fv(location, 1, array);
 	}
 
-	template <> void UniformValueT<float, 4>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<float, 4>::apply_value (GLint location) const
 	{
 		glUniform4fv(location, 1, array);
 	}
@@ -191,7 +199,9 @@ namespace Rays
 
 		Uniform (const char* name, const UniformValue* value)
 		{
-			if (!name || name[0] == '\0')
+			if (!name)
+				argument_error(__FILE__, __LINE__);
+			if (name[0] == '\0')
 				argument_error(__FILE__, __LINE__);
 
 			reset(value);

data/src/shader_source.cpp

@@ -29,7 +29,11 @@ namespace Rays
 
 		void compile (GLenum type_, const char* source_)
 		{
-			if (!is_valid_type(type_) || !source_ || !*source_)
+			if (!is_valid_type(type_))
+				argument_error(__FILE__, __LINE__);
+			if (!source_)
+				argument_error(__FILE__, __LINE__);
+			if (!*source_)
 				argument_error(__FILE__, __LINE__);
 
 			if (is_valid())

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);