Initial update for NAN suport

Author: mikeseven

binding.gyp

@@ -11,14 +11,15 @@
     {
       'target_name': 'webgl',
       'defines': [
-        'VERSION=0.1.4'
+        'VERSION=0.3.0'
       ],
       'sources': [ 
           'src/bindings.cc',
           'src/image.cc',
           'src/webgl.cc',
       ],
       'include_dirs': [
+        "<!(node -e \"require('nan')\")",
         '<(module_root_dir)/deps/include',
       ],
       'library_dirs': [

package.json

@@ -2,34 +2,37 @@
   "author": "Mikael Bourges-Sevenier <[email protected]>",
   "name": "node-webgl",
   "description": "WebGL bindings for node",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "main": "index.js",
-  "keywords": [ "webgl", "opengl" ],
+  "keywords": [
+    "webgl",
+    "opengl"
+  ],
   "engines": {
-    "node": "0.7.0-0.11.3"
+    "node": ">=0.7.0"
   },
-   "directories": {
-       "src": "src",
-       "lib": "lib",
-       "doc": "doc",
-       "examples": "examples",
-       "test": "test"
-   },
-   "repository": {
-       "type": "git",
-       "url": "https://[email protected]/mikeseven/node-webgl.git" 
-   },
-   "scripts": {
-       "install": "node-gyp rebuild"
-   },
-   "licenses": [{
-        "type": "BSD",
-        "url": "http://github.com/mikeseven/node-webgl/raw/master/LICENSES"
-    }],
-   "dependencies": {
-    "node-glfw" : ">=0.2.0"
-   },
-   "devDependencies": {
-    "node-glfw" : ">=0.2.0"
-   }
+  "directories": {
+    "src": "src",
+    "lib": "lib",
+    "doc": "doc",
+    "examples": "examples",
+    "test": "test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://[email protected]/mikeseven/node-webgl.git"
+  },
+  "scripts": {
+    "install": "node-gyp rebuild"
+  },
+  "licenses": [
+    {
+      "type": "BSD",
+      "url": "http://github.com/mikeseven/node-webgl/raw/master/LICENSES"
+    }
+  ],
+  "dependencies": {
+    "node-glfw": ">=0.2.0",
+    "nan": "^0.8.0"
+  }
 }

src/common.h

@@ -9,6 +9,7 @@
 #define COMMON_H_
 
 #include <node.h>
+#include "nan.h"
 #include <v8.h>
 #include "arch_wrapper.h"
 
@@ -17,7 +18,6 @@ namespace {
 #define JS_INT(val) v8::Integer::New(val)
 #define JS_FLOAT(val) v8::Number::New(val)
 #define JS_BOOL(val) v8::Boolean::New(val)
-#define JS_METHOD(name) v8::Handle<v8::Value> name(const v8::Arguments& args)
 
 }
 #endif /* COMMON_H_ */

src/image.cc

@@ -29,7 +29,7 @@ static void unregisterImage(Image* obj) {
 Persistent<FunctionTemplate> Image::constructor_template;
 
 void Image::Initialize (Handle<Object> target) {
-  HandleScope scope;
+  NanScope();
 
   Local<FunctionTemplate> t = FunctionTemplate::New(New);
   constructor_template = Persistent<FunctionTemplate>::New(t);
@@ -44,7 +44,7 @@ void Image::Initialize (Handle<Object> target) {
   constructor_template->PrototypeTemplate()->SetAccessor(JS_STR("src"), SrcGetter, SrcSetter);
   //constructor_template->PrototypeTemplate()->SetAccessor(JS_STR("onload"), NULL, OnloadSetter);
 
-  target->Set(String::NewSymbol("Image"), constructor_template->GetFunction());
+  target->Set(NanSymbol("Image"), constructor_template->GetFunction());
 
   FreeImage_Initialise(true);
 }
@@ -88,7 +88,7 @@ void Image::Load (const char *filename) {
 }
 
 Handle<Value> Image::New (const Arguments& args) {
-  HandleScope scope;
+  NanScope();
 
   Image *image = new Image();
   image->Wrap(args.This());
@@ -98,39 +98,39 @@ Handle<Value> Image::New (const Arguments& args) {
 }
 
 Handle<Value> Image::WidthGetter (Local<String> property, const AccessorInfo& info) {
-  HandleScope scope;
+  NanScope();
 
   Image *image = ObjectWrap::Unwrap<Image>(info.This());
 
-  return scope.Close(JS_INT(image->GetWidth()));
+  NanReturnValue(JS_INT(image->GetWidth()));
 }
 
 Handle<Value> Image::HeightGetter (Local<String> property, const AccessorInfo& info) {
-  HandleScope scope;
+  NanScope();
 
   Image *image = ObjectWrap::Unwrap<Image>(info.This());
 
-  return scope.Close(JS_INT(image->GetHeight()));
+  NanReturnValue(JS_INT(image->GetHeight()));
 }
 
 Handle<Value> Image::PitchGetter (Local<String> property, const AccessorInfo& info) {
-  HandleScope scope;
+  NanScope();
 
   Image *image = ObjectWrap::Unwrap<Image>(info.This());
 
-  return scope.Close(JS_INT(image->GetPitch()));
+  NanReturnValue(JS_INT(image->GetPitch()));
 }
 
 Handle<Value> Image::SrcGetter (Local<String> property, const AccessorInfo& info) {
-  HandleScope scope;
+  NanScope();
 
   Image *image = ObjectWrap::Unwrap<Image>(info.This());
 
-  return scope.Close(JS_STR(image->filename));
+  NanReturnValue(JS_STR(image->filename));
 }
 
 void Image::SrcSetter (Local<String> property, Local<Value> value, const AccessorInfo& info) {
-  HandleScope scope;
+  NanScope();
 
   Image *image = ObjectWrap::Unwrap<Image>(info.This());
   String::Utf8Value filename_s(value->ToString());
@@ -155,7 +155,7 @@ void Image::SrcSetter (Local<String> property, Local<Value> value, const Accesso
                                                        (int) num_bytes);
 
   // emit event
-  Local<Value> emit_v = info.This()->Get(String::NewSymbol("emit"));
+  Local<Value> emit_v = info.This()->Get(NanSymbol("emit"));
   assert(emit_v->IsFunction());
   Local<Function> emit_f = emit_v.As<Function>();
 
@@ -172,8 +172,8 @@ void Image::SrcSetter (Local<String> property, Local<Value> value, const Accesso
     FatalException(tc);
 }
 
-JS_METHOD(Image::save) {
-  HandleScope scope;
+NAN_METHOD(Image::save) {
+  NanScope();
   String::Utf8Value filename(args[0]->ToString());
 
   FREE_IMAGE_FORMAT format = FreeImage_GetFIFFromFilename(*filename);
@@ -205,7 +205,7 @@ JS_METHOD(Image::save) {
   }
   bool ret=FreeImage_Save(format, image, *filename)==1;
   FreeImage_Unload(image);
-  return scope.Close(Boolean::New(ret));
+  NanReturnValue(Boolean::New(ret));
 }
 
 Image::~Image () {

src/image.h

@@ -26,7 +26,7 @@ class Image : public ObjectWrap {
   static void SrcSetter (Local<String> property, Local<Value> value, const AccessorInfo& info);
   static void OnloadSetter (Local<String> property, Local<Value> value, const AccessorInfo& info);
   static Handle<Value> PitchGetter (Local<String> property, const AccessorInfo& info);
-  static JS_METHOD(save);
+  static NAN_METHOD(save);
 
   virtual ~Image ();