Skip to content

Commit

Permalink
feat: update textures and adjust fight
Browse files Browse the repository at this point in the history
  • Loading branch information
buxx committed May 20, 2024
1 parent 2d47a9c commit b23642d
Show file tree
Hide file tree
Showing 43 changed files with 1,039 additions and 183 deletions.
282 changes: 282 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,27 @@
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "face_to_face1",
"cargo": {
"args": [
"build",
"--bin=face_to_face1",
"--package=examples",
],
"filter": {
"name": "face_to_face1",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
Expand Down Expand Up @@ -943,5 +964,266 @@
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "face_to_face_with_one_side_brickwall1 --release",
"cargo": {
"args": [
"build",
"--bin=face_to_face_with_one_side_brickwall1",
"--package=examples",
"--release"
],
"filter": {
"name": "face_to_face_with_one_side_brickwall1",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "face_to_face_with_one_side_brickwall2 --release",
"cargo": {
"args": [
"build",
"--bin=face_to_face_with_one_side_brickwall2",
"--package=examples",
"--release"
],
"filter": {
"name": "face_to_face_with_one_side_brickwall2",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "face_to_face_with_one_side_brickwall3 --release",
"cargo": {
"args": [
"build",
"--bin=face_to_face_with_one_side_brickwall3",
"--package=examples",
"--release"
],
"filter": {
"name": "face_to_face_with_one_side_brickwall3",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "face_to_face_opaque1 --release",
"cargo": {
"args": [
"build",
"--bin=face_to_face_opaque1",
"--package=examples",
"--release"
],
"filter": {
"name": "face_to_face_opaque1",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "face_to_face_opaque2 --release",
"cargo": {
"args": [
"build",
"--bin=face_to_face_opaque2",
"--package=examples",
"--release"
],
"filter": {
"name": "face_to_face_opaque2",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "running_with_one_side_brickwall1 --release",
"cargo": {
"args": [
"build",
"--bin=running_with_one_side_brickwall1",
"--package=examples",
"--release"
],
"filter": {
"name": "running_with_one_side_brickwall1",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "walking_with_one_side_brickwall1 --release",
"cargo": {
"args": [
"build",
"--bin=walking_with_one_side_brickwall1",
"--package=examples",
"--release"
],
"filter": {
"name": "walking_with_one_side_brickwall1",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "walking_with_one_side_brickwall1",
"cargo": {
"args": [
"build",
"--bin=walking_with_one_side_brickwall1",
"--package=examples",
],
"filter": {
"name": "walking_with_one_side_brickwall1",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "walking_with_one_side_brickwall2 --release",
"cargo": {
"args": [
"build",
"--bin=walking_with_one_side_brickwall2",
"--package=examples",
"--release"
],
"filter": {
"name": "walking_with_one_side_brickwall2",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "walking_with_one_side_brickwall2",
"cargo": {
"args": [
"build",
"--bin=walking_with_one_side_brickwall2",
"--package=examples"
],
"filter": {
"name": "walking_with_one_side_brickwall2",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "walking_with_one_side_brickwall3 --release",
"cargo": {
"args": [
"build",
"--bin=walking_with_one_side_brickwall3",
"--package=examples",
"--release"
],
"filter": {
"name": "walking_with_one_side_brickwall3",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
{
"type": "lldb",
"request": "launch",
"name": "walking_with_one_side_brickwall3",
"cargo": {
"args": [
"build",
"--bin=walking_with_one_side_brickwall3",
"--package=examples"
],
"filter": {
"name": "walking_with_one_side_brickwall3",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "1"
}
},
]
}
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion battle_core/src/behavior/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
pub mod feeling;
pub mod gesture;

#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
pub enum Body {
StandUp,
Crouched,
Expand Down Expand Up @@ -148,6 +148,7 @@ impl Behavior {

pub fn posture(&self) -> Posture {
// TODO : posture can be different on same behavior (like with SuppressFire, EngageSoldier)
// FIXME: Clarify which usage with `Body` !!
match self {
Behavior::MoveTo(_) | Behavior::MoveFastTo(_) | Behavior::Idle(_) => Posture::StandUp,
Behavior::Defend(_)
Expand Down
Loading

0 comments on commit b23642d

Please sign in to comment.