Permalink
Browse files

Merge branch 'tmpvarm'

  • Loading branch information...
2 parents 3ac138c + 660cfef commit fe6e33082dbb7f668b6adb64eab3d9cef2dbf8dd @ncb000gt ncb000gt committed Jun 11, 2010
Showing with 3 additions and 253 deletions.
  1. +3 −2 src/common.h
  2. +0 −250 src/gl.cc
  3. +0 −1 src/glu.cc
View
@@ -13,8 +13,9 @@
#include <sys/time.h>
// OpenGL Includes
-#include <GL/gl.h>
-#include <GL/glu.h>
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+
//TODO: Add osx headers
View
@@ -3,7 +3,6 @@
// Includes
#include "gl.h"
-#include <GL/gl.h>
using namespace v8;
namespace node {
@@ -8007,215 +8006,6 @@ namespace node {
}
- /**
- * imaxabs
- *
- * @param intmax_t __n
- * @return intmax_t
- */
- Handle<Value> gl_imaxabs(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("imaxabs is not implemented!")));
- }
-
-
- /**
- * imaxdiv
- *
- * @param intmax_t __numer
- * @param intmax_t __denom
- * @return imaxdiv_t
- */
- Handle<Value> gl_imaxdiv(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("imaxdiv is not implemented!")));
- }
-
-
- /**
- * strtoimax
- *
- * @param __ char *__restrict __nptr
- * @param char **__restrict __endptr
- * @param int __base
- * @return intmax_t
- */
- Handle<Value> gl_strtoimax(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("strtoimax is not implemented!")));
- }
-
-
- /**
- * strtoumax
- *
- * @param __ char *__restrict __nptr
- * @param char ** __restrict __endptr
- * @param int __base
- * @return uintmax_t
- */
- Handle<Value> gl_strtoumax(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("strtoumax is not implemented!")));
- }
-
-
- /**
- * wcstoimax
- *
- * @param __ __gwchar_t *__restrict __nptr
- * @param __gwchar_t **__restrict __endptr
- * @param int __base
- * @return intmax_t
- */
- Handle<Value> gl_wcstoimax(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("wcstoimax is not implemented!")));
- }
-
-
- /**
- * wcstoumax
- *
- * @param __ __gwchar_t *__restrict __nptr
- * @param __gwchar_t ** __restrict __endptr
- * @param int __base
- * @return uintmax_t
- */
- Handle<Value> gl_wcstoumax(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("wcstoumax is not implemented!")));
- }
-
-
- /**
- * glCreateDebugObjectMESA
- *
- * @return GLhandleARB
- */
- Handle<Value> gl_glCreateDebugObjectMESA(const Arguments& args) {
- HandleScope scope;
- GLhandleARB _ret = glCreateDebugObjectMESA();
- }
-
-
- /**
- * glClearDebugLogMESA
- *
- * @param GLhandleARB obj
- * @param GLenum logType
- * @param GLenum shaderType
- * @return void
- */
- Handle<Value> gl_glClearDebugLogMESA(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("glClearDebugLogMESA is not implemented!")));
- }
-
-
- /**
- * glGetDebugLogMESA
- *
- * @param GLhandleARB obj
- * @param GLenum logType
- * @param GLenum shaderType
- * @param GLsizei maxLength
- * @param GLsizei *length
- * @param GLcharARB *debugLog
- * @return void
- */
- Handle<Value> gl_glGetDebugLogMESA(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("glGetDebugLogMESA is not implemented!")));
- }
-
-
- /**
- * glGetDebugLogLengthMESA
- *
- * @param GLhandleARB obj
- * @param GLenum logType
- * @param GLenum shaderType
- * @return GLsizei
- */
- Handle<Value> gl_glGetDebugLogLengthMESA(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("glGetDebugLogLengthMESA is not implemented!")));
- }
-
-
- /**
- * glProgramCallbackMESA
- *
- * @param GLenum target
- * @param GLprogramcallbackMESA callback
- * @param GLvoid *data
- * @return void
- */
- Handle<Value> gl_glProgramCallbackMESA(const Arguments& args) {
- HandleScope scope;
-
- return ThrowException(Exception::Error(
- String::New("glProgramCallbackMESA is not implemented!")));
- }
-
-
- /**
- * glGetProgramRegisterfvMESA
- *
- * @param GLenum target
- * @param GLsizei len
- * @param GLubyte *name
- * @param GLfloat *v
- * @return void
- */
- Handle<Value> gl_glGetProgramRegisterfvMESA(const Arguments& args) {
- HandleScope scope;
- GLenum _target = (GLenum)args[0]->Int32Value();
- GLsizei _len = (GLsizei)args[1]->Int32Value();
- GLubyte _name = (GLubyte)args[2]->Int32Value();
- GLfloat _v = (GLfloat)args[3]->NumberValue();
- glGetProgramRegisterfvMESA(_target, _len, &_name, &_v);
-
- args[2] = Number::New(_name);
-
- args[3] = Number::New(_v);
- }
-
-
- /**
- * glBlendEquationSeparateATI
- *
- * @param GLenum modeRGB
- * @param GLenum modeA
- * @return void
- */
- Handle<Value> gl_glBlendEquationSeparateATI(const Arguments& args) {
- HandleScope scope;
- GLenum _modeRGB = (GLenum)args[0]->Int32Value();
- GLenum _modeA = (GLenum)args[1]->Int32Value();
- glBlendEquationSeparateATI(_modeRGB, _modeA);
- }
-
-
// Constructor
gl::gl() { }
@@ -12833,45 +12623,5 @@ namespace node {
Local<FunctionTemplate> _gl_glMultiTexCoord4svARB = FunctionTemplate::New(gl_glMultiTexCoord4svARB);
target->Set(String::New("glMultiTexCoord4svARB"), _gl_glMultiTexCoord4svARB->GetFunction());
- Local<FunctionTemplate> _gl_imaxabs = FunctionTemplate::New(gl_imaxabs);
- target->Set(String::New("imaxabs"), _gl_imaxabs->GetFunction());
-
- Local<FunctionTemplate> _gl_imaxdiv = FunctionTemplate::New(gl_imaxdiv);
- target->Set(String::New("imaxdiv"), _gl_imaxdiv->GetFunction());
-
- Local<FunctionTemplate> _gl_strtoimax = FunctionTemplate::New(gl_strtoimax);
- target->Set(String::New("strtoimax"), _gl_strtoimax->GetFunction());
-
- Local<FunctionTemplate> _gl_strtoumax = FunctionTemplate::New(gl_strtoumax);
- target->Set(String::New("strtoumax"), _gl_strtoumax->GetFunction());
-
- Local<FunctionTemplate> _gl_wcstoimax = FunctionTemplate::New(gl_wcstoimax);
- target->Set(String::New("wcstoimax"), _gl_wcstoimax->GetFunction());
-
- Local<FunctionTemplate> _gl_wcstoumax = FunctionTemplate::New(gl_wcstoumax);
- target->Set(String::New("wcstoumax"), _gl_wcstoumax->GetFunction());
-
- Local<FunctionTemplate> _gl_glCreateDebugObjectMESA = FunctionTemplate::New(gl_glCreateDebugObjectMESA);
- target->Set(String::New("glCreateDebugObjectMESA"), _gl_glCreateDebugObjectMESA->GetFunction());
-
- Local<FunctionTemplate> _gl_glClearDebugLogMESA = FunctionTemplate::New(gl_glClearDebugLogMESA);
- target->Set(String::New("glClearDebugLogMESA"), _gl_glClearDebugLogMESA->GetFunction());
-
- Local<FunctionTemplate> _gl_glGetDebugLogMESA = FunctionTemplate::New(gl_glGetDebugLogMESA);
- target->Set(String::New("glGetDebugLogMESA"), _gl_glGetDebugLogMESA->GetFunction());
-
- Local<FunctionTemplate> _gl_glGetDebugLogLengthMESA = FunctionTemplate::New(gl_glGetDebugLogLengthMESA);
- target->Set(String::New("glGetDebugLogLengthMESA"), _gl_glGetDebugLogLengthMESA->GetFunction());
-
- Local<FunctionTemplate> _gl_glProgramCallbackMESA = FunctionTemplate::New(gl_glProgramCallbackMESA);
- target->Set(String::New("glProgramCallbackMESA"), _gl_glProgramCallbackMESA->GetFunction());
-
- Local<FunctionTemplate> _gl_glGetProgramRegisterfvMESA = FunctionTemplate::New(gl_glGetProgramRegisterfvMESA);
- target->Set(String::New("glGetProgramRegisterfvMESA"), _gl_glGetProgramRegisterfvMESA->GetFunction());
-
- Local<FunctionTemplate> _gl_glBlendEquationSeparateATI = FunctionTemplate::New(gl_glBlendEquationSeparateATI);
- target->Set(String::New("glBlendEquationSeparateATI"), _gl_glBlendEquationSeparateATI->GetFunction());
-
-
}
} // namespace node
View
@@ -3,7 +3,6 @@
// Includes
#include "glu.h"
-#include <GL/glu.h>
using namespace v8;
namespace node {

0 comments on commit fe6e330

Please sign in to comment.