Merge branch 'migration' of ssh://service-gitea/geefr/olcjam2020

Cargo.toml

@@ -0,0 +1,39 @@
+[package]
+name = "goldberg"
+version = "0.1.0"
+authors = ["Gareth Francis <gfrancis.dev@gmail.com>"]
+edition = "2018"
+
+[profile.release]
+lto = true
+
+# TODO: wasm no longer supported, had issues with graphics frameworks
+#[lib]
+#crate-type = ["cdylib"]
+
+[[bin]]
+name = "main"
+path = "src/bin/main.rs"
+include = ["assets"]
+
+[[bin]]
+name = "define-primitive"
+path = "src/bin/define-primitive.rs"
+
+[dependencies]
+#wasm-bindgen = "0.2.67"
+#log = "0.4.11"
+#console_error_panic_hook = "0.1.6"
+#console_log = "0.2.0"
+nphysics3d = { version = "0.17.0", features = ["dim3", "use-wasm-bindgen"] }
+ncollide3d = { version = "0.24.0" }
+nalgebra = { version = "0.22.0" }
+kiss3d = { path = "../../kiss3d" }
+serde = "1.0.115"
+serde_derive = "1.0.115"
+serde_json = "1.0.57"
+text_io = "0.1.8"
+
+# Audio support - cpal or similar seems useful, but lots of dev to get the boilerplate in..
+# Requires alsa dev libs on Linux (libasound2-dev)
+# cpal = { version = "0.12.1"} #, features = ["wasm-bindgen"] }

assets/entities/cannon-2m.json

@@ -0,0 +1,51 @@
+{
+  "name": "Cannon-2m",
+  "entity_type": "Cannon",
+  "primitive": {
+    "name": "Cannon-2m",
+    "path_obj": "models/cannon/cannon.obj",
+    "path_mtl": "models/cannon/",
+    "scale": [
+      1.0,
+      1.0,
+      1.0
+    ],
+    "density": 150000.0,
+    "restitution": 0.0,
+    "friction": 0.9,
+    "collider_def": [
+      {
+        "collider_type": "Cuboid",
+        "origin": [
+          0.0,
+          1.5,
+          3.5
+        ],
+        "dimensions": [
+          1.0,
+          1.5,
+          3.5
+        ]
+      }
+    ]
+  },
+  "active_default": false,
+  "cannon_spawn_point": [
+    0.0,
+    2.0,
+    7.0
+  ],
+  "cannon_spawn_force": [
+    0.0,
+    0.0,
+    1000.0
+  ],
+  "cannon_projectile_name": "cannon-ball-1m",
+  "cannon_projectile_scale": [
+    1.0,
+    1.0,
+    1.0
+  ],
+  "cannon_ammo": 1,
+  "cannon_fire_delay": 0.0
+}