diff --git a/.gitignore b/.gitignore index d6b5e33..fa84b0e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,7 @@ Thumbs.db # Temporary editor files *.swp .idea + + +# Temporary example files +examples/12-experimental/test.mp4 diff --git a/examples/01-basics/01-rect.py b/examples/01-basics/01-rect.py index ac70ffa..47ed788 100644 --- a/examples/01-basics/01-rect.py +++ b/examples/01-basics/01-rect.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - # Import the drawing commands from the NodeBox module. -from nodebox.graphics import * +from nodeboxgl.graphics import * # This includes: # - drawing primitives such as line(), rect(), ellipse(), triangle(), # - color commands such as fill(), stroke(), strokewidth(), @@ -33,4 +30,4 @@ def draw(canvas): rect(x=100, y=10, width=300, height=max(100, canvas.mouse.y)) canvas.size = 500, 500 # Set the size of the canvas. -canvas.run(draw) # Register the draw function and start the application. \ No newline at end of file +canvas.run(draw) # Register the draw function and start the application. diff --git a/examples/01-basics/02-color.py b/examples/01-basics/02-color.py index cb25d48..1ea15b6 100644 --- a/examples/01-basics/02-color.py +++ b/examples/01-basics/02-color.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # When you run a script, NodeBox reads the code from top to bottom, like a recipe. # When it encounters coloring or transformation commands, it changes the current state. @@ -57,4 +54,4 @@ def draw(canvas): text("%s,%s"%(x,y), x, y) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/01-basics/03-frame.py b/examples/01-basics/03-frame.py index 025d2dd..9296484 100644 --- a/examples/01-basics/03-frame.py +++ b/examples/01-basics/03-frame.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # Here is the "Hypnoval", a classic example in NodeBox for Mac OS X. # It uses the canvas.frame counter to create variation in each frame. @@ -38,4 +35,4 @@ def draw(canvas): canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/01-basics/04-mouse.py b/examples/01-basics/04-mouse.py index 851bc57..62ba10e 100644 --- a/examples/01-basics/04-mouse.py +++ b/examples/01-basics/04-mouse.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # A freehand drawing application! @@ -41,4 +38,4 @@ def draw(canvas): line(m.x, m.y, m.x - m.dx, m.y - m.dy) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/02-transform/01-spiral.py b/examples/02-transform/01-spiral.py index a72794b..69a460b 100644 --- a/examples/02-transform/01-spiral.py +++ b/examples/02-transform/01-spiral.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * def draw(canvas): @@ -50,4 +47,4 @@ def draw(canvas): # has a different effect than scaling / rotating first. canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/02-transform/02-push.py b/examples/02-transform/02-push.py index 38a070a..7a9d3db 100644 --- a/examples/02-transform/02-push.py +++ b/examples/02-transform/02-push.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # Often, you may need groups of shapes that you can transform as a whole. # For example: a planet that has moons rotating around it. @@ -39,4 +36,4 @@ def draw(canvas): pop() # Move the origin back to the sun. Undo rotation. canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/03-image/01-image.py b/examples/03-image/01-image.py index dfdecfd..4bef640 100644 --- a/examples/03-image/01-image.py +++ b/examples/03-image/01-image.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # The main purpose of NodeBox for OpenGL is drawing images to the canvas. # Typically, an image can be a JPEG or TIFF file, or a PNG if it uses transparency. @@ -29,4 +26,4 @@ def draw(canvas): image(img, x=-img.width/2, y=-img.height/2) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/03-image/02-color.py b/examples/03-image/02-color.py index 4a2f341..9692792 100644 --- a/examples/03-image/02-color.py +++ b/examples/03-image/02-color.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.geometry import smoothstep +from nodeboxgl.graphics import * +from nodeboxgl.graphics.geometry import smoothstep img = Image("creature.png") @@ -32,4 +29,4 @@ def draw(canvas): # or simply a (R,G,B)-tuple, which is faster because no Color needs to be constructed. canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/03-image/03-filter.py b/examples/03-image/03-filter.py index 8576a58..966235f 100644 --- a/examples/03-image/03-filter.py +++ b/examples/03-image/03-filter.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # This example will make more sense after you've seen the examples in /07-filter @@ -33,4 +30,4 @@ def draw(canvas): dy=canvas.mouse.relative_y)) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/03-image/04-quad.py b/examples/03-image/04-quad.py index 13a8609..09566b0 100644 --- a/examples/03-image/04-quad.py +++ b/examples/03-image/04-quad.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * img = Image("creature.png") diff --git a/examples/03-image/05-pixels.py b/examples/03-image/05-pixels.py index bb69a46..9b60e05 100644 --- a/examples/03-image/05-pixels.py +++ b/examples/03-image/05-pixels.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # The pixels() command yields a list of pixels from a given image. # Since this is a relatively slow operation, this is not useful for dynamic image processing, @@ -25,8 +22,8 @@ def draw(canvas): # Here we simply use pixels from the image as a color palette. for i in range(15): - x = random(p.width) - y = random(p.height) + x = int(random(p.width)) + y = int(random(p.height)) clr = p.get(x, y) clr.alpha *= 0.5 fill(clr) @@ -36,4 +33,4 @@ def draw(canvas): ellipse(random(canvas.width), random(canvas.height), r*2, r*2) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/03-image/06-noise.py b/examples/03-image/06-noise.py index 75dbd13..92daaa9 100644 --- a/examples/03-image/06-noise.py +++ b/examples/03-image/06-noise.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # Create a pixels array from a solid white image: p = Pixels(solid(200, 200, Color(1))) @@ -33,4 +30,4 @@ def draw(canvas): image(p, 150, 150) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/04-text/01-text.py b/examples/04-text/01-text.py index 906f91f..0add550 100644 --- a/examples/04-text/01-text.py +++ b/examples/04-text/01-text.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # In the classic NodeBox for Mac OS X, text can easily be drawn with text(), font(), fontsize(). # This is possible here as well, but it is much faster to prepare the text beforehand: @@ -28,4 +25,4 @@ def draw(canvas): text(txt, x, y) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/04-text/02-style.py b/examples/04-text/02-style.py index 38b5ce6..dfb8d69 100644 --- a/examples/04-text/02-style.py +++ b/examples/04-text/02-style.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * txt = Text("So long!\nThanks for all the fish.", font = "Droid Serif", @@ -23,4 +20,4 @@ def draw(canvas): text(txt, x, y) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/05-path/01-curve.py b/examples/05-path/01-curve.py index e356c4d..b33de1c 100644 --- a/examples/05-path/01-curve.py +++ b/examples/05-path/01-curve.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # The BezierPath object handles complex vector shapes made up of curves and lines. # As with images and text, it is a good idea to create the path once, outside the draw loop. @@ -45,4 +42,4 @@ def draw(canvas): drawpath(leaf) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/05-path/02-clip.py b/examples/05-path/02-clip.py index ecf67b4..40a5c44 100644 --- a/examples/05-path/02-clip.py +++ b/examples/05-path/02-clip.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # Here, the leaf shape from the previous example is reused, # but instead of simply coloring it with blue, we give it a nice gradient touch. @@ -38,4 +35,4 @@ def draw(canvas): drawpath(leaf, stroke=(0,0,0,0.25), strokewidth=1, fill=None) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/05-path/03-tangent.py b/examples/05-path/03-tangent.py index 929edb7..e7c52d7 100644 --- a/examples/05-path/03-tangent.py +++ b/examples/05-path/03-tangent.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # The classic NodeBox for Mac OS X has interesting path mathematics functionality. # This functionality is also present in NodeBox for OpenGL. diff --git a/examples/05-path/04-text.py b/examples/05-path/04-text.py index ed5d93f..423641c 100644 --- a/examples/05-path/04-text.py +++ b/examples/05-path/04-text.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # The classic NodeBox for Mac OS X has an interesting textpath() function # that transforms a string into a BezierPath. diff --git a/examples/05-path/05-spider.py b/examples/05-path/05-spider.py index a1d7f35..f64590e 100644 --- a/examples/05-path/05-spider.py +++ b/examples/05-path/05-spider.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.geometry import distance +from nodeboxgl.graphics import * +from nodeboxgl.graphics.geometry import distance from math import sqrt def spider(string, x=0, y=0, radius=25, **kwargs): @@ -53,4 +50,4 @@ def draw(canvas): image(img) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/05-path/06-handle.py b/examples/05-path/06-handle.py index 1d4293e..6c8ac91 100644 --- a/examples/05-path/06-handle.py +++ b/examples/05-path/06-handle.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # I always seem to forget how Bezier handles work. # This example clarifies which handles control what part of a curve. @@ -57,4 +54,4 @@ def draw(canvas): text("ptx.ctrtl2", x=pt.ctrl2.x, y=pt.ctrl2.y+5) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/05-path/07-fit.py b/examples/05-path/07-fit.py index b666879..467fe41 100644 --- a/examples/05-path/07-fit.py +++ b/examples/05-path/07-fit.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0,os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # This example demonstrated how to fit text to a path using the directed() command # (thanks to Karsten Wolf). diff --git a/examples/05-path/08-drag.py b/examples/05-path/08-drag.py index c1be0b2..de0933c 100644 --- a/examples/05-path/08-drag.py +++ b/examples/05-path/08-drag.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys;sys.path.insert(0,os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # A classic NodeBox example (http://nodebox.net/code/index.php/Dendrite). # It registers the dragged mouse movements, diff --git a/examples/06-math/01-attractor.py b/examples/06-math/01-attractor.py index 4252b53..d22ef2f 100644 --- a/examples/06-math/01-attractor.py +++ b/examples/06-math/01-attractor.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * from math import sin, cos # The Peter De Jong attractor feeds its previous value back into the equation, @@ -51,4 +48,4 @@ def draw(canvas): pass canvas.size = 700, 700 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/07-filter/01-shadow.py b/examples/07-filter/01-shadow.py index 657d17d..08c2f3b 100644 --- a/examples/07-filter/01-shadow.py +++ b/examples/07-filter/01-shadow.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # Load an image from file. # For performance, it's a good idea to create images once, outside the draw() loop. @@ -37,4 +34,4 @@ def draw(canvas): # Start the application: canvas.fps = 60 canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/07-filter/02-bump.py b/examples/07-filter/02-bump.py index dd8b769..7bd52b3 100644 --- a/examples/07-filter/02-bump.py +++ b/examples/07-filter/02-bump.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * img = Image("creature.png") @@ -28,4 +25,4 @@ def draw(canvas): # Start the application: canvas.fps = 60 canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/07-filter/03-mirror.py b/examples/07-filter/03-mirror.py index c5d63bf..5d162d9 100644 --- a/examples/07-filter/03-mirror.py +++ b/examples/07-filter/03-mirror.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * img = Image("dendrite.png") @@ -30,4 +27,4 @@ def draw(canvas): # Open a window that is as big as the image. canvas.fps = 60 canvas.size = img.width, img.height -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/07-filter/04-twirl.py b/examples/07-filter/04-twirl.py index 340742f..bad481c 100644 --- a/examples/07-filter/04-twirl.py +++ b/examples/07-filter/04-twirl.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * img = Image("creature.png") @@ -28,4 +25,4 @@ def draw(canvas): # Start the application: canvas.fps = 60 canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/07-filter/05-render.py b/examples/07-filter/05-render.py index 1d9173d..395e760 100644 --- a/examples/07-filter/05-render.py +++ b/examples/07-filter/05-render.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # The render() command executes a function with drawing commands # in an offscreen (i.e. hidden) canvas and returns an Image object. diff --git a/examples/07-filter/06-mask.py b/examples/07-filter/06-mask.py index ea22c93..a51e728 100644 --- a/examples/07-filter/06-mask.py +++ b/examples/07-filter/06-mask.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # Render a radial gradient image. # Without additional parameters, the gradient will be grayscale. @@ -38,4 +35,4 @@ def draw(canvas): # Start the application: canvas.fps = 5 # Slow framerate so we can observe what is happening. canvas.size = 500, 500 # This is a bad idea since keyboard events -canvas.run(draw) # are now logged very slowly. \ No newline at end of file +canvas.run(draw) # are now logged very slowly. diff --git a/examples/07-filter/07-blend.py b/examples/07-filter/07-blend.py index 27d81b6..1385644 100644 --- a/examples/07-filter/07-blend.py +++ b/examples/07-filter/07-blend.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # Blend modes are used to combine the pixels of two images, # in different ways than standard transparency. @@ -36,4 +33,4 @@ def draw(canvas): # Start the application: canvas.fps = 30 canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/07-filter/08-bloom.py b/examples/07-filter/08-bloom.py index 59f04f1..b48f1b9 100644 --- a/examples/07-filter/08-bloom.py +++ b/examples/07-filter/08-bloom.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * img = Image("dendrite.png") @@ -17,4 +14,4 @@ def draw(canvas): # Start the application: canvas.fps = 30 canvas.size = 700, 350 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/07-filter/09-buffer.py b/examples/07-filter/09-buffer.py index 7a047a5..45d6d5f 100644 --- a/examples/07-filter/09-buffer.py +++ b/examples/07-filter/09-buffer.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.geometry import coordinates +from nodeboxgl.graphics import * +from nodeboxgl.graphics.geometry import coordinates from time import time flower = Image("cell.png") @@ -144,4 +141,4 @@ def draw(canvas): canvas.fps = 20 canvas.size = 800, 600 canvas.fullscreen = True -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/08-physics/01-flock.py b/examples/08-physics/01-flock.py index 908df95..ceac470 100644 --- a/examples/08-physics/01-flock.py +++ b/examples/08-physics/01-flock.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.physics import Vector, Boid, Flock, Obstacle +from nodeboxgl.graphics import * +from nodeboxgl.graphics.physics import Vector, Boid, Flock, Obstacle # Flocking can be used to simulate birds, herds, or school of fish. # Each "boid" in the flock adheres to a simple set of rules: @@ -77,4 +74,4 @@ def draw(canvas): canvas.fps = 30 canvas.size = 600, 600 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/08-physics/02-spring.py b/examples/08-physics/02-spring.py index a7cc8ca..3fbe126 100644 --- a/examples/08-physics/02-spring.py +++ b/examples/08-physics/02-spring.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.physics import Particle, Spring, System +from nodeboxgl.graphics import * +from nodeboxgl.graphics.physics import Particle, Spring, System # A "particle system" is used to simulate effects such as explosions, smoke, water, ... # It consists of object with a mass (particles) that are subjected to forces @@ -74,4 +71,4 @@ def draw(canvas): dragged = p canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/08-physics/03-force.py b/examples/08-physics/03-force.py index 3bf1329..7fedb6b 100644 --- a/examples/08-physics/03-force.py +++ b/examples/08-physics/03-force.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.physics import Particle, Force, System +from nodeboxgl.graphics import * +from nodeboxgl.graphics.physics import Particle, Force, System # BANG! @@ -46,4 +43,4 @@ def draw(canvas): # Running physics in real-time takes a lot of processing power. # If you are using physics for game effects (e.g. explosions, spells), # it is a good idea to render them offscreen, store them as an Animation, -# and replay the animation when necessary. \ No newline at end of file +# and replay the animation when necessary. diff --git a/examples/08-physics/04-animation.py b/examples/08-physics/04-animation.py index bc82ccc..26edcb1 100644 --- a/examples/08-physics/04-animation.py +++ b/examples/08-physics/04-animation.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.physics import Particle, Force, System +from nodeboxgl.graphics import * +from nodeboxgl.graphics.physics import Particle, Force, System # This example demonstrates the Animation object, # which can be used to store and replay a sequence of image frames. diff --git a/examples/08-physics/05-emitter.py b/examples/08-physics/05-emitter.py index 5905166..29c6a83 100644 --- a/examples/08-physics/05-emitter.py +++ b/examples/08-physics/05-emitter.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.physics import System, Emitter, Particle, MASS +from nodeboxgl.graphics import * +from nodeboxgl.graphics.physics import System, Emitter, Particle, MASS # 1) An emitter will be firing particles with a constant velocity. # 2) Drag in the system slows down the particles. @@ -50,4 +47,4 @@ def draw(canvas): obstacle.y = canvas.mouse.y canvas.size = 400, 700 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/08-physics/06-pack.py b/examples/08-physics/06-pack.py index 14e5b40..a576a12 100644 --- a/examples/08-physics/06-pack.py +++ b/examples/08-physics/06-pack.py @@ -1,8 +1,6 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.geometry import distance, angle, smoothstep +import os +from nodeboxgl.graphics import * +from nodeboxgl.graphics.geometry import distance, angle, smoothstep # Circle-packing algorithm. # This script was used to produce one of the panels in NANOPHYSICAL: @@ -138,4 +136,4 @@ def draw(canvas): pack(circles, 300, 300, exclude=[dragged]) canvas.size = 600, 600 -canvas.run(draw, setup) \ No newline at end of file +canvas.run(draw, setup) diff --git a/examples/08-physics/07-graph.py b/examples/08-physics/07-graph.py index 73c8592..11440c4 100644 --- a/examples/08-physics/07-graph.py +++ b/examples/08-physics/07-graph.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.physics import Node, Edge, Graph +from nodeboxgl.graphics import * +from nodeboxgl.graphics.physics import Node, Edge, Graph # Create a graph with randomly connected nodes. # Nodes and edges can be styled with fill, stroke, strokewidth parameters. diff --git a/examples/09-layer/01-drag.py b/examples/09-layer/01-drag.py index abd9a05..a2ab1ef 100644 --- a/examples/09-layer/01-drag.py +++ b/examples/09-layer/01-drag.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # In the previous examples, drawing occurs directly to the canvas. # It is also possible to draw into different layers, @@ -88,4 +85,4 @@ def draw(canvas): canvas.run(draw) # Note: if you have layers that do not need to receive events, -# set Layer.enabled = False; this saves some time doing expensive matrix operations. \ No newline at end of file +# set Layer.enabled = False; this saves some time doing expensive matrix operations. diff --git a/examples/09-layer/02-polygon.py b/examples/09-layer/02-polygon.py index 267ff6a..7738870 100644 --- a/examples/09-layer/02-polygon.py +++ b/examples/09-layer/02-polygon.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # Since a layer is a rectangular area, all mouse events are also triggered in a rectangle. # This can be a bit clumsy in some situations. diff --git a/examples/09-layer/03-tween.py b/examples/09-layer/03-tween.py index eeaa2e8..53d5f9d 100644 --- a/examples/09-layer/03-tween.py +++ b/examples/09-layer/03-tween.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # This example demonstrates motion tweening and prototype-based inheritance on layers. diff --git a/examples/10-gui/01-slider.py b/examples/10-gui/01-slider.py index 336d029..bb562ce 100644 --- a/examples/10-gui/01-slider.py +++ b/examples/10-gui/01-slider.py @@ -1,9 +1,6 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.graphics.geometry import coordinates -from nodebox.gui import Slider +from nodeboxgl.graphics import * +from nodeboxgl.graphics.geometry import coordinates +from nodeboxgl.gui import Slider # The nodebox.gui module provides simple visual controls, such as Slider, Button, CheckBox and Field. # Each control inherits from a Control class, which in turn inherits from Layer. @@ -74,4 +71,4 @@ def draw(canvas): snake.draw() canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/10-gui/02-panel.py b/examples/10-gui/02-panel.py index 271d5de..151587f 100644 --- a/examples/10-gui/02-panel.py +++ b/examples/10-gui/02-panel.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.gui import * +from nodeboxgl.graphics import * +from nodeboxgl.gui import * # A panel is a container for other GUI controls. # Controls can be added to the panel, diff --git a/examples/10-gui/03-button.py b/examples/10-gui/03-button.py index e37be63..045eee3 100644 --- a/examples/10-gui/03-button.py +++ b/examples/10-gui/03-button.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.gui import * +from nodeboxgl.graphics import * +from nodeboxgl.gui import * # This is the same example as the previous, but with a button added to the panel. # All controls have a Control.on_action() event that fires when the user @@ -40,4 +37,4 @@ def draw(canvas): text(panel.field_text.value, 50, 250) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/10-gui/04-knob.py b/examples/10-gui/04-knob.py index e34df15..6276be0 100644 --- a/examples/10-gui/04-knob.py +++ b/examples/10-gui/04-knob.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.gui import * +from nodeboxgl.graphics import * +from nodeboxgl.gui import * # This example demonstrates the knob GUI control, # and how different layout managers can be nested. @@ -36,4 +33,4 @@ def draw(canvas): text(panel.field_text.value, 20, 200) canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/10-gui/05-layout.py b/examples/10-gui/05-layout.py index 0f84ad9..58ac9ce 100644 --- a/examples/10-gui/05-layout.py +++ b/examples/10-gui/05-layout.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.gui import * +from nodeboxgl.graphics import * +from nodeboxgl.gui import * # Comparison between Rows and Row containers. # Both are subclasses of Layout. @@ -88,4 +85,4 @@ def draw(canvas): canvas.append(panel4) canvas.append(panel5) canvas.size = 800, 600 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/11-sound/01-fft.py b/examples/11-sound/01-fft.py index 05e9996..a24fe57 100644 --- a/examples/11-sound/01-fft.py +++ b/examples/11-sound/01-fft.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.sound import PD, LOCALHOST +from nodeboxgl.graphics import * +from nodeboxgl.sound import PD, LOCALHOST # PureData is a free, real-time graphical programming environment for audio processing. # You can connect building blocks to manipulate audio input, or generate audio output. diff --git a/examples/11-sound/02-in-out.py b/examples/11-sound/02-in-out.py index 730c597..32eaeda 100644 --- a/examples/11-sound/02-in-out.py +++ b/examples/11-sound/02-in-out.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.sound import PD, LOCALHOST, IN, OUT +from nodeboxgl.graphics import * +from nodeboxgl.sound import PD, LOCALHOST, IN, OUT # This script demonstrates how to simultaneously receive from and send to Pd. # We need two communication ports. By default, NodeBox receives on port 44000 (IN), diff --git a/examples/11-sound/03-sequencer.py b/examples/11-sound/03-sequencer.py index 67d52e6..19bab13 100644 --- a/examples/11-sound/03-sequencer.py +++ b/examples/11-sound/03-sequencer.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.sound import PD +from nodeboxgl.graphics import * +from nodeboxgl.sound import PD from math import sin, pow # An evolutionary melody. diff --git a/examples/11-sound/04-audiosnails.py b/examples/11-sound/04-audiosnails.py index b898a38..f4ed426 100644 --- a/examples/11-sound/04-audiosnails.py +++ b/examples/11-sound/04-audiosnails.py @@ -1,8 +1,5 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * -from nodebox.sound import PD +from nodeboxgl.graphics import * +from nodeboxgl.sound import PD from math import sqrt # SCREECHING AUDIO SNAILS! @@ -118,4 +115,4 @@ def stop(canvas): canvas.fps = 30 canvas.size = 600, 400 -canvas.run(draw, stop=stop) \ No newline at end of file +canvas.run(draw, stop=stop) diff --git a/examples/12-experimental/01-isight.py b/examples/12-experimental/01-isight.py index 79cdad8..ea6ef47 100644 --- a/examples/12-experimental/01-isight.py +++ b/examples/12-experimental/01-isight.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..","..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * # On Mac OS X, you can access the built-in iSight camera with PySight + CocoaSequenceGrabber: # http://livingcode.blogspot.com/2005/10/pysight-preview.html (Tim Omernick, Dethe Elza) diff --git a/examples/12-experimental/02-blend.py b/examples/12-experimental/02-blend.py index 224997c..7c4ba72 100644 --- a/examples/12-experimental/02-blend.py +++ b/examples/12-experimental/02-blend.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..", "..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * from pyglet.gl import * from random import seed diff --git a/examples/12-experimental/03-movie.py b/examples/12-experimental/03-movie.py index 9d4cfbd..c9987b7 100644 --- a/examples/12-experimental/03-movie.py +++ b/examples/12-experimental/03-movie.py @@ -1,6 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..", "..")) - +import os import tempfile import subprocess import shutil @@ -60,7 +58,7 @@ def __del__(self): except: pass -from nodebox.graphics import * +from nodeboxgl.graphics import * movie = Movie(canvas) diff --git a/examples/12-experimental/04-live1.py b/examples/12-experimental/04-live1.py index ed68dc3..b8ae453 100644 --- a/examples/12-experimental/04-live1.py +++ b/examples/12-experimental/04-live1.py @@ -1,8 +1,7 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..", "..")) +import os import warnings -from nodebox.graphics import * +from nodeboxgl.graphics import * # Live coding example. # The actual drawing code is in 04-live2.py. @@ -27,4 +26,4 @@ def draw(canvas): canvas.size = 500, 500 canvas.fps = 30 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/template.py b/examples/template.py index 8a81ed2..668ed97 100644 --- a/examples/template.py +++ b/examples/template.py @@ -1,10 +1,7 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * def draw(canvas): canvas.clear() canvas.size = 500, 500 -canvas.run(draw) \ No newline at end of file +canvas.run(draw) diff --git a/examples/test.py b/examples/test.py index c6a0fbb..dd94626 100644 --- a/examples/test.py +++ b/examples/test.py @@ -1,7 +1,4 @@ -# Add the upper directory (where the nodebox module is) to the search path. -import os, sys; sys.path.insert(0, os.path.join("..")) - -from nodebox.graphics import * +from nodeboxgl.graphics import * def draw(canvas): background(1) diff --git a/nodebox/ext/setup.py b/nodebox/ext/setup.py deleted file mode 100644 index 6e3f7d5..0000000 --- a/nodebox/ext/setup.py +++ /dev/null @@ -1,13 +0,0 @@ -from distutils.core import setup, Extension - -bezier = Extension("bezier", sources=["bezier.c"]) -geometry = Extension("geometry", sources=["geometry.c"]) -noise = Extension("noise", sources=["noise.c"]) - -setup( - name = "extensions", - version = "1.0", - author = "Tom De Smedt, Frederik De Bleser", - description = "Fast C Bezier, geometry and noise math.", - ext_modules = [bezier, geometry, noise] -) \ No newline at end of file diff --git a/nodebox/__init__.py b/nodeboxgl/__init__.py similarity index 100% rename from nodebox/__init__.py rename to nodeboxgl/__init__.py diff --git a/nodebox/ext/__init__.py b/nodeboxgl/ext/__init__.py similarity index 100% rename from nodebox/ext/__init__.py rename to nodeboxgl/ext/__init__.py diff --git a/nodebox/ext/bezier.c b/nodeboxgl/ext/nglbezier.c similarity index 90% rename from nodebox/ext/bezier.c rename to nodeboxgl/ext/nglbezier.c index 48f6e4b..ce22a8b 100644 --- a/nodebox/ext/bezier.c +++ b/nodeboxgl/ext/nglbezier.c @@ -143,18 +143,18 @@ curvelength(PyObject *self, PyObject *args) { static PyObject *BezierMathError; static PyMethodDef bezier_methods[] = { - { "linepoint", linepoint, METH_VARARGS }, - { "linelength", linelength, METH_VARARGS }, - { "curvepoint", curvepoint, METH_VARARGS }, - { "curvelength", curvelength, METH_VARARGS }, - { NULL, NULL } + { "linepoint", linepoint, METH_VARARGS, "linepoint(t, x0, y0, x1, y1)." }, + { "linelength", linelength, METH_VARARGS, "linelength(x0, y0, x1, y1)." }, + { "curvepoint", curvepoint, METH_VARARGS, "curvepoint(t, x0, y0, x1, y1, x2, y2, x3, y3, handles)." }, + { "curvelength", curvelength, METH_VARARGS, "curvelength(x0, y0, x1, y1, x2, y2, x3, y3, n)" }, + { NULL, NULL, 0, NULL } }; PyMODINIT_FUNC -initbezier(void) { +initnglbezier(void) { PyObject *m; - m = Py_InitModule("bezier", bezier_methods); - BezierMathError = PyErr_NewException("bezier.error", NULL, NULL); + m = Py_InitModule("nglbezier", bezier_methods); + BezierMathError = PyErr_NewException("nglbezier.error", NULL, NULL); Py_INCREF(BezierMathError); PyModule_AddObject(m, "error", BezierMathError); } @@ -162,6 +162,6 @@ initbezier(void) { int main(int argc, char *argv[]) { Py_SetProgramName(argv[0]); Py_Initialize(); - initbezier(); + initnglbezier(); return 0; } \ No newline at end of file diff --git a/nodebox/ext/geometry.c b/nodeboxgl/ext/nglgeometry.c similarity index 87% rename from nodebox/ext/geometry.c rename to nodeboxgl/ext/nglgeometry.c index 97154fb..03e72f2 100644 --- a/nodebox/ext/geometry.c +++ b/nodeboxgl/ext/nglgeometry.c @@ -167,25 +167,24 @@ mmult(PyObject *self, PyObject *args) { // ------------------------------------------------------------------------------ static PyMethodDef geometry_methods[]={ - { "fast_inverse_sqrt", fast_inverse_sqrt, METH_VARARGS }, - { "angle", angle, METH_VARARGS }, - { "distance", distance, METH_VARARGS }, - { "coordinates", coordinates, METH_VARARGS }, - { "rotate", rotate, METH_VARARGS }, - { "smoothstep", smoothstep, METH_VARARGS }, - { "superformula", superformula, METH_VARARGS }, - { "mmult", mmult, METH_VARARGS }, - { NULL, NULL } + { "fast_inverse_sqrt", fast_inverse_sqrt, METH_VARARGS, "Fast inverse square root." }, + { "angle", angle, METH_VARARGS, "angle(x1,y1,x2,y2)." }, + { "distance", distance, METH_VARARGS, "distance(x1,y1,x2,y2)." }, + { "coordinates", coordinates, METH_VARARGS, "coordinates(x0, y0, d, a, x1, y1)." }, + { "rotate", rotate, METH_VARARGS, "rotate( x, y, x0, y0, a, x1, y1)." }, + { "smoothstep", smoothstep, METH_VARARGS, "smoothstep(a, b, x, t)." }, + { "superformula", superformula, METH_VARARGS, "superformula(m, n1, n2, n3, phi)." }, + { "mmult", mmult, METH_VARARGS, "mmult(a0, a1, a2, a3, a4, a5, a6, a7, a8, b0, b1, b2, b3, b4, b5, b6, b7, b8)." }, + { NULL, NULL, 0, NULL } }; -PyMODINIT_FUNC initgeometry(void){ - PyObject *m; - m = Py_InitModule("geometry", geometry_methods); +PyMODINIT_FUNC initnglgeometry(void){ + Py_InitModule("nglgeometry", geometry_methods); } int main(int argc, char *argv[]) { Py_SetProgramName(argv[0]); Py_Initialize(); - initgeometry(); + initnglgeometry(); return 0; } \ No newline at end of file diff --git a/nodebox/ext/noise.c b/nodeboxgl/ext/nglnoise.c similarity index 91% rename from nodebox/ext/noise.c rename to nodeboxgl/ext/nglnoise.c index e5a4423..18939b8 100644 --- a/nodebox/ext/noise.c +++ b/nodeboxgl/ext/nglnoise.c @@ -69,20 +69,20 @@ init(PyObject *self, PyObject *args) { } static PyMethodDef methods[]={ - { "generate", generate, METH_VARARGS }, - { "init", init, METH_VARARGS }, - { NULL, NULL } + { "generate", generate, METH_VARARGS, "generate(x, y, z)." }, + { "init", init, METH_VARARGS, "init(a)." }, + { NULL, NULL, 0, NULL } }; -PyMODINIT_FUNC initnoise(void) { +PyMODINIT_FUNC initnglnoise(void) { PyObject *m; - m = Py_InitModule("noise", methods); + m = Py_InitModule("nglnoise", methods); } int main(int argc, char *argv[]) { Py_SetProgramName(argv[0]); Py_Initialize(); - initnoise(); + initnglnoise(); return 0; } diff --git a/nodebox/ext/psyco/__init__.py b/nodeboxgl/ext/psyco/__init__.py similarity index 100% rename from nodebox/ext/psyco/__init__.py rename to nodeboxgl/ext/psyco/__init__.py diff --git a/nodebox/ext/psyco/classes.py b/nodeboxgl/ext/psyco/classes.py similarity index 100% rename from nodebox/ext/psyco/classes.py rename to nodeboxgl/ext/psyco/classes.py diff --git a/nodebox/ext/psyco/core.py b/nodeboxgl/ext/psyco/core.py similarity index 100% rename from nodebox/ext/psyco/core.py rename to nodeboxgl/ext/psyco/core.py diff --git a/nodebox/ext/psyco/kdictproxy.py b/nodeboxgl/ext/psyco/kdictproxy.py similarity index 100% rename from nodebox/ext/psyco/kdictproxy.py rename to nodeboxgl/ext/psyco/kdictproxy.py diff --git a/nodebox/ext/psyco/logger.py b/nodeboxgl/ext/psyco/logger.py similarity index 100% rename from nodebox/ext/psyco/logger.py rename to nodeboxgl/ext/psyco/logger.py diff --git a/nodebox/ext/psyco/profiler.py b/nodeboxgl/ext/psyco/profiler.py similarity index 100% rename from nodebox/ext/psyco/profiler.py rename to nodeboxgl/ext/psyco/profiler.py diff --git a/nodebox/ext/psyco/src/COPYING.txt b/nodeboxgl/ext/psyco/src/COPYING.txt similarity index 100% rename from nodebox/ext/psyco/src/COPYING.txt rename to nodeboxgl/ext/psyco/src/COPYING.txt diff --git a/nodebox/ext/psyco/src/MANIFEST b/nodeboxgl/ext/psyco/src/MANIFEST similarity index 100% rename from nodebox/ext/psyco/src/MANIFEST rename to nodeboxgl/ext/psyco/src/MANIFEST diff --git a/nodebox/ext/psyco/src/README.txt b/nodeboxgl/ext/psyco/src/README.txt similarity index 100% rename from nodebox/ext/psyco/src/README.txt rename to nodeboxgl/ext/psyco/src/README.txt diff --git a/nodebox/ext/psyco/src/c/Makefile b/nodeboxgl/ext/psyco/src/c/Makefile similarity index 100% rename from nodebox/ext/psyco/src/c/Makefile rename to nodeboxgl/ext/psyco/src/c/Makefile diff --git a/nodebox/ext/psyco/src/c/Modules/parray.c b/nodeboxgl/ext/psyco/src/c/Modules/parray.c similarity index 100% rename from nodebox/ext/psyco/src/c/Modules/parray.c rename to nodeboxgl/ext/psyco/src/c/Modules/parray.c diff --git a/nodebox/ext/psyco/src/c/Modules/pmath.c b/nodeboxgl/ext/psyco/src/c/Modules/pmath.c similarity index 100% rename from nodebox/ext/psyco/src/c/Modules/pmath.c rename to nodeboxgl/ext/psyco/src/c/Modules/pmath.c diff --git a/nodebox/ext/psyco/src/c/Modules/ppsyco.c b/nodeboxgl/ext/psyco/src/c/Modules/ppsyco.c similarity index 100% rename from nodebox/ext/psyco/src/c/Modules/ppsyco.c rename to nodeboxgl/ext/psyco/src/c/Modules/ppsyco.c diff --git a/nodebox/ext/psyco/src/c/Objects/compactobject.c b/nodeboxgl/ext/psyco/src/c/Objects/compactobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/compactobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/compactobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/compactobject.h b/nodeboxgl/ext/psyco/src/c/Objects/compactobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/compactobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/compactobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pabstract.c b/nodeboxgl/ext/psyco/src/c/Objects/pabstract.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pabstract.c rename to nodeboxgl/ext/psyco/src/c/Objects/pabstract.c diff --git a/nodebox/ext/psyco/src/c/Objects/pabstract.h b/nodeboxgl/ext/psyco/src/c/Objects/pabstract.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pabstract.h rename to nodeboxgl/ext/psyco/src/c/Objects/pabstract.h diff --git a/nodebox/ext/psyco/src/c/Objects/pboolobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pboolobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pboolobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pboolobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pboolobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pboolobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pboolobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pboolobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pclassobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pclassobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pclassobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pclassobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pclassobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pclassobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pclassobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pclassobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pcompactobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pcompactobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pcompactobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pcompactobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pcompactobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pcompactobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pcompactobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pcompactobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pdescrobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pdescrobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pdescrobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pdescrobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pdescrobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pdescrobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pdescrobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pdescrobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pdictobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pdictobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pdictobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pdictobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pdictobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pdictobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pdictobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pdictobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pfloatobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pfloatobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pfloatobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pfloatobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pfloatobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pfloatobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pfloatobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pfloatobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pfuncobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pfuncobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pfuncobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pfuncobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pfuncobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pfuncobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pfuncobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pfuncobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pintobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pintobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pintobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pintobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pintobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pintobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pintobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pintobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/piterobject.c b/nodeboxgl/ext/psyco/src/c/Objects/piterobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/piterobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/piterobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/piterobject.h b/nodeboxgl/ext/psyco/src/c/Objects/piterobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/piterobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/piterobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/plistobject.c b/nodeboxgl/ext/psyco/src/c/Objects/plistobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/plistobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/plistobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/plistobject.h b/nodeboxgl/ext/psyco/src/c/Objects/plistobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/plistobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/plistobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/plongobject.c b/nodeboxgl/ext/psyco/src/c/Objects/plongobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/plongobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/plongobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/plongobject.h b/nodeboxgl/ext/psyco/src/c/Objects/plongobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/plongobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/plongobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pmethodobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pmethodobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pmethodobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pmethodobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pmethodobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pmethodobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pmethodobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pmethodobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/prangeobject.c b/nodeboxgl/ext/psyco/src/c/Objects/prangeobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/prangeobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/prangeobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/prangeobject.h b/nodeboxgl/ext/psyco/src/c/Objects/prangeobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/prangeobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/prangeobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pstringobject.c b/nodeboxgl/ext/psyco/src/c/Objects/pstringobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pstringobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/pstringobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/pstringobject.h b/nodeboxgl/ext/psyco/src/c/Objects/pstringobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pstringobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/pstringobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/pstructmember.c b/nodeboxgl/ext/psyco/src/c/Objects/pstructmember.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pstructmember.c rename to nodeboxgl/ext/psyco/src/c/Objects/pstructmember.c diff --git a/nodebox/ext/psyco/src/c/Objects/pstructmember.h b/nodeboxgl/ext/psyco/src/c/Objects/pstructmember.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/pstructmember.h rename to nodeboxgl/ext/psyco/src/c/Objects/pstructmember.h diff --git a/nodebox/ext/psyco/src/c/Objects/ptupleobject.c b/nodeboxgl/ext/psyco/src/c/Objects/ptupleobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/ptupleobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/ptupleobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/ptupleobject.h b/nodeboxgl/ext/psyco/src/c/Objects/ptupleobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/ptupleobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/ptupleobject.h diff --git a/nodebox/ext/psyco/src/c/Objects/ptypeobject.c b/nodeboxgl/ext/psyco/src/c/Objects/ptypeobject.c similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/ptypeobject.c rename to nodeboxgl/ext/psyco/src/c/Objects/ptypeobject.c diff --git a/nodebox/ext/psyco/src/c/Objects/ptypeobject.h b/nodeboxgl/ext/psyco/src/c/Objects/ptypeobject.h similarity index 100% rename from nodebox/ext/psyco/src/c/Objects/ptypeobject.h rename to nodeboxgl/ext/psyco/src/c/Objects/ptypeobject.h diff --git a/nodebox/ext/psyco/src/c/Python/frames.c b/nodeboxgl/ext/psyco/src/c/Python/frames.c similarity index 100% rename from nodebox/ext/psyco/src/c/Python/frames.c rename to nodeboxgl/ext/psyco/src/c/Python/frames.c diff --git a/nodebox/ext/psyco/src/c/Python/frames.h b/nodeboxgl/ext/psyco/src/c/Python/frames.h similarity index 100% rename from nodebox/ext/psyco/src/c/Python/frames.h rename to nodeboxgl/ext/psyco/src/c/Python/frames.h diff --git a/nodebox/ext/psyco/src/c/Python/pbltinmodule.c b/nodeboxgl/ext/psyco/src/c/Python/pbltinmodule.c similarity index 100% rename from nodebox/ext/psyco/src/c/Python/pbltinmodule.c rename to nodeboxgl/ext/psyco/src/c/Python/pbltinmodule.c diff --git a/nodebox/ext/psyco/src/c/Python/pbltinmodule.h b/nodeboxgl/ext/psyco/src/c/Python/pbltinmodule.h similarity index 100% rename from nodebox/ext/psyco/src/c/Python/pbltinmodule.h rename to nodeboxgl/ext/psyco/src/c/Python/pbltinmodule.h diff --git a/nodebox/ext/psyco/src/c/Python/pycheader.h b/nodeboxgl/ext/psyco/src/c/Python/pycheader.h similarity index 100% rename from nodebox/ext/psyco/src/c/Python/pycheader.h rename to nodeboxgl/ext/psyco/src/c/Python/pycheader.h diff --git a/nodebox/ext/psyco/src/c/Python/pycinternal.h b/nodeboxgl/ext/psyco/src/c/Python/pycinternal.h similarity index 100% rename from nodebox/ext/psyco/src/c/Python/pycinternal.h rename to nodeboxgl/ext/psyco/src/c/Python/pycinternal.h diff --git a/nodebox/ext/psyco/src/c/Python/pycompiler.c b/nodeboxgl/ext/psyco/src/c/Python/pycompiler.c similarity index 100% rename from nodebox/ext/psyco/src/c/Python/pycompiler.c rename to nodeboxgl/ext/psyco/src/c/Python/pycompiler.c diff --git a/nodebox/ext/psyco/src/c/Python/pycompiler.h b/nodeboxgl/ext/psyco/src/c/Python/pycompiler.h similarity index 100% rename from nodebox/ext/psyco/src/c/Python/pycompiler.h rename to nodeboxgl/ext/psyco/src/c/Python/pycompiler.h diff --git a/nodebox/ext/psyco/src/c/Python/pyver.h b/nodeboxgl/ext/psyco/src/c/Python/pyver.h similarity index 100% rename from nodebox/ext/psyco/src/c/Python/pyver.h rename to nodeboxgl/ext/psyco/src/c/Python/pyver.h diff --git a/nodebox/ext/psyco/src/c/alarm.c b/nodeboxgl/ext/psyco/src/c/alarm.c similarity index 100% rename from nodebox/ext/psyco/src/c/alarm.c rename to nodeboxgl/ext/psyco/src/c/alarm.c diff --git a/nodebox/ext/psyco/src/c/alarm.h b/nodeboxgl/ext/psyco/src/c/alarm.h similarity index 100% rename from nodebox/ext/psyco/src/c/alarm.h rename to nodeboxgl/ext/psyco/src/c/alarm.h diff --git a/nodebox/ext/psyco/src/c/blockalloc.h b/nodeboxgl/ext/psyco/src/c/blockalloc.h similarity index 100% rename from nodebox/ext/psyco/src/c/blockalloc.h rename to nodeboxgl/ext/psyco/src/c/blockalloc.h diff --git a/nodebox/ext/psyco/src/c/codegen.c b/nodeboxgl/ext/psyco/src/c/codegen.c similarity index 100% rename from nodebox/ext/psyco/src/c/codegen.c rename to nodeboxgl/ext/psyco/src/c/codegen.c diff --git a/nodebox/ext/psyco/src/c/codegen.h b/nodeboxgl/ext/psyco/src/c/codegen.h similarity index 100% rename from nodebox/ext/psyco/src/c/codegen.h rename to nodeboxgl/ext/psyco/src/c/codegen.h diff --git a/nodebox/ext/psyco/src/c/codemanager.c b/nodeboxgl/ext/psyco/src/c/codemanager.c similarity index 100% rename from nodebox/ext/psyco/src/c/codemanager.c rename to nodeboxgl/ext/psyco/src/c/codemanager.c diff --git a/nodebox/ext/psyco/src/c/codemanager.h b/nodeboxgl/ext/psyco/src/c/codemanager.h similarity index 100% rename from nodebox/ext/psyco/src/c/codemanager.h rename to nodeboxgl/ext/psyco/src/c/codemanager.h diff --git a/nodebox/ext/psyco/src/c/cstruct.c b/nodeboxgl/ext/psyco/src/c/cstruct.c similarity index 100% rename from nodebox/ext/psyco/src/c/cstruct.c rename to nodeboxgl/ext/psyco/src/c/cstruct.c diff --git a/nodebox/ext/psyco/src/c/cstruct.h b/nodeboxgl/ext/psyco/src/c/cstruct.h similarity index 100% rename from nodebox/ext/psyco/src/c/cstruct.h rename to nodeboxgl/ext/psyco/src/c/cstruct.h diff --git a/nodebox/ext/psyco/src/c/depend.py b/nodeboxgl/ext/psyco/src/c/depend.py similarity index 100% rename from nodebox/ext/psyco/src/c/depend.py rename to nodeboxgl/ext/psyco/src/c/depend.py diff --git a/nodebox/ext/psyco/src/c/dispatcher.c b/nodeboxgl/ext/psyco/src/c/dispatcher.c similarity index 100% rename from nodebox/ext/psyco/src/c/dispatcher.c rename to nodeboxgl/ext/psyco/src/c/dispatcher.c diff --git a/nodebox/ext/psyco/src/c/dispatcher.h b/nodeboxgl/ext/psyco/src/c/dispatcher.h similarity index 100% rename from nodebox/ext/psyco/src/c/dispatcher.h rename to nodeboxgl/ext/psyco/src/c/dispatcher.h diff --git a/nodebox/ext/psyco/src/c/files.py b/nodeboxgl/ext/psyco/src/c/files.py similarity index 100% rename from nodebox/ext/psyco/src/c/files.py rename to nodeboxgl/ext/psyco/src/c/files.py diff --git a/nodebox/ext/psyco/src/c/i386/idispatcher.c b/nodeboxgl/ext/psyco/src/c/i386/idispatcher.c similarity index 100% rename from nodebox/ext/psyco/src/c/i386/idispatcher.c rename to nodeboxgl/ext/psyco/src/c/i386/idispatcher.c diff --git a/nodebox/ext/psyco/src/c/i386/idispatcher.h b/nodeboxgl/ext/psyco/src/c/i386/idispatcher.h similarity index 100% rename from nodebox/ext/psyco/src/c/i386/idispatcher.h rename to nodeboxgl/ext/psyco/src/c/i386/idispatcher.h diff --git a/nodebox/ext/psyco/src/c/i386/iencoding.c b/nodeboxgl/ext/psyco/src/c/i386/iencoding.c similarity index 100% rename from nodebox/ext/psyco/src/c/i386/iencoding.c rename to nodeboxgl/ext/psyco/src/c/i386/iencoding.c diff --git a/nodebox/ext/psyco/src/c/i386/iencoding.h b/nodeboxgl/ext/psyco/src/c/i386/iencoding.h similarity index 100% rename from nodebox/ext/psyco/src/c/i386/iencoding.h rename to nodeboxgl/ext/psyco/src/c/i386/iencoding.h diff --git a/nodebox/ext/psyco/src/c/i386/iinitialize.h b/nodeboxgl/ext/psyco/src/c/i386/iinitialize.h similarity index 100% rename from nodebox/ext/psyco/src/c/i386/iinitialize.h rename to nodeboxgl/ext/psyco/src/c/i386/iinitialize.h diff --git a/nodebox/ext/psyco/src/c/i386/iprocessor.c b/nodeboxgl/ext/psyco/src/c/i386/iprocessor.c similarity index 100% rename from nodebox/ext/psyco/src/c/i386/iprocessor.c rename to nodeboxgl/ext/psyco/src/c/i386/iprocessor.c diff --git a/nodebox/ext/psyco/src/c/i386/ipyencoding.c b/nodeboxgl/ext/psyco/src/c/i386/ipyencoding.c similarity index 100% rename from nodebox/ext/psyco/src/c/i386/ipyencoding.c rename to nodeboxgl/ext/psyco/src/c/i386/ipyencoding.c diff --git a/nodebox/ext/psyco/src/c/i386/ipyencoding.h b/nodeboxgl/ext/psyco/src/c/i386/ipyencoding.h similarity index 100% rename from nodebox/ext/psyco/src/c/i386/ipyencoding.h rename to nodeboxgl/ext/psyco/src/c/i386/ipyencoding.h diff --git a/nodebox/ext/psyco/src/c/initialize.h b/nodeboxgl/ext/psyco/src/c/initialize.h similarity index 100% rename from nodebox/ext/psyco/src/c/initialize.h rename to nodeboxgl/ext/psyco/src/c/initialize.h diff --git a/nodebox/ext/psyco/src/c/ivm/idispatcher.c b/nodeboxgl/ext/psyco/src/c/ivm/idispatcher.c similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/idispatcher.c rename to nodeboxgl/ext/psyco/src/c/ivm/idispatcher.c diff --git a/nodebox/ext/psyco/src/c/ivm/idispatcher.h b/nodeboxgl/ext/psyco/src/c/ivm/idispatcher.h similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/idispatcher.h rename to nodeboxgl/ext/psyco/src/c/ivm/idispatcher.h diff --git a/nodebox/ext/psyco/src/c/ivm/iencoding.c b/nodeboxgl/ext/psyco/src/c/ivm/iencoding.c similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/iencoding.c rename to nodeboxgl/ext/psyco/src/c/ivm/iencoding.c diff --git a/nodebox/ext/psyco/src/c/ivm/iencoding.h b/nodeboxgl/ext/psyco/src/c/ivm/iencoding.h similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/iencoding.h rename to nodeboxgl/ext/psyco/src/c/ivm/iencoding.h diff --git a/nodebox/ext/psyco/src/c/ivm/iinitialize.h b/nodeboxgl/ext/psyco/src/c/ivm/iinitialize.h similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/iinitialize.h rename to nodeboxgl/ext/psyco/src/c/ivm/iinitialize.h diff --git a/nodebox/ext/psyco/src/c/ivm/iprocessor.c b/nodeboxgl/ext/psyco/src/c/ivm/iprocessor.c similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/iprocessor.c rename to nodeboxgl/ext/psyco/src/c/ivm/iprocessor.c diff --git a/nodebox/ext/psyco/src/c/ivm/ipyencoding.c b/nodeboxgl/ext/psyco/src/c/ivm/ipyencoding.c similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/ipyencoding.c rename to nodeboxgl/ext/psyco/src/c/ivm/ipyencoding.c diff --git a/nodebox/ext/psyco/src/c/ivm/ipyencoding.h b/nodeboxgl/ext/psyco/src/c/ivm/ipyencoding.h similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/ipyencoding.h rename to nodeboxgl/ext/psyco/src/c/ivm/ipyencoding.h diff --git a/nodebox/ext/psyco/src/c/ivm/ivm-insns.c b/nodeboxgl/ext/psyco/src/c/ivm/ivm-insns.c similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/ivm-insns.c rename to nodeboxgl/ext/psyco/src/c/ivm/ivm-insns.c diff --git a/nodebox/ext/psyco/src/c/ivm/ivm-insns.h b/nodeboxgl/ext/psyco/src/c/ivm/ivm-insns.h similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/ivm-insns.h rename to nodeboxgl/ext/psyco/src/c/ivm/ivm-insns.h diff --git a/nodebox/ext/psyco/src/c/ivm/localsetup.py b/nodeboxgl/ext/psyco/src/c/ivm/localsetup.py similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/localsetup.py rename to nodeboxgl/ext/psyco/src/c/ivm/localsetup.py diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/Makefile b/nodeboxgl/ext/psyco/src/c/ivm/prolog/Makefile similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/Makefile rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/Makefile diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/ccode.pl b/nodeboxgl/ext/psyco/src/c/ivm/prolog/ccode.pl similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/ccode.pl rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/ccode.pl diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/detcheck.pl b/nodeboxgl/ext/psyco/src/c/ivm/prolog/detcheck.pl similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/detcheck.pl rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/detcheck.pl diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/insns-igen-h.i.default b/nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-igen-h.i.default similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/insns-igen-h.i.default rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-igen-h.i.default diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/insns-igen.i.default b/nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-igen.i.default similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/insns-igen.i.default rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-igen.i.default diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/insns-switch.i.default b/nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-switch.i.default similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/insns-switch.i.default rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-switch.i.default diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/insns-table.py.default b/nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-table.py.default similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/insns-table.py.default rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-table.py.default diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/insns-threaded.i.default b/nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-threaded.i.default similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/insns-threaded.i.default rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/insns-threaded.i.default diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/insns.pl b/nodeboxgl/ext/psyco/src/c/ivm/prolog/insns.pl similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/insns.pl rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/insns.pl diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/insns.py b/nodeboxgl/ext/psyco/src/c/ivm/prolog/insns.py similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/insns.py rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/insns.py diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/insnset.py b/nodeboxgl/ext/psyco/src/c/ivm/prolog/insnset.py similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/insnset.py rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/insnset.py diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/mode_combine.pl.default b/nodeboxgl/ext/psyco/src/c/ivm/prolog/mode_combine.pl.default similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/mode_combine.pl.default rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/mode_combine.pl.default diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/optimize.pl b/nodeboxgl/ext/psyco/src/c/ivm/prolog/optimize.pl similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/optimize.pl rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/optimize.pl diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/samelines.py b/nodeboxgl/ext/psyco/src/c/ivm/prolog/samelines.py similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/samelines.py rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/samelines.py diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/utils.pl b/nodeboxgl/ext/psyco/src/c/ivm/prolog/utils.pl similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/utils.pl rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/utils.pl diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/vm.pl b/nodeboxgl/ext/psyco/src/c/ivm/prolog/vm.pl similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/vm.pl rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/vm.pl diff --git a/nodebox/ext/psyco/src/c/ivm/prolog/vmwriter.pl b/nodeboxgl/ext/psyco/src/c/ivm/prolog/vmwriter.pl similarity index 100% rename from nodebox/ext/psyco/src/c/ivm/prolog/vmwriter.pl rename to nodeboxgl/ext/psyco/src/c/ivm/prolog/vmwriter.pl diff --git a/nodebox/ext/psyco/src/c/linuxmemchk.c b/nodeboxgl/ext/psyco/src/c/linuxmemchk.c similarity index 100% rename from nodebox/ext/psyco/src/c/linuxmemchk.c rename to nodeboxgl/ext/psyco/src/c/linuxmemchk.c diff --git a/nodebox/ext/psyco/src/c/linuxmemchk.h b/nodeboxgl/ext/psyco/src/c/linuxmemchk.h similarity index 100% rename from nodebox/ext/psyco/src/c/linuxmemchk.h rename to nodeboxgl/ext/psyco/src/c/linuxmemchk.h diff --git a/nodebox/ext/psyco/src/c/mergepoints.c b/nodeboxgl/ext/psyco/src/c/mergepoints.c similarity index 100% rename from nodebox/ext/psyco/src/c/mergepoints.c rename to nodeboxgl/ext/psyco/src/c/mergepoints.c diff --git a/nodebox/ext/psyco/src/c/mergepoints.h b/nodeboxgl/ext/psyco/src/c/mergepoints.h similarity index 100% rename from nodebox/ext/psyco/src/c/mergepoints.h rename to nodeboxgl/ext/psyco/src/c/mergepoints.h diff --git a/nodebox/ext/psyco/src/c/mkincl.py b/nodeboxgl/ext/psyco/src/c/mkincl.py similarity index 100% rename from nodebox/ext/psyco/src/c/mkincl.py rename to nodeboxgl/ext/psyco/src/c/mkincl.py diff --git a/nodebox/ext/psyco/src/c/mychecker.py b/nodeboxgl/ext/psyco/src/c/mychecker.py similarity index 100% rename from nodebox/ext/psyco/src/c/mychecker.py rename to nodeboxgl/ext/psyco/src/c/mychecker.py diff --git a/nodebox/ext/psyco/src/c/platform.c b/nodeboxgl/ext/psyco/src/c/platform.c similarity index 100% rename from nodebox/ext/psyco/src/c/platform.c rename to nodeboxgl/ext/psyco/src/c/platform.c diff --git a/nodebox/ext/psyco/src/c/platform.h b/nodeboxgl/ext/psyco/src/c/platform.h similarity index 100% rename from nodebox/ext/psyco/src/c/platform.h rename to nodeboxgl/ext/psyco/src/c/platform.h diff --git a/nodebox/ext/psyco/src/c/processor.h b/nodeboxgl/ext/psyco/src/c/processor.h similarity index 100% rename from nodebox/ext/psyco/src/c/processor.h rename to nodeboxgl/ext/psyco/src/c/processor.h diff --git a/nodebox/ext/psyco/src/c/profile.c b/nodeboxgl/ext/psyco/src/c/profile.c similarity index 100% rename from nodebox/ext/psyco/src/c/profile.c rename to nodeboxgl/ext/psyco/src/c/profile.c diff --git a/nodebox/ext/psyco/src/c/profile.h b/nodeboxgl/ext/psyco/src/c/profile.h similarity index 100% rename from nodebox/ext/psyco/src/c/profile.h rename to nodeboxgl/ext/psyco/src/c/profile.h diff --git a/nodebox/ext/psyco/src/c/psyco.c b/nodeboxgl/ext/psyco/src/c/psyco.c similarity index 100% rename from nodebox/ext/psyco/src/c/psyco.c rename to nodeboxgl/ext/psyco/src/c/psyco.c diff --git a/nodebox/ext/psyco/src/c/psyco.h b/nodeboxgl/ext/psyco/src/c/psyco.h similarity index 100% rename from nodebox/ext/psyco/src/c/psyco.h rename to nodeboxgl/ext/psyco/src/c/psyco.h diff --git a/nodebox/ext/psyco/src/c/psyfunc.c b/nodeboxgl/ext/psyco/src/c/psyfunc.c similarity index 100% rename from nodebox/ext/psyco/src/c/psyfunc.c rename to nodeboxgl/ext/psyco/src/c/psyfunc.c diff --git a/nodebox/ext/psyco/src/c/psyfunc.h b/nodeboxgl/ext/psyco/src/c/psyfunc.h similarity index 100% rename from nodebox/ext/psyco/src/c/psyfunc.h rename to nodeboxgl/ext/psyco/src/c/psyfunc.h diff --git a/nodebox/ext/psyco/src/c/pycodegen.h b/nodeboxgl/ext/psyco/src/c/pycodegen.h similarity index 100% rename from nodebox/ext/psyco/src/c/pycodegen.h rename to nodeboxgl/ext/psyco/src/c/pycodegen.h diff --git a/nodebox/ext/psyco/src/c/stats.c b/nodeboxgl/ext/psyco/src/c/stats.c similarity index 100% rename from nodebox/ext/psyco/src/c/stats.c rename to nodeboxgl/ext/psyco/src/c/stats.c diff --git a/nodebox/ext/psyco/src/c/stats.h b/nodeboxgl/ext/psyco/src/c/stats.h similarity index 100% rename from nodebox/ext/psyco/src/c/stats.h rename to nodeboxgl/ext/psyco/src/c/stats.h diff --git a/nodebox/ext/psyco/src/c/timing.h b/nodeboxgl/ext/psyco/src/c/timing.h similarity index 100% rename from nodebox/ext/psyco/src/c/timing.h rename to nodeboxgl/ext/psyco/src/c/timing.h diff --git a/nodebox/ext/psyco/src/c/vcompiler.c b/nodeboxgl/ext/psyco/src/c/vcompiler.c similarity index 100% rename from nodebox/ext/psyco/src/c/vcompiler.c rename to nodeboxgl/ext/psyco/src/c/vcompiler.c diff --git a/nodebox/ext/psyco/src/c/vcompiler.h b/nodeboxgl/ext/psyco/src/c/vcompiler.h similarity index 100% rename from nodebox/ext/psyco/src/c/vcompiler.h rename to nodeboxgl/ext/psyco/src/c/vcompiler.h diff --git a/nodebox/ext/psyco/src/c/versionchecker.py b/nodeboxgl/ext/psyco/src/c/versionchecker.py similarity index 100% rename from nodebox/ext/psyco/src/c/versionchecker.py rename to nodeboxgl/ext/psyco/src/c/versionchecker.py diff --git a/nodebox/ext/psyco/src/c/win32/psyco.vcproj b/nodeboxgl/ext/psyco/src/c/win32/psyco.vcproj similarity index 100% rename from nodebox/ext/psyco/src/c/win32/psyco.vcproj rename to nodeboxgl/ext/psyco/src/c/win32/psyco.vcproj diff --git a/nodebox/ext/psyco/src/doc/Makefile b/nodeboxgl/ext/psyco/src/doc/Makefile similarity index 100% rename from nodebox/ext/psyco/src/doc/Makefile rename to nodeboxgl/ext/psyco/src/doc/Makefile diff --git a/nodebox/ext/psyco/src/doc/README.txt b/nodeboxgl/ext/psyco/src/doc/README.txt similarity index 100% rename from nodebox/ext/psyco/src/doc/README.txt rename to nodeboxgl/ext/psyco/src/doc/README.txt diff --git a/nodebox/ext/psyco/src/doc/psycoguide.tex b/nodeboxgl/ext/psyco/src/doc/psycoguide.tex similarity index 100% rename from nodebox/ext/psyco/src/doc/psycoguide.tex rename to nodeboxgl/ext/psyco/src/doc/psycoguide.tex diff --git a/nodebox/ext/psyco/src/psyco-mactel.diff b/nodeboxgl/ext/psyco/src/psyco-mactel.diff similarity index 100% rename from nodebox/ext/psyco/src/psyco-mactel.diff rename to nodeboxgl/ext/psyco/src/psyco-mactel.diff diff --git a/nodebox/ext/psyco/src/py-support/__init__.py b/nodeboxgl/ext/psyco/src/py-support/__init__.py similarity index 100% rename from nodebox/ext/psyco/src/py-support/__init__.py rename to nodeboxgl/ext/psyco/src/py-support/__init__.py diff --git a/nodebox/ext/psyco/src/py-support/classes.py b/nodeboxgl/ext/psyco/src/py-support/classes.py similarity index 100% rename from nodebox/ext/psyco/src/py-support/classes.py rename to nodeboxgl/ext/psyco/src/py-support/classes.py diff --git a/nodebox/ext/psyco/src/py-support/core.py b/nodeboxgl/ext/psyco/src/py-support/core.py similarity index 100% rename from nodebox/ext/psyco/src/py-support/core.py rename to nodeboxgl/ext/psyco/src/py-support/core.py diff --git a/nodebox/ext/psyco/src/py-support/kdictproxy.py b/nodeboxgl/ext/psyco/src/py-support/kdictproxy.py similarity index 100% rename from nodebox/ext/psyco/src/py-support/kdictproxy.py rename to nodeboxgl/ext/psyco/src/py-support/kdictproxy.py diff --git a/nodebox/ext/psyco/src/py-support/logger.py b/nodeboxgl/ext/psyco/src/py-support/logger.py similarity index 100% rename from nodebox/ext/psyco/src/py-support/logger.py rename to nodeboxgl/ext/psyco/src/py-support/logger.py diff --git a/nodebox/ext/psyco/src/py-support/profiler.py b/nodeboxgl/ext/psyco/src/py-support/profiler.py similarity index 100% rename from nodebox/ext/psyco/src/py-support/profiler.py rename to nodeboxgl/ext/psyco/src/py-support/profiler.py diff --git a/nodebox/ext/psyco/src/py-support/support.py b/nodeboxgl/ext/psyco/src/py-support/support.py similarity index 100% rename from nodebox/ext/psyco/src/py-support/support.py rename to nodeboxgl/ext/psyco/src/py-support/support.py diff --git a/nodebox/ext/psyco/src/py-utils/cvs.py b/nodeboxgl/ext/psyco/src/py-utils/cvs.py similarity index 100% rename from nodebox/ext/psyco/src/py-utils/cvs.py rename to nodeboxgl/ext/psyco/src/py-utils/cvs.py diff --git a/nodebox/ext/psyco/src/py-utils/httpxam.py b/nodeboxgl/ext/psyco/src/py-utils/httpxam.py similarity index 100% rename from nodebox/ext/psyco/src/py-utils/httpxam.py rename to nodeboxgl/ext/psyco/src/py-utils/httpxam.py diff --git a/nodebox/ext/psyco/src/py-utils/ivmdump.py b/nodeboxgl/ext/psyco/src/py-utils/ivmdump.py similarity index 100% rename from nodebox/ext/psyco/src/py-utils/ivmdump.py rename to nodeboxgl/ext/psyco/src/py-utils/ivmdump.py diff --git a/nodebox/ext/psyco/src/py-utils/ivmextract.py b/nodeboxgl/ext/psyco/src/py-utils/ivmextract.py similarity index 100% rename from nodebox/ext/psyco/src/py-utils/ivmextract.py rename to nodeboxgl/ext/psyco/src/py-utils/ivmextract.py diff --git a/nodebox/ext/psyco/src/py-utils/ivmoptimize.py b/nodeboxgl/ext/psyco/src/py-utils/ivmoptimize.py similarity index 100% rename from nodebox/ext/psyco/src/py-utils/ivmoptimize.py rename to nodeboxgl/ext/psyco/src/py-utils/ivmoptimize.py diff --git a/nodebox/ext/psyco/src/py-utils/manifest.py b/nodeboxgl/ext/psyco/src/py-utils/manifest.py similarity index 100% rename from nodebox/ext/psyco/src/py-utils/manifest.py rename to nodeboxgl/ext/psyco/src/py-utils/manifest.py diff --git a/nodebox/ext/psyco/src/py-utils/symbols.py b/nodeboxgl/ext/psyco/src/py-utils/symbols.py similarity index 100% rename from nodebox/ext/psyco/src/py-utils/symbols.py rename to nodeboxgl/ext/psyco/src/py-utils/symbols.py diff --git a/nodebox/ext/psyco/src/py-utils/vinfo_dump.py b/nodeboxgl/ext/psyco/src/py-utils/vinfo_dump.py similarity index 100% rename from nodebox/ext/psyco/src/py-utils/vinfo_dump.py rename to nodeboxgl/ext/psyco/src/py-utils/vinfo_dump.py diff --git a/nodebox/ext/psyco/src/py-utils/win32/README.TXT b/nodeboxgl/ext/psyco/src/py-utils/win32/README.TXT similarity index 100% rename from nodebox/ext/psyco/src/py-utils/win32/README.TXT rename to nodeboxgl/ext/psyco/src/py-utils/win32/README.TXT diff --git a/nodebox/ext/psyco/src/py-utils/xam.py b/nodeboxgl/ext/psyco/src/py-utils/xam.py similarity index 100% rename from nodebox/ext/psyco/src/py-utils/xam.py rename to nodeboxgl/ext/psyco/src/py-utils/xam.py diff --git a/nodebox/ext/psyco/src/py-utils/xamsupport.c b/nodeboxgl/ext/psyco/src/py-utils/xamsupport.c similarity index 100% rename from nodebox/ext/psyco/src/py-utils/xamsupport.c rename to nodeboxgl/ext/psyco/src/py-utils/xamsupport.c diff --git a/nodebox/ext/psyco/src/setup.py b/nodeboxgl/ext/psyco/src/setup.py similarity index 100% rename from nodebox/ext/psyco/src/setup.py rename to nodeboxgl/ext/psyco/src/setup.py diff --git a/nodebox/ext/psyco/src/test/bpnn.py b/nodeboxgl/ext/psyco/src/test/bpnn.py similarity index 100% rename from nodebox/ext/psyco/src/test/bpnn.py rename to nodeboxgl/ext/psyco/src/test/bpnn.py diff --git a/nodebox/ext/psyco/src/test/btrun.py b/nodeboxgl/ext/psyco/src/test/btrun.py similarity index 100% rename from nodebox/ext/psyco/src/test/btrun.py rename to nodeboxgl/ext/psyco/src/test/btrun.py diff --git a/nodebox/ext/psyco/src/test/classicregrtest.py b/nodeboxgl/ext/psyco/src/test/classicregrtest.py similarity index 100% rename from nodebox/ext/psyco/src/test/classicregrtest.py rename to nodeboxgl/ext/psyco/src/test/classicregrtest.py diff --git a/nodebox/ext/psyco/src/test/file1-basetests b/nodeboxgl/ext/psyco/src/test/file1-basetests similarity index 100% rename from nodebox/ext/psyco/src/test/file1-basetests rename to nodeboxgl/ext/psyco/src/test/file1-basetests diff --git a/nodebox/ext/psyco/src/test/file2-basetests.uu b/nodeboxgl/ext/psyco/src/test/file2-basetests.uu similarity index 100% rename from nodebox/ext/psyco/src/test/file2-basetests.uu rename to nodeboxgl/ext/psyco/src/test/file2-basetests.uu diff --git a/nodebox/ext/psyco/src/test/fulltester.py b/nodeboxgl/ext/psyco/src/test/fulltester.py similarity index 100% rename from nodebox/ext/psyco/src/test/fulltester.py rename to nodeboxgl/ext/psyco/src/test/fulltester.py diff --git a/nodebox/ext/psyco/src/test/life-psyco.py b/nodeboxgl/ext/psyco/src/test/life-psyco.py similarity index 100% rename from nodebox/ext/psyco/src/test/life-psyco.py rename to nodeboxgl/ext/psyco/src/test/life-psyco.py diff --git a/nodebox/ext/psyco/src/test/life.py b/nodeboxgl/ext/psyco/src/test/life.py similarity index 100% rename from nodebox/ext/psyco/src/test/life.py rename to nodeboxgl/ext/psyco/src/test/life.py diff --git a/nodebox/ext/psyco/src/test/pystone-jit.py b/nodeboxgl/ext/psyco/src/test/pystone-jit.py similarity index 100% rename from nodebox/ext/psyco/src/test/pystone-jit.py rename to nodeboxgl/ext/psyco/src/test/pystone-jit.py diff --git a/nodebox/ext/psyco/src/test/pystone.py b/nodeboxgl/ext/psyco/src/test/pystone.py similarity index 100% rename from nodebox/ext/psyco/src/test/pystone.py rename to nodeboxgl/ext/psyco/src/test/pystone.py diff --git a/nodebox/ext/psyco/src/test/regrtester.py b/nodeboxgl/ext/psyco/src/test/regrtester.py similarity index 100% rename from nodebox/ext/psyco/src/test/regrtester.py rename to nodeboxgl/ext/psyco/src/test/regrtester.py diff --git a/nodebox/ext/psyco/src/test/regrtester2.py b/nodeboxgl/ext/psyco/src/test/regrtester2.py similarity index 100% rename from nodebox/ext/psyco/src/test/regrtester2.py rename to nodeboxgl/ext/psyco/src/test/regrtester2.py diff --git a/nodebox/ext/psyco/src/test/test1.py b/nodeboxgl/ext/psyco/src/test/test1.py similarity index 100% rename from nodebox/ext/psyco/src/test/test1.py rename to nodeboxgl/ext/psyco/src/test/test1.py diff --git a/nodebox/ext/psyco/src/test/test3.py b/nodeboxgl/ext/psyco/src/test/test3.py similarity index 100% rename from nodebox/ext/psyco/src/test/test3.py rename to nodeboxgl/ext/psyco/src/test/test3.py diff --git a/nodebox/ext/psyco/src/test/test5.py b/nodeboxgl/ext/psyco/src/test/test5.py similarity index 100% rename from nodebox/ext/psyco/src/test/test5.py rename to nodeboxgl/ext/psyco/src/test/test5.py diff --git a/nodebox/ext/psyco/src/test/test_base.py b/nodeboxgl/ext/psyco/src/test/test_base.py similarity index 100% rename from nodebox/ext/psyco/src/test/test_base.py rename to nodeboxgl/ext/psyco/src/test/test_base.py diff --git a/nodebox/ext/psyco/src/test/test_compactobject.py b/nodeboxgl/ext/psyco/src/test/test_compactobject.py similarity index 100% rename from nodebox/ext/psyco/src/test/test_compactobject.py rename to nodeboxgl/ext/psyco/src/test/test_compactobject.py diff --git a/nodebox/ext/psyco/src/test/test_misc.py b/nodeboxgl/ext/psyco/src/test/test_misc.py similarity index 100% rename from nodebox/ext/psyco/src/test/test_misc.py rename to nodeboxgl/ext/psyco/src/test/test_misc.py diff --git a/nodebox/ext/psyco/support.py b/nodeboxgl/ext/psyco/support.py similarity index 100% rename from nodebox/ext/psyco/support.py rename to nodeboxgl/ext/psyco/support.py diff --git a/nodeboxgl/ext/setup.py b/nodeboxgl/ext/setup.py new file mode 100644 index 0000000..4e55de8 --- /dev/null +++ b/nodeboxgl/ext/setup.py @@ -0,0 +1,13 @@ +from distutils.core import setup, Extension + +bezier = Extension("nglbezier", sources=["nglbezier.c"]) +geometry = Extension("nglgeometry", sources=["nglgeometry.c"]) +noise = Extension("nglnoise", sources=["nglnoise.c"]) + +setup( + name = "Nodebox for OpenGL c-extensions", + version = "1.0", + author = "Tom De Smedt, Frederik De Bleser", + description = "Fast C Bezier, geometry and noise math.", + ext_modules = [bezier, geometry, noise] +) diff --git a/nodebox/font/Droid Sans Mono.ttf b/nodeboxgl/font/Droid Sans Mono.ttf similarity index 100% rename from nodebox/font/Droid Sans Mono.ttf rename to nodeboxgl/font/Droid Sans Mono.ttf diff --git a/nodebox/font/Droid Sans-Bold.ttf b/nodeboxgl/font/Droid Sans-Bold.ttf similarity index 100% rename from nodebox/font/Droid Sans-Bold.ttf rename to nodeboxgl/font/Droid Sans-Bold.ttf diff --git a/nodebox/font/Droid Sans.ttf b/nodeboxgl/font/Droid Sans.ttf similarity index 100% rename from nodebox/font/Droid Sans.ttf rename to nodeboxgl/font/Droid Sans.ttf diff --git a/nodebox/font/Droid Serif-Bold.ttf b/nodeboxgl/font/Droid Serif-Bold.ttf similarity index 100% rename from nodebox/font/Droid Serif-Bold.ttf rename to nodeboxgl/font/Droid Serif-Bold.ttf diff --git a/nodebox/font/Droid Serif-BoldItalic.ttf b/nodeboxgl/font/Droid Serif-BoldItalic.ttf similarity index 100% rename from nodebox/font/Droid Serif-BoldItalic.ttf rename to nodeboxgl/font/Droid Serif-BoldItalic.ttf diff --git a/nodebox/font/Droid Serif-Italic.ttf b/nodeboxgl/font/Droid Serif-Italic.ttf similarity index 100% rename from nodebox/font/Droid Serif-Italic.ttf rename to nodeboxgl/font/Droid Serif-Italic.ttf diff --git a/nodebox/font/Droid Serif-Regular.ttf b/nodeboxgl/font/Droid Serif-Regular.ttf similarity index 100% rename from nodebox/font/Droid Serif-Regular.ttf rename to nodeboxgl/font/Droid Serif-Regular.ttf diff --git a/nodeboxgl/font/__init__.py b/nodeboxgl/font/__init__.py new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/nodeboxgl/font/__init__.py @@ -0,0 +1 @@ +# diff --git a/nodebox/font/glyph.p b/nodeboxgl/font/glyph.p similarity index 100% rename from nodebox/font/glyph.p rename to nodeboxgl/font/glyph.p diff --git a/nodebox/font/glyph.py b/nodeboxgl/font/glyph.py similarity index 100% rename from nodebox/font/glyph.py rename to nodeboxgl/font/glyph.py diff --git a/nodebox/graphics/__init__.py b/nodeboxgl/graphics/__init__.py similarity index 100% rename from nodebox/graphics/__init__.py rename to nodeboxgl/graphics/__init__.py diff --git a/nodebox/graphics/bezier.py b/nodeboxgl/graphics/bezier.py similarity index 99% rename from nodebox/graphics/bezier.py rename to nodeboxgl/graphics/bezier.py index ce8883e..622fb88 100644 --- a/nodebox/graphics/bezier.py +++ b/nodeboxgl/graphics/bezier.py @@ -88,8 +88,12 @@ def curvelength(x0, y0, x1, y1, x2, y2, x3, y3, n=20): return length # Fast C implementations: -try: from nodebox.ext.bezier import linepoint, linelength, curvepoint, curvelength -except: +try: + from nglbezier import linepoint, linelength, curvepoint, curvelength + #print "FAST BEZIER" +except Exception, err: + #print err + #print "SLOW BEZIER" pass #--- BEZIER PATH LENGTH ------------------------------------------------------------------------------ diff --git a/nodebox/graphics/context.py b/nodeboxgl/graphics/context.py similarity index 99% rename from nodebox/graphics/context.py rename to nodeboxgl/graphics/context.py index 54d0f64..15fbbb3 100644 --- a/nodebox/graphics/context.py +++ b/nodeboxgl/graphics/context.py @@ -631,7 +631,7 @@ def ellipse(x, y, width, height, segments=ELLIPSE_SEGMENTS, **kwargs): # Then reuse the cached ellipse by scaling it to the desired size. commands = [] f = 2 * pi / segments - v = [(cos(t)/2, sin(t)/2) for t in [i*f for i in range(segments)+[0]]] + v = [(cos(t)/2, sin(t)/2) for t in [i*f for i in list(range(segments))+[0]]] for mode in (GL_TRIANGLE_FAN, GL_LINE_LOOP): commands.append(precompile(lambda:( glBegin(mode), diff --git a/nodebox/graphics/geometry.py b/nodeboxgl/graphics/geometry.py similarity index 98% rename from nodebox/graphics/geometry.py rename to nodeboxgl/graphics/geometry.py index 8052407..8ed754f 100644 --- a/nodebox/graphics/geometry.py +++ b/nodeboxgl/graphics/geometry.py @@ -43,8 +43,12 @@ def reflect(x, y, x0, y0, d=1.0, a=180): return coordinates(x0, y0, d*distance(x0,y0,x,y), a+angle(x0,y0,x,y)) # Fast C implementations: -try: from nodebox.ext.geometry import angle, distance, coordinates, rotate -except: +try: + from nglgeometry import angle, distance, coordinates, rotate + #print "FAST GEOMETRY" +except Exception, err: + #print err + #print "SLOW GEOMETRY" pass #--- INTERPOLATION ----------------------------------------------------------------------------------- @@ -76,8 +80,12 @@ def clamp(v, a, b): return max(a, min(v, b)) # Fast C implementations: -try: from nodebox.ext.geometry import smoothstep -except: +try: + from nglgeometry import smoothstep + # print "FAST GEOMETRY" +except Exception, err: + # print err + # print "SLOW GEOMETRY" pass #--- INTERSECTION ------------------------------------------------------------------------------------ @@ -178,8 +186,12 @@ def superformula(m, n1, n2, n3, phi): return (r*cos(phi), r*sin(phi)) # Fast C implementation: -try: from nodebox.ext.geometry import superformula -except: +try: + from nglgeometry import superformula + # print "FAST GEOMETRY" +except Exception, err: + # print err + # print "SLOW GEOMETRY" pass #===================================================================================================== diff --git a/nodebox/graphics/noise.py b/nodeboxgl/graphics/noise.py similarity index 95% rename from nodebox/graphics/noise.py rename to nodeboxgl/graphics/noise.py index b8f9669..1b94c00 100644 --- a/nodebox/graphics/noise.py +++ b/nodeboxgl/graphics/noise.py @@ -61,10 +61,13 @@ def generate(self, x, y=0, z=0): try: # Fast C implementations: - from nodebox.ext.noise import init, generate + from nglnoise import init, generate PerlinNoise._init = init PerlinNoise.generate = generate -except: + # print "FAST NOISE" +except Exception, err: + # print err + # print "SLOW NOISE" pass _generator = PerlinNoise() diff --git a/nodebox/graphics/physics.py b/nodeboxgl/graphics/physics.py similarity index 99% rename from nodebox/graphics/physics.py rename to nodeboxgl/graphics/physics.py index ec2a2cf..174fcd5 100644 --- a/nodebox/graphics/physics.py +++ b/nodeboxgl/graphics/physics.py @@ -945,7 +945,7 @@ def update(self): #--- NODE -------------------------------------------------------------------------------------------- def deepcopy(o): - # A color can be represented as a tuple or as a nodebox.graphics.Color object, + # A color can be represented as a tuple or as a nodeboxgl.graphics.Color object, # in which case it needs to be copied by invoking Color.copy(). if o is None: return o diff --git a/nodebox/graphics/shader.py b/nodeboxgl/graphics/shader.py similarity index 100% rename from nodebox/graphics/shader.py rename to nodeboxgl/graphics/shader.py diff --git a/nodebox/gui/__init__.py b/nodeboxgl/gui/__init__.py similarity index 100% rename from nodebox/gui/__init__.py rename to nodeboxgl/gui/__init__.py diff --git a/nodebox/gui/controls.py b/nodeboxgl/gui/controls.py similarity index 99% rename from nodebox/gui/controls.py rename to nodeboxgl/gui/controls.py index bee3aed..5900650 100644 --- a/nodebox/gui/controls.py +++ b/nodeboxgl/gui/controls.py @@ -12,8 +12,8 @@ from pyglet.text.layout import IncrementalTextLayout from pyglet.text.caret import Caret -from nodebox.graphics.geometry import angle, distance, clamp, Bounds, INFINITE -from nodebox.graphics import \ +from nodeboxgl.graphics.geometry import angle, distance, clamp, Bounds, INFINITE +from nodeboxgl.graphics import \ Layer, Color, Image, image, crop, rect, \ Text, font, NORMAL, BOLD, CENTER, DEFAULT_FONT, install_font, \ translate, rotate, \ diff --git a/nodebox/gui/theme/Droid Sans-Bold.ttf b/nodeboxgl/gui/theme/Droid Sans-Bold.ttf similarity index 100% rename from nodebox/gui/theme/Droid Sans-Bold.ttf rename to nodeboxgl/gui/theme/Droid Sans-Bold.ttf diff --git a/nodebox/gui/theme/Droid Sans.ttf b/nodeboxgl/gui/theme/Droid Sans.ttf similarity index 100% rename from nodebox/gui/theme/Droid Sans.ttf rename to nodeboxgl/gui/theme/Droid Sans.ttf diff --git a/nodebox/gui/theme/action-close.png b/nodeboxgl/gui/theme/action-close.png similarity index 100% rename from nodebox/gui/theme/action-close.png rename to nodeboxgl/gui/theme/action-close.png diff --git a/nodebox/gui/theme/action.png b/nodeboxgl/gui/theme/action.png similarity index 100% rename from nodebox/gui/theme/action.png rename to nodeboxgl/gui/theme/action.png diff --git a/nodebox/gui/theme/button.png b/nodeboxgl/gui/theme/button.png similarity index 100% rename from nodebox/gui/theme/button.png rename to nodeboxgl/gui/theme/button.png diff --git a/nodebox/gui/theme/field.png b/nodeboxgl/gui/theme/field.png similarity index 100% rename from nodebox/gui/theme/field.png rename to nodeboxgl/gui/theme/field.png diff --git a/nodebox/gui/theme/flag-checked.png b/nodeboxgl/gui/theme/flag-checked.png similarity index 100% rename from nodebox/gui/theme/flag-checked.png rename to nodeboxgl/gui/theme/flag-checked.png diff --git a/nodebox/gui/theme/flag.png b/nodeboxgl/gui/theme/flag.png similarity index 100% rename from nodebox/gui/theme/flag.png rename to nodeboxgl/gui/theme/flag.png diff --git a/nodebox/gui/theme/flag.psd b/nodeboxgl/gui/theme/flag.psd similarity index 100% rename from nodebox/gui/theme/flag.psd rename to nodeboxgl/gui/theme/flag.psd diff --git a/nodebox/gui/theme/knob-socket.png b/nodeboxgl/gui/theme/knob-socket.png similarity index 100% rename from nodebox/gui/theme/knob-socket.png rename to nodeboxgl/gui/theme/knob-socket.png diff --git a/nodebox/gui/theme/knob.png b/nodeboxgl/gui/theme/knob.png similarity index 100% rename from nodebox/gui/theme/knob.png rename to nodeboxgl/gui/theme/knob.png diff --git a/nodebox/gui/theme/panel.png b/nodeboxgl/gui/theme/panel.png similarity index 100% rename from nodebox/gui/theme/panel.png rename to nodeboxgl/gui/theme/panel.png diff --git a/nodebox/gui/theme/slider-handle.png b/nodeboxgl/gui/theme/slider-handle.png similarity index 100% rename from nodebox/gui/theme/slider-handle.png rename to nodeboxgl/gui/theme/slider-handle.png diff --git a/nodebox/gui/theme/slider.png b/nodeboxgl/gui/theme/slider.png similarity index 100% rename from nodebox/gui/theme/slider.png rename to nodeboxgl/gui/theme/slider.png diff --git a/nodebox/sound/__init__.py b/nodeboxgl/sound/__init__.py similarity index 100% rename from nodebox/sound/__init__.py rename to nodeboxgl/sound/__init__.py diff --git a/nodebox/sound/osc.py b/nodeboxgl/sound/osc.py similarity index 100% rename from nodebox/sound/osc.py rename to nodeboxgl/sound/osc.py diff --git a/nodebox/sound/process.py b/nodeboxgl/sound/process.py similarity index 100% rename from nodebox/sound/process.py rename to nodeboxgl/sound/process.py diff --git a/setup.py b/setup.py index bdc8676..dc036ce 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ import os from setuptools import setup from setuptools import find_packages +from setuptools.extension import Extension # Utility function to read the README file. # From http://packages.python.org/an_example_pypi_project/setuptools.html. @@ -17,8 +18,13 @@ def read(fname): author = "Tom De Smedt", url = "http://www.cityinabottle.org/nodebox/", packages = find_packages(), - package_data = {"nodebox.gui": ["theme/*"]}, + package_data = {"nodeboxgl.gui": ["theme/*"], "nodeboxgl.font":["glyph.p"]}, install_requires = ["pyglet",], + py_modules = ["nodeboxgl", "nodeboxgl.graphics", "nodeboxgl.gui", "nodeboxgl.sound", "nodeboxgl.font"], + ext_modules = [ + Extension("nglbezier", sources=["nodeboxgl/ext/nglbezier.c"]), + Extension("nglgeometry", sources=["nodeboxgl/ext/nglgeometry.c"]), + Extension("nglnoise", sources=["nodeboxgl/ext/nglnoise.c"]) ], classifiers = [ "Development Status :: 4 - Beta", "Environment :: MacOS X",