Re-enable chaining in user JS code

Author: Tobias Knöschke

data/glkernel.js

@@ -29,11 +29,11 @@ var _Kernel = function(x,y,z) {
         this.noise = {
             uniform: function(range_min, range_max) {
                 _glkernel.noise_uniform(that.kernel, range_min, range_max);
-                return that.kernel;
+                return that;
             },
             normal: function(mean, stddev) {
                 _glkernel.noise_normal(that.kernel, mean, stddev);
-                return that.kernel;
+                return that;
             },
             gradient: function(noise_type, octave_type, startFrequency, octaves) {
                 // Defaults
@@ -43,7 +43,7 @@ var _Kernel = function(x,y,z) {
                 octaves = (typeof octaves !== 'undefined') ? octaves : 5;
 
                 _glkernel.noise_gradient(that.kernel, noise_type, octave_type, startFrequency, octaves);
-                return that.kernel;
+                return that;
             }
         };
         this.sample = {
@@ -52,62 +52,62 @@ var _Kernel = function(x,y,z) {
                 num_probes = (typeof num_probes !== 'undefined') ? num_probes : 32;
 
                 _glkernel.sample_poisson_square(that.kernel, num_probes);
-                return that.kernel;
+                return that;
             },
             poisson_square: function(min_dist, num_probes) {
                 // Defaults
                 num_probes = (typeof num_probes !== 'undefined') ? num_probes : 32;
 
                 _glkernel.sample_poisson_square1(that.kernel, min_dist, num_probes);
-                return that.kernel;
+                return that;
             },
             stratified: function() {
                 _glkernel.sample_stratified(that.kernel);
-                return that.kernel;
+                return that;
             },
             hammersley: function() {
                 _glkernel.sample_hammersley(that.kernel);
-                return that.kernel;
+                return that;
             },
             halton: function(base1, base2) {
                 _glkernel.sample_halton(that.kernel, base1, base2);
-                return that.kernel;
+                return that;
             },
             hammersley_sphere: function(type) {
                 // Defaults
                 type = (typeof type !== 'undefined') ? type : HemisphereMapping.Uniform;
 
                 _glkernel.sample_hammersley_sphere(that.kernel, type);
-                return that.kernel;
+                return that;
             },
             halton_sphere: function(base1, base2, type) {
                 // Defaults
                 type = (typeof type !== 'undefined') ? type : HemisphereMapping.Uniform;
 
                 _glkernel.sample_halton_sphere(that.kernel, base1, base2, type);
-                return that.kernel;
+                return that;
             },
             best_candidate: function(num_candidates) {
                 // Defaults
                 num_candidates = (typeof num_candidates !== 'undefined') ? num_candidates : 32;
 
                 _glkernel.sample_best_candidate(that.kernel, num_candidates);
-                return that.kernel;
+                return that;
             },
             n_rooks: function() {
                 _glkernel.sample_n_rooks(that.kernel);
-                return that.kernel;
+                return that;
             },
             multi_jittered: function(correlated) {
                 // Defaults
                 correlated = (typeof correlated !== 'undefined') ? correlated : false;
 
                 _glkernel.sample_multi_jittered(that.kernel, correlated);
-                return that.kernel;
+                return that;
             },
             golden_point_set: function() {
                 _glkernel.sample_golden_point_set(that.kernel);
-                return that.kernel;
+                return that;
             }
         };
         this.scale = {
@@ -117,13 +117,13 @@ var _Kernel = function(x,y,z) {
                 rangeFromUpper = (typeof rangeFromUpper !== 'undefined') ? rangeFromUpper : 1;
 
                 _glkernel.scale_range(that.kernel, rangeToLower, rangeToUpper, rangeFromLower, rangeFromUpper);
-                return that.kernel;
+                return that;
             }
         };
         this.sequence = {
             uniform: function(range_min, range_max) {
                 _glkernel.sequence_uniform(that.kernel, range_min, range_max);
-                return that.kernel;
+                return that;
             }
         };
         this.shuffle = {
@@ -135,24 +135,24 @@ var _Kernel = function(x,y,z) {
                 permutate_per_bucket = (typeof permutate_per_bucket !== 'undefined') ? permutate_per_bucket : false;
 
                 _glkernel.shuffle_bucket_permutate(that.kernel, subkernel_width, subkernel_height, subkernel_depth, permutate_per_bucket);
-                return that.kernel;
+                return that;
             },
             bayer: function() {
                 _glkernel.shuffle_bayer(that.kernel);
-                return that.kernel;
+                return that;
             },
             random: function(start) {
                 // Defaults
                 start = (typeof start !== 'undefined') ? start : 1;
 
                 _glkernel.shuffle_random(that.kernel, start);
-                return that.kernel;
+                return that;
             }
         };
         this.sort = {
             distance: function(origin) {
                 _glkernel.sort_distance(that.kernel, origin);
-                return that.kernel;
+                return that;
             }
         };
     };

scripts/generate.py

@@ -202,7 +202,7 @@ def jsFunction(func, enums):
 
     jsCode = """{firstLine}{defaultChecks}
 {finalCall}
-                return that.kernel;
+                return that;
             }}""".format(firstLine = firstLine, defaultChecks = defaultChecks, finalCall = finalCall)
 
     return jsCode

source/tools/glkernel-cli/KernelGenerator.cpp

@@ -42,9 +42,13 @@ cppexpose::Variant KernelGenerator::generateKernelFromJavascript()
 
     auto variant = scriptContext.evaluate(m_scriptCode);
 
-    if (variant.hasType<cppexpose::Object*>())
+    if (variant.hasType<cppexpose::VariantMap>())
     {
-        auto kernelObject = variant.value<cppexpose::Object*>();
+        auto kernelWrapper = variant.value<cppexpose::VariantMap>();
+        if (!kernelWrapper.count("kernel"))
+            return variant;
+
+        auto kernelObject = kernelWrapper["kernel"].value<cppexpose::Object*>();
 
         auto kernel1Object = dynamic_cast<Kernel1Object*>(kernelObject);
         if (kernel1Object)