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

    r3502 r4889  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22/*
    3  * ----------------------------------------------------------------------
    4  * ConvexPolygon.h: convex polygon class
     3 * Copyright (c) 2004-2013  HUBzero Foundation, LLC
    54 *
    6  * ======================================================================
    7  *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
    8  *           Purdue Rendering and Perceptualization Lab (PURPL)
    9  *
    10  *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
    11  *
    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 */
    16 #ifndef _CONVEX_POLYGON_H_
    17 #define _CONVEX_POLYGON_H_
     8#ifndef NV_CONVEX_POLYGON_H
     9#define NV_CONVEX_POLYGON_H
    1810
    1911#include <assert.h>
     
    2517
    2618#include "Plane.h"
     19
     20namespace nv {
    2721
    2822typedef std::vector<vrmath::Vector4f> VertexVector;
     
    7165};
    7266
     67}
     68
    7369#endif
Note: See TracChangeset for help on using the changeset viewer.