Merge branch 'rexim/big-changes' into big-changes.

Author: ForNeVeR

src/hyperspace/game.clj

@@ -41,12 +41,12 @@
   (let [{position               :position
          [_, power :as heading] :heading} player
          missile-position (-> (polar->cartesian heading)
-                              normilize-vector
+                              normalize-vector
                               (multiply-by-scalar (+ player-radius
                                                      missile-radius))
                               (vector-sum position))
          missile-velocity (-> (polar->cartesian heading)
-                              normilize-vector
+                              normalize-vector
                               (multiply-by-scalar (* power 100)))]
     (add-missile world
                  missile-position
@@ -91,7 +91,7 @@
              planet-radius     :radius} planet
 
              fragments-position (-> (vector-subtract particle-position planet-position)
-                                    normilize-vector
+                                    normalize-vector
                                     (multiply-by-scalar (+ particle-radius planet-radius 5))
                                     (vector-sum planet-position))]
         (repeatedly 5

src/hyperspace/geometry.clj

@@ -2,15 +2,13 @@
 
 (def
   ^{:arglists '([vtr & vtrs])
-    :doc "Returns the sum of vectors. The result vector has a minimum
-  possible dimension."}
+    :doc "Returns the sum of vectors."}
   vector-sum (partial mapv +))
 
 (def
   ^{:arglists '([vtr & vtrs])
-    :doc "If no vtrs are supplied, returns the negation of vtr, else
-  subtracts the vtrs from vtr and returns the result. The result
-  vector has a minimum possible dimension."}
+    :doc "If  vtrs are supplied, returns the negation of vtr, else
+  subtracts the vtrs from vtr and returns the result."}
   vector-subtract
   (partial mapv -))
 
@@ -36,8 +34,8 @@
   [vtr]
   (Math/sqrt (reduce #(+ %1 (* %2 %2)) 0.0 vtr)))
 
-(defn normilize-vector
-  "Normilizes vector, that is returns a vector with the same
+(defn normalize-vector
+  "Normalizes vector, that is returns a vector with the same
   direction, but with the length equal 1."
   [vtr]
   (let [length (vector-length vtr)]

src/hyperspace/gravity.clj

@@ -13,5 +13,5 @@
                  (* d d))
         acceleration (/ force mass1)]
     (-> (vector-subtract position2 position1)
-        normilize-vector
+        normalize-vector
         (multiply-by-scalar acceleration))))

src/hyperspace/main.clj

@@ -4,4 +4,4 @@
 
 (defn -main
   [& args]
-  (start-ui (generate-world 800 600)))
+  (start-ui (generate-world 1024 768)))

src/hyperspace/ui.clj

@@ -126,8 +126,8 @@
   ;; Init OpenGL
   (GL11/glMatrixMode GL11/GL_PROJECTION)
   (GL11/glLoadIdentity)
-  (GL11/glOrtho x (+ x window-width)
-                y (+ y window-height)
+  (GL11/glOrtho x (+ x width)
+                y (+ y height)
                 1 -1)
   (GL11/glMatrixMode GL11/GL_MODELVIEW))
 

src/hyperspace/world.clj

@@ -23,11 +23,12 @@
 
 (defn add-random-planet
   [{planets         :planets
+    [x, y]          :position
     [width, height] :size
     :as world}]
-  (let [radius (-> (min width height) (/ 4) rand)
-        x      (rand-range radius (- width radius))
-        y      (rand-range radius (- height radius))]
+  (let [radius (-> (min width height) (/ 5) rand)
+        x      (rand-range (+ x radius) (- (+ x width) radius))
+        y      (rand-range (+ y radius) (- (+ y height) radius))]
     (assoc world
       :planets (conj planets (make-planet [x, y] radius)))))
 
@@ -59,20 +60,6 @@
       :missiles (conj missiles new-missile)
       :traces (conj traces []))))
 
-(defn add-random-missile
-  [{[width, height] :size
-    :as world}]
-  (let [x (rand-range missile-radius (- width missile-radius))
-        y (rand-range missile-radius (- height missile-radius))
-        vx (rand-range -300 300)
-        vy (rand-range -300 300)]
-    (add-missile world [x, y] [vx, vy])))
-
-(defn generate-missiles
-  [world]
-  (-> (iterate add-random-missile world)
-      (nth amount-of-missiles)))
-
 ;;; Fragments related stuff
 
 (defn make-fragment
@@ -93,11 +80,12 @@
    :radius player-radius})
 
 (defn add-random-player
-  [{[width, height] :size
+  [{[x, y]          :position
+    [width, height] :size
     players         :players
     :as world}]
-  (let [x (rand-range player-radius (- width player-radius))
-        y (rand-range player-radius (- height player-radius))]
+  (let [x (rand-range (+ x player-radius) (- (+ x width) player-radius))
+        y (rand-range (+ y player-radius) (- (+ y height) player-radius))]
     (assoc world
       :players (conj players (make-player [x, y] [0, 3.0])))))
 
@@ -119,5 +107,4 @@
         :traces []
         :exit false}
        generate-players
-       generate-planets
-       generate-missiles))
+       generate-planets))

test/hyperspace/test/geometry.clj

@@ -20,6 +20,12 @@
        (multiply-by-scalar [0.2, 0.5] 3) => (just [(almost= 0.6),
                                                    (almost= 1.5)]))
 
+;; (facts "about polar->cartesian function"
+;;        )
+
+;; (facts "about cartesia->polar function"
+;;        )
+
 (facts "about vector-length function"
        (vector-length [10, 10]) => (almost= 14.142135623730951)
        (vector-length [1.23, 10.32]) => (almost= 10.393040940937354))
@@ -37,4 +43,20 @@
 
 (facts "about distance function"
        (distance [0, 0] [10, 10]) => (almost= (vector-length [10, 10]))
-       (distance [34, 12] [-24, 42]) => (almost= 65.29931086925804))
+       (distance [34, 12] [-24, 42]) => (almost= 65.29931086925804))
+
+;; (facts "about circle-X-circle? function"
+;;        (circle-X-circle? {:position [0, 0],     :radius 10}
+;;                          {:position [100, 100], :radius 10})
+;;        => false
+
+;;        (circle-X-circle? {:position [34, 32], :radius 20}
+;;                          {:position []})
+;;        => true
+;;        )
+
+;; (facts "about circle-X-any-circle? function"
+;;        )
+
+;; (facts "about circle-X-rectangle? fucntion"
+;;        )