Allow subclasses in webGLObjectFromJSValue; fixes WebGL's delete* functions

phoboslab · phoboslab · commit c2db926a2d78 · 2014-06-19T21:26:49.000+02:00
diff --git a/Source/Ejecta/EJCanvas/WebGL/EJBindingWebGLObjects.m b/Source/Ejecta/EJCanvas/WebGL/EJBindingWebGLObjects.m
@@ -24,14 +24,14 @@ + (GLuint)indexFromJSValue:(JSValueRef)value {
 	if( !value ) { return 0; }
 	
 	EJBindingWebGLObject *binding = (EJBindingWebGLObject *)JSValueGetPrivate(value);
-	return (binding && [binding isMemberOfClass:[self class]]) ? binding->index : 0;
+	return (binding && [binding isKindOfClass:[self class]]) ? binding->index : 0;
 }
 
 + (EJBindingWebGLObject *)webGLObjectFromJSValue:(JSValueRef)value {
 	if( !value ) { return nil; }
 	
 	EJBindingWebGLObject *binding = (EJBindingWebGLObject *)JSValueGetPrivate(value);
-	return (binding && [binding isMemberOfClass:[self class]]) ? binding : nil;
+	return (binding && [binding isKindOfClass:[self class]]) ? binding : nil;
 }
 
 + (JSObjectRef)createJSObjectWithContext:(JSContextRef)ctx
@@ -95,7 +95,7 @@ + (EJTexture *)textureFromJSValue:(JSValueRef)value {
 	if( !value ) { return NULL; }
 	
 	EJBindingWebGLTexture *binding = (EJBindingWebGLTexture *)JSValueGetPrivate(value);
-	return (binding && [binding isMemberOfClass:[self class]]) ? binding->texture : NULL;
+	return (binding && [binding isKindOfClass:[self class]]) ? binding->texture : NULL;
 }
 
 + (JSObjectRef)createJSObjectWithContext:(JSContextRef)ctx

Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ + (GLuint)indexFromJSValue:(JSValueRef)value {`
`24`	`24`	`if( !value ) { return 0; }`
`25`	`25`
`26`	`26`	`EJBindingWebGLObject binding = (EJBindingWebGLObject )JSValueGetPrivate(value);`
`27`		`- return (binding && [binding isMemberOfClass:[self class]]) ? binding->index : 0;`
	`27`	`+ return (binding && [binding isKindOfClass:[self class]]) ? binding->index : 0;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`+ (EJBindingWebGLObject *)webGLObjectFromJSValue:(JSValueRef)value {`
`31`	`31`	`if( !value ) { return nil; }`
`32`	`32`
`33`	`33`	`EJBindingWebGLObject binding = (EJBindingWebGLObject )JSValueGetPrivate(value);`
`34`		`- return (binding && [binding isMemberOfClass:[self class]]) ? binding : nil;`
	`34`	`+ return (binding && [binding isKindOfClass:[self class]]) ? binding : nil;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`+ (JSObjectRef)createJSObjectWithContext:(JSContextRef)ctx`
`@@ -95,7 +95,7 @@ + (EJTexture *)textureFromJSValue:(JSValueRef)value {`
`95`	`95`	`if( !value ) { return NULL; }`
`96`	`96`
`97`	`97`	`EJBindingWebGLTexture binding = (EJBindingWebGLTexture )JSValueGetPrivate(value);`
`98`		`- return (binding && [binding isMemberOfClass:[self class]]) ? binding->texture : NULL;`
	`98`	`+ return (binding && [binding isKindOfClass:[self class]]) ? binding->texture : NULL;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`+ (JSObjectRef)createJSObjectWithContext:(JSContextRef)ctx`