[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob/vob/demo gl/glinfo.py paper/basis.py pap...
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] libvob/vob/demo gl/glinfo.py paper/basis.py pap... |
Date: |
Mon, 28 Apr 2003 03:06:25 -0400 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Changes by: Janne V. Kujala <address@hidden> 03/04/28 03:06:24
Modified files:
vob/demo/gl : glinfo.py
vob/demo/paper : basis.py combiners.py combinerutil.py
multipaper.py singlepaper.py util.py
Log message:
fix imports
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/gl/glinfo.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/basis.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/combiners.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/combinerutil.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/multipaper.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/singlepaper.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/util.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: libvob/vob/demo/gl/glinfo.py
diff -u libvob/vob/demo/gl/glinfo.py:1.1 libvob/vob/demo/gl/glinfo.py:1.2
--- libvob/vob/demo/gl/glinfo.py:1.1 Thu Apr 10 10:00:19 2003
+++ libvob/vob/demo/gl/glinfo.py Mon Apr 28 03:06:24 2003
@@ -21,7 +21,7 @@
#
from __future__ import nested_scopes
-from org.nongnu.libvob.putil.misc import *
+from vob.putil.misc import *
def parstr(name):
return name + ": " + js(GL.getGLFloat(name))
@@ -206,7 +206,7 @@
if i >= len(foo): break
putText(vs, cs1, foo[i], color=(0,0,0), h=1,
- x=x*(colchars/cols), y=y+8)
+ x=x*(colchars/cols), y=y+8, key = str(i))
i += 1
Index: libvob/vob/demo/paper/basis.py
diff -u libvob/vob/demo/paper/basis.py:1.1 libvob/vob/demo/paper/basis.py:1.2
--- libvob/vob/demo/paper/basis.py:1.1 Thu Apr 10 10:00:19 2003
+++ libvob/vob/demo/paper/basis.py Mon Apr 28 03:06:24 2003
@@ -21,8 +21,8 @@
#
from __future__ import nested_scopes
-from org.nongnu import libvob as vob
-from org.nongnu.libvob.putil.misc import *
+import vob
+from vob.putil.misc import *
class Scene:
"""All basis textures used in libpaper.
Index: libvob/vob/demo/paper/combiners.py
diff -u libvob/vob/demo/paper/combiners.py:1.1
libvob/vob/demo/paper/combiners.py:1.2
--- libvob/vob/demo/paper/combiners.py:1.1 Thu Apr 10 10:00:19 2003
+++ libvob/vob/demo/paper/combiners.py Mon Apr 28 03:06:24 2003
@@ -23,9 +23,9 @@
from __future__ import nested_scopes
from combinerutil import *
-from org.nongnu.libvob.putil import saveanim
-from org.nongnu.libvob.putil.demokeys import *
-from org.nongnu.libvob.putil import misc
+from vob.putil import saveanim
+from vob.putil.demokeys import *
+from vob.putil import misc
class Scene:
Index: libvob/vob/demo/paper/combinerutil.py
diff -u libvob/vob/demo/paper/combinerutil.py:1.1
libvob/vob/demo/paper/combinerutil.py:1.2
--- libvob/vob/demo/paper/combinerutil.py:1.1 Thu Apr 10 10:00:19 2003
+++ libvob/vob/demo/paper/combinerutil.py Mon Apr 28 03:06:24 2003
@@ -21,9 +21,9 @@
#
from __future__ import nested_scopes
-from org.nongnu.libvob.putil import nvcode
-from org.nongnu.libvob.putil.misc import *
-from org.nongnu.libvob.putil.demokeys import *
+from vob.putil import nvcode
+from vob.putil.misc import *
+from vob.putil.demokeys import *
def shootImages():
pt = PaperTemplate()
@@ -46,14 +46,14 @@
import java
from java.lang import Math
-from org.nongnu.libvob.color.spaces import *
+from vob.color.spaces import *
-import org.nongnu.libvob.paper.textures
-org.nongnu.libvob.paper.textures.init(4, "RGBA")
+import vob.paper.textures
+vob.paper.textures.init(4, "RGBA")
-#from org.nongnu.libvob.paper.textures import *
-from org.nongnu.libvob.paper.texcoords import *
-from org.nongnu.libvob.paper.colors import *
+#from vob.paper.textures import *
+from vob.paper.texcoords import *
+from vob.paper.colors import *
passmask = [ 1, 0, 0, 0 ]
@@ -145,9 +145,9 @@
ActiveTexture TEXTURE0
""")
- # texid = org.nongnu.libvob.paper.textures.ptextures["RGB2"][1].getTexId();
- texid0 = org.nongnu.libvob.paper.textures.getNamed("RGB2", t0).getTexId()
- texid1 = org.nongnu.libvob.paper.textures.getNamed("RGB2", t1).getTexId()
+ # texid = vob.paper.textures.ptextures["RGB2"][1].getTexId();
+ texid0 = vob.paper.textures.getNamed("RGB2", t0).getTexId()
+ texid1 = vob.paper.textures.getNamed("RGB2", t1).getTexId()
constcode = """
ActiveTexture TEXTURE0
Index: libvob/vob/demo/paper/multipaper.py
diff -u libvob/vob/demo/paper/multipaper.py:1.1
libvob/vob/demo/paper/multipaper.py:1.2
--- libvob/vob/demo/paper/multipaper.py:1.1 Thu Apr 10 10:00:19 2003
+++ libvob/vob/demo/paper/multipaper.py Mon Apr 28 03:06:24 2003
@@ -21,7 +21,7 @@
#
from __future__ import nested_scopes
-from org.nongnu import libvob as vob
+import vob
from util import *
class Scene:
Index: libvob/vob/demo/paper/singlepaper.py
diff -u libvob/vob/demo/paper/singlepaper.py:1.1
libvob/vob/demo/paper/singlepaper.py:1.2
--- libvob/vob/demo/paper/singlepaper.py:1.1 Thu Apr 10 10:00:19 2003
+++ libvob/vob/demo/paper/singlepaper.py Mon Apr 28 03:06:24 2003
@@ -22,5 +22,5 @@
from __future__ import nested_scopes
from util import *
-from org.nongnu.libvob.putil.misc import *
+from vob.putil.misc import *
import re
Index: libvob/vob/demo/paper/util.py
diff -u libvob/vob/demo/paper/util.py:1.1 libvob/vob/demo/paper/util.py:1.2
--- libvob/vob/demo/paper/util.py:1.1 Thu Apr 10 10:00:19 2003
+++ libvob/vob/demo/paper/util.py Mon Apr 28 03:06:24 2003
@@ -22,17 +22,17 @@
from __future__ import nested_scopes
-import org.nongnu.libvob.paper.papermill
-import org.nongnu.libvob.paper.textures
-from org.nongnu.libvob.paper.papermill import ThePaperMill
+import vob.paper.papermill
+import vob.paper.textures
+from vob.paper.papermill import ThePaperMill
from types import ClassType
-from org.nongnu.libvob.putil import saveanim
+from vob.putil import saveanim
import java
-from org.nongnu.libvob.putil.misc import *
-from org.nongnu.libvob.putil import demowindow
+from vob.putil.misc import *
+from vob.putil import demowindow
def r(sc, filename):
vs = demowindow.w.createVobScene()
@@ -127,7 +127,7 @@
org.nongnu.libvob.paper.papermill.dbg = not
org.nongnu.libvob.paper.papermill.dbg
print "Papermilldbg ",org.nongnu.libvob.paper.papermill.dbg
-from org.nongnu.libvob.putil.demokeys import *
+from vob.putil.demokeys import *
keys = [
SlideLog("zoom", 900.0, "zoom factor", "<", ">"),
Action("Reload textures", "t", lambda *args: retexture()),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] libvob/vob/demo gl/glinfo.py paper/basis.py pap...,
Janne V. Kujala <=