Change to use v8-typed-array.

puffnfresh · May 29, 2011 · 59f9499 · 59f9499
1 parent 8780802
commit 59f9499
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 136 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,7 @@ Building
 --------
 
     node-waf configure build
+    npm install https://github.com/pufuwozu/v8-typed-array/tarball/master
 
 Testing
 -------

diff --git a/examples/example-include.js b/examples/example-include.js
@@ -5,8 +5,8 @@ function init(canvas, nodejs) {
 
     if(nodejs) {
 	var webgl = require('../webgl');
-	ArrayBuffer = require('buffer').Buffer;
+	ArrayBuffer = require('typed-array').ArrayBuffer;
-	Float32Array = webgl.Float32Array;
+	Float32Array = require('typed-array').Float32Array;
 	Image = webgl.Image;
     }
 

diff --git a/src/glcontext.h b/src/glcontext.h
@@ -5,7 +5,6 @@
 #include <node.h>
 #include <node_events.h>
 
-#include "typedarray.h"
 #include "image.h"
 
 using namespace v8;
@@ -185,11 +184,12 @@ class GLContext : public ObjectWrap {
     BufferData (const Arguments& args) {
         HandleScope scope;
 
-        Float32Array *fa = Unwrap<Float32Array>(args[1]->ToObject());
+	Local<Object> array = args[1]->ToObject();
+	Local<Object> buffer = array->GetHiddenValue(String::New("_buffer"))->ToObject();
 
 	GLenum target = args[0]->Uint32Value();
-        GLsizei size = fa->Length();
+        GLsizei size = buffer->Get(String::New("byteLength"))->Uint32Value();
-        const GLvoid* data = fa->GetData();
+        const GLvoid* data = array->GetIndexedPropertiesExternalArrayData();
 	GLenum usage = args[2]->Uint32Value();
 
 	glBufferData(target, size, data, usage);
@@ -274,12 +274,12 @@ class GLContext : public ObjectWrap {
     UniformMatrix4fv (const Arguments &args) {
 	HandleScope scope;
 
-        Float32Array *fa = Unwrap<Float32Array>(args[2]->ToObject());
+	Local<Object> array = args[2]->ToObject();
 
 	GLint location = args[0]->IntegerValue();
-	GLsizei count = fa->Length() / sizeof(float);
+	GLsizei count = array->GetIndexedPropertiesExternalArrayDataLength();
 	GLboolean transpose = args[1]->BooleanValue();
-	const GLfloat *value = (float *)fa->GetData();
+	const GLfloat *value = (float *)array->GetIndexedPropertiesExternalArrayData();
 	glUniformMatrix4fv(location, count, transpose, value);
 
 	return Undefined();

diff --git a/src/typedarray.h b/src/typedarray.h
diff --git a/src/webgl.cc b/src/webgl.cc
@@ -6,7 +6,6 @@
 #include <node_events.h>
 
 #include "glcontext.h"
-#include "typedarray.h"
 #include "image.h"
 
 using namespace v8;
@@ -190,7 +189,6 @@ init (Handle<Object> target) {
     HandleScope scope;
 
     GLContext::Initialize(target);
-    Float32Array::Initialize(target);
     Image::Initialize(target);
     Window::Initialize(target);
 }