# # ChangeLog for nanovis # # Generated by Trac 1.0.13 # Mar 29, 2024 12:57:40 AM Wed, 20 May 2015 22:22:40 GMT ldelgass [5584] * nanovis/branches/1.2/nanovis.cpp (modified) Syncing with trunk: update clipping range in all camera methods Wed, 20 May 2015 03:28:09 GMT ldelgass [5576] * nanovis/branches/1.2/Flow.cpp (modified) Fix potential crash if volume not created when getting bounds for ... Tue, 19 May 2015 02:50:45 GMT ldelgass [5553] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Unirect.cpp (modified) * nanovis/branches/1.2/Unirect.h (modified) merge r5552 from nanovis trunk Tue, 19 May 2015 02:49:47 GMT ldelgass [5552] * nanovis/trunk/Unirect.cpp (modified) * nanovis/trunk/Unirect.h (modified) whitespace Tue, 19 May 2015 02:45:26 GMT ldelgass [5551] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/FlowCmd.cpp (modified) * nanovis/branches/1.2/HeightMap.cpp (modified) * nanovis/branches/1.2/HeightMap.h (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (modified) * nanovis/branches/1.2/VtkReader.cpp (modified) * nanovis/branches/1.2/dxReader.cpp (modified) merge r5549:5550 from nanovis trunk Tue, 19 May 2015 02:42:02 GMT ldelgass [5550] * nanovis/trunk/HeightMap.cpp (modified) * nanovis/trunk/HeightMap.h (modified) whitespace Tue, 19 May 2015 02:37:15 GMT ldelgass [5549] * nanovis/trunk/FlowCmd.cpp (modified) * nanovis/trunk/VtkDataSetReader.cpp (modified) * nanovis/trunk/VtkReader.cpp (modified) * nanovis/trunk/dxReader.cpp (modified) %lg only valid in scanf, not printf Mon, 18 May 2015 17:54:25 GMT ldelgass [5543] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/protocol-nanovis.txt (modified) mergeinfo sync Mon, 18 May 2015 09:47:29 GMT ldelgass [5542] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Axis.cpp (modified) * nanovis/branches/1.2/Axis.h (modified) * nanovis/branches/1.2/Chain.cpp (deleted) * nanovis/branches/1.2/Chain.h (deleted) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/Grid.cpp (modified) * nanovis/branches/1.2/HeightMap.cpp (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/nanovis.cpp (modified) Merge r5478,r5480 from nanovis trunk (grid refactoring) Sun, 17 May 2015 00:09:20 GMT ldelgass [5524] * nanovis/branches/1.2/OrientationIndicator.cpp (modified) Fix x axis label orientation Sat, 16 May 2015 01:52:06 GMT ldelgass [5523] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/OrientationIndicator.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Remove old axis from nanovis Fri, 15 May 2015 11:14:04 GMT ldelgass [5519] * nanovis/branches/1.2/nanovisServer.h (modified) bump version Fri, 15 May 2015 11:09:19 GMT ldelgass [5518] * nanovis/tags/1.2.2 (copied) tag 1.2.2 release of nanovis Fri, 15 May 2015 07:31:44 GMT ldelgass [5516] * nanovis/branches/1.2/OrientationIndicator.cpp (modified) * nanovis/branches/1.2/OrientationIndicator.h (modified) Merge trunk version of OrientationIndicator (scaling/translation) Mon, 11 May 2015 21:46:22 GMT ldelgass [5500] * nanovis/branches/1.2/nanovis.cpp (modified) fix merge problem from r5489 Mon, 11 May 2015 20:50:01 GMT ldelgass [5499] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Makefile.in (modified) merge r4060 Mon, 11 May 2015 20:44:39 GMT ldelgass [5498] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/OrientationIndicator.cpp (copied) * nanovis/branches/1.2/OrientationIndicator.h (copied) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Officially merge r3605 -- picks up OrientationIndicator, but is ... Mon, 11 May 2015 20:18:55 GMT ldelgass [5497] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 11 May 2015 20:11:44 GMT ldelgass [5496] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 11 May 2015 19:40:35 GMT ldelgass [5495] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/nanovisServer.cpp (modified) more merge updates Mon, 11 May 2015 19:26:36 GMT ldelgass [5494] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/nanovisServer.cpp (modified) merge r5492 from nanovis trunk Mon, 11 May 2015 19:21:11 GMT ldelgass [5493] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 11 May 2015 19:12:52 GMT ldelgass [5492] * nanovis/trunk/nanovisServer.cpp (modified) Go back to writing version with buffered output: the threaded server ... Mon, 11 May 2015 19:11:50 GMT ldelgass [5491] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/nanovisServer.cpp (modified) More merge updates Mon, 11 May 2015 18:01:08 GMT ldelgass [5490] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 11 May 2015 16:57:59 GMT ldelgass [5489] * nanovis/branches/1.2/Flow.cpp (modified) * nanovis/branches/1.2/Flow.h (modified) * nanovis/branches/1.2/FlowCmd.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Move cumulative flow min/max magnitude to Flow. Mon, 11 May 2015 09:50:11 GMT ldelgass [5488] * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (modified) Partial (manual) merge of r3935 - vector fields in VTK reader Mon, 11 May 2015 09:14:17 GMT ldelgass [5487] * nanovis/trunk/FlowParticles.cpp (modified) init _volume ivar Mon, 11 May 2015 02:34:24 GMT ldelgass [5486] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) merge r5479 from nanovis trunk Sat, 09 May 2015 21:03:06 GMT ldelgass [5485] * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) backport: remove getFlowBounds Sat, 09 May 2015 20:57:38 GMT ldelgass [5484] * nanovis/trunk/Makefile.in (modified) whitespace Sat, 09 May 2015 20:52:14 GMT ldelgass [5483] * nanovis/trunk/ParticleRenderer.cpp (modified) * nanovis/trunk/configure.in (modified) whitespace/comment Sat, 09 May 2015 20:39:49 GMT ldelgass [5482] * nanovis/branches/1.2/ParticleRenderer.cpp (modified) whitespace Sat, 09 May 2015 20:37:21 GMT ldelgass [5481] * nanovis/branches/1.2/ParticleRenderer.cpp (modified) * nanovis/branches/1.2/ParticleRenderer.h (modified) Merge (manual) ParticleRenderer changes from trunk Sat, 09 May 2015 20:20:00 GMT ldelgass [5480] * nanovis/trunk/Axis.h (modified) remove unused member var Sat, 09 May 2015 10:18:33 GMT ldelgass [5479] * nanovis/trunk/Command.cpp (modified) whitespace Sat, 09 May 2015 09:56:07 GMT ldelgass [5478] * nanovis/trunk/Axis.cpp (modified) * nanovis/trunk/Axis.h (modified) * nanovis/trunk/Chain.cpp (deleted) * nanovis/trunk/Chain.h (deleted) * nanovis/trunk/Command.cpp (modified) * nanovis/trunk/Grid.cpp (modified) * nanovis/trunk/HeightMap.cpp (modified) * nanovis/trunk/Makefile.in (modified) * nanovis/trunk/nanovis.cpp (modified) Begin refactoring axis/grid in nanovis: remove unused features, make ... Fri, 08 May 2015 03:37:37 GMT ldelgass [5477] * nanovis/branches/1.2/nvconf.h.in (modified) autoheader update Fri, 08 May 2015 03:26:03 GMT ldelgass [5476] * nanovis/branches/1.2/Makefile.in (modified) Don't build old VTK reader if using new one Fri, 08 May 2015 02:53:54 GMT ldelgass [5475] * nanovis/branches/1.2/Command.cpp (modified) fix include Fri, 08 May 2015 02:43:36 GMT ldelgass [5474] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (modified) minor merge in nanovis 1.2 branch Fri, 08 May 2015 02:34:44 GMT ldelgass [5473] * nanovis/branches/1.2 (modified) update mergeinfo Fri, 08 May 2015 02:11:27 GMT ldelgass [5472] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/DataSetResample.cpp (copied) * nanovis/branches/1.2/DataSetResample.h (copied) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (copied) * nanovis/branches/1.2/VtkDataSetReader.h (copied) * nanovis/branches/1.2/configure (modified) * nanovis/branches/1.2/configure.in (modified) Merge r3870,r4061 from nanovis trunk (new VTK reader/resampler - ... Thu, 07 May 2015 11:38:35 GMT ldelgass [5461] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Unirect.cpp (modified) merge r5460 from nanovis trunk Thu, 07 May 2015 11:37:39 GMT ldelgass [5460] * nanovis/trunk/Unirect.cpp (modified) Fix DX keyword order in unirect DX import Wed, 06 May 2015 20:01:23 GMT ldelgass [5431] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Unirect.cpp (modified) merge r5430 from trunk Wed, 06 May 2015 20:00:45 GMT ldelgass [5430] * nanovis/trunk/Unirect.cpp (modified) Fix detection of skewed grids in unirect DX parser Wed, 06 May 2015 19:06:24 GMT ldelgass [5429] * nanovis/branches/1.2 (modified) update mergeinfo Wed, 06 May 2015 00:32:41 GMT ldelgass [5428] * nanovis/branches/1.2 (modified) update mergeinfo Tue, 05 May 2015 20:54:23 GMT ldelgass [5427] * nanovis/branches/1.2 (modified) update mergeinfo Tue, 05 May 2015 20:44:00 GMT ldelgass [5426] * nanovis/trunk/ZincBlendeReconstructor.cpp (modified) Drop check for misspelled keyword in (unused) ZincBlende data parser Tue, 05 May 2015 20:40:09 GMT ldelgass [5425] * nanovis/trunk/FlowCmd.cpp (modified) * nanovis/trunk/nanovisServer.cpp (modified) drop namespace qualifier on globals where we have a using directive. Tue, 05 May 2015 19:39:51 GMT ldelgass [5424] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 04 May 2015 11:35:49 GMT ldelgass [5407] * nanovis/trunk/ZincBlendeVolume.h (modified) whitespace Mon, 04 May 2015 11:31:25 GMT ldelgass [5406] * nanovis/branches/1.2/Volume.cpp (modified) * nanovis/branches/1.2/Volume.h (modified) * nanovis/branches/1.2/VolumeInterpolator.cpp (modified) * nanovis/branches/1.2/ZincBlendeReconstructor.cpp (modified) * nanovis/branches/1.2/ZincBlendeVolume.cpp (modified) * nanovis/branches/1.2/ZincBlendeVolume.h (modified) * nanovis/branches/1.2/nanovis.cpp (modified) backport from trunk: remove unused ctor params Mon, 04 May 2015 11:19:26 GMT ldelgass [5405] * nanovis/branches/1.2/nanovis.cpp (modified) fix typo Mon, 04 May 2015 10:52:34 GMT ldelgass [5404] * nanovis/trunk/ParticleRenderer.cpp (modified) whitespace Mon, 04 May 2015 07:59:57 GMT ldelgass [5403] * nanovis/trunk/FlowParticles.cpp (modified) Fix FlowParticles for change in flow position type Mon, 04 May 2015 07:37:51 GMT ldelgass [5402] * nanovis/branches/1.2/Flow.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Backport from trunk: make use of BBox Mon, 04 May 2015 06:37:33 GMT ldelgass [5401] * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) remove unused var Mon, 04 May 2015 00:34:14 GMT ldelgass [5400] * nanovis/branches/1.2/nanovis.cpp (modified) minor change to sync with nanovis trunk Sat, 02 May 2015 22:23:07 GMT ldelgass [5399] * nanovis/trunk/Flow.cpp (modified) * nanovis/trunk/FlowCmd.cpp (modified) * nanovis/trunk/FlowTypes.h (modified) Use double for Flow position since it can be an absolute value. Sat, 02 May 2015 19:38:21 GMT ldelgass [5398] * nanovis/branches/1.2 (modified) update mergeinfo Sat, 02 May 2015 10:19:17 GMT ldelgass [5397] * nanovis/branches/1.2/ParticleAdvectionShader.cpp (modified) * nanovis/branches/1.2/ParticleAdvectionShader.h (modified) * nanovis/branches/1.2/ParticleRenderer.cpp (modified) * nanovis/branches/1.2/shaders/update_pos.cg (modified) Hand merge fix for flow reset Sat, 02 May 2015 09:57:34 GMT ldelgass [5396] * nanovis/branches/1.2 (modified) update mergeinfo Sat, 02 May 2015 09:38:26 GMT ldelgass [5395] * nanovis/branches/1.2 (modified) update mergeinfo Sat, 02 May 2015 09:31:12 GMT ldelgass [5394] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/Shader.cpp (modified) * nanovis/branches/1.2/VelocityArrowsSlice.cpp (modified) * nanovis/branches/1.2/config.h (modified) * nanovis/branches/1.2/nanovis.cpp (modified) Merge r3875:3876 from trunk, update mergeinfo Sat, 02 May 2015 08:17:11 GMT ldelgass [5393] * nanovis/branches/1.2 (modified) update mergeinfo Thu, 30 Apr 2015 15:37:48 GMT ldelgass [5373] * nanovis/branches/1.2/ParticleRenderer.cpp (modified) minor cleanup Mon, 27 Apr 2015 23:50:15 GMT ldelgass [5329] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Unirect.cpp (modified) merge r5328 from nanovis trunk Mon, 27 Apr 2015 22:30:28 GMT ldelgass [5328] * nanovis/trunk/Unirect.cpp (modified) add delta checks to nanovis unirect DX parser Mon, 27 Apr 2015 22:12:40 GMT ldelgass [5327] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/dxReader.cpp (modified) merge r5326 from nanovis trunk Mon, 27 Apr 2015 22:08:24 GMT ldelgass [5326] * nanovis/trunk/dxReader.cpp (modified) nanovis can't handle negative deltas in DX files, so return an error ... Sat, 25 Apr 2015 02:28:41 GMT ldelgass [5314] * nanovis/branches/1.2/nanovisServer.h (modified) bump version Sat, 25 Apr 2015 02:27:27 GMT ldelgass [5313] * nanovis/tags/1.2.1 (copied) tag 1.2.1 release Sat, 25 Apr 2015 02:26:39 GMT ldelgass [5312] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/dxReader.cpp (modified) merge r5311 from trunk Sat, 25 Apr 2015 02:25:12 GMT ldelgass [5311] * nanovis/trunk/dxReader.cpp (modified) Check for valid deltas in DX Fri, 24 Apr 2015 23:34:34 GMT ldelgass [5304] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) merge r5302:5303 from trunk Fri, 24 Apr 2015 23:33:32 GMT ldelgass [5303] * nanovis/trunk/Command.cpp (modified) fix copy/paste error Fri, 24 Apr 2015 23:28:43 GMT ldelgass [5302] * nanovis/trunk/Command.cpp (modified) * nanovis/trunk/FlowCmd.cpp (modified) Don't abort on bad number of bytes, just return an error Tue, 24 Feb 2015 22:45:39 GMT ldelgass [5048] * nanovis/trunk (modified) * nanovis/trunk/Makefile.in (modified) merge r5047 from release branch Tue, 24 Feb 2015 22:25:33 GMT ldelgass [5047] * nanovis/branches/1.2/Makefile.in (modified) particle bitmap only used for pointset renderer Tue, 24 Feb 2015 21:41:44 GMT ldelgass [5046] * nanovis/branches/1.2/nanovisServer.h (modified) bump version Sun, 22 Feb 2015 23:31:34 GMT ldelgass [5040] * nanovis/tags/1.2.0 (copied) Tag nanovis 1.2.0 release Tue, 20 Jan 2015 06:38:09 GMT ldelgass [4949] * nanovis/trunk/Makefile.in (modified) * nanovis/trunk/configure (modified) * nanovis/trunk/configure.in (modified) * nanovis/trunk/nanovis.cpp (modified) * nanovis/trunk/nanovis.h (modified) Bump version in configure, minor cleanups Tue, 20 Jan 2015 01:43:30 GMT ldelgass [4948] * nanovis/trunk (modified) * nanovis/trunk/Command.h (modified) * nanovis/trunk/Makefile.in (modified) * nanovis/trunk/nanovisServer.cpp (modified) Merge r4920 from release branch Tue, 20 Jan 2015 01:20:21 GMT ldelgass [4947] * nanovis/trunk/nanovis.cpp (modified) use proper texparam call for type Sun, 18 Jan 2015 10:28:38 GMT ldelgass [4937] * nanovis/branches/1.2/BMPWriter.cpp (added) * nanovis/branches/1.2/BMPWriter.h (added) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/Command.h (modified) * nanovis/branches/1.2/FlowCmd.cpp (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/PPMWriter.cpp (added) * nanovis/branches/1.2/PPMWriter.h (added) * nanovis/branches/1.2/ResponseQueue.cpp (added) * nanovis/branches/1.2/ResponseQueue.h (added) * nanovis/branches/1.2/configure (modified) * nanovis/branches/1.2/configure.in (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) * nanovis/branches/1.2/nanovisServer.cpp (modified) * nanovis/branches/1.2/nanovisServer.h (modified) merge threading Sun, 18 Jan 2015 08:51:06 GMT ldelgass [4936] * nanovis/trunk/Camera.h (modified) * nanovis/trunk/Command.cpp (modified) * nanovis/trunk/nanovisServer.cpp (modified) whitespace Sun, 18 Jan 2015 03:00:10 GMT ldelgass [4935] * nanovis/trunk/nanovisServer.h (modified) bump version Sun, 18 Jan 2015 02:58:28 GMT ldelgass [4934] * nanovis/branches/1.2/nanovisServer.h (modified) set version to 1.2.0 Sun, 18 Jan 2015 02:57:19 GMT ldelgass [4933] * nanovis/branches/1.2 (copied) create nanovis 1.2 branch Fri, 16 Jan 2015 23:26:49 GMT ldelgass [4930] * nanovis/tags/1.1.4 (copied) tag nanovis 1.1.4 release Tue, 13 Jan 2015 19:50:08 GMT ldelgass [4923] * nanovis/branches/1.1/FlowParticles.cpp (modified) * nanovis/branches/1.1/ZincBlendeVolume.h (modified) whitespace Thu, 08 Jan 2015 10:21:02 GMT ldelgass [4920] * nanovis/branches/1.1/Makefile.in (modified) Don't build newmat11 matrix library unless point set renderer is included Wed, 24 Dec 2014 01:27:03 GMT ldelgass [4908] * nanovis/branches/1.1 (modified) * nanovis/branches/1.1/VolumeInterpolator.cpp (modified) Merge r4907 from trunk Wed, 24 Dec 2014 01:24:52 GMT ldelgass [4907] * nanovis/trunk/VolumeInterpolator.cpp (modified) volume interpolator fix Mon, 22 Dec 2014 22:24:33 GMT ldelgass [4906] * nanovis/branches/1.1/vrmath/Matrix4x4d.cpp (modified) * nanovis/branches/1.1/vrmath/Matrix4x4f.cpp (modified) merge matrix classes from trunk Mon, 22 Dec 2014 22:22:29 GMT ldelgass [4905] * nanovis/trunk/vrmath/Matrix4x4f.cpp (modified) Apply matrix changes from double to float version Mon, 22 Dec 2014 12:18:59 GMT ldelgass [4904] * nanovis/branches/1.1/Axis.h (modified) * nanovis/branches/1.1/Camera.cpp (modified) * nanovis/branches/1.1/Camera.h (modified) * nanovis/branches/1.1/CmdProc.cpp (modified) * nanovis/branches/1.1/ColorTableShader.cpp (modified) * nanovis/branches/1.1/Command.cpp (modified) * nanovis/branches/1.1/Flow.cpp (modified) * nanovis/branches/1.1/Flow.h (modified) * nanovis/branches/1.1/FlowBox.cpp (modified) * nanovis/branches/1.1/FlowCmd.cpp (modified) * nanovis/branches/1.1/FlowParticles.cpp (modified) * nanovis/branches/1.1/FlowParticles.h (modified) * nanovis/branches/1.1/FlowTypes.h (modified) * nanovis/branches/1.1/Grid.cpp (modified) * nanovis/branches/1.1/Grid.h (modified) * nanovis/branches/1.1/HeightMap.cpp (modified) * nanovis/branches/1.1/LIC.cpp (modified) * nanovis/branches/1.1/LIC.h (modified) * nanovis/branches/1.1/Makefile.in (modified) * nanovis/branches/1.1/ParticleAdvectionShader.cpp (modified) * nanovis/branches/1.1/ParticleAdvectionShader.h (modified) * nanovis/branches/1.1/ParticleRenderer.cpp (modified) * nanovis/branches/1.1/ParticleRenderer.h (modified) * nanovis/branches/1.1/ParticleSystem.cpp (modified) * nanovis/branches/1.1/PointSetRenderer.cpp (modified) * nanovis/branches/1.1/PointShader.cpp (modified) * nanovis/branches/1.1/ReaderCommon.cpp (modified) * nanovis/branches/1.1/ReaderCommon.h (modified) * nanovis/branches/1.1/RegularVolumeShader.cpp (modified) * nanovis/branches/1.1/RenderVertexArray.h (modified) * nanovis/branches/1.1/Shader.cpp (modified) * nanovis/branches/1.1/Shader.h (modified) * nanovis/branches/1.1/StdVertexShader.cpp (modified) * nanovis/branches/1.1/Unirect.cpp (modified) * nanovis/branches/1.1/Unirect.h (modified) * nanovis/branches/1.1/VelocityArrowsSlice.cpp (modified) * nanovis/branches/1.1/VelocityArrowsSlice.h (modified) * nanovis/branches/1.1/Volume.cpp (modified) * nanovis/branches/1.1/Volume.h (modified) * nanovis/branches/1.1/VolumeInterpolator.cpp (modified) * nanovis/branches/1.1/VolumeInterpolator.h (modified) * nanovis/branches/1.1/VolumeRenderer.cpp (modified) * nanovis/branches/1.1/VtkReader.cpp (modified) * nanovis/branches/1.1/VtkReader.h (modified) * nanovis/branches/1.1/ZincBlendeReconstructor.cpp (modified) * nanovis/branches/1.1/ZincBlendeReconstructor.h (modified) * nanovis/branches/1.1/ZincBlendeVolume.cpp (modified) * nanovis/branches/1.1/ZincBlendeVolumeShader.cpp (modified) * nanovis/branches/1.1/configure (modified) * nanovis/branches/1.1/configure.in (modified) * nanovis/branches/1.1/dxReader.cpp (modified) * nanovis/branches/1.1/dxReader.h (modified) * nanovis/branches/1.1/graphics/Makefile.in (modified) * nanovis/branches/1.1/imgLoaders/Makefile.in (modified) * nanovis/branches/1.1/nanovis.cpp (modified) * nanovis/branches/1.1/nanovis.h (modified) * nanovis/branches/1.1/nanovisServer.cpp (modified) * nanovis/branches/1.1/newmat11/Makefile.in (modified) * nanovis/branches/1.1/nvconf.h.in (modified) * nanovis/branches/1.1/shaders/common.cg (modified) * nanovis/branches/1.1/shaders/copy_texcoord.cg (modified) * nanovis/branches/1.1/shaders/cutplane_fp.cg (modified) * nanovis/branches/1.1/shaders/cutplane_vp.cg (modified) * nanovis/branches/1.1/shaders/heightcolor.cg (modified) * nanovis/branches/1.1/shaders/moveparticles.cg (modified) * nanovis/branches/1.1/shaders/one_plane.cg (modified) * nanovis/branches/1.1/shaders/one_volume.cg (modified) * nanovis/branches/1.1/shaders/particle_common.cg (modified) * nanovis/branches/1.1/shaders/particlefp.cg (modified) * nanovis/branches/1.1/shaders/particlevp.cg (modified) * nanovis/branches/1.1/shaders/passthrough.cg (modified) * nanovis/branches/1.1/shaders/passthru.cg (modified) * nanovis/branches/1.1/shaders/pointsvp.cg (modified) * nanovis/branches/1.1/shaders/queryvelocity.cg (modified) * nanovis/branches/1.1/shaders/render_vel.cg (modified) * nanovis/branches/1.1/shaders/renderparticle.cg (modified) * nanovis/branches/1.1/shaders/update_pos.cg (modified) * nanovis/branches/1.1/shaders/update_pos_vel.cg (modified) * nanovis/branches/1.1/shaders/update_vel.cg (modified) * nanovis/branches/1.1/shaders/velocityslicefp.cg (modified) * nanovis/branches/1.1/shaders/velocityslicevp.cg (modified) * nanovis/branches/1.1/shaders/vertex_std.cg (modified) * nanovis/branches/1.1/shaders/volqd_volume.cg (modified) * nanovis/branches/1.1/shaders/zincblende_volume.cg (modified) * nanovis/branches/1.1/util/Fonts.cpp (modified) * nanovis/branches/1.1/util/Fonts.h (modified) * nanovis/branches/1.1/util/Makefile.in (modified) * nanovis/branches/1.1/vrmath/Makefile.in (modified) * nanovis/branches/1.1/vrmath/include/vrmath/BBox.h (modified) Merge serveral changes from trunk. Does not include threading, world ...