From eb1767cf159acd74366b5376cf7d18d473eec7c2 Mon Sep 17 00:00:00 2001 From: enkimute Date: Thu, 8 Nov 2018 00:09:47 +0100 Subject: [PATCH] cga opns visualizer demo --- examples/coffeeshop.html | 2 +- examples/example_cga3d_opns_line_circle.html | 2 +- ganja.js | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/coffeeshop.html b/examples/coffeeshop.html index c911020..7282005 100644 --- a/examples/coffeeshop.html +++ b/examples/coffeeshop.html @@ -184,7 +184,7 @@

The CoffeeShop

"pga2d_points_and_lines","pga2d_distances_and_angles","pga2d_project_and_reject","pga2d_rotors_and_translators","pga2d_isometries", "pga2d_inverse_kinematics","pga2d_separating_axis","pga2d_pose_estimation","pga2d_euler_line","pga2d_desargues_theorem","pga2d_differentiation","pga2d_physics_moon","pga2d_origami", "pga2d_poncelet", "pga3d_points_and_lines","pga3d_distances_and_angles","pga3d_rotors_and_translators","pga3d_icosahedron","pga3d_sampling","pga3d_slicing","pga3d_differentiation","pga3d_skinning","pga3d_physics_planets","pga3d_origami","pga3d_physics_symmetric_top","pga3d_physics_free_top","pga3d_objects", "cga2d_points_and_circles","cga2d_project_and_reject","cga2d_rotors_and_translators","cga2d_euler_line", - "cga3d_points_circles_lines","cga3d_points_spheres_planes","cga3d_dual_spheres_planes","cga3d_intersections","cga3d_project_reject","cga3d_opns_line_circle", + "cga3d_points_circles_lines","cga3d_points_spheres_planes","cga3d_dual_spheres_planes","cga3d_intersections","cga3d_project_reject","cga3d_opns_visualizer","cga3d_opns_line_circle", "mga3d_points_and_lines", "ccga3d_points_quadrics", "qcga3d_points_and_more", diff --git a/examples/example_cga3d_opns_line_circle.html b/examples/example_cga3d_opns_line_circle.html index 529864f..cb79d35 100644 --- a/examples/example_cga3d_opns_line_circle.html +++ b/examples/example_cga3d_opns_line_circle.html @@ -25,7 +25,7 @@ // Now we will use the OPNS visualizer to show how the shape of the // object evolves as we interpolate from one to the other. - document.body.appendChild(this.graphGL2(()=>{ + document.body.appendChild(this.graph(()=>{ // factor between 0 and 1 var t = Math.min(1,Math.max(0,0.5 + 0.75*Math.sin(performance.now()/700))); // interpolate diff --git a/ganja.js b/ganja.js index 6085824..78b9805 100644 --- a/ganja.js +++ b/ganja.js @@ -500,7 +500,7 @@ // project 3D to 2D. This allows to render 3D and 2D PGA with the same code. project=(o)=>{ if (!o) return o; while (o.call) o=o(); return (tot==4 && (o.length==16))?(tpcam).Vee(options.camera.Mul(o).Mul(options.camera.Conjugate)).Wedge(tpy):o}; // gl escape. - if (options.gl) return Element.graphGL(f,options); if (tot>5 && options.up) return Element.graphGL2(f,options); + if (options.gl) return Element.graphGL(f,options); if (options.up) return Element.graphGL2(f,options); // if we get an array or function without parameters, we render c2d or p2d SVG points/lines/circles/etc if (!(f instanceof Function) || f.length===0) { // Our current cursor, color, animation state and 2D mapping. diff --git a/package.json b/package.json index ea22bfa..2fd6c57 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ganja.js", - "version": "1.0.87", + "version": "1.0.89", "description": "Geometric Algebra for javascript with operator overloading and algebraic literals", "main": "ganja.js", "directories": {