Changeset 3465
- Timestamp:
- Mar 6, 2013 9:34:56 AM (11 years ago)
- Location:
- trunk/packages/vizservers
- Files:
-
- 4 added
- 1 deleted
- 17 edited
- 14 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/configure
r3436 r3465 16541 16541 16542 16542 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"16543 ac_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" 16544 16544 16545 16545 cat >confcache <<\_ACEOF … … 17146 17146 "nanovis/Doxyfile") CONFIG_FILES="$CONFIG_FILES nanovis/Doxyfile" ;; 17147 17147 "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" ;; 17148 17150 "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" ;; 17150 17152 "nanovis/vrmath/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/vrmath/Makefile" ;; 17151 "nanovis/imgLoaders/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/imgLoaders/Makefile" ;;17152 17153 "pymolproxy/Makefile") CONFIG_FILES="$CONFIG_FILES pymolproxy/Makefile" ;; 17153 17154 "vtkvis/Doxyfile") CONFIG_FILES="$CONFIG_FILES vtkvis/Doxyfile" ;; -
trunk/packages/vizservers/configure.in
r3436 r3465 361 361 nanovis/Doxyfile \ 362 362 nanovis/Makefile \ 363 nanovis/graphics/Makefile \ 364 nanovis/imgLoaders/Makefile \ 363 365 nanovis/newmat11/Makefile \ 364 nanovis/ R2/src/Makefile \366 nanovis/util/Makefile \ 365 367 nanovis/vrmath/Makefile \ 366 nanovis/imgLoaders/Makefile \367 368 pymolproxy/Makefile \ 368 369 vtkvis/Doxyfile \ -
trunk/packages/vizservers/nanovis/ContourLineFilter.cpp
r3463 r3465 10 10 #include <string> 11 11 12 #include < R2/graphics/R2VertexBuffer.h>12 #include <graphics/VertexBuffer.h> 13 13 14 14 #include "ContourLineFilter.h" -
trunk/packages/vizservers/nanovis/ContourLineFilter.h
r3463 r3465 5 5 #include <list> 6 6 7 #include < R2/graphics/R2Geometry.h>7 #include <graphics/Geometry.h> 8 8 9 9 #include "Vector3.h" -
trunk/packages/vizservers/nanovis/Grid.h
r3463 r3465 3 3 #define GRID_H 4 4 5 #include < R2/R2Fonts.h>5 #include <util/Fonts.h> 6 6 7 7 #include "Axis.h" -
trunk/packages/vizservers/nanovis/HeightMap.cpp
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 2 #include <GL/glew.h> 3 4 #include <graphics/RenderContext.h> 3 5 4 6 #include "Grid.h" … … 6 8 #include "ContourLineFilter.h" 7 9 #include "Texture1D.h" 8 #include "RenderContext.h"9 10 10 11 bool HeightMap::updatePending = false; -
trunk/packages/vizservers/nanovis/HeightMap.h
r3463 r3465 3 3 #define HEIGHTMAP_H 4 4 5 #include <R2/graphics/R2Geometry.h> 5 #include <graphics/Geometry.h> 6 #include <graphics/RenderContext.h> 6 7 7 8 #include "TransferFunction.h" 8 9 #include "NvShader.h" 9 10 #include "Vector3.h" 10 #include "RenderContext.h"11 11 #include "AxisRange.h" 12 12 -
trunk/packages/vizservers/nanovis/Makefile.in
r3453 r3465 32 32 GL_INC_SPEC = 33 33 GL_LIB_SPEC = -lGL -lglut -lGLEW -lGLU 34 GRAPHICS_DIR = ./graphics 35 GRAPHICS_INC_SPEC = -I$(srcdir)/$(GRAPHICS_DIR)/include 36 GRAPHICS_LIB = $(GRAPHICS_DIR)/nvgraphics.a 37 GRAPHICS_LIB_SPEC = $(GRAPHICS_LIB) 34 38 IMG_DIR = ./imgLoaders 35 39 IMG_INC_SPEC = -I$(srcdir)/$(IMG_DIR) … … 40 44 MAT_LIB = $(MAT_DIR)/newmat11.a 41 45 MAT_LIB_SPEC = $(MAT_LIB) 46 UTIL_DIR = ./util 47 UTIL_INC_SPEC = -I$(srcdir)/$(UTIL_DIR) 48 UTIL_LIB = $(UTIL_DIR)/nvutil.a 49 UTIL_LIB_SPEC = $(UTIL_LIB) 42 50 VRMATH_DIR = ./vrmath 43 51 VRMATH_INC_SPEC = -I$(srcdir)/$(VRMATH_DIR)/include 44 52 VRMATH_LIB = $(VRMATH_DIR)/vrmath.a 45 53 VRMATH_LIB_SPEC = $(VRMATH_LIB) 46 R2_DIR = ./R247 R2_INC_SPEC = -I$(srcdir)/$(R2_DIR)/include48 R2_LIB = $(R2_DIR)/src/R2.a49 R2_LIB_SPEC = $(R2_LIB)50 54 51 55 EXTRA_LIBS = -lm -lpthread … … 64 68 LIBS = \ 65 69 $(RP_LIB_SPEC) \ 70 $(GRAPHICS_LIB_SPEC) \ 66 71 $(IMG_LIB_SPEC) \ 67 $(R2_LIB_SPEC) \68 72 $(MAT_LIB_SPEC) \ 73 $(UTIL_LIB_SPEC) \ 69 74 $(VRMATH_LIB_SPEC) \ 70 75 $(TCL_LIB_SPEC) \ … … 78 83 -I. \ 79 84 -I$(srcdir) \ 80 $(R2_INC_SPEC) \81 85 $(IMG_INC_SPEC) \ 82 86 $(MAT_INC_SPEC) \ … … 129 133 Plane.o \ 130 134 PlaneRenderer.o \ 131 RenderContext.o \132 135 RenderVertexArray.o \ 133 136 RpAVTranslate.o \ … … 195 198 endif 196 199 197 .PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean newmat11 R2 imgloadersvrmath198 199 all: newmat11 R2 imgloadersvrmath nanovis200 .PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean graphics imgloaders newmat11 util vrmath 201 202 all: newmat11 graphics imgloaders util vrmath nanovis 200 203 201 204 install: install-nanovis install-resources install-shaders … … 205 208 doxygen 206 209 210 graphics: $(GRAPHICS_LIB) 211 imgloaders: $(IMG_LIB) 207 212 newmat11: $(MAT_LIB) 208 R2: $(R2_LIB)213 util: $(UTIL_LIB) 209 214 vrmath: $(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 211 221 212 222 $(MAT_LIB): 213 223 $(MAKE) -C $(MAT_DIR) all 214 224 225 $(UTIL_LIB): 226 $(MAKE) -C $(UTIL_DIR) all 227 215 228 $(VRMATH_LIB): 216 229 $(MAKE) -C $(VRMATH_DIR) all 217 230 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) 231 nanovis: $(MAT_LIB) $(GRAPHICS_LIB) $(IMG_LIB) $(UTIL_LIB) $(VRMATH_LIB) $(OBJS) 225 232 $(CXX) $(CXX_SWITCHES) -o $@ $^ $(LIBS) 226 233 … … 250 257 clean: 251 258 $(MAKE) -C $(MAT_DIR) clean 259 $(MAKE) -C $(GRAPHICS_DIR) clean 260 $(MAKE) -C $(IMG_DIR) clean 261 $(MAKE) -C $(UTIL_DIR) clean 252 262 $(MAKE) -C $(VRMATH_DIR) clean 253 $(MAKE) -C $(R2_DIR)/src clean254 $(MAKE) -C $(IMG_DIR) clean255 263 $(RM) nanovis client *.o 256 264 … … 260 268 distclean: clean 261 269 $(MAKE) -C $(MAT_DIR) distclean 270 $(MAKE) -C $(GRAPHICS_DIR) distclean 271 $(MAKE) -C $(IMG_DIR) distclean 272 $(MAKE) -C $(UTIL_DIR) distclean 262 273 $(MAKE) -C $(VRMATH_DIR) distclean 263 $(MAKE) -C $(R2_DIR)/src distclean264 $(MAKE) -C $(IMG_DIR) distclean265 274 $(RM) Makefile nvconf.h *~ 266 275 … … 303 312 PointShader.o: PointShader.cpp PointShader.h 304 313 Renderable.o: Renderable.cpp Renderable.h 305 RenderContext.o: RenderContext.cpp RenderContext.h306 314 RenderVertexArray.o: RenderVertexArray.cpp RenderVertexArray.h 307 315 RpAVTranslate.o: RpAVTranslate.cpp RpAVTranslate.h nvconf.h … … 320 328 dxReader.o: dxReader.cpp dxReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h NvZincBlendeReconstructor.h 321 329 dxReaderCommon.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.hSwitch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h330 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 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 4 4 #include <GL/glew.h> 5 5 6 #include < R2/R2Fonts.h>6 #include <util/Fonts.h> 7 7 8 8 #include "NvColorTableRenderer.h" -
trunk/packages/vizservers/nanovis/NvColorTableRenderer.h
r3463 r3465 3 3 #define NV_COLORTABLE_RENDERER_H 4 4 5 #include < R2/R2Fonts.h>5 #include <util/Fonts.h> 6 6 7 7 #include "Texture2D.h" -
trunk/packages/vizservers/nanovis/NvShader.cpp
r3463 r3465 6 6 #include <Cg/cgGL.h> 7 7 8 #include < R2/R2FilePath.h>8 #include <util/FilePath.h> 9 9 10 10 #include "NvShader.h" -
trunk/packages/vizservers/nanovis/ParticleSystem.cpp
r3463 r3465 11 11 #include <Cg/cgGL.h> 12 12 13 #include < R2/R2FilePath.h>13 #include <util/FilePath.h> 14 14 15 15 #include <Image.h> -
trunk/packages/vizservers/nanovis/ParticleSystemFactory.cpp
r3463 r3465 5 5 #include <expat.h> 6 6 7 #include < R2/R2FilePath.h>7 #include <util/FilePath.h> 8 8 9 9 #include "ParticleSystemFactory.h" -
trunk/packages/vizservers/nanovis/PointSetRenderer.cpp
r3463 r3465 5 5 #include <ImageLoaderFactory.h> 6 6 #include <ImageLoader.h> 7 #include < R2/R2FilePath.h>7 #include <util/FilePath.h> 8 8 9 9 #include "PointSetRenderer.h" -
trunk/packages/vizservers/nanovis/VelocityArrowsSlice.cpp
r3463 r3465 7 7 #include <GL/gl.h> 8 8 9 #include < R2/R2FilePath.h>9 #include <util/FilePath.h> 10 10 #include <Image.h> 11 11 #include <ImageLoaderFactory.h> -
trunk/packages/vizservers/nanovis/graphics/Geometry.cpp
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 5 2 6 #include <GL/glew.h> 3 7 #include <GL/gl.h> 4 8 5 #include <R2/graphics/R2Geometry.h>9 #include "Geometry.h" 6 10 7 11 using 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 */ 2 5 #ifndef NV_GRAPHICS_GEOMETRY_H 3 6 #define NV_GRAPHICS_GEOMETRY_H 4 7 5 8 #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> 8 12 9 13 namespace nv { -
trunk/packages/vizservers/nanovis/graphics/IndexBuffer.cpp
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 2 5 #include <stdlib.h> 3 6 #include <memory.h> 4 7 5 #include <R2/graphics/R2IndexBuffer.h>8 #include "IndexBuffer.h" 6 9 7 10 using namespace nv::graphics; -
trunk/packages/vizservers/nanovis/graphics/IndexBuffer.h
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 2 5 #ifndef NV_GRAPHICS_INDEX_BUFFER_H 3 6 #define NV_GRAPHICS_INDEX_BUFFER_H -
trunk/packages/vizservers/nanovis/graphics/RenderContext.cpp
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 2 5 #include "RenderContext.h" 3 6 -
trunk/packages/vizservers/nanovis/graphics/RenderContext.h
r3463 r3465 1 1 /* -*- 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 4 7 5 8 #include <GL/gl.h> -
trunk/packages/vizservers/nanovis/graphics/VertexBuffer.cpp
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 2 5 #include <memory.h> 3 6 #include <stdlib.h> … … 6 9 #include <GL/gl.h> 7 10 8 #include <R2/graphics/R2VertexBuffer.h>11 #include "VertexBuffer.h" 9 12 10 13 using namespace nv::graphics; -
trunk/packages/vizservers/nanovis/graphics/VertexBuffer.h
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 2 5 #ifndef NV_GRAPHICS_VERTEXBUFFER_H 3 6 #define NV_GRAPHICS_VERTEXBUFFER_H -
trunk/packages/vizservers/nanovis/nanovis.cpp
r3463 r3465 41 41 #include <string> 42 42 43 #include <GL/glew.h> 44 #include <GL/glut.h> 45 43 46 #include <RpEncode.h> 44 47 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> 47 52 48 53 #include <BMPImageLoaderImpl.h> 49 54 #include <ImageLoaderFactory.h> 50 51 #include <GL/glew.h>52 #include <GL/glut.h>53 55 54 56 #include "config.h" … … 60 62 #include "HeightMap.h" 61 63 #include "NvCamera.h" 62 #include "RenderContext.h"63 64 #include "NvShader.h" 64 65 #include "NvColorTableRenderer.h" -
trunk/packages/vizservers/nanovis/util/FilePath.cpp
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 5 2 6 #include <string.h> 3 7 #ifdef _WIN32 … … 9 13 #include <unistd.h> 10 14 11 #include <R2/R2FilePath.h>15 #include "FilePath.h" 12 16 13 17 #include "Trace.h" -
trunk/packages/vizservers/nanovis/util/FilePath.h
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 2 5 #ifndef NV_UTIL_FILE_PATH_H 3 6 #define NV_UTIL_FILE_PATH_H -
trunk/packages/vizservers/nanovis/util/Fonts.cpp
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 5 2 6 #include <stdarg.h> 3 7 #include <string.h> … … 7 11 #include <GL/glew.h> 8 12 9 #include <R2/R2Fonts.h>10 #include <R2/R2FilePath.h>13 #include "Fonts.h" 14 #include "FilePath.h" 11 15 12 16 using namespace nv::util; -
trunk/packages/vizservers/nanovis/util/Fonts.h
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 2 5 #ifndef NV_UTIL_FONTS_H 3 6 #define NV_UTIL_FONTS_H … … 6 9 #include <string> 7 10 8 #include < R2/R2Object.h>11 #include <util/Object.h> 9 12 10 13 namespace nv { -
trunk/packages/vizservers/nanovis/util/Object.cpp
r3463 r3465 1 1 /* -*- 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" 3 7 4 8 using namespace nv::util; -
trunk/packages/vizservers/nanovis/util/Object.h
r3463 r3465 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 /* 3 * Copyright (c) 2004-2013 HUBzero Foundation, LLC 4 */ 2 5 #ifndef NV_UTIL_OBJECT_H 3 6 #define NV_UTIL_OBJECT_H -
trunk/packages/vizservers/vtkvis/RpVtkRenderServer.cpp
r3451 r3465 196 196 #endif /*USE_THREADS*/ 197 197 198 static int sendAck(ClientData clientData, int fdOut) 198 static int 199 sendAck(ClientData clientData, int fdOut) 199 200 { 200 201 std::ostringstream oss;
Note: See TracChangeset
for help on using the changeset viewer.