[Gzz-commits] libvob org/nongnu/libvob/paper/texcache.py src/...

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Janne V. Kujala <address@hidden>        03/03/27 05:39:42

Modified files:
        org/nongnu/libvob/paper: texcache.py 
        src/texture    : Texture_pipetexture.cxx irregu.texture 

Log message:
        fix texture paths

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/paper/texcache.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/texture/Texture_pipetexture.cxx.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/texture/irregu.texture.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/paper/texcache.py
diff -u libvob/org/nongnu/libvob/paper/texcache.py:1.2 
libvob/org/nongnu/libvob/paper/texcache.py:1.3
--- libvob/org/nongnu/libvob/paper/texcache.py:1.2      Wed Mar 26 14:23:42 2003
+++ libvob/org/nongnu/libvob/paper/texcache.py  Thu Mar 27 05:39:42 2003
@@ -40,7 +40,7 @@
     global texcache
 
     name = args[6]
-    file = "src/texture/" + name
+    file = "../libvob/src/texture/" + name
     binfile = file + ".bin"
     srcfile = file + ".texture"
 
@@ -48,7 +48,7 @@
     srctime = File(srcfile).lastModified()
 
     if srctime > bintime:
-        os.system("make -C src/texture " + name + ".bin")
+        os.system("make -C ./libvob/src/texture " + name + ".bin")
         
     key = str((args,shade_all_levels))
     if texcache.has_key(key) and texcache[(key,"ctime")] == srctime:
Index: libvob/src/texture/Texture_pipetexture.cxx
diff -u libvob/src/texture/Texture_pipetexture.cxx:1.4 
libvob/src/texture/Texture_pipetexture.cxx:1.5
--- libvob/src/texture/Texture_pipetexture.cxx:1.4      Thu Mar 27 03:24:35 2003
+++ libvob/src/texture/Texture_pipetexture.cxx  Thu Mar 27 05:39:42 2003
@@ -49,7 +49,7 @@
   virtual void render(TextureParam *params, 
                      int width, int height, int depth, int components, float 
*data) {
       string s;
-      s += "src/texture/";
+      s += "../libvob/src/texture/";
       s += name;
       s += ".bin ";
 
Index: libvob/src/texture/irregu.texture
diff -u libvob/src/texture/irregu.texture:1.2 
libvob/src/texture/irregu.texture:1.3
--- libvob/src/texture/irregu.texture:1.2       Thu Mar 27 05:27:37 2003
+++ libvob/src/texture/irregu.texture   Thu Mar 27 05:39:42 2003
@@ -97,7 +97,7 @@
 
     {
        char s[1000];
-       sprintf(s, "src/texture/%s.bin %d %d %d %d %s", 
+       sprintf(s, "../libvob/src/texture/%s.bin %d %d %d %d %s", 
                texture,
                width, height, depth, 4, 
                texparams);