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/ZincBlendeVolume.h

    r3502 r4889  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22/*
    3  * ----------------------------------------------------------------------
    4  * ZincBlendeVolume.h: 3d zincblende volume class, a subclass of Volume.
    5  *                      It contains two cubic volumes.
     3 * Copyright (c) 2004-2013  HUBzero Foundation, LLC
    64 *
    7  * ======================================================================
    8  *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
    9  *           Purdue Rendering and Perceptualization Lab (PURPL)
    10  *
    11  *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
    12  *
    13  *  See the file "license.terms" for information on usage and
    14  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    15  * ======================================================================
     5 * Authors:
     6 *   Wei Qiao <qiaow@purdue.edu>
    167 */
    17 #ifndef _ZINCBLENDE_VOLUME_H_
    18 #define _ZINCBLENDE_VOLUME_H_
     8#ifndef NV_ZINCBLENDE_VOLUME_H
     9#define NV_ZINCBLENDE_VOLUME_H
    1910
    2011#include <vrmath/Vector3f.h>
     
    2213#include "Volume.h"
    2314
     15namespace nv {
     16
     17/**
     18 * \brief 3D ZincBlende volume, contains two cubic volumes
     19 */
    2420class ZincBlendeVolume : public Volume
    2521{
     
    3632};
    3733
     34}
     35
    3836#endif
Note: See TracChangeset for help on using the changeset viewer.