Changeset 611 for trunk

Timestamp:

Mar 8, 2007, 10:38:27 AM (17 years ago)

Author:

vrinside

Message:

added a memeber function for handling application directory in R2FilePath class.
removed all the absolute path of resources in Nv.cpp except for /opt/...
removed test code segment for checking default transfer function data

Location:

trunk/gui/vizservers/nanovis

Files:

• Nv.cpp (modified) (1 diff)
• R2/include/R2/R2FilePath.h (modified) (1 diff)
• R2/src/R2FilePath.cpp (modified) (3 diffs)
• nanovis.cpp (modified) (2 diffs)

trunk/gui/vizservers/nanovis/Nv.cpp

@@ -121 +121 @@
 void NvInit()
 {
-    char* filepath = "/home/nanohub/vrinside/rappture/gui/vizservers/nanovis/shaders:" \
-                    "/home/nanohub/vrinside/rappture/gui/vizservers/nanovis/resources:" \
+    char* filepath = "./shaders:./resources:" \
                     "/opt/nanovis/lib/shaders:/opt/nanovis/lib/resources";
 

trunk/gui/vizservers/nanovis/R2/include/R2/R2FilePath.h

@@ -41 +41 @@
          */
         void setPath(const R2string& filePath);
+
+    /**
+     *
+     */
+    void setWorkingDirectory(int argc, const char** argv);
 public :
 

trunk/gui/vizservers/nanovis/R2/src/R2FilePath.cpp

@@ -23 +23 @@
 
         _curDirectory = buff;
+
 }
 
@@ -54 +55 @@
                 else
                 {
+            FILE* f = fopen("/tmp/insoo.txt", "wt");
+            fprintf(f, "%s\n", (char*) (_curDirectory + R2string(token)));
+            fprintf(f, "%s\n", (char*) (_curDirectory + R2string(token) + "/"));
+            fclose(f);
+
                         if (token[lastIndex] == '/' || token[lastIndex] == '\\')
                         {
@@ -100 +106 @@
 }
 
+void R2FilePath::setWorkingDirectory(int argc, const char** argv)
+{
+    char buff[255];
+    strcpy(buff, argv[0]);
+    for (int i = strlen(buff) - 1; i >= 0; --i)
+    {
+        if (buff[i] == '\\' || buff[i] == '/')
+        {
+            buff[i] = '/'; 
+            buff[i + 1] = '\0'; 
+            break;
+        }
+    }
 
+        _curDirectory = buff;
+}
+

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -658 +658 @@
             data[4*i+3] = wFunc.value(xval);
         }
-
-        //INSOO
-        FILE* f = fopen("/tmp/aa.cpp", "wt");
-        fprintf(f, "float tfdata[] = {\n");
-        fprintf(f, "    ");
-        int num = nslots * 4;
-        for (i=0; i < num; i++) {
-            if (((i + 1) % 4) == 0)
-            {
-                fprintf(f, "\n    ");
-            }
-            fprintf(f, "%f, ", data[i]);
-        }
-        fclose(f);
 
         // find or create this transfer function
@@ -3316 +3302 @@
 int main(int argc, char** argv) 
 { 
+    R2FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
+
 #ifdef XINETD
    NvInitService();