Changeset 1299 for trunk/packages/vizservers/nanovis/nanovis.cpp

Timestamp:

Mar 7, 2009 2:46:49 PM (15 years ago)

Author:

vrinside

Message:

modified lic

File:

• trunk/packages/vizservers/nanovis/nanovis.cpp (modified) (13 diffs)

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -153 +153 @@
 // in Command.cpp
 extern Tcl_Interp *initTcl();
+
+// in dxReader.cpp
+extern void load_vector_stream(int index, std::istream& fin);
 
 float vert[NMESH*NMESH*3];              //particle positions in main memory
@@ -399 +402 @@
         assert(path != NULL);
     }
+    printf("cg program compiling: %s\n", path);
+    fflush(stdout);
     CGprogram program;
     program = cgCreateProgramFromFile(context, CG_SOURCE, path, profile, 
         entryPoint, NULL);
+    cgGLLoadProgram(program);
+
+    CGerror LastError = cgGetError();
+    if (LastError)
+    {
+       printf("Error message: %s\n", cgGetLastListing(context));
+    }
+
     delete [] path;
-    cgGLLoadProgram(program);
+
     return program;
 }
@@ -1864 +1877 @@
         }
         //3D rendering mode
-        glEnable(GL_TEXTURE_2D);
+        // TBD..
+        //glEnable(GL_TEXTURE_2D);
         glEnable(GL_DEPTH_TEST);
 
@@ -1991 +2005 @@
 
     angle = cam->rotate();
-    angle.x += delta.x;
-    angle.y += delta.y;
+    angle.x += delta_x;
+    angle.y += delta_y;
 
     if (angle.x > 360.0) {
@@ -2018 +2032 @@
 NanoVis::keyboard(unsigned char key, int x, int y)
 {
+/*
    bool log = false;
 
@@ -2026 +2041 @@
    case '+':
        lic_slice_z+=0.05;
-       lic->set_offset(lic_slice_z);
+       licRenderer->set_offset(lic_slice_z);
        break;
    case '-':
        lic_slice_z-=0.05;
-       lic->set_offset(lic_slice_z);
+       licRenderer->set_offset(lic_slice_z);
        break;
    case ',':
@@ -2083 +2098 @@
        break;
    }
+*/
 #ifdef EVENTLOG
    if(log){
@@ -2197 +2213 @@
 #endif
 
+void 
+NanoVis::render()
+{
+      if (NanoVis::licRenderer && NanoVis::licRenderer->isActivated())
+      {
+      NanoVis::licRenderer->convolve();
+      }
+
+      if (NanoVis::particleRenderer && NanoVis::particleRenderer->isActivated())
+      {
+      NanoVis::particleRenderer->advect();
+      }
+
+      NanoVis::update();
+
+        display();
+        glutSwapBuffers();
+
+}
+
+void 
+NanoVis::resize(int x, int y)
+{
+        glViewport(0, 0, x, y);
+}
 
 void 
@@ -2361 +2402 @@
     glutInitWindowPosition(10, 10);
     NanoVis::render_window = glutCreateWindow("nanovis");
-    glutDisplayFunc(NanoVis::display);
     glutIdleFunc(NanoVis::idle);
-    glutReshapeFunc(NanoVis::resize_offscreen_buffer);
 
 #ifndef XINETD
@@ -2369 +2408 @@
     glutMotionFunc(NanoVis::motion);
     glutKeyboardFunc(NanoVis::keyboard);
-#endif
-
+    glutReshapeFunc(NanoVis::resize);
+    glutDisplayFunc(NanoVis::render);
+#else
+    glutDisplayFunc(NanoVis::display);
+    glutReshapeFunc(NanoVis::resize_offscreen_buffer);
+#endif
 
     while (1) {
@@ -2450 +2493 @@
         // Assume program is in the form <path>/bin/nanovis.
 
+#ifdef XINETD
         path = argv[0];
         p = strrchr(path, '/');
@@ -2464 +2508 @@
         sprintf(newPath, "%s/lib/shaders:%s/lib/resources", path, path);
         path = newPath;
+#else
+        char buff[256];
+        getcwd(buff, 255);
+        p = strrchr(buff, '/');
+        if (p != NULL) {
+            *p = '\0';
+        }
+        newPath = new char[(strlen(buff) + 15) * 2 + 1];
+        sprintf(newPath, "%s/lib/shaders:%s/lib/resources", buff, buff);
+        path = newPath;
+#endif
     }
     R2FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
@@ -2483 +2538 @@
     NanoVis::interp = initTcl();
     NanoVis::resize_offscreen_buffer(NanoVis::win_width, NanoVis::win_height);
+
+#ifndef XINETD
+/*
+    CGprofile newProfile;
+    newProfile = cgGetProfile("fp30");
+    if (newProfile == CG_PROFILE_UNKNOWN)
+        printf("unknown profile\n");
+    else printf("fp30 know profile\n");
+
+    int n = NanoVis::n_volumes;
+    std::ifstream fdata;
+    fdata.open("flow2d.dx", std::ios::in);
+    load_vector_stream(n, fdata);
+    Volume *volPtr = NanoVis::volume[n];
+
+    if (volPtr != NULL) {
+        //volPtr->set_n_slice(256-n);
+        volPtr->set_n_slice(512-n);
+        volPtr->disable_cutplane(0);
+        volPtr->disable_cutplane(1);
+        volPtr->disable_cutplane(2);
+
+        NanoVis::vol_renderer->add_volume(volPtr,
+                NanoVis::get_transfunc("default"));
+    }
+
+
+    if (NanoVis::particleRenderer != NULL) {
+        NanoVis::particleRenderer->setVectorField(volPtr->id, 1.0f,
+            volPtr->height / (float)volPtr->width,
+            volPtr->depth  / (float)volPtr->width,
+            volPtr->wAxis.max());
+        NanoVis::initParticle();
+    }
+    if (NanoVis::licRenderer != NULL) {
+        NanoVis::licRenderer->setVectorField(volPtr->id,
+            1.0f / volPtr->aspect_ratio_width,
+            1.0f / volPtr->aspect_ratio_height,
+            1.0f / volPtr->aspect_ratio_depth,
+            volPtr->wAxis.max());
+        NanoVis::licRenderer->set_offset(NanoVis::lic_slice_z);
+        }
+*/
+#endif
     glutMainLoop();