Changeset 2834 for trunk/packages/vizservers/nanovis

Timestamp:

Mar 9, 2012 1:18:24 PM (12 years ago)

Author:

ldelgass

Message:

Don't create array of planes unless PLANE_CMD is defined. Use a separate
texture pointer for legend rendering instead of using plane[0].

Location:

trunk/packages/vizservers/nanovis

Files:

• PlaneRenderer.cpp (modified) (11 diffs)
• PlaneRenderer.h (modified) (3 diffs)
• nanovis.cpp (modified) (5 diffs)
• nanovis.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/PlaneRenderer.cpp

@@ -20 +20 @@
 
 PlaneRenderer::PlaneRenderer(CGcontext _context, int _width, int _height) :
-    active_plane(-1),
-    n_planes(0),
-    render_width(_width),
-    render_height(_height),
-    g_context(_context)
+    _active_plane(-1),
+    _n_planes(0),
+    _render_width(_width),
+    _render_height(_height),
+    _g_context(_context)
 {
-    plane.clear();
-    tf.clear();
+    _plane.clear();
+    _tf.clear();
     init_shaders();
 }
@@ -40 +40 @@
 {
     //plane rendering shader
-    m_fprog = LoadCgSourceProgram(g_context, "one_plane.cg", CG_PROFILE_FP30, 
+    _fprog = LoadCgSourceProgram(_g_context, "one_plane.cg", CG_PROFILE_FP30, 
         NULL);
-    m_data_param = cgGetNamedParameter(m_fprog, "data");
-    m_tf_param = cgGetNamedParameter(m_fprog, "tf");
-    m_render_param = cgGetNamedParameter(m_fprog, "render_param");
+    _data_param = cgGetNamedParameter(_fprog, "data");
+    _tf_param = cgGetNamedParameter(_fprog, "tf");
+    _render_param = cgGetNamedParameter(_fprog, "render_param");
 }
 
@@ -50 +50 @@
 PlaneRenderer::add_plane(Texture2D* _p, TransferFunction* tfPtr)
 {
-    int ret = n_planes;
+    int ret = _n_planes;
 
-    plane.push_back(_p);
-    tf.push_back(tfPtr);
+    _plane.push_back(_p);
+    _tf.push_back(tfPtr);
 
     if(ret==0)
-        active_plane = ret;
+        _active_plane = ret;
 
-    n_planes++;
+    _n_planes++;
     return ret;
 }
@@ -64 +64 @@
 void
 PlaneRenderer::remove_plane(int index) {
-    std::vector<Texture2D*>::iterator piter = plane.begin()+index;
-    std::vector<TransferFunction*>::iterator tfiter = tf.begin()+index;
+    std::vector<Texture2D*>::iterator piter = _plane.begin()+index;
+    std::vector<TransferFunction*>::iterator tfiter = _tf.begin()+index;
 
-    plane.erase(piter);
-    tf.erase(tfiter);
+    _plane.erase(piter);
+    _tf.erase(tfiter);
 
-    n_planes--;
+    _n_planes--;
 }
 
@@ -76 +76 @@
 PlaneRenderer::render()
 {
-    if (n_planes == 0)
+    if (_n_planes == 0)
         return;
 
@@ -82 +82 @@
     glEnable(GL_BLEND);
 
-    glViewport(0, 0, render_width, render_height);
+    glViewport(0, 0, _render_width, _render_height);
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
-    gluOrtho2D(0, render_width, 0, render_height);
+    gluOrtho2D(0, _render_width, 0, _render_height);
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
@@ -92 +92 @@
 
     //if no active plane
-    if (active_plane == -1)
+    if (_active_plane == -1)
         return;
 
-    activate_shader(active_plane);
+    activate_shader(_active_plane);
     glBegin(GL_QUADS);
     glTexCoord2f(0, 0); glVertex2f(0, 0);
-    glTexCoord2f(1, 0); glVertex2f(render_width, 0);
-    glTexCoord2f(1, 1); glVertex2f(render_width, render_height);
-    glTexCoord2f(0, 1); glVertex2f(0, render_height);
+    glTexCoord2f(1, 0); glVertex2f(_render_width, 0);
+    glTexCoord2f(1, 1); glVertex2f(_render_width, _render_height);
+    glTexCoord2f(0, 1); glVertex2f(0, _render_height);
     glEnd();
     deactivate_shader();
@@ -109 +109 @@
 PlaneRenderer::activate_shader(int index)
 {
-    cgGLSetTextureParameter(m_data_param, plane[index]->id);
-    cgGLSetTextureParameter(m_tf_param, tf[index]->id());
-    cgGLEnableTextureParameter(m_data_param);
-    cgGLEnableTextureParameter(m_tf_param);
+    cgGLSetTextureParameter(_data_param, _plane[index]->id);
+    cgGLSetTextureParameter(_tf_param, _tf[index]->id());
+    cgGLEnableTextureParameter(_data_param);
+    cgGLEnableTextureParameter(_tf_param);
 
-    cgGLSetParameter4f(m_render_param, 0., 0., 0., 0.);
+    cgGLSetParameter4f(_render_param, 0., 0., 0., 0.);
 
-    cgGLBindProgram(m_fprog);
+    cgGLBindProgram(_fprog);
     cgGLEnableProfile(CG_PROFILE_FP30);
 }
@@ -124 +124 @@
 {
     cgGLDisableProfile(CG_PROFILE_FP30);
-    cgGLDisableTextureParameter(m_data_param);
-    cgGLDisableTextureParameter(m_tf_param);
+    cgGLDisableTextureParameter(_data_param);
+    cgGLDisableTextureParameter(_tf_param);
 }
 
@@ -131 +131 @@
 PlaneRenderer::set_active_plane(int index) 
 {
-    active_plane = index;
+    _active_plane = index;
 }
 
@@ -137 +137 @@
 PlaneRenderer::set_screen_size(int w, int h) 
 {
-    render_width = w;
-    render_height = h;
+    _render_width = w;
+    _render_height = h;
 }

trunk/packages/vizservers/nanovis/PlaneRenderer.h

@@ -14 +14 @@
  * ======================================================================
  */
-#ifndef _PLANE_RENDERER_H_
-#define _PLANE_RENDERER_H_
-
-#include <GL/glew.h>
-#include <Cg/cgGL.h>
+#ifndef PLANE_RENDERER_H
+#define PLANE_RENDERER_H
 
 #include <math.h>
@@ -24 +21 @@
 #include <assert.h>
 #include <float.h>
+
 #include <vector>
+
+#include <GL/glew.h>
+#include <Cg/cgGL.h>
 
 #include "global.h"
@@ -32 +33 @@
 class PlaneRenderer
 {
-private:
-    std::vector<Texture2D*> plane;      // Array of volumes
-    std::vector<TransferFunction*> tf; // Array of corresponding transfer functions 
-    int active_plane;           // The active plane, only one is rendered
-    int n_planes;
-
-    int render_width;   //render size
-    int render_height;  
-
-    //cg related
-    CGcontext g_context;        // The Nvidia cg context 
-    CGprogram m_fprog;
-    CGparameter m_data_param;
-    CGparameter m_tf_param;
-    CGparameter m_render_param;
-
-    void init_shaders();
-    void activate_shader(int plane_index);
-    void deactivate_shader();
-
 public:
     PlaneRenderer(CGcontext _context, int width, int height);
+
     ~PlaneRenderer();
 
     int add_plane(Texture2D* _p, TransferFunction* _tf);
+
     // Add a plane and its transfer function. We require a transfer function
     // when a plane is added.
     void remove_plane(int index);
+
     void set_active_plane(int index); //set the active plane to be rendered
+
     void set_screen_size(int w, int h); //change the rendering size
+
     void render();
+
+private:
+    void init_shaders();
+
+    void activate_shader(int plane_index);
+
+    void deactivate_shader();
+
+    std::vector<Texture2D *> _plane;    // Array of volumes
+    std::vector<TransferFunction *> _tf; // Array of corresponding transfer functions 
+    int _active_plane;          // The active plane, only one is rendered
+    int _n_planes;
+
+    int _render_width;   //render size
+    int _render_height;  
+
+    //cg related
+    CGcontext _g_context;       // The Nvidia cg context 
+    CGprogram _fprog;
+    CGparameter _data_param;
+    CGparameter _tf_param;
+    CGparameter _render_param;
 };
 

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -121 +121 @@
 std::vector<PointSet *> NanoVis::pointSet;
 #endif
+
 PlaneRenderer *NanoVis::plane_renderer = NULL;
+#if PLANE_CMD
 // pointers to 2D planes, currently handle up 10
 Texture2D *NanoVis::plane[10];
+#endif
+Texture2D *NanoVis::legendTexture = NULL;
 NvColorTableRenderer *NanoVis::color_table_renderer = NULL;
 
@@ -523 +527 @@
         data[i] = data[i+256] = (float)(i/255.0);
     }
-    plane[0] = new Texture2D(256, 2, GL_FLOAT, GL_LINEAR, 1, data);
-    int index = plane_renderer->add_plane(plane[0], tf);
+    legendTexture = new Texture2D(256, 2, GL_FLOAT, GL_LINEAR, 1, data);
+    int index = plane_renderer->add_plane(legendTexture, tf);
     plane_renderer->set_active_plane(index);
 
@@ -549 +553 @@
 
     TRACE("leaving render_legend\n");
-    delete plane[0];
+    delete legendTexture;
     return TCL_OK;
 }
@@ -671 +675 @@
 }
 
+#if PROTOTYPE
 /*
  * FIXME: This routine is fairly expensive (60000 floating pt divides).
@@ -694 +699 @@
     delete[] data;
 }
+#endif
 
 void NanoVis::initParticle()

trunk/packages/vizservers/nanovis/nanovis.h

@@ -108 +108 @@
 
     static VolumeRenderer *vol_renderer;
-    static PointSetRenderer *pointset_renderer;
 #ifndef NEW_FLOW_ENGINE
     static NvParticleRenderer *flowVisRenderer;
@@ -117 +116 @@
     static NvLIC *licRenderer;
     static PlaneRenderer *plane_renderer;
+#if PLANE_CMD
+    static Texture2D *plane[]; //< Pointers to 2D planes
+#endif
+#ifdef USE_POINTSET_RENDERER
+    static PointSetRenderer *pointset_renderer;
     static std::vector<PointSet *> pointSet;
-
-    /**
-     *  pointers to 2D planes
-     */
-    static Texture2D *plane[];
+#endif
+
+    static Texture2D *legendTexture;
     static NvColorTableRenderer *color_table_renderer;
+
     static graphics::RenderContext *renderContext;
     static std::vector<HeightMap *> heightMap;