Mercurial > octave-nkf
comparison libinterp/corefcn/gl-render.cc @ 18803:ff39ddf84a19
* gl-render.cc (opengl_renderer::make_marker_list): Replace glVertex2f with
glVertex2d since inputs are doubles.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 17 May 2014 13:17:47 -0700 |
parents | 75f8926deef1 |
children | be8d7721ac16 |
comparison
equal
deleted
inserted
replaced
18802:75f8926deef1 | 18803:ff39ddf84a19 |
---|---|
3004 | 3004 |
3005 switch (marker[0]) | 3005 switch (marker[0]) |
3006 { | 3006 { |
3007 case '+': | 3007 case '+': |
3008 glBegin (GL_LINES); | 3008 glBegin (GL_LINES); |
3009 glVertex2f (-sz/2, 0); | 3009 glVertex2d (-sz/2, 0); |
3010 glVertex2f (sz/2, 0); | 3010 glVertex2d (sz/2, 0); |
3011 glVertex2f (0, -sz/2); | 3011 glVertex2d (0, -sz/2); |
3012 glVertex2f (0, sz/2); | 3012 glVertex2d (0, sz/2); |
3013 glEnd (); | 3013 glEnd (); |
3014 break; | 3014 break; |
3015 case 'x': | 3015 case 'x': |
3016 glBegin (GL_LINES); | 3016 glBegin (GL_LINES); |
3017 glVertex2f (-sz/2, -sz/2); | 3017 glVertex2d (-sz/2, -sz/2); |
3018 glVertex2f (sz/2, sz/2); | 3018 glVertex2d (sz/2, sz/2); |
3019 glVertex2f (-sz/2, sz/2); | 3019 glVertex2d (-sz/2, sz/2); |
3020 glVertex2f (sz/2, -sz/2); | 3020 glVertex2d (sz/2, -sz/2); |
3021 glEnd (); | 3021 glEnd (); |
3022 break; | 3022 break; |
3023 case '*': | 3023 case '*': |
3024 glBegin (GL_LINES); | 3024 glBegin (GL_LINES); |
3025 glVertex2f (-sz/2, 0); | 3025 glVertex2d (-sz/2, 0); |
3026 glVertex2f (sz/2, 0); | 3026 glVertex2d (sz/2, 0); |
3027 glVertex2f (0, -sz/2); | 3027 glVertex2d (0, -sz/2); |
3028 glVertex2f (0, sz/2); | 3028 glVertex2d (0, sz/2); |
3029 glVertex2f (-tt, -tt); | 3029 glVertex2d (-tt, -tt); |
3030 glVertex2f (+tt, +tt); | 3030 glVertex2d (+tt, +tt); |
3031 glVertex2f (-tt, +tt); | 3031 glVertex2d (-tt, +tt); |
3032 glVertex2f (+tt, -tt); | 3032 glVertex2d (+tt, -tt); |
3033 glEnd (); | 3033 glEnd (); |
3034 break; | 3034 break; |
3035 case '.': | 3035 case '.': |
3036 { | 3036 { |
3037 double ang_step = M_PI / 5; | 3037 double ang_step = M_PI / 5; |
3068 glVertex2d (-sz/2, 0); | 3068 glVertex2d (-sz/2, 0); |
3069 glEnd (); | 3069 glEnd (); |
3070 break; | 3070 break; |
3071 case 'v': | 3071 case 'v': |
3072 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP)); | 3072 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP)); |
3073 glVertex2f (0, sz/2); | 3073 glVertex2d (0, sz/2); |
3074 glVertex2f (sz/2, -sz/2); | 3074 glVertex2d (sz/2, -sz/2); |
3075 glVertex2f (-sz/2, -sz/2); | 3075 glVertex2d (-sz/2, -sz/2); |
3076 glEnd (); | 3076 glEnd (); |
3077 break; | 3077 break; |
3078 case '^': | 3078 case '^': |
3079 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP)); | 3079 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP)); |
3080 glVertex2f (0, -sz/2); | 3080 glVertex2d (0, -sz/2); |
3081 glVertex2f (-sz/2, sz/2); | 3081 glVertex2d (-sz/2, sz/2); |
3082 glVertex2f (sz/2, sz/2); | 3082 glVertex2d (sz/2, sz/2); |
3083 glEnd (); | 3083 glEnd (); |
3084 break; | 3084 break; |
3085 case '>': | 3085 case '>': |
3086 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP)); | 3086 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP)); |
3087 glVertex2f (sz/2, 0); | 3087 glVertex2d (sz/2, 0); |
3088 glVertex2f (-sz/2, sz/2); | 3088 glVertex2d (-sz/2, sz/2); |
3089 glVertex2f (-sz/2, -sz/2); | 3089 glVertex2d (-sz/2, -sz/2); |
3090 glEnd (); | 3090 glEnd (); |
3091 break; | 3091 break; |
3092 case '<': | 3092 case '<': |
3093 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP)); | 3093 glBegin ((filled ? GL_POLYGON : GL_LINE_LOOP)); |
3094 glVertex2f (-sz/2, 0); | 3094 glVertex2d (-sz/2, 0); |
3095 glVertex2f (sz/2, -sz/2); | 3095 glVertex2d (sz/2, -sz/2); |
3096 glVertex2f (sz/2, sz/2); | 3096 glVertex2d (sz/2, sz/2); |
3097 glEnd (); | 3097 glEnd (); |
3098 break; | 3098 break; |
3099 case 'p': | 3099 case 'p': |
3100 { | 3100 { |
3101 double ang; | 3101 double ang; |