Skip to content
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

add Minie and update examples #7

Merged
merged 1 commit into from
Jan 15, 2021
Merged

add Minie and update examples #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
add Minie and update examples
  • Loading branch information
@ertugrulcetin
ertugrulcetin committed Jan 15, 2021
commit 11e37b032e11b8958d259244bdf9abdaf82ccade
5 changes: 2 additions & 3 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(def jme-version "3.2.2-stable")
(def jme-version "3.3.2-stable")

(defproject jme-clj "0.1.12"

Expand All @@ -15,8 +15,6 @@
[org.jmonkeyengine/jme3-core ~jme-version]
[org.jmonkeyengine/jme3-plugins ~jme-version]
[org.jmonkeyengine/jme3-terrain ~jme-version]
[org.jmonkeyengine/jme3-bullet ~jme-version]
[org.jmonkeyengine/jme3-bullet-native ~jme-version]
[org.jmonkeyengine/jme3-jogg ~jme-version]
[org.jmonkeyengine/jme3-jogl ~jme-version]
[org.jmonkeyengine/jme3-effects ~jme-version]
Expand All @@ -26,6 +24,7 @@
[org.jmonkeyengine/jme3-networking ~jme-version]
[org.jmonkeyengine/jme3-blender ~jme-version]
[camel-snake-kebab "0.4.2"]
[com.github.stephengold/Minie "3.1.0"]
[kezban "0.1.92"]
[potemkin "0.4.5"]]

Expand Down
6 changes: 3 additions & 3 deletions test/examples/beginner_tutorials/hello_collision.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
(let [{:keys [player]} (get-state)]
(if (= ::jump name*)
(when pressed?
(call* player :jump (vec3 0 20 0)))
(call* player :jump))
(set-state (-> name* name keyword) pressed?))))))


Expand Down Expand Up @@ -55,9 +55,9 @@
scene-model (add-control scene-model landscape)
capsule-shape (capsule-collision-shape 1.5 6 1)
player (setc (character-control capsule-shape 0.05)
:jump-speed 50
:jump-speed 20
:fall-speed 80
:gravity (vec3 0 -30 0)
:gravity 30
:physics-location (vec3 0 10 0))]
(attach bullet-as)
(add-to-root scene-model)
Expand Down
4 changes: 2 additions & 2 deletions test/examples/fps/client.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
(setc player
:jump-speed 20
:fall-speed 30
:gravity (vec3 0 -30 0)
:gravity 30
:physics-location (vec3 -500 0 0))))


Expand Down Expand Up @@ -82,7 +82,7 @@
(let [player (setc (character-control (capsule-collision-shape 3 3.5 1) 0.05)
:jump-speed 20
:fall-speed 30
:gravity (vec3 0 -30 0))
:gravity 30)
spatial (load-model "Models/Oto/Oto.mesh.xml")]
(-> spatial
(set* :user-data "name" (str "model_" i))
Expand Down
2 changes: 1 addition & 1 deletion test/examples/fps/controls.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
(get* :physics-space)
(call* :remove-all node))
(remove-from-parent node)))))
(= ::jump name*) (when pressed? (call* player :jump (vec3 0 20 0)))
(= ::jump name*) (when pressed? (call* player :jump))
:else (set-state :control [::user-input (-> name* name keyword)] pressed?))))))


Expand Down
2 changes: 1 addition & 1 deletion test/examples/simple_multiplayer/player_app_state.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
(let [player (load-model "Models/Oto/OtoOldAnim.j3o")
player-control (character-control (capsule-collision-shape 3.0 4.0) 0.01)]
(setc player-control
:gravity (vec3 0 -30 0)
:gravity 30
:physics-location (vec3 0 100 0))
(add-control player player-control)
(-> bullet-as
Expand Down