Apple-2-SW/robotwar
1
0
Fork 0
mirror of https://github.com/richardharrington/robotwar.git synced 2024-06-26 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity

working on collision detection

Browse Source
This commit is contained in:
Richard Harrington 2013-08-29 12:48:22 -04:00
parent ae1faa667a
commit 9edc004ab0
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/robotwar/robot.clj
View File

@ -21,6 +21,18 @@
:shot-timer 0.0
:brain (brain/init-brain src-code (register/init-registers idx))}))
(defn update-robot
"takes a robot, a world, and a function, and returns a world
with the robot updated by passing it through the function"
[robot world f]
(update-in world [:robots (:idx robot)] f))
(defn update-shot-timer
"takes a robot and returns one with the :shot-timer updated"
[{shot-timer :shot-timer :as robot}]
(merge robot {:shot-timer
(max (- shot-timer *GAME-SECONDS-PER-TICK*) 0.0)}))
(defn move-robot
"takes a robot and returns it, moved through space.
helper function for tick-robot."
@ -44,11 +56,18 @@
:v-x new-v-x
:v-y new-v-y})))
(defn update-shot-timer
"takes a robot and returns one with the :shot-timer updated"
[{shot-timer :shot-timer :as robot}]
(merge robot {:shot-timer
(max (- shot-timer *GAME-SECONDS-PER-TICK*) 0.0)}))
(defn collide-or-not
"takes a robot and a world and returns the world, with the
velocities of robots altered if they have collided with
each other. Does not currently calculate damage to robots."
[{robot-idx :idx :as robot} {robots :robots :as world}]
(let [other-robots (concat (take robot-idx robots)
(drop (inc robot-idx robots)))
colliding-x ]
(defn tick-robot
"takes a robot and a world and returns the new state of the world
@ -63,5 +82,12 @@
robot
world
register/read-register
register/write-register)]
register/write-register)
shot-timer-updated-world (update-robot robot ticked-world update-shot-timer)
moved-robot-world (update-robot robot shot-timer-updated move-robot)]
(update-in ticked-world [:robots robot-idx] (comp update-shot-timer move-robot)))))