Fixed README, Added all worlds

lspector · Oct 11, 2021 · 0ea35e9 · 0ea35e9
1 parent 6fa7bae
commit 0ea35e9
Show file tree

Hide file tree

Showing 820 changed files with 464,068 additions and 1,445 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -158,6 +158,8 @@ The pucks transfer system is still under development and will continue to change
 
 World files should define zero-argument functions named agents and settings. The agents function should return a sequence of agents, which will be used as the initial agents in simulations, and the settings function should return a map that maps settings keywords to desired values. Once a world file is loaded, evaluating (run-pucks (agents) (settings)) will run a simulation that starts with the agents produced by the call to agents, using the settings that result from merging the default settings with the results of the call to settings.
 
+New worlds should be preloaded as namespaces in `core.cljs` and `core.clj` using using `:require :as`. This is due to namespaces not being able to be loaded during runtime in ClojureScript, so they must be preloaded using `:require` for both Clj and Cljs support.
+
 ## Settings
 
 The following simulation settings are set in src/pucks/globals.clj and can be reset in world files and/or on the leiningen command line:
@@ -180,6 +182,33 @@ Setting | Description | Default
 :ms-limit | the number of milliseconds that the simulation should run; if nil then it will run forever or until manually terminated; if a number then the simulation will run for that many milliseconds, print the number of iterations completed, and exit | nil
 :pause-on-start | if true then the simulation will be paused immediately when started | false
 
+## Publishing a Quil Sketch
+
+Before you publish your sketch, run `lein do clean, cljsbuild once optimized`. This will compile your code and run Google Closure Compiler with advanced optimizations. 
+
+##Using Github Pages
+Having run the Google Clojure Compiler, the files in the `resources/public` directory (index.html, style.css, js) can now be used to host the website. 
+
+If you are creating an independent repository, you will need to name the repository in the following format:`<user>.github.io` or `<organization>.github.io`. 
+
+
+If you are using an existing repository, you will need to make a subtree first. Since `public` will be the folder that holds pucks, we will use that as an example.
+
+
+`git add public && git commit -m "Initial dist subtree commit"`
+
+Use subtree push to send it to the `gh-pages` branch on GitHub.
+
+`git subtree push --prefix dist origin gh-pages`
+
+You could also copy the files and push them onto a new `gh-pages` branch using Github Desktop.
+
+If you are creating an independent repository, you can push the files in the `resources/public` folder to your repository.
+
+To find the link to your hosted website, go to your repository settings and look for the pages tab.
+You will see a section titled `Source`, where you will be able to set the source directory for your GitHub website.
+You should set your source directory to the branch where you pushed your code from `resources/public`. If you made an
+ independent repository, then it should be the `master` branch, or the `gh-pages` branch if you used an existing repository.
 
 ## Contributors
 

diff --git a/bin/pucks/agents/active.clj b/bin/pucks/agents/active.clj
diff --git a/bin/pucks/agents/beacon.clj b/bin/pucks/agents/beacon.clj
diff --git a/bin/pucks/agents/generic.clj b/bin/pucks/agents/generic.clj
diff --git a/bin/pucks/agents/linear.clj b/bin/pucks/agents/linear.clj
diff --git a/bin/pucks/agents/nursery.clj b/bin/pucks/agents/nursery.clj
diff --git a/bin/pucks/agents/startstop.clj b/bin/pucks/agents/startstop.clj
diff --git a/bin/pucks/agents/stone.clj b/bin/pucks/agents/stone.clj
diff --git a/bin/pucks/agents/swarmer.clj b/bin/pucks/agents/swarmer.clj
diff --git a/bin/pucks/agents/user.clj b/bin/pucks/agents/user.clj
diff --git a/bin/pucks/agents/vent.clj b/bin/pucks/agents/vent.clj
diff --git a/bin/pucks/agents/zapper.clj b/bin/pucks/agents/zapper.clj
diff --git a/bin/pucks/agents/zigzag.clj b/bin/pucks/agents/zigzag.clj
diff --git a/bin/pucks/core_test.clj b/bin/pucks/core_test.clj
diff --git a/bin/pucks/globals.clj b/bin/pucks/globals.clj
diff --git a/bin/pucks/sensors.clj b/bin/pucks/sensors.clj
diff --git a/bin/pucks/util.clj b/bin/pucks/util.clj
diff --git a/bin/pucks/vec2D.clj b/bin/pucks/vec2D.clj
diff --git a/bin/pucks/worlds/ai/world1.clj b/bin/pucks/worlds/ai/world1.clj
diff --git a/bin/pucks/worlds/dev/world1.clj b/bin/pucks/worlds/dev/world1.clj
diff --git a/bin/pucks/worlds/dev/world2.clj b/bin/pucks/worlds/dev/world2.clj
diff --git a/bin/pucks/worlds/dev/world3.clj b/bin/pucks/worlds/dev/world3.clj
diff --git a/bin/pucks/worlds/dev/world4.clj b/bin/pucks/worlds/dev/world4.clj
diff --git a/bin/pucks/worlds/dev/world5.clj b/bin/pucks/worlds/dev/world5.clj
diff --git a/doc/intro.md b/doc/intro.md
diff --git a/figwheel_server.log b/figwheel_server.log
diff --git a/project.clj b/project.clj
@@ -1,20 +1,39 @@
-(defproject pucks "0.1.26"
-  :description "An environment for experiments and education in artificial intelligence and artificial life."
+(defproject pucks "0.1.0-SNAPSHOT"
+  :description "FIXME: write description"
   :url "http://example.com/FIXME"
   :license {:name "Eclipse Public License"
-            :url "https://github.com/lspector/pucks"}
+            :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[org.clojure/clojure "1.10.1"]
                  [quil "4.0.0-SNAPSHOT"]
-                 [clojush "2.8.0"]]
+                 [org.clojure/clojurescript "1.10.520"]
+                 [net.clojars.lspector/propeller "0.2.1"]]
+
+  :plugins [[lein-cljsbuild "1.1.7"]
+            [lein-figwheel "0.5.19"]]
+  :hooks [leiningen.cljsbuild]
+
+  :profiles {:uberjar {:aot :all}}
+  :resource-paths ["target"]
   :main pucks.core
   :target-path "target/%s"
-  :profiles {:uberjar {:aot :all}}
-  ;; the following should automatically take n% of the machine's RAM and also use the G1 garbage collector
-  ;:jvm-opts ~(let [mem-to-use (long (* (.getTotalPhysicalMemorySize
-  ;                                       (java.lang.management.ManagementFactory/getOperatingSystemMXBean))
-  ;                                     0.5))]
-  ;             [(str "-Xmx" mem-to-use)
-  ;              (str "-Xms" mem-to-use)
-  ;              ;"-XX:+UseG1GC"
-  ;              ])
-  )
+
+  :clean-targets ^{:protect false} ["resources/public/js"]
+  :cljsbuild
+  {:builds [; development build with figwheel hot swap
+            {:id "development"
+             :source-paths ["src"]
+             :figwheel true
+             :compiler
+             {:main "pucks.core"
+              :output-to "resources/public/js/main.js"
+              :output-dir "resources/public/js/development"
+              :asset-path "js/development"}}
+            ; minified and bundled build for deployment
+            {:id "optimized"
+             :source-paths ["src"]
+             :compiler
+             {:main "pucks.core"
+              :output-to "resources/public/js/main.js"
+              :output-dir "resources/public/js/optimized"
+              :asset-path "js/optimized"
+              :optimizations :advanced}}]})
diff --git a/resources/.DS_Store b/resources/.DS_Store
diff --git a/resources/public/.DS_Store b/resources/public/.DS_Store
diff --git a/resources/public/index.html b/resources/public/index.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+  <head>
+      <link rel="preconnect" href="https://fonts.googleapis.com">
+      <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+      <link href="https://fonts.googleapis.com/css2?family=Raleway:wght@600&display=swap" rel="stylesheet">
+      <link href='./style.css' rel='stylesheet'>
+    <title>pucks</title>
+  </head>
+  <body>
+    <p>Pucks: An environment for experiments and education in artificial intelligence and artificial life.</p>
+
+    <div align="center">
+
+    <select id="mySelect">
+        <option value="World1">World1</option>
+        <option value="World2">World2</option>
+        <option value="World3">World3</option>
+        <option value="World4">World4</option>
+        <option value="World5">World5</option>
+        <option value="World6">World6</option>
+        <option value="World7">World7</option>
+        <option value="World8">World8</option>
+        <option value="World9">World9</option>
+        <option value="World10">World10</option>
+        <option value="World11">World11</option>
+        <option value="World12">World12</option>
+        <option value="World13">World13</option>
+        <option value="World14">World14</option>
+        <option value="World15">World15</option>
+        <option value="World16">World16</option>
+        <option value="World17">World17</option>
+        <option value="World18">World18</option>
+        <option value="World19">World19</option>
+        <option value="World20">World20</option>
+        <option value="World21">World21</option>
+        <option value="World22">World22</option>
+        <option value="World23">World23</option>
+        <option value="World24">World24</option>
+        <option value="aiWorld1">aiWorld1</option>
+        <option value="aiWorld2">aiWorld2</option>
+        <option value="aiWorld3">aiWorld3</option>
+        <option value="aiWorld4">aiWorld4</option>
+        <option value="aiWorld5">aiWorld5</option>
+        <option value="aiWorld6">aiWorld6</option>
+        <option value="aiWorld7">aiWorld7</option>
+        <option value="aiWorld8">aiWorld8</option>
+    </select>
+        <button id="btn">Run!</button>
+
+        <script> document.getElementById('btn').addEventListener("click", function(){
+        var x = document.getElementById("mySelect").value;
+        pucks.core._main(x);});</script>
+
+    </div>
+    <div id="pucks">
+        <script src="js/main.js"></script>
+    </div>
+<!--    <script>pucks.core._main()</script>-->
+  </body>
+</html>