view test/bug-31371.tst @ 18802:75f8926deef1

Fix Z-order stacking of patches and axes grid lines (bug #40722). * gl-render.h (set_polygon_offset): Change function prototype for offset argument to float. * gl-render.cc (set_polygon_offset): Change offset argument to type float. Now matches OpenGL prototype for glPolygonOffset. * gl-render.cc (patch_tesselator::patch_tesselator): Change constructor variable idx to a float, from int. * gl-render.cc (patch_tesselator::begin): Pass index directly to set_polygon_offset. * gl-render.cc (opengl_renderer::draw_patch): Call patch_tesselator with index of 1.0 for filled portion of patch to push it down below outline of patch. * patch.m: For 2-D patches, set zlim to [-1,1] so that axes 'layer' property works.
author Rik <rik@octave.org>
date Sat, 17 May 2014 12:56:11 -0700
parents 6fe6ac8bbfdb
children
line wrap: on
line source

%!test
%! % Work around MATLAB bug where f(x)(y) is invalid syntax
%! % (This bug does not apply to Octave)
%!
%! C = @(fcn,x) fcn(x);
%! C2 = @(fcn,x,y) fcn(x,y);
%!
%! % Church Booleans
%! T = @(t,f) t;
%! F = @(t,f) f;
%!
%! % Church Numerals
%! Zero  = @(fcn,x) x;
%! One   = @(fcn,x) fcn(x);
%! Two   = @(fcn,x) fcn(fcn(x));
%! Three = @(fcn,x) fcn(fcn(fcn(x)));
%! Four  = @(fcn,x) fcn(fcn(fcn(fcn(x))));
%!
%! % Arithmetic Operations
%! Inc = @(a) @(f,x) f(a(f,x)); % Increment
%! Add = @(a,b) @(f,x) a(f,b(f,x));
%! Mult = @(a,b) @(f,x) a(@(x) b(f,x),x);
%! Dec = @(a) @(f,x) C(a(@(g) @(h) h(g(f)), @(u) x), @(u) u); % Decrement
%! Sub = @(a,b) b(Dec, a);
%!
%! % Renderer - Convert church numeral to "real" number
%! Render = @(n) n(@(n) n+1,0);
%!
%! % Predicates
%! Iszero = @(n) n(@(x) F, T);
%!
%! % Y combinator implements recursion
%! Ycomb = @(f) C(@(g) f(@(x) C(g(g), x)), ...
%!                @(g) f(@(x) C(g(g), x)));
%!
%! Factorial = Ycomb(@(f) @(n) C(C2(Iszero(n), ...
%!                   @(d) One, @(d) Mult(n, f(Dec(n)))),0));
%!
%! assert (Render (Factorial (Two)), 2)
%! assert (Render (Factorial (Three)), 6)
%! assert (Render (Factorial (Four)), 24)