Ignore:
Timestamp:
Dec 20, 2014, 2:37:04 AM (5 years ago)
Author:
ldelgass
Message:

merge r3627:3628 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/Grid.cpp

    r4889 r4890  
    99#include <GL/glew.h>
    1010#include <GL/gl.h>
     11
     12#include <util/Fonts.h>
     13#include <vrmath/Color4f.h>
    1114
    1215#include "Grid.h"
     
    8689
    8790    glLineWidth(2.0f);
    88     glColor4f(_axisColor.red, _axisColor.green, _axisColor.blue,
    89               _axisColor.alpha);
     91    glColor4f(_axisColor.r, _axisColor.g, _axisColor.b,
     92              _axisColor.a);
    9093
    9194    glBegin(GL_LINES);
     
    101104
    102105    glLineWidth(1.0f);
    103     glColor4f(_majorColor.red, _majorColor.green, _majorColor.blue,
    104               _majorColor.alpha);
     106    glColor4f(_majorColor.r, _majorColor.g, _majorColor.b,
     107              _majorColor.a);
    105108
    106109    glBegin(GL_LINES);
     
    137140
    138141    // Set minor line color
    139     glColor4f(_minorColor.red, _minorColor.green, _minorColor.blue,
    140               _minorColor.alpha);
     142    glColor4f(_minorColor.r, _minorColor.g, _minorColor.b,
     143              _minorColor.a);
    141144
    142145    glBegin(GL_LINES);
Note: See TracChangeset for help on using the changeset viewer.