move stuff into app/

example/game/asteroids.clj

@@ -9,8 +9,6 @@
 (ns example.game.asteroids
   (:use [penumbra opengl geometry])
   (:require [penumbra.app :as app])
-  (:require [penumbra.input :as input])
-  (:require [penumbra.window :as window])
   (:use [clojure.contrib.seq-utils :only (separate)]))
 
 ;;;
@@ -154,7 +152,7 @@
         15 0.25 [0 0 1] 2)))))
 
 (defn emit-flame [state]
-  (if (input/key-pressed? :up)
+  (if (app/key-pressed? :up)
     (let [ship (:spaceship state)
           theta (+ 180 (:theta ship) (- (rand 20) 10))
           particles (:particles state)
@@ -168,11 +166,11 @@
   (let [p     (:position ship)
         v     (:velocity ship)
         theta (:theta ship)
-        theta (condp (fn [x _] (input/key-pressed? x)) nil
+        theta (condp (fn [x _] (app/key-pressed? x)) nil
                 :left  (rem (+ theta (* 360 dt)) 360)
                 :right (rem (- theta (* 360 dt)) 360)
                 theta)
-        a     (if (input/key-pressed? :up)
+        a     (if (app/key-pressed? :up)
                   (map (partial * 3) (cartesian theta))
                   [0 0])
         v     (map + v (map * a (repeat dt))) 
@@ -284,7 +282,7 @@
 
 (defn init [state]
   (app/set-title "Asteroids")
-  (window/vsync true)
+  (app/vsync true)
   (init-asteroids)
   (init-particles)
   (init-spaceship)

example/game/tetris.clj

@@ -9,7 +9,6 @@
 (ns example.game.tetris
   (:use [penumbra opengl])
   (:require [penumbra.app :as app])
-  (:require [penumbra.input :as input])
   (:use [clojure.contrib.seq-utils :only (indexed)])
   (:use [clojure.contrib.def :only (defn-memo)])
   (:use [clojure.contrib.pprint]))
@@ -182,11 +181,11 @@
   (app/start-update-loop
    2
    (fn [state]
-     (if (input/key-pressed? :down)
+     (if (app/key-pressed? :down)
        (app/frequency! 10)
        (app/frequency! 2))
      (descend state)))
-  (input/key-repeat true)
+  (app/key-repeat true)
   state)
 
 (defn reshape [[x y w h] state]

example/opengl/gears.clj

@@ -9,7 +9,7 @@
 (ns example.opengl.gears
   (:use [penumbra opengl geometry])
   (:require [penumbra.app :as app])
-  (:require [penumbra.window :as window]))
+  (:require [penumbra.text :as text]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;Gear building functions
@@ -85,6 +85,7 @@
 
 (defn init [state]
   (app/set-title "Gears")
+  (disable :multisample)
   (enable :depth-test)
   (enable :lighting)
   (enable :light0)
@@ -105,7 +106,7 @@
     :rot-y (+ (:rot-y state) dx)))
 
 (defn display [[delta time] state]
-  (write-to-screen (format "%d fps" (int (/ 1 delta))) 0 0)  
+  (text/write-to-screen (format "%d fps" (int (/ 1 delta))) 0 0)  
   (rotate (:rot-x state) 1 0 0)
   (rotate (:rot-y state) 0 1 0)
   (rotate (* 20. (rem time 360)) 0 0 1)

example/opengl/marble.clj

@@ -9,7 +9,6 @@
 (ns example.opengl.marble
   (:use [penumbra opengl geometry])
   (:require [penumbra.app :as app])
-  (:require [penumbra.window :as window])
   (:use [penumbra.glsl.effects]))
 
 ;;;;;;;;;;;;;;;;;
@@ -68,7 +67,6 @@
   (enable :depth-test)
   (enable :lighting)
   (enable :light0)
-  (window/vsync true)
   (assoc state
     :sphere (sphere-geometry 100)
     :program (create-program declarations vertex-shader fragment-shader)))

example/opengl/render_to_texture.clj

@@ -8,8 +8,7 @@
 
 (ns example.opengl.render-to-texture
   (:use [penumbra opengl])
-  (:require [penumbra.app :as app])
-  (:require [penumbra.window :as window]))
+  (:require [penumbra.app :as app]))
 
 (defn textured-quad []
   (push-matrix
@@ -65,7 +64,7 @@
   state)
 
 (defn mouse-drag [[dx dy] [x y] button state]
-  (let [[w h] (window/dimensions)]
+  (let [[w h] (app/dimensions)]
     (if (< x (int (/ w 2)))
       (let [[lx ly] (:left state)]
         (assoc state :left [(+ lx dy) (+ ly dx)]))
@@ -77,7 +76,7 @@
         [rx ry] (:right state)
         checkers (:checkers state)
         view (:view state)
-        [w h] (window/dimensions)]
+        [w h] (app/dimensions)]
 
     (light 0
        :position [-1 -1 1 0])

example/opengl/sierpinski.clj

@@ -48,7 +48,6 @@
   (app/set-title "Sierpinski Pyramid")
   (enable :normalize)
   (enable :depth-test)
-  (enable :multisample)
   (enable :cull-face)
   (enable :lighting)
   (enable :light0)