Changeset 2972 for trunk/packages/vizservers/nanovis/ParticleSystemFactory.cpp

Timestamp:

Apr 16, 2012, 12:14:03 PM (13 years ago)

Author:

ldelgass

Message:

Remove vrutil library. Was only used for FilePath? that already exists in
R2 library (may need some fixing for windows portability though). Make
R2FilePath::getPath return a std::string so users can allocate a std::string
on the stack and not worry about deleting the string buffer returned. Also,
use std::string in R2Fonts to avoid leaking font names. Remove R2string as
it is now replaced by std::strings.

File:

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

trunk/packages/vizservers/nanovis/ParticleSystemFactory.cpp

@@ -5 +5 @@
 #include <expat.h>
 
-#include <vrutil/vrFilePath.h>
+#include <R2/R2FilePath.h>
 
 #include "ParticleSystemFactory.h"
@@ -144 +144 @@
         char buff[256];
         sprintf(buff, fileName.c_str(), startIndex);
-        std::string path = vrFilePath::getInstance()->getPath(buff);
+        std::string path = R2FilePath::getInstance()->getPath(buff);
         if (path.size()) {
             std::string dir;
@@ -169 +169 @@
         }
     } else {
-        std::string path = vrFilePath::getInstance()->getPath(fileName.c_str());
+        std::string path = R2FilePath::getInstance()->getPath(fileName.c_str());
         _newParticleSystem =
             new ParticleSystem(width, height, path.c_str(),