rays 0.3.10 → 0.3.11

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

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

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

@@ -1,7 +1,8 @@
-#include "../opengl.h"
+#include "../../renderer.h"
 
 
 #include <SDL.h>
+#include "../opengl.h"
 #include "rays/rays.h"
 #include "rays/exception.h"
 
@@ -66,7 +67,7 @@ namespace Rays
 
 
 	void
-	OpenGL_init ()
+	Renderer_init ()
 	{
 		activate_offscreen_context();
 
@@ -80,7 +81,7 @@ namespace Rays
 	}
 
 	void
-	OpenGL_fin ()
+	Renderer_fin ()
 	{
 	}
 

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

@@ -3,8 +3,7 @@
 
 #include <assert.h>
 #include "rays/exception.h"
-#include "opengl.h"
-#include "image.h"
+#include "../image.h"
 #include "shader_program.h"
 #include "shader_source.h"
 

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

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_SRC_SHADER_H__
-#define __RAYS_SRC_SHADER_H__
+#ifndef __RAYS_SRC_OPENGL_SHADER_H__
+#define __RAYS_SRC_OPENGL_SHADER_H__
 
 
 #include "rays/shader.h"

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

@@ -7,9 +7,9 @@
 #include <algorithm>
 #include "rays/shader.h"
 #include "rays/exception.h"
-#include "shader_source.h"
+#include "../painter.h"
 #include "texture.h"
-#include "painter.h"
+#include "shader_source.h"
 
 
 namespace Rays
@@ -169,7 +169,7 @@ namespace Rays
 					shader_error(__FILE__, __LINE__, "texture unit must be less than %d", max);
 
 				glActiveTexture(GL_TEXTURE0 + unit);
-				glBindTexture(GL_TEXTURE_2D, texture.id());
+				glBindTexture(GL_TEXTURE_2D, Texture_get_id(texture));
 				glUniform1i(location, unit);
 				return !OpenGL_has_error();
 			}

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

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

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

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

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

@@ -5,7 +5,6 @@
 #include "rays/exception.h"
 #include "rays/bitmap.h"
 #include "rays/debug.h"
-#include "opengl.h"
 #include "color_space.h"
 #include "frame_buffer.h"
 
@@ -320,9 +319,9 @@ namespace Rays
 	}
 
 	GLuint
-	Texture::id () const
+	Texture_get_id (const Texture& texture)
 	{
-		return self->id;
+		return texture.self->id;
 	}
 
 	void

data/src/opengl/texture.h

@@ -0,0 +1,21 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_SRC_OPENGL_TEXTURE_H__
+#define __RAYS_SRC_OPENGL_TEXTURE_H__
+
+
+#include "../texture.h"
+#include "opengl.h"
+
+
+namespace Rays
+{
+
+
+	GLuint Texture_get_id (const Texture& texture);
+
+
+}// Rays
+
+
+#endif//EOH

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

@@ -1,7 +1,8 @@
-#include "../opengl.h"
+#include "../../renderer.h"
 
 
 #include <xot/windows.h>
+#include "../opengl.h"
 #include "rays/rays.h"
 #include "rays/exception.h"
 
@@ -90,7 +91,7 @@ namespace Rays
 	}
 
 	void
-	OpenGL_init ()
+	Renderer_init ()
 	{
 		activate_offscreen_context();
 
@@ -104,7 +105,7 @@ namespace Rays
 	}
 
 	void
-	OpenGL_fin ()
+	Renderer_fin ()
 	{
 	}
 

data/src/osx/bitmap.mm

@@ -5,10 +5,8 @@
 #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"
 
 
 namespace Rays
@@ -130,11 +128,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__);
@@ -161,31 +158,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 (
 		Bitmap* bitmap, CGImageRef image,
@@ -318,7 +290,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/osx/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;