Ignore:
Timestamp:
Dec 20, 2014, 1:00:34 AM (5 years ago)
Author:
ldelgass
Message:

Merge r3611:3618 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/PlaneRenderer.cpp

    r4612 r4889  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22/*
    3  * ----------------------------------------------------------------------
    4  * PlaneRenderer.cpp : PlaneRenderer class for volume visualization
    5  *
    6  * ======================================================================
    7  *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
    8  *           Purdue Rendering and Perceptualization Lab (PURPL)
    9  *
    103 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
    114 *
    12  *  See the file "license.terms" for information on usage and
    13  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    14  * ======================================================================
     5 *  Authors:
     6 *    Wei Qiao <qiaow@purdue.edu>
    157 */
    168
     
    2012#include "Trace.h"
    2113
     14using namespace nv;
     15
    2216PlaneRenderer::PlaneRenderer(int width, int height) :
    2317    _activePlane(-1),
     
    2519    _renderWidth(width),
    2620    _renderHeight(height),
    27     _shader(new NvColorTableShader())
     21    _shader(new ColorTableShader())
    2822{
    2923    _plane.clear();
Note: See TracChangeset for help on using the changeset viewer.