rays 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ebe243b01fc7a01ec4ff0a6cec05648f8cca592
-  data.tar.gz: 0865209e13e9aaaf678d215df4afe9b3262d094d
+  metadata.gz: e230aa24b23fc3613e532f8a99f86f8e2bb8c7a1
+  data.tar.gz: 01c21244f0c0865cba464c9df735423c83b1bbf4
 SHA512:
-  metadata.gz: ef1548261bc1ef3d7710f47422ea7a8f6dda287fe452f619545b4bd7cda47837ada92b090eae6dedec51d758b70628d38f1e65adc381230cfa1d463c53fa648e
-  data.tar.gz: bae292886978f083b34fd2506960865591787ccebc3fb0c2f9bb0d6b6ef17cacdfe2219dbf84dcce5cbc585014775f06377c70009ad7930c31043f5f4f97d42b
+  metadata.gz: ec8c73e68609daef267718abf45481454e675797c99e405748e032c1b330706125408fd3a00079de35db730259caccfe8ad79b2fa2adca7cd2f539a517e6ce87
+  data.tar.gz: d7443ae673e5c62792dda760dc81e0f6bc9ddcc1110951b00acb15301e5ae1eb575442092752a0cb982c0d4d885b63c5fc0c86518e95b2750602388201df53bf

data/.doc/ext/rays/native.cpp

@@ -6,35 +6,45 @@ using namespace Rucy;
 
 
 void Init_rays ();
+
 void Init_point ();
 void Init_bounds ();
 void Init_color ();
 void Init_color_space ();
+
 void Init_bitmap ();
 void Init_texture ();
 void Init_image ();
 void Init_font ();
 void Init_shader ();
+
 void Init_painter ();
 
 
 extern "C" void
-Init_native ()
+#ifdef COCOAPODS
+	Init_rays_native ()
+#else
+	Init_native ()
+#endif
 {
 	RUCY_TRY
 
 	Rucy::init();
 
 	Init_rays();
+
 	Init_point();
 	Init_bounds();
 	Init_color();
 	Init_color_space();
+
 	Init_bitmap();
 	Init_texture();
 	Init_image();
 	Init_font();
 	Init_shader();
+
 	Init_painter();
 
 	RUCY_CATCH

data/README.md

@@ -1,4 +1,4 @@
 
-# Rays - A Drawing Engine using OpenGL
+# Rays - A Drawing Engine using OpenGL.
 
-## by snori@xord.org
+ by snori@xord.org

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/ext/rays/native.cpp

@@ -6,35 +6,45 @@ using namespace Rucy;
 
 
 void Init_rays ();
+
 void Init_point ();
 void Init_bounds ();
 void Init_color ();
 void Init_color_space ();
+
 void Init_bitmap ();
 void Init_texture ();
 void Init_image ();
 void Init_font ();
 void Init_shader ();
+
 void Init_painter ();
 
 
 extern "C" void
-Init_native ()
+#ifdef COCOAPODS
+	Init_rays_native ()
+#else
+	Init_native ()
+#endif
 {
 	RUCY_TRY
 
 	Rucy::init();
 
 	Init_rays();
+
 	Init_point();
 	Init_bounds();
 	Init_color();
 	Init_color_space();
+
 	Init_bitmap();
 	Init_texture();
 	Init_image();
 	Init_font();
 	Init_shader();
+
 	Init_painter();
 
 	RUCY_CATCH

data/include/rays/opengl.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_GL_H__
-#define __RAYS_GL_H__
+#ifndef __RAYS_OPENGL_H__
+#define __RAYS_OPENGL_H__
 
 
 #if defined(OSX)

data/rays.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = "https://github.com/xord/spacy/wiki/#{name.capitalize}-Home"
+  s.homepage = "https://github.com/xord/rays"
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'

data/src/exception.cpp

@@ -1,7 +1,7 @@
 #include "rays/exception.h"
 
 
-#include "xot/string.h"
+#include <xot/string.h>
 
 
 namespace Rays

data/src/frame_buffer.cpp

@@ -49,7 +49,7 @@ namespace Rays
 
 			if (id >= 0)
 			{
-				GLenum id_ = id;
+				GLuint id_ = id;
 				glDeleteFramebuffers(1, &id_);
 				check_error(__FILE__, __LINE__);
 			}

data/src/frame_buffer.h

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

data/src/ios/helper.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_OSX_HELPER_H__
-#define __RAYS_OSX_HELPER_H__
+#ifndef __RAYS_SRC_OSX_HELPER_H__
+#define __RAYS_SRC_OSX_HELPER_H__
 
 
 #include <boost/shared_ptr.hpp>

data/src/osx/helper.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_OSX_HELPER_H__
-#define __RAYS_OSX_HELPER_H__
+#ifndef __RAYS_SRC_OSX_HELPER_H__
+#define __RAYS_SRC_OSX_HELPER_H__
 
 
 #include <boost/shared_ptr.hpp>

data/src/painter.cpp

@@ -870,7 +870,7 @@ namespace Rays
 		if (!tex)
 			rays_error(__FILE__, __LINE__, "text_image's texture is invalid.");
 
-		#ifdef DEBUG
+		#if 0//def DEBUG
 			save_image(self->text_image, "/Users/snori/font.png");
 
 			painter->push_attr();

data/src/program.cpp

@@ -1,6 +1,14 @@
 #include "program.h"
 
 
+#ifndef IOS
+#define USE_SHADER
+#endif
+
+
+#ifdef USE_SHADER
+
+
 #include <vector>
 #include <algorithm>
 #include <boost/scoped_ptr.hpp>
@@ -511,3 +519,130 @@ namespace Rays
 
 
 }// Rays
+
+
+#else// USE_SHADER
+
+
+#include "rays/exception.h"
+
+
+namespace Rays
+{
+
+
+	struct Program::Data {};
+
+
+	Program::Program ()
+	{
+	}
+
+	Program::~Program ()
+	{
+	}
+
+	void
+	Program::attach (const Shader& shader)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::detach (const Shader& shader)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, int arg1)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, int arg1, int arg2)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, int arg1, int arg2, int arg3)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, int arg1, int arg2, int arg3, int arg4)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, const int* args, size_t size)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, float arg1)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, float arg1, float arg2)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, float arg1, float arg2, float arg3)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, float arg1, float arg2, float arg3, float arg4)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::set_uniform (const char* name, const float* args, size_t size)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	void
+	Program::push ()
+	{
+	}
+
+	void
+	Program::pop ()
+	{
+	}
+
+	GLuint
+	Program::id () const
+	{
+		return 0;
+	}
+
+	Program::operator bool () const
+	{
+		return false;
+	}
+
+	bool
+	Program::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Rays
+
+
+#endif// USE_SHADER

data/src/program.h

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

data/src/render_buffer.cpp

@@ -59,7 +59,7 @@ namespace Rays
 		{
 			if (id >= 0)
 			{
-				GLenum id_ = id;
+				GLuint id_ = id;
 				glDeleteRenderbuffers(1, &id_);
 			}
 

data/src/render_buffer.h

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

data/src/shader.cpp

@@ -1,6 +1,14 @@
 #include "rays/shader.h"
 
 
+#ifndef IOS
+#define USE_SHADER
+#endif
+
+
+#ifdef USE_SHADER
+
+
 #include <boost/scoped_array.hpp>
 #include "rays/exception.h"
 
@@ -115,3 +123,65 @@ namespace Rays
 
 
 }// Rays
+
+
+#else// USE_SHADER
+
+
+#include "rays/exception.h"
+
+
+namespace Rays
+{
+
+
+	struct Shader::Data {};
+
+
+	Shader::Shader ()
+	{
+	}
+
+	Shader::Shader (const char* source)
+	{
+		not_implemented_error(__FILE__, __LINE__);
+	}
+
+	Shader::~Shader ()
+	{
+	}
+
+	GLuint
+	Shader::id () const
+	{
+		return 0;
+	}
+
+	bool
+	Shader::operator == (const Shader& rhs) const
+	{
+		return false;
+	}
+
+	bool
+	Shader::operator != (const Shader& rhs) const
+	{
+		return !operator==(rhs);
+	}
+
+	Shader::operator bool () const
+	{
+		return false;
+	}
+
+	bool
+	Shader::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Rays
+
+
+#endif// USE_SHADER

data/src/texture.cpp

@@ -35,7 +35,7 @@ namespace Rays
 		{
 			if (id >= 0)
 			{
-				GLenum id_ = id;
+				GLuint id_ = id;
 				glDeleteTextures(1, &id_);
 			}
 

data/src/win32/gdi.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_WIN32_GDI_H__
-#define __RAYS_WIN32_GDI_H__
+#ifndef __RAYS_SRC_WIN32_GDI_H__
+#define __RAYS_SRC_WIN32_GDI_H__
 
 
 #include <windows.h>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - snori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -160,7 +160,6 @@ files:
 - src/ios/helper.h
 - src/ios/helper.mm
 - src/ios/opengl.mm
-- src/ios/program.cpp
 - src/ios/rays.mm
 - src/matrix.cpp
 - src/opengl.cpp
@@ -207,7 +206,7 @@ files:
 - ".doc/ext/rays/rays.cpp"
 - ".doc/ext/rays/shader.cpp"
 - ".doc/ext/rays/texture.cpp"
-homepage: https://github.com/xord/spacy/wiki/Rays-Home
+homepage: https://github.com/xord/rays
 licenses: []
 metadata: {}
 post_install_message: 

data/src/ios/program.cpp

@@ -1,122 +0,0 @@
-#include "program.h"
-
-
-#include "rays/exception.h"
-
-
-namespace Rays
-{
-
-
-	struct Program::Data {};
-
-
-	Program::Program ()
-	{
-	}
-
-	Program::~Program ()
-	{
-	}
-
-	void
-	Program::attach (const Shader& shader)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::detach (const Shader& shader)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, int arg1)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, int arg1, int arg2)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, int arg1, int arg2, int arg3)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, int arg1, int arg2, int arg3, int arg4)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, const int* args, size_t size)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, float arg1)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, float arg1, float arg2)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, float arg1, float arg2, float arg3)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, float arg1, float arg2, float arg3, float arg4)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::set_uniform (const char* name, const float* args, size_t size)
-	{
-		not_implemented_error(__FILE__, __LINE__);
-	}
-
-	void
-	Program::push ()
-	{
-	}
-
-	void
-	Program::pop ()
-	{
-	}
-
-	GLuint
-	Program::id () const
-	{
-		return 0;
-	}
-
-	Program::operator bool () const
-	{
-		return false;
-	}
-
-	bool
-	Program::operator ! () const
-	{
-		return !operator bool();
-	}
-
-
-}// Rays