Changeset 3465


Ignore:
Timestamp:
Mar 6, 2013 9:34:56 AM (11 years ago)
Author:
ldelgass
Message:

Rename R2 library to nv::graphics and nv::util.

Location:
trunk/packages/vizservers
Files:
4 added
1 deleted
17 edited
14 moved

Legend:

Unmodified
Added
Removed

  • trunk/packages/vizservers/configure

    r3436 r3465  
    1654116541
    1654216542
    16543 ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanoscale/renderservers.tcl nanovis/Doxyfile nanovis/Makefile nanovis/newmat11/Makefile nanovis/R2/src/Makefile nanovis/vrmath/Makefile nanovis/imgLoaders/Makefile pymolproxy/Makefile vtkvis/Doxyfile vtkvis/Makefile start_viz.sh start_nanoscale.sh"
     16543ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanoscale/renderservers.tcl nanovis/Doxyfile nanovis/Makefile nanovis/graphics/Makefile nanovis/imgLoaders/Makefile nanovis/newmat11/Makefile nanovis/util/Makefile nanovis/vrmath/Makefile pymolproxy/Makefile vtkvis/Doxyfile vtkvis/Makefile start_viz.sh start_nanoscale.sh"
    1654416544
    1654516545cat >confcache <<\_ACEOF
    … …  
    1714617146    "nanovis/Doxyfile") CONFIG_FILES="$CONFIG_FILES nanovis/Doxyfile" ;;
    1714717147    "nanovis/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/Makefile" ;;
     17148    "nanovis/graphics/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/graphics/Makefile" ;;
     17149    "nanovis/imgLoaders/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/imgLoaders/Makefile" ;;
    1714817150    "nanovis/newmat11/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/newmat11/Makefile" ;;
    17149     "nanovis/R2/src/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/R2/src/Makefile" ;;
     17151    "nanovis/util/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/util/Makefile" ;;
    1715017152    "nanovis/vrmath/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/vrmath/Makefile" ;;
    17151     "nanovis/imgLoaders/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/imgLoaders/Makefile" ;;
    1715217153    "pymolproxy/Makefile") CONFIG_FILES="$CONFIG_FILES pymolproxy/Makefile" ;;
    1715317154    "vtkvis/Doxyfile") CONFIG_FILES="$CONFIG_FILES vtkvis/Doxyfile" ;;

  • trunk/packages/vizservers/configure.in

    r3436 r3465  
    361361   nanovis/Doxyfile \
    362362   nanovis/Makefile \
     363   nanovis/graphics/Makefile \
     364   nanovis/imgLoaders/Makefile \
    363365   nanovis/newmat11/Makefile \
    364    nanovis/R2/src/Makefile \
     366   nanovis/util/Makefile \
    365367   nanovis/vrmath/Makefile \
    366    nanovis/imgLoaders/Makefile \
    367368   pymolproxy/Makefile \
    368369   vtkvis/Doxyfile \

  • trunk/packages/vizservers/nanovis/ContourLineFilter.cpp

    r3463 r3465  
    1010#include <string>
    1111
    12 #include <R2/graphics/R2VertexBuffer.h>
     12#include <graphics/VertexBuffer.h>
    1313
    1414#include "ContourLineFilter.h"

  • trunk/packages/vizservers/nanovis/ContourLineFilter.h

    r3463 r3465  
    55#include <list>
    66
    7 #include <R2/graphics/R2Geometry.h>
     7#include <graphics/Geometry.h>
    88
    99#include "Vector3.h"

  • trunk/packages/vizservers/nanovis/Grid.h

    r3463 r3465  
    33#define GRID_H
    44
    5 #include <R2/R2Fonts.h>
     5#include <util/Fonts.h>
    66
    77#include "Axis.h"

  • trunk/packages/vizservers/nanovis/HeightMap.cpp

    r3463 r3465  
    11 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22#include <GL/glew.h>
     3
     4#include <graphics/RenderContext.h>
    35
    46#include "Grid.h"
    … …  
    68#include "ContourLineFilter.h"
    79#include "Texture1D.h"
    8 #include "RenderContext.h"
    910
    1011bool HeightMap::updatePending = false;

  • trunk/packages/vizservers/nanovis/HeightMap.h

    r3463 r3465  
    33#define HEIGHTMAP_H
    44
    5 #include <R2/graphics/R2Geometry.h>
     5#include <graphics/Geometry.h>
     6#include <graphics/RenderContext.h>
    67
    78#include "TransferFunction.h"
    89#include "NvShader.h"
    910#include "Vector3.h"
    10 #include "RenderContext.h"
    1111#include "AxisRange.h"
    1212

  • trunk/packages/vizservers/nanovis/Makefile.in

    r3453 r3465  
    3232GL_INC_SPEC     =
    3333GL_LIB_SPEC     = -lGL -lglut -lGLEW -lGLU
     34GRAPHICS_DIR      = ./graphics
     35GRAPHICS_INC_SPEC = -I$(srcdir)/$(GRAPHICS_DIR)/include
     36GRAPHICS_LIB      = $(GRAPHICS_DIR)/nvgraphics.a
     37GRAPHICS_LIB_SPEC = $(GRAPHICS_LIB)
    3438IMG_DIR         = ./imgLoaders
    3539IMG_INC_SPEC    = -I$(srcdir)/$(IMG_DIR)
    … …  
    4044MAT_LIB         = $(MAT_DIR)/newmat11.a
    4145MAT_LIB_SPEC    = $(MAT_LIB)
     46UTIL_DIR        = ./util
     47UTIL_INC_SPEC   = -I$(srcdir)/$(UTIL_DIR)
     48UTIL_LIB        = $(UTIL_DIR)/nvutil.a
     49UTIL_LIB_SPEC   = $(UTIL_LIB)
    4250VRMATH_DIR      = ./vrmath
    4351VRMATH_INC_SPEC = -I$(srcdir)/$(VRMATH_DIR)/include
    4452VRMATH_LIB      = $(VRMATH_DIR)/vrmath.a
    4553VRMATH_LIB_SPEC = $(VRMATH_LIB)
    46 R2_DIR          = ./R2
    47 R2_INC_SPEC     = -I$(srcdir)/$(R2_DIR)/include
    48 R2_LIB          = $(R2_DIR)/src/R2.a
    49 R2_LIB_SPEC     = $(R2_LIB)
    5054
    5155EXTRA_LIBS      = -lm -lpthread
    … …  
    6468LIBS            = \
    6569                $(RP_LIB_SPEC) \
     70                $(GRAPHICS_LIB_SPEC) \
    6671                $(IMG_LIB_SPEC) \
    67                 $(R2_LIB_SPEC) \
    6872                $(MAT_LIB_SPEC) \
     73                $(UTIL_LIB_SPEC) \
    6974                $(VRMATH_LIB_SPEC) \
    7075                $(TCL_LIB_SPEC) \
    … …  
    7883                -I. \
    7984                -I$(srcdir) \
    80                 $(R2_INC_SPEC) \
    8185                $(IMG_INC_SPEC) \
    8286                $(MAT_INC_SPEC) \
    … …  
    129133                Plane.o \
    130134                PlaneRenderer.o \
    131                 RenderContext.o \
    132135                RenderVertexArray.o \
    133136                RpAVTranslate.o \
    … …  
    195198endif
    196199
    197 .PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean newmat11 R2 imgloaders vrmath
    198 
    199 all: newmat11 R2 imgloaders vrmath nanovis
     200.PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean graphics imgloaders newmat11 util vrmath
     201
     202all: newmat11 graphics imgloaders util vrmath nanovis
    200203
    201204install: install-nanovis install-resources install-shaders
    … …  
    205208        doxygen
    206209
     210graphics:               $(GRAPHICS_LIB)
     211imgloaders:             $(IMG_LIB)
    207212newmat11:               $(MAT_LIB)
    208 R2:                     $(R2_LIB)
     213util:                   $(UTIL_LIB)
    209214vrmath:                 $(VRMATH_LIB)
    210 imgloaders:             $(IMG_LIB)
     215
     216$(GRAPHICS_LIB):
     217        $(MAKE) -C $(GRAPHICS_DIR) all
     218
     219$(IMG_LIB):
     220        $(MAKE) -C $(IMG_DIR) all
    211221
    212222$(MAT_LIB):
    213223        $(MAKE) -C $(MAT_DIR) all
    214224
     225$(UTIL_LIB):
     226        $(MAKE) -C $(UTIL_DIR) all
     227
    215228$(VRMATH_LIB):
    216229        $(MAKE) -C $(VRMATH_DIR) all
    217230
    218 $(R2_LIB):
    219         $(MAKE) -C $(R2_DIR)/src all
    220 
    221 $(IMG_LIB):
    222         $(MAKE) -C $(IMG_DIR) all
    223 
    224 nanovis: $(MAT_LIB) $(R2_LIB) $(IMG_LIB) $(VRMATH_LIB) $(OBJS)
     231nanovis: $(MAT_LIB) $(GRAPHICS_LIB) $(IMG_LIB) $(UTIL_LIB) $(VRMATH_LIB) $(OBJS)
    225232        $(CXX) $(CXX_SWITCHES) -o $@ $^ $(LIBS)
    226233
    … …  
    250257clean:
    251258        $(MAKE) -C $(MAT_DIR) clean
     259        $(MAKE) -C $(GRAPHICS_DIR) clean
     260        $(MAKE) -C $(IMG_DIR) clean
     261        $(MAKE) -C $(UTIL_DIR) clean
    252262        $(MAKE) -C $(VRMATH_DIR) clean
    253         $(MAKE) -C $(R2_DIR)/src clean
    254         $(MAKE) -C $(IMG_DIR) clean
    255263        $(RM) nanovis client *.o
    256264
    … …  
    260268distclean: clean
    261269        $(MAKE) -C $(MAT_DIR) distclean
     270        $(MAKE) -C $(GRAPHICS_DIR) distclean
     271        $(MAKE) -C $(IMG_DIR) distclean
     272        $(MAKE) -C $(UTIL_DIR) distclean
    262273        $(MAKE) -C $(VRMATH_DIR) distclean
    263         $(MAKE) -C $(R2_DIR)/src distclean
    264         $(MAKE) -C $(IMG_DIR) distclean
    265274        $(RM) Makefile nvconf.h *~
    266275
    … …  
    303312PointShader.o: PointShader.cpp PointShader.h
    304313Renderable.o: Renderable.cpp Renderable.h
    305 RenderContext.o: RenderContext.cpp RenderContext.h
    306314RenderVertexArray.o: RenderVertexArray.cpp RenderVertexArray.h
    307315RpAVTranslate.o: RpAVTranslate.cpp RpAVTranslate.h nvconf.h
    … …  
    320328dxReader.o: dxReader.cpp dxReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h NvZincBlendeReconstructor.h
    321329dxReaderCommon.o: dxReaderCommon.cpp dxReaderCommon.h GradientFilter.h Vector3.h
    322 nanovis.o: nanovis.cpp nanovis.h $(AUXSRC) FlowCmd.h Grid.h HeightMap.h NvCamera.h NvColorTableRenderer.h NvFlowVisRenderer.h NvLIC.h NvZincBlendeReconstructor.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h RenderContext.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h
     330nanovis.o: nanovis.cpp nanovis.h $(AUXSRC) FlowCmd.h Grid.h HeightMap.h NvCamera.h NvColorTableRenderer.h NvFlowVisRenderer.h NvLIC.h NvZincBlendeReconstructor.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h

  • trunk/packages/vizservers/nanovis/NvColorTableRenderer.cpp

    r3463 r3465  
    44#include <GL/glew.h>
    55
    6 #include <R2/R2Fonts.h>
     6#include <util/Fonts.h>
    77
    88#include "NvColorTableRenderer.h"

  • trunk/packages/vizservers/nanovis/NvColorTableRenderer.h

    r3463 r3465  
    33#define NV_COLORTABLE_RENDERER_H
    44
    5 #include <R2/R2Fonts.h>
     5#include <util/Fonts.h>
    66
    77#include "Texture2D.h"

  • trunk/packages/vizservers/nanovis/NvShader.cpp

    r3463 r3465  
    66#include <Cg/cgGL.h>
    77
    8 #include <R2/R2FilePath.h>
     8#include <util/FilePath.h>
    99
    1010#include "NvShader.h"

  • trunk/packages/vizservers/nanovis/ParticleSystem.cpp

    r3463 r3465  
    1111#include <Cg/cgGL.h>
    1212
    13 #include <R2/R2FilePath.h>
     13#include <util/FilePath.h>
    1414
    1515#include <Image.h>

  • trunk/packages/vizservers/nanovis/ParticleSystemFactory.cpp

    r3463 r3465  
    55#include <expat.h>
    66
    7 #include <R2/R2FilePath.h>
     7#include <util/FilePath.h>
    88
    99#include "ParticleSystemFactory.h"

  • trunk/packages/vizservers/nanovis/PointSetRenderer.cpp

    r3463 r3465  
    55#include <ImageLoaderFactory.h>
    66#include <ImageLoader.h>
    7 #include <R2/R2FilePath.h>
     7#include <util/FilePath.h>
    88
    99#include "PointSetRenderer.h"

  • trunk/packages/vizservers/nanovis/VelocityArrowsSlice.cpp

    r3463 r3465  
    77#include <GL/gl.h>
    88
    9 #include <R2/R2FilePath.h>
     9#include <util/FilePath.h>
    1010#include <Image.h>
    1111#include <ImageLoaderFactory.h>

  • trunk/packages/vizservers/nanovis/graphics/Geometry.cpp

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
     5
    26#include <GL/glew.h>
    37#include <GL/gl.h>
    48
    5 #include <R2/graphics/R2Geometry.h>
     9#include "Geometry.h"
    610
    711using namespace nv::graphics;

  • trunk/packages/vizservers/nanovis/graphics/Geometry.h

    r3463 r3465  
    1  /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     1/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
    25#ifndef NV_GRAPHICS_GEOMETRY_H
    36#define NV_GRAPHICS_GEOMETRY_H
    47
    58#include <GL/glew.h>
    6 #include <R2/graphics/R2VertexBuffer.h>
    7 #include <R2/graphics/R2IndexBuffer.h>
     9
     10#include <graphics/VertexBuffer.h>
     11#include <graphics/IndexBuffer.h>
    812
    913namespace nv {

  • trunk/packages/vizservers/nanovis/graphics/IndexBuffer.cpp

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
    25#include <stdlib.h>
    36#include <memory.h>
    47
    5 #include <R2/graphics/R2IndexBuffer.h>
     8#include "IndexBuffer.h"
    69
    710using namespace nv::graphics;

  • trunk/packages/vizservers/nanovis/graphics/IndexBuffer.h

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
    25#ifndef NV_GRAPHICS_INDEX_BUFFER_H
    36#define NV_GRAPHICS_INDEX_BUFFER_H

  • trunk/packages/vizservers/nanovis/graphics/RenderContext.cpp

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
    25#include "RenderContext.h"
    36

  • trunk/packages/vizservers/nanovis/graphics/RenderContext.h

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    2 #ifndef RENDER_CONTEXT_H
    3 #define RENDER_CONTEXT_H
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
     5#ifndef NV_GRAPHICS_RENDER_CONTEXT_H
     6#define NV_GRAPHICS_RENDER_CONTEXT_H
    47
    58#include <GL/gl.h>

  • trunk/packages/vizservers/nanovis/graphics/VertexBuffer.cpp

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
    25#include <memory.h>
    36#include <stdlib.h>
    … …  
    69#include <GL/gl.h>
    710
    8 #include <R2/graphics/R2VertexBuffer.h>
     11#include "VertexBuffer.h"
    912
    1013using namespace nv::graphics;

  • trunk/packages/vizservers/nanovis/graphics/VertexBuffer.h

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
    25#ifndef NV_GRAPHICS_VERTEXBUFFER_H
    36#define NV_GRAPHICS_VERTEXBUFFER_H

  • trunk/packages/vizservers/nanovis/nanovis.cpp

    r3463 r3465  
    4141#include <string>
    4242
     43#include <GL/glew.h>
     44#include <GL/glut.h>
     45
    4346#include <RpEncode.h>
    4447
    45 #include <R2/R2FilePath.h>
    46 #include <R2/R2Fonts.h>
     48#include <graphics/RenderContext.h>
     49
     50#include <util/FilePath.h>
     51#include <util/Fonts.h>
    4752
    4853#include <BMPImageLoaderImpl.h>
    4954#include <ImageLoaderFactory.h>
    50 
    51 #include <GL/glew.h>
    52 #include <GL/glut.h>
    5355
    5456#include "config.h"
    … …  
    6062#include "HeightMap.h"
    6163#include "NvCamera.h"
    62 #include "RenderContext.h"
    6364#include "NvShader.h"
    6465#include "NvColorTableRenderer.h"

  • trunk/packages/vizservers/nanovis/util/FilePath.cpp

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
     5
    26#include <string.h>
    37#ifdef _WIN32
    … …  
    913#include <unistd.h>
    1014
    11 #include <R2/R2FilePath.h>
     15#include "FilePath.h"
    1216
    1317#include "Trace.h"

  • trunk/packages/vizservers/nanovis/util/FilePath.h

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
    25#ifndef NV_UTIL_FILE_PATH_H
    36#define NV_UTIL_FILE_PATH_H

  • trunk/packages/vizservers/nanovis/util/Fonts.cpp

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
     5
    26#include <stdarg.h>
    37#include <string.h>
    … …  
    711#include <GL/glew.h>
    812
    9 #include <R2/R2Fonts.h>
    10 #include <R2/R2FilePath.h>
     13#include "Fonts.h"
     14#include "FilePath.h"
    1115
    1216using namespace nv::util;

  • trunk/packages/vizservers/nanovis/util/Fonts.h

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
    25#ifndef NV_UTIL_FONTS_H
    36#define NV_UTIL_FONTS_H
    … …  
    69#include <string>
    710
    8 #include <R2/R2Object.h>
     11#include <util/Object.h>
    912
    1013namespace nv {

  • trunk/packages/vizservers/nanovis/util/Object.cpp

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    2 #include <R2/R2Object.h>
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
     5
     6#include "Object.h"
    37
    48using namespace nv::util;

  • trunk/packages/vizservers/nanovis/util/Object.h

    r3463 r3465  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
     4 */
    25#ifndef NV_UTIL_OBJECT_H
    36#define NV_UTIL_OBJECT_H

  • trunk/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

    r3451 r3465  
    196196#endif /*USE_THREADS*/
    197197
    198 static int sendAck(ClientData clientData, int fdOut)
     198static int
     199sendAck(ClientData clientData, int fdOut)
    199200{
    200201    std::ostringstream oss;
Note: See TracChangeset for help on using the changeset viewer.