Skip to content

Use a different "approaching" function to fix the "sticky balls" bug. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martinodb wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Use a different "approaching" function to fix the "sticky balls" bug. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0772e9
initial
martinodb Mar 24, 2017
19a3dc1
changed gitignore to github recommended
martinodb Mar 24, 2017
c7561de
replaced deprecated warn-on-reflection declaration
martinodb Mar 24, 2017
0a251d4
untrack files in gitignore http://stackoverflow.com/questions/1143796…
martinodb Apr 1, 2017
a171c14
let's change the approaching fn
martinodb Apr 1, 2017
ad1f777
works, but slow. function changed, some cleanup.
martinodb Apr 2, 2017
808881e
WORKS. restored original value of :velocity (0.01, 0.01) in file ball…
martinodb Apr 2, 2017
70f28bc
whitespace and formatting fix
martinodb Apr 2, 2017
3c6ade9
cleanup distance fn, colliding? fn
martinodb Apr 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/pom.xml
*jar
/lib
/classes
/native
/.lein-failures
/checkouts
/.lein-deps-sum
# Taken from Github recommended gitignore file for Leiningen.
# https://raw.githubusercontent.com/github/gitignore/master/Leiningen.gitignore
# https://github.com/github/gitignore/blob/master/Leiningen.gitignore

pom.xml
pom.xml.asc
*.jar
*.class
/lib/
/classes/
/target/
/checkouts/
.lein-deps-sum
.lein-repl-history
.lein-plugins/
.lein-failures
.nrepl-port
7 changes: 6 additions & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@

:main quilltest.balls

:warn-on-reflection true)
;; :warn-on-reflection true
;; DEPRECATED: https://github.com/technomancy/leiningen/blob/master/sample.project.clj

:global-vars {*warn-on-reflection* true}

)
21 changes: 14 additions & 7 deletions src/quilltest/physics.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,27 @@

(defrecord RigidBody [mass position velocity])


(defn approaching [r1 r2]
(let [v1 (:velocity r1)
v2 (:velocity r2)]
(with-math (neg? (* v1 v2)))))
v2 (:velocity r2)
x1 (:position r1)
x2 (:position r2)]
(with-math (neg? (* (- x1 x2) (- v1 v2))))))

(defn colliding? [r1 r2]
(and (approaching r1 r2)

(defn distance [r1 r2]
(let [x1 (:position r1)
x2 (:position r2)
[x1 y1] [(:x x1) (:y x1)]
[x2 y2] [(:x x2) (:y x2)]
[dx dy] [(- x1 x2) (- y1 y2)]
distance (Math/sqrt (+ (* dy dy) (* dx dx)))]
(< distance 20))))
[dx dy] [(- x1 x2) (- y1 y2)]]
(Math/sqrt (+ (* dy dy) (* dx dx)))))


(defn colliding? [r1 r2]
(and (approaching r1 r2)
(< (distance r1 r2) 20)))

(defn collide
"Elastically collides two rigid bodies, returning
Expand Down