Mercurial > octave

diff libinterp/corefcn/gl-render.cc @ 27932:b018f553fd85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding conventions in libinterp/ * __ftp__.cc, __ichol__.cc, call-stack.cc, error.h, event-manager.cc, file-io.cc, gl-render.cc, graphics.cc, help.cc, input.cc, interpreter.cc, load-path.cc, load-save.cc, ls-hdf5.cc, ls-hdf5.h, mex.cc, oct-hist.cc, oct-stream.cc, sighandlers.h, stack-frame.cc, stack-frame.h, strfns.cc, syminfo.cc, sysdep.cc, text-engine.h, url-handle-manager.h, urlwrite.cc, xpow.cc, __init_fltk__.cc, __ode15__.cc, ccolamd.cc, colamd.cc, cdef-class.cc, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-object.cc, cdef-package.h, cdef-property.cc, ov-class.cc, ov-classdef.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.h, ov-java.cc, ov-typeinfo.h, bp-table.cc, jit-ir.h, jit-typeinfo.h, pt-classdef.h, pt-eval.cc, pt-eval.h, pt-idx.cc: Use Octave coding conventions in libinterp.
author Rik <rik@octave.org>
date Fri, 10 Jan 2020 17:25:12 -0800
parents bd51beb6205e
children cd7f8df11669
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/corefcn/gl-render.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -2631,7 +2631,7 @@
             if ((fl_mode > 0) && do_lighting)
               m_glfcns.glEnable (GL_LIGHTING);
             m_glfcns.glShadeModel ((fc_mode == INTERP || fl_mode == GOURAUD)
-                          ? GL_SMOOTH : GL_FLAT);
+                                   ? GL_SMOOTH : GL_FLAT);
             set_polygon_offset (true, 1.0);
             if (fc_mode == TEXTURE)
               m_glfcns.glEnable (GL_TEXTURE_2D);
@@ -2837,7 +2837,7 @@
             if ((el_mode > 0) && do_lighting)
               m_glfcns.glEnable (GL_LIGHTING);
             m_glfcns.glShadeModel ((ec_mode == INTERP || el_mode == GOURAUD)
-                          ? GL_SMOOTH : GL_FLAT);
+                                   ? GL_SMOOTH : GL_FLAT);
 
             set_linestyle (props.get_linestyle (), false,
                            props.get_linewidth ());
@@ -3528,7 +3528,7 @@
                     bool flag = false;
 
                     m_glfcns.glShadeModel ((ec_mode == INTERP || el_mode == GOURAUD)
-                                  ? GL_SMOOTH : GL_FLAT);
+                                           ? GL_SMOOTH : GL_FLAT);
 
                     // Add vertices in reverse order for Matlab compatibility
                     for (int j = count_f(i)-1; j >= 0; j--)
@@ -4142,11 +4142,12 @@
           pattern = 0x1111;
       }
     else if (s == "--")
+      {
         if (factor > 1)
           pattern = 0x0F0F;
         else
           pattern = 0x01FF;
-
+      }
     else if (s == "-.")
       {
         if (factor > 1)
@@ -4685,7 +4686,7 @@
         m_glfcns.glRasterPos3d (x, y, z);
         m_glfcns.glBitmap(0, 0, 0, 0, bbox(0), bbox(1), nullptr);
         m_glfcns.glDrawPixels (bbox(2), bbox(3),
-                      GL_RGBA, GL_UNSIGNED_BYTE, pixels.data ());
+                               GL_RGBA, GL_UNSIGNED_BYTE, pixels.data ());
         m_glfcns.glDisable (GL_ALPHA_TEST);
 
         if (! blend)