Allow real functions to render

paulmasson · Aug 6, 2022 · 5bd5ed1 · 5bd5ed1
1 parent b2fb73d
commit 5bd5ed1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/build/mathcell.js b/build/mathcell.js
@@ -652,6 +652,9 @@ function colorFromHue( h ) {
 
 function colorFromArg( x ) {
 
+  if ( !( typeof x === 'object' && 're' in x ) ) // from Math
+    x = { re: x, im: 0 };
+
   var h = Math.atan2( x.im, x.re ) / Math.PI / 2;
 
   return colorFromHue(h);
@@ -1879,7 +1882,9 @@ function parametric( vector, xRange, yRange, options={} ) {
       var x = xRange[0] + j * xStep;
       var v = vector(x,y);
 
-      if ( 'complexFunction' in options )
+      if ( 'complexFunction' in options ) {
+        if ( !( typeof v[2] === 'object' && 're' in v[2] ) ) // from Math
+          v[2] = { re: v[2], im: 0 };
         switch( options.complexFunction ) {
           case 're':
             vertices.push( [ v[0], v[1], v[2].re ] );
@@ -1893,7 +1898,7 @@ function parametric( vector, xRange, yRange, options={} ) {
           default:
             throw Error( 'Unsupported complex function case' );
         }
-      else vertices.push( v );
+      } else vertices.push( v );
 
       if ( 'colormap' in options ) {
         if ( options.colormap === 'complexArgument' )

diff --git a/src/functions.js b/src/functions.js
@@ -246,6 +246,9 @@ function colorFromHue( h ) {
 
 function colorFromArg( x ) {
 
+  if ( !( typeof x === 'object' && 're' in x ) ) // from Math
+    x = { re: x, im: 0 };
+
   var h = Math.atan2( x.im, x.re ) / Math.PI / 2;
 
   return colorFromHue(h);

diff --git a/src/plot/functions.js b/src/plot/functions.js
@@ -90,7 +90,9 @@ function parametric( vector, xRange, yRange, options={} ) {
       var x = xRange[0] + j * xStep;
       var v = vector(x,y);
 
-      if ( 'complexFunction' in options )
+      if ( 'complexFunction' in options ) {
+        if ( !( typeof v[2] === 'object' && 're' in v[2] ) ) // from Math
+          v[2] = { re: v[2], im: 0 };
         switch( options.complexFunction ) {
           case 're':
             vertices.push( [ v[0], v[1], v[2].re ] );
@@ -104,7 +106,7 @@ function parametric( vector, xRange, yRange, options={} ) {
           default:
             throw Error( 'Unsupported complex function case' );
         }
-      else vertices.push( v );
+      } else vertices.push( v );
 
       if ( 'colormap' in options ) {
         if ( options.colormap === 'complexArgument' )