Changeset 4901 for nanovis


Ignore:
Timestamp:
Dec 22, 2014, 4:27:27 AM (4 years ago)
Author:
ldelgass
Message:

sync with release branch

Location:
nanovis/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk/Command.h

    r4823 r4901  
    1212#define NV_COMMAND_H
    1313
     14#include <unistd.h>
     15
    1416#include <tcl.h>
    15 
    16 #include <RpBuffer.h>
    1717
    1818#include "ResponseQueue.h"
  • nanovis/trunk/Grid.cpp

    r4164 r4901  
    103103
    104104    glLineWidth(2.0f);
    105     glColor4f(_axisColor.r, _axisColor.g, _axisColor.b, 
     105    glColor4f(_axisColor.r, _axisColor.g, _axisColor.b,
    106106              _axisColor.a);
    107107
     
    118118
    119119    glLineWidth(1.0f);
    120     glColor4f(_majorColor.r, _majorColor.g, _majorColor.b, 
     120    glColor4f(_majorColor.r, _majorColor.g, _majorColor.b,
    121121              _majorColor.a);
    122122
     
    202202        _font->begin();
    203203
    204         glColor4f(_axisColor.r, _axisColor.g, _axisColor.b, 
     204        glColor4f(_axisColor.r, _axisColor.g, _axisColor.b,
    205205                  _axisColor.a);
    206206
     
    237237            _font->draw(name);
    238238        }
    239        
    240         glColor4f(_majorColor.r, _majorColor.g, _majorColor.b, 
     239
     240        glColor4f(_majorColor.r, _majorColor.g, _majorColor.b,
    241241                  _majorColor.a);
    242242
  • nanovis/trunk/LIC.cpp

    r4894 r4901  
    2525using namespace vrmath;
    2626
    27 LIC::LIC(FlowSliceAxis axis,
    28          float offset) :
     27LIC::LIC(FlowSliceAxis axis, float offset) :
    2928    _width(NPIX),
    3029    _height(NPIX),
     
    6968    glTexParameterf(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
    7069    glTexParameterf(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
    71     glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); 
    72     glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 
     70    glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     71    glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
    7372    glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA32F_ARB, _size, _size,
    7473                 0, GL_RGBA, GL_FLOAT, NULL);
     
    8685    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    8786    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    88     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); 
    89     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 
     87    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     88    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
    9089    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, _width, _height, 0,
    9190                 GL_RGB, GL_UNSIGNED_BYTE, NULL);
  • nanovis/trunk/nanovis.cpp

    r4167 r4901  
    922922    bindOffscreenBuffer();
    923923
    924     //clear screen
     924    // Clear screen
    925925    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    926926
     
    950950         itr != heightMapTable.end(); ++itr) {
    951951        itr->second->render(renderContext);
    952      }
     952    }
    953953
    954954    CHECK_FRAMEBUFFER_STATUS();
Note: See TracChangeset for help on using the changeset viewer.