Skip to content
Browse files

Move from clj-processing to Quil

1 parent 5825789 commit 32871e15056f6841470633093e6340173d5b20be @samaaron samaaron committed Mar 5, 2012
View
53 CPL.TXT → LICENSE
@@ -1,13 +1,10 @@
-Common Public License Version 1.0
-
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
+1. DEFINITIONS
"Contribution" means:
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
b) in the case of each subsequent Contributor:
@@ -17,14 +14,13 @@ ii) additions to the Program;
where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
+"Contributor" means any person or entity that distributes the Program.
"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+"Program" means the Contributions distributed in accordance with this Agreement.
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
2. GRANT OF RIGHTS
@@ -36,59 +32,54 @@ c) Recipient understands that although each Contributor grants the licenses to i
d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+3. REQUIREMENTS
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
a) it complies with the terms and conditions of this Agreement; and
b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
When the Program is made available in source code form:
a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
+b) a copy of this Agreement must be included with each copy of the Program.
Contributors may not remove or alter any copyright notices contained within the Program.
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+4. COMMERCIAL DISTRIBUTION
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
5. NO WARRANTY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-
-6. DISCLAIMER OF LIABILITY
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+6. DISCLAIMER OF LIABILITY
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
7. GENERAL
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
View
78 README.markdown
@@ -1,78 +0,0 @@
-# Processing for Clojure #
-
-This lib is a wrapper for the [Processing][] project. Mixture of
-Clojure and Processing enables you to do live-coding and experiment
-easily.
-
-Most of the function are covered; some have a slightly different name
-than in Java (partly because Clojure is confused by methods of the
-same arity but different argument types). Most of the constants are
-accessible.
-
-## How To Use It? ##
-
-*NOTE*: project is currently going through some cleanups when it comes
- to lein/maven compatibility. Untill that's finished, you pretty much
- have to setup your project manually.
-
-If you use mave or leiningn, just add the following to your
-`project.clj`:
-
- [processing-core/processsing.core "0.1.0"]
-
-## Manual Setup
-
-Add Processing's `core.jar` to your classpath along with
-clj-processing jar and you're ready to go.
-
-To use the OpenGL features, you also have to add `gluegen-rt.jar`,
-`jogl.jar` and `opengl.jar` from the
-`$PROCESSING_DIR/libraries/opengl/library`. You also need to pass the
-argument:
-
- -Djava.library.path=`$PROCESSING_DIR/libraries/opengl/library
-
-to the JVM.
-
-Then, create a JAR by running `ant` and also add the resulting file to
-your CLASSPATH.
-
-## Examples ##
-
-The `examples` directory contains a simple script to get you going.
-
-## COMMON ISSUES ##
-
-clj-procesing may not work if you're using `add-classpath` to put the
-Processing jars into your CLASSPATH. Please, use a "proper" way to set
-up your CLASSPATH (eg. with a special script like the [clj][cljscript]
-on Clojure Wiki)
-
-If your're using Clojure's `proxy` macro, you'll have to define the
-mouse handling methods to take one argument (which is just an instance
-of java.awt.event.MouseEvent class) and get all needed information
-(like mouse position etc) from that object. Also, accessing instance
-fields of the PApplet class from within proxy doesn't work.
-
-## License
-
-`processing.core` is distributed under Common Public License Version
-1.0. The official Processing.org's core.jar is distributed under LGPG
-and its code can be found on http://processing.org/
-
-## TODO ##
-
-* docstrings
-* include remaining constants
-
-[processing]:http://processing.org/
-[cljscript]:http://en.wikibooks.org/wiki/Clojure_Programming/Getting_Started#Create_clj_Script
-
-## Contributors ##
-
-* Roland Sadowski
-* Phil Hagelberg
-* Vilson Vieira
-* Marshall T. Vandegrift
-* Ilya Epifanov
-* Sam Aaron
View
80 README.md
@@ -0,0 +1,80 @@
+# Quil
+
+Quil looked up in shock to see Bigelow floating high in the clouds, his balloons rustling merrily in the wind. He gruffed to her from above, "This truly is a party!". Image after image, vista after vista, passed furry Bige's wide-open eyes. The underlying beauty of what he saw unfolded before him. A flock of bezier gulls whistled past him. Beneath his dangling feet a distant shepard called his scribbly sheep in for re-drawing. Goading him from the distance, wooden letters of so many different fonts mocked **PERLIN-WOULD** from the hilltops.
+
+This truly was an amazing place. Here, dreams and reality had been drawn together - all in one Process. "*_Why* would I ever leave?" he barked with joy! *_Why* indeed!
+
+## (mix Processing Clojure)
+
+In one hand Quil holds Processing, a carefully crafted API for making drawing and animation extremely easy to get your biscuit-loving chops around. In the other she clutches Clojure, an interlocking suite of exquisite language abstractions forged by an army of hammocks and wrapped in flowing silky parens of un-braided joy.
+
+In one skilled motion, Quil throws them high into the air together. They bond instantly and fly off into the distance painting their way with immutable trails of brilliant colour. Moments later, you see them swiftly return and hover nearby. Your very own ride to Perlinwould awaits. Summon the winds and ride well, my friend.
+
+## Installation
+
+Simply add Quil as a dependency in your `project.clj`:
+
+ [quil "1.0.0-SNAPSHOT"]
+
+**Please Note:** In order to use the OpenGL features, you need to be using Leiningen 2.x.
+
+## Getting Started
+
+Using Quil is as easy as eating chocolate digestives. You just need to grok three basic concepts:
+
+* The Setup fn
+* The Draw fn
+* The Applet obj
+
+If `setup` and `draw` are hard working *artistic gladiators*, `applet` is the *arena* in which they battle for the glory of art. However, they don't actually fight each other - they work as a team - relentlessly spilling colour all over the arena sands. The crowds roar for messy fight.
+
+`setup` lays all the groundwork and is called only once at the start. `draw`, on the other hand, is called immediately after `setup` has completed, and then repeatedly until you summon it to stop. When you create an `applet` and name your `setup` and `draw` fns, the fun automatically starts.
+
+A simple example is called for:
+
+ (defn setup []
+ (smooth) ;;Turn on anti-aliasing
+ (frame-rate 1) ;;Set framerate to 1 FPS
+ (background 200)) ;;Set the background colour to
+ ;; a nice shade of grey.
+ (defn draw []
+ (stroke (random 255)) ;;Set the stroke colour to a random grey
+ (stroke-weight (random 10)) ;;Set the stroke thickness randomly
+ (fill (random 255)) ;;Set the fill colour to a random grey
+
+ (let [diam (random 100) ;;Set the diameter to a value between 0 and 100
+ x (random (width)) ;;Set the x coord randomly within the applet
+ y (random (height))] ;;Set the y coord randomly within the applet
+ (ellipse x y diam diam))) ;;Draw a circle at x y with the correct diameter
+
+ (defapplet example ;;Define a new applet named example
+ :title "Oh so many grey circles" ;;Set the title of the applet
+ :setup setup ;;Specify the setup fn
+ :draw draw ;;Specify the draw fn
+ :size [500 300]) ;;Specify the size to be 500 x 300
+
+
+Feast your eyes on this beauty. You're witnessing `setup`, `draw` and `applet` working in complete harmony. See how `setup` turns on anti-aliasing, sets the framerate to 1 FPS and sets the background colour to a nice shade of grey. `draw` then kicks into action. It chooses random stroke, fill colours as well as a random stroke weight (thickness of the pen). It then chooses some random coordinates and circle size and draws an ellipse. An ellipse with the same height and width is a circle. Finally `defapplet` a convenience macro around `applet` ties everything together, specifies a title and size and starts things running. Don't just watch it though, start modifying it to see immediate effects. Go to town.
+
+## Processing Support
+
+Quil provides support for the standard Processing API. The majority of fns Processing methods have an equivalent Quil fn. Typically, `camelCased` methods have been converted to `hyphenated-versions`. For a full API list (with both Processing and Quil equivalents) see `API.md`.
+
+## API Exploration
+
+Quil supports an explorable API. For a full list of API categories and subcategories simply type `(doc-cats)` at the REPL. In order to see the fns within a specific category use `(doc-fns 1.1)` if `1.1` is the index of the category you wish to examine. If you know the start of Processing API method name such as `bezier`, you can use `(doc-meths "bezier")` to list all Processing API methods starting with `bezier` alongside their Quil equivalents.
+
+## License
+
+Quil is distributed under Common Public License Version 1.0. See LICENCE for details.
+
+The official Processing.org's jars, used as dependencies, are distributed under LGPG and their code can be found on http://processing.org/
+
+## Contributors ##
+
+* Roland Sadowski
+* Phil Hagelberg
+* Vilson Vieira
+* Marshall T. Vandegrift
+* Ilya Epifanov
+* Sam Aaron
View
5 examples/example2.clj
@@ -1,6 +1,5 @@
(ns example2
- (:use [processing.core]
- [processing.core.applet]))
+ (:use [quil core applet]))
;; here's a function which will be called by Processing's (PApplet)
;; draw method every frame. Place your code here. If you eval it
@@ -37,5 +36,3 @@
:setup setup
:draw draw
:size [200 200])
-
-(applet-start example2)
View
18 examples/mouse.clj
@@ -1,30 +1,26 @@
(ns mouse-example
- (:use [processing.core]
- [processing.core.applet]))
+ (:use [quil core applet]))
-(def mouse-position (atom [0 0]))
+(defn setup []
+ (smooth)
+ (no-stroke)
+ (set-state! :mouse-position (atom [0 0])))
(defn draw
[]
(background-float 125)
(stroke-weight 20)
(stroke-float 10)
- (let [[x y] @mouse-position]
+ (let [[x y] @(state :mouse-position)]
(point x y)))
-(defn setup []
- (smooth)
- (no-stroke))
-
(defn mouse-moved []
(let [x (mouse-x) y (mouse-y)]
- (reset! mouse-position [x y])))
+ (reset! (state :mouse-position) [x y])))
(defapplet mouse-example
:title "Mouse example."
:size [200 200]
:setup setup
:draw draw
:mouse-moved mouse-moved)
-
-(applet-start mouse-example)
View
11 src/processing/core/applet.clj → src/quil/applet.clj
@@ -1,7 +1,10 @@
-(ns processing.core.applet
- (:use [processing.core :except (size)]
- [processing.constants]
- [processing.util :only [resolve-constant-key]])
+(ns
+ ^{:doc "Functions and macros for initialising and controlling visualisation applets."
+ :author "Roland Sadowsky, Sam Aaron"}
+ quil.applet
+ (:use [quil.core]
+ [quil.constants]
+ [quil.util :only [resolve-constant-key]])
(:import (javax.swing JFrame)
(java.awt.event WindowListener)))
View
16 src/processing/constants.clj → src/quil/constants.clj
@@ -1,15 +1,7 @@
-;; Constants for the simple processing wrapper for Clojure
-;; Roland Sadowski [szabla gmail com]
-
-;; Copyright (c) 2008 Roland Sadowski. All rights reserved. The use and
-;; distribution terms for this software are covered by the Common
-;; Public License 1.0 (http://www.opensource.org/licenses/cpl1.0.php)
-;; which can be found in the file CPL.TXT at the root of this
-;; distribution. By using this software in any fashion, you are
-;; agreeing to be bound by the terms of this license. You must not
-;; remove this notice, or any other, from this software.
-
-(ns processing.constants
+(ns
+ ^{:doc "Convenient bindings for most of the Processing.org constants"
+ :author "Roland Sadowsky, Sam Aaron"}
+ quil.constants
(:import [processing.core PApplet PConstants]))
;; renderers known to org.processing.core
View
22 src/processing/core.clj → src/quil/core.clj
@@ -1,19 +1,11 @@
-;; simple processing wrapper for Clojure
-;; Roland Sadowski [szabla gmail com]
-
-;; Copyright (c) 2008 Roland Sadowski. All rights reserved. The use and
-;; distribution terms for this software are covered by the Common
-;; Public License 1.0 (http://www.opensource.org/licenses/cpl1.0.php)
-;; which can be found in the file CPL.TXT at the root of this
-;; distribution. By using this software in any fashion, you are
-;; agreeing to be bound by the terms of this license. You must not
-;; remove this notice, or any other, from this software.
-
-(ns processing.core
+(ns
+ ^{:doc "Wrappers and extensions around the core Processing.org API."
+ :author "Roland Sadowsky, Sam Aaron"}
+ quil.core
(:import [processing.core PApplet PImage PGraphics PFont PConstants PShape])
(:require [clojure.set])
- (:use [processing.constants]
- [processing.util :only [int-like? resolve-constant-key length-of-longest-key gen-padding print-definition-list]]))
+ (:use [quil.constants]
+ [quil.util :only [int-like? resolve-constant-key length-of-longest-key gen-padding print-definition-list]]))
;; used by functions in this lib. Use binding to set it
;; to an instance of processing.core.PApplet
@@ -4152,7 +4144,7 @@
;;; version number
(let [version-stream (.getResourceAsStream (clojure.lang.RT/baseLoader)
- "processing/core/version.properties")
+ "quil/processing-core/version.properties")
properties (doto (new java.util.Properties) (.load version-stream))
prop (fn [k] (.getProperty properties (str "processing.core.version." k)))
processing-version {:major (Integer/valueOf ^String (prop "major"))
View
0 src/processing/core/version.properties → src/quil/processing-core/version.properties
File renamed without changes.
View
5 src/processing/util.clj → src/quil/util.clj
@@ -1,4 +1,7 @@
-(ns processing.util)
+(ns
+ ^{:doc "Utility fns"
+ :author "Roland Sadowsky, Sam Aaron"}
+ quil.util)
(defn int-like?
[val]

0 comments on commit 32871e1

Please sign in to comment.
Something went wrong with that request. Please try again.