Changeset 3611 for trunk/packages/vizservers/nanovis/ParticleRenderer.h

Timestamp:

Apr 2, 2013 8:02:50 PM (11 years ago)

Author:

ldelgass

Message:

Use nv namespace for classes in nanovis rather than prefixing class names with
Nv (still need to convert shader classes).

File:

• trunk/packages/vizservers/nanovis/ParticleRenderer.h (moved) (moved from trunk/packages/vizservers/nanovis/NvParticleRenderer.h) (4 diffs)

trunk/packages/vizservers/nanovis/ParticleRenderer.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * ----------------------------------------------------------------------
- * NvParticleRenderer.h: particle system class
- *
- * ======================================================================
- *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
- *           Purdue Rendering and Perceptualization Lab (PURPL)
- *
  *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
  *
- *  See the file "license.terms" for information on usage and
- *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- * ======================================================================
+ *  Authors:
+ *    Wei Qiao <qiaow@purdue.edu>
  */
-#ifndef NVPARTICLERENDERER_H
-#define NVPARTICLERENDERER_H
+#ifndef NV_PARTICLE_RENDERER_H
+#define NV_PARTICLE_RENDERER_H
 
 #include <GL/glew.h>
@@ -24 +16 @@
 #include "NvParticleAdvectionShader.h"
 #include "RenderVertexArray.h"
+
+namespace nv {
 
 struct Particle {
@@ -39 +33 @@
 };
 
-class NvParticleRenderer
+class ParticleRenderer
 {
 public:
-    NvParticleRenderer(int w, int h);
+    ParticleRenderer(int w, int h);
 
-    ~NvParticleRenderer();
+    ~ParticleRenderer();
 
     void setVectorField(unsigned int texID, const vrmath::Vector3f& origin,
@@ -135 +129 @@
 };
 
+class ParticleAdvectionShaderInstance
+{
+public :
+    ParticleAdvectionShaderInstance()
+    {}
+
+    ~ParticleAdvectionShaderInstance()
+    {
+        if (ParticleRenderer::_advectionShader) {
+            delete ParticleRenderer::_advectionShader;
+        }
+    }
+};
+
+}
+
 #endif