First commit
This commit is contained in:
commit
5a36660d65
10
.gitignore
vendored
Normal file
10
.gitignore
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
/target
|
||||
/classes
|
||||
/checkouts
|
||||
pom.xml
|
||||
pom.xml.asc
|
||||
*.jar
|
||||
*.class
|
||||
/.lein-*
|
||||
/.nrepl-port
|
||||
*~
|
||||
214
LICENSE
Normal file
214
LICENSE
Normal file
@ -0,0 +1,214 @@
|
||||
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
|
||||
LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
|
||||
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
|
||||
|
||||
1. DEFINITIONS
|
||||
|
||||
"Contribution" means:
|
||||
|
||||
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:
|
||||
|
||||
i) changes to the Program, and
|
||||
|
||||
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.
|
||||
|
||||
"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.
|
||||
|
||||
2. GRANT OF RIGHTS
|
||||
|
||||
a) Subject to the terms of this Agreement, each Contributor hereby grants
|
||||
Recipient a non-exclusive, worldwide, royalty-free copyright license to
|
||||
reproduce, prepare derivative works of, publicly display, publicly perform,
|
||||
distribute and sublicense the Contribution of such Contributor, if any, and
|
||||
such derivative works, in source code and object code form.
|
||||
|
||||
b) Subject to the terms of this Agreement, each Contributor hereby grants
|
||||
Recipient a non-exclusive, worldwide, royalty-free patent license under
|
||||
Licensed Patents to make, use, sell, offer to sell, import and otherwise
|
||||
transfer the Contribution of such Contributor, if any, in source code and
|
||||
object code form. This patent license shall apply to the combination of the
|
||||
Contribution and the Program if, at the time the Contribution is added by the
|
||||
Contributor, such addition of the Contribution causes such combination to be
|
||||
covered by the Licensed Patents. The patent license shall not apply to any
|
||||
other combinations which include the Contribution. No hardware per se is
|
||||
licensed hereunder.
|
||||
|
||||
c) Recipient understands that although each Contributor grants the licenses
|
||||
to its Contributions set forth herein, no assurances are provided by any
|
||||
Contributor that the Program does not infringe the patent or other
|
||||
intellectual property rights of any other entity. Each Contributor disclaims
|
||||
any liability to Recipient for claims brought by any other entity based on
|
||||
infringement of intellectual property rights or otherwise. As a condition to
|
||||
exercising the rights and licenses granted hereunder, each Recipient hereby
|
||||
assumes sole responsibility to secure any other intellectual property rights
|
||||
needed, if any. For example, if a third party patent license is required to
|
||||
allow Recipient to distribute the Program, it is Recipient's responsibility
|
||||
to acquire that license before distributing the Program.
|
||||
|
||||
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
|
||||
|
||||
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;
|
||||
|
||||
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
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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 tocontrol, 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, 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 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.
|
||||
|
||||
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. The Eclipse Foundation is the initial Agreement Steward. The
|
||||
Eclipse Foundation 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 Washington 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.
|
||||
9
project.clj
Normal file
9
project.clj
Normal file
@ -0,0 +1,9 @@
|
||||
(defproject curlnoise "0.1.0-SNAPSHOT"
|
||||
:description "Quil implementation of 'Curl-Noise for Procedural Fluid-Flow'"
|
||||
:url "http://example.com/FIXME"
|
||||
:license {:name "Eclipse Public License"
|
||||
:url "http://www.eclipse.org/legal/epl-v10.html"}
|
||||
:aot [curlnoise.core]
|
||||
:main curlnoise.core
|
||||
:dependencies [[org.clojure/clojure "1.10.1"]
|
||||
[quil "3.1.0"]])
|
||||
182
src/curlnoise/core.clj
Normal file
182
src/curlnoise/core.clj
Normal file
@ -0,0 +1,182 @@
|
||||
(ns curlnoise.core
|
||||
(:require [quil.core :as q]
|
||||
[quil.middleware :as m]))
|
||||
|
||||
(def framerate 30)
|
||||
(def res-x 800)
|
||||
(def res-y res-x)
|
||||
;; Lower grid size produces more points
|
||||
(def grid-size 25)
|
||||
;; Lower alpha produces *longer* particle trails
|
||||
(def alpha 10)
|
||||
|
||||
;; Return sequence of [x y], with
|
||||
(defn grid [nx ny]
|
||||
"Returns lazy sequence of [x y], with x ranging in [0,nx) and y in [0,ny).
|
||||
|
||||
That is, the resultant sequence has nx*ny elements and goes through every
|
||||
value of x and y in that range, varying y first and then x."
|
||||
(mapcat
|
||||
(fn [x] (map (fn [y] [x y]) (range ny)))
|
||||
(range nx)))
|
||||
|
||||
(defn pix-grid [grid-size res-x res-y]
|
||||
"Returns both grid indices and screen coordinates.
|
||||
|
||||
grid-size is the desired size of a grid square in pixels.
|
||||
res-x and res-y are resolutions in X & Y (likewise in pixels).
|
||||
|
||||
More specifically, this returns a lazy sequence of [x y px py] for
|
||||
which x & y are grid indices, and px & py are the corresponding
|
||||
*center* point of that grid square.
|
||||
|
||||
x and y still are grid indices, but px and py are screen coordinates
|
||||
for the *center* of the respective grid square.
|
||||
"
|
||||
(let [nx (int (/ res-x grid-size))
|
||||
ny (int (/ res-y grid-size))
|
||||
offset (int (/ grid-size 2))
|
||||
x2pix #(+ offset (q/map-range % 0 nx 0 res-x))
|
||||
y2pix #(+ offset (q/map-range % 0 ny 0 res-y))
|
||||
]
|
||||
(map (fn [[i j]] [i j (x2pix i) (y2pix j)]) (grid nx ny))))
|
||||
|
||||
(defn ramp [r]
|
||||
"Ramp function suggested in 'Curl-Noise for Procedural Fluid-Flow'"
|
||||
(cond (>= r 1.0) 1.0
|
||||
(<= r -1.0) -1.0
|
||||
:else (let [c1 (/ 15.0 8.0)
|
||||
c3 (/ -10.0 8.0)
|
||||
c5 (/ 3.0 8.0)]
|
||||
(+ (* r c1)
|
||||
(* (Math/pow r 3) c3)
|
||||
(* (Math/pow r 5) c5)))))
|
||||
|
||||
(defn dist2 [x y]
|
||||
(+ (* x x) (* y y)))
|
||||
|
||||
(defn dist [x y]
|
||||
(Math/sqrt (dist2 x y)))
|
||||
|
||||
(defn setup []
|
||||
(q/background 255)
|
||||
(q/frame-rate framerate)
|
||||
{:frame 0
|
||||
:grid (pix-grid grid-size res-x res-y)
|
||||
})
|
||||
|
||||
(defn update-state [state]
|
||||
(let [w (q/width)
|
||||
h (q/height)
|
||||
;; Overall multiplier for velocity of particle:
|
||||
vf 0.2
|
||||
;; Domain scale for noise function:
|
||||
scale 400.0
|
||||
;; Amplitude multiplier for noise:
|
||||
noise-scale (* scale 3.0)
|
||||
;; Radius for mouse-thingy
|
||||
rad 50.0
|
||||
margin 0
|
||||
eps (* w 1e-3)
|
||||
mx (q/mouse-x)
|
||||
my (q/mouse-y)
|
||||
f-inv (/ scale)
|
||||
;; "width of the modified region":
|
||||
d0 150.0
|
||||
;; distance of point to a circle of radius 'rad'
|
||||
;; centered at mouse cursor:
|
||||
d-mouse #(if (q/mouse-pressed?)
|
||||
(- (dist (- mx %1) (- my %2)) rad)
|
||||
1e6 ;; arbitrarily large value
|
||||
)
|
||||
;; function for distance to the border:
|
||||
d-border (fn [x y]
|
||||
(min
|
||||
(- x margin)
|
||||
(- y margin)
|
||||
(- (- w margin) x)
|
||||
(- (- h margin) y)))
|
||||
;; potential modulation function - takes (x,y):
|
||||
amp-fn #(ramp (min (/ (d-mouse %1 %2) d0)
|
||||
(/ (d-border %1 %2) d0)))
|
||||
;;amp-fn (fn [x y] 1.0)
|
||||
;; Noise function - must take 3 arguments, (x,y,z):
|
||||
n-fn #(* noise-scale (q/noise (* f-inv %1) (* f-inv %2) (* f-inv %3)))
|
||||
;;n-fn (fn [x y z] (* x f-inv))
|
||||
;; Overall amplitude function:
|
||||
p-fn #(* vf (amp-fn %1 %2) (n-fn %1 %2 %3))
|
||||
points
|
||||
(map (fn [pt]
|
||||
(let [[i j x y] pt
|
||||
z (/ (:frame state) 50.0)
|
||||
border (if (and (and (> x margin) (< x (- w margin)))
|
||||
(and (> y margin) (< x (- h margin))))
|
||||
1.0 0.0)
|
||||
;; Potential at (x, y, z):
|
||||
n (p-fn x y z)
|
||||
n-dx (p-fn (+ x eps) y z)
|
||||
n-dy (p-fn x (+ y eps) z)
|
||||
;; Velocity by finite differences:
|
||||
vx (/ (- n-dy n) eps)
|
||||
vy (/ (- n n-dx) eps)
|
||||
;; Updated point position:
|
||||
x2 (+ x vx)
|
||||
y2 (+ y vy)]
|
||||
[i j x2 y2]
|
||||
)) (:grid state))]
|
||||
(-> state
|
||||
(update :frame inc)
|
||||
(assoc :grid points))))
|
||||
|
||||
(defn draw-state [state]
|
||||
;;(q/background 255)
|
||||
(q/fill 255 255 255 alpha)
|
||||
(q/rect 0 0 (q/width) (q/height))
|
||||
(q/stroke 0)
|
||||
(q/stroke-weight 3)
|
||||
(let [pix (q/pixels)
|
||||
w (q/width)
|
||||
color (+ 255 (* 256 255) (* 256 256 255))
|
||||
]
|
||||
(doseq [point (:grid state)]
|
||||
(let [[i j px py] point
|
||||
;;pix (q/pixels)
|
||||
]
|
||||
;;(aset-int pix (+ px (* py w)) color)
|
||||
(q/point px py)
|
||||
))
|
||||
;;(q/update-pixels)
|
||||
))
|
||||
|
||||
(defn update-state-circles [state]
|
||||
(update state :frame inc))
|
||||
|
||||
(defn draw-state-circles [state]
|
||||
(q/background 240)
|
||||
(q/fill 0 0 0)
|
||||
(doseq [point (:grid state)]
|
||||
(let [[i j px py] point
|
||||
z (/ (:frame state) 50.0)
|
||||
x (/ i 10.0)
|
||||
y (/ j 10.0)
|
||||
rad (int (* (q/noise x y z) grid-size))]
|
||||
(q/ellipse px py rad rad))))
|
||||
|
||||
(q/defsketch curlnoise
|
||||
:title "Curl Noise"
|
||||
:size [res-x res-y]
|
||||
:setup setup
|
||||
:update update-state
|
||||
:draw draw-state
|
||||
:features [:keep-on-top]
|
||||
:middleware [m/fun-mode m/pause-on-error])
|
||||
|
||||
(defn -main [& args]
|
||||
(q/sketch
|
||||
:title "Curl Noise"
|
||||
:size [res-x res-y]
|
||||
:setup setup
|
||||
:update update-state
|
||||
:draw draw-state
|
||||
:features []
|
||||
:middleware [m/fun-mode]))
|
||||
Loading…
x
Reference in New Issue
Block a user