Mercurial > hg > octave-nkf

comparison libinterp/corefcn/gl-render.cc @ 20244:42c3a0829324

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Skip z axes rendering when in 2D mode (bug #44752) * gl-render.cc (opengl_renderer::draw_axes_boxes): skip z axes rendering when in 2D mode
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Mon, 06 Apr 2015 21:33:13 +0200
parents 2eed41ae3b64
children 438485f6a479
comparison
equal deleted inserted replaced
20243:490ae1d98f27 20244:42c3a0829324
970 glVertex3d (xpTick, yPlane, zpTickN); 970 glVertex3d (xpTick, yPlane, zpTickN);
971 } 971 }
972 } 972 }
973 973
974 // Z box 974 // Z box
975 set_color (props.get_zcolor_rgb ()); 975 if (! is2d)
976 976 {
977 if (xySym) 977 set_color (props.get_zcolor_rgb ());
978 {
979 glVertex3d (xPlaneN, yPlane, zPlaneN);
980 glVertex3d (xPlaneN, yPlane, zPlane);
981 }
982 else
983 {
984 glVertex3d (xPlane, yPlaneN, zPlaneN);
985 glVertex3d (xPlane, yPlaneN, zPlane);
986 }
987
988 if (props.is_box ())
989 {
990 glVertex3d (xPlane, yPlane, zPlaneN);
991 glVertex3d (xPlane, yPlane, zPlane);
992 978
993 if (xySym) 979 if (xySym)
980 {
981 glVertex3d (xPlaneN, yPlane, zPlaneN);
982 glVertex3d (xPlaneN, yPlane, zPlane);
983 }
984 else
994 { 985 {
995 glVertex3d (xPlane, yPlaneN, zPlaneN); 986 glVertex3d (xPlane, yPlaneN, zPlaneN);
996 glVertex3d (xPlane, yPlaneN, zPlane); 987 glVertex3d (xPlane, yPlaneN, zPlane);
997 } 988 }
998 else 989
999 { 990 if (props.is_box ())
1000 glVertex3d (xPlaneN, yPlane, zPlaneN); 991 {
1001 glVertex3d (xPlaneN, yPlane, zPlane); 992 glVertex3d (xPlane, yPlane, zPlaneN);
1002 } 993 glVertex3d (xPlane, yPlane, zPlane);
1003 994
1004 glVertex3d (xPlaneN, yPlaneN, zPlaneN); 995 if (xySym)
1005 glVertex3d (xPlaneN, yPlaneN, zPlane); 996 {
997 glVertex3d (xPlane, yPlaneN, zPlaneN);
998 glVertex3d (xPlane, yPlaneN, zPlane);
999 }
1000 else
1001 {
1002 glVertex3d (xPlaneN, yPlane, zPlaneN);
1003 glVertex3d (xPlaneN, yPlane, zPlane);
1004 }
1005
1006 glVertex3d (xPlaneN, yPlaneN, zPlaneN);
1007 glVertex3d (xPlaneN, yPlaneN, zPlane);
1008 }
1006 } 1009 }
1007 1010
1008 glEnd (); 1011 glEnd ();
1009 } 1012 }
1010 1013