Skip to content

Commit

Permalink
Shave a Tnua-shaped yak
Browse files Browse the repository at this point in the history
  • Loading branch information
@janhohenheim
janhohenheim committed Sep 8, 2024
1 parent ab237f2 commit 58cb171
Show file tree
Hide file tree
Showing 10 changed files with 116 additions and 123 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
.cargo/config.toml
# Blender backup files
*.blend[1-9]
# Blenvy backup files
*[1-9].blend
6 changes: 3 additions & 3 deletions Cargo.lock
View file

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ avian3d = { git = "https://github.com/Jondolf/avian" }
bevy-inspector-egui = { version = "0.25.2", optional = true }
leafwing-input-manager = { git = "https://github.com/Leafwing-Studios/leafwing_input_manager" }
bevy_dolly = "0.0.4"
bevy-tnua-avian3d = { version = "0.1.1", git = "https://github.com/janhohenheim/bevy-tnua", branch = "avian-main" }
bevy-tnua = { version = "0.19.0", git = "https://github.com/janhohenheim/bevy-tnua", branch = "avian-main"}
bevy-tnua-avian3d = { version = "0.1.1", git = "https://github.com/janhohenheim/bevy-tnua", branch = "fix-minor-avian-stuff" }
bevy-tnua = { version = "0.19.0", git = "https://github.com/janhohenheim/bevy-tnua", branch = "fix-minor-avian-stuff"}

# Generic dependencies
rand = "0.8"
Expand Down
Binary file modified art/foxtrot.blend
View file
Binary file not shown.
Binary file modified assets/levels/World.glb
View file
Binary file not shown.
82 changes: 41 additions & 41 deletions assets/levels/World.meta.ron
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,66 +18,66 @@
("Road Corner Curved", File ( path: "blueprints/Road Corner Curved.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("Car Blue", File ( path: "blueprints/Car Blue.glb" )),
("Blue", File ( path: "materials/Blue.glb" )),
("Headlights", File ( path: "materials/Headlights.glb" )),
("Windows", File ( path: "materials/Windows.glb" )),
("TailLights", File ( path: "materials/TailLights.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("Black", File ( path: "materials/Black.glb" )),
("Windows", File ( path: "materials/Windows.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("Blue", File ( path: "materials/Blue.glb" )),
("Headlights", File ( path: "materials/Headlights.glb" )),
("Building Red", File ( path: "blueprints/Building Red.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("wood", File ( path: "materials/wood.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("Building Red Corner", File ( path: "blueprints/Building Red Corner.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("wood", File ( path: "materials/wood.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("Building Red Corner", File ( path: "blueprints/Building Red Corner.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("wood", File ( path: "materials/wood.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("Building Beige", File ( path: "blueprints/Building Beige.glb" )),
("brick_shadeGreen2", File ( path: "materials/brick_shadeGreen2.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("door_white", File ( path: "materials/door_white.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("brick_shadeGreen2", File ( path: "materials/brick_shadeGreen2.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("brick_shadeGreen", File ( path: "materials/brick_shadeGreen.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("Building Beige Corner Pizza", File ( path: "blueprints/Building Beige Corner Pizza.glb" )),
("brick_shadeGreen2", File ( path: "materials/brick_shadeGreen2.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("door_white", File ( path: "materials/door_white.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("brick_shadeGreen2", File ( path: "materials/brick_shadeGreen2.glb" )),
("red", File ( path: "materials/red.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("White", File ( path: "materials/White.glb" )),
("red", File ( path: "materials/red.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("brick_shadeGreen", File ( path: "materials/brick_shadeGreen.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("Building Black", File ( path: "blueprints/Building Black.glb" )),
("brick_shade3", File ( path: "materials/brick_shade3.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("brick_shade3", File ( path: "materials/brick_shade3.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("Building Red Barren", File ( path: "blueprints/Building Red Barren.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("Buliding Big", File ( path: "blueprints/Buliding Big.glb" )),
("Beige", File ( path: "materials/Beige.glb" )),
("BrickRed", File ( path: "materials/BrickRed.glb" )),
("DarkGrey", File ( path: "materials/DarkGrey.glb" )),
("LightYellow", File ( path: "materials/LightYellow.glb" )),
("Beige", File ( path: "materials/Beige.glb" )),
("Brown", File ( path: "materials/Brown.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("DarkGrey", File ( path: "materials/DarkGrey.glb" )),
("BrickRed", File ( path: "materials/BrickRed.glb" )),
("Air Conditioner", File ( path: "blueprints/Air Conditioner.glb" )),
("Mat", File ( path: "materials/Mat.glb" )),
("Fire Exit", File ( path: "blueprints/Fire Exit.glb" )),
Expand All @@ -89,29 +89,29 @@
("Traffic Light", File ( path: "blueprints/Traffic Light.glb" )),
("Atlas.052", File ( path: "materials/Atlas.052.glb" )),
("Mailbox", File ( path: "blueprints/Mailbox.glb" )),
("mailbox", File ( path: "materials/mailbox.glb" )),
("sign_shade2", File ( path: "materials/sign_shade2.glb" )),
("sign", File ( path: "materials/sign.glb" )),
("sign_shade2", File ( path: "materials/sign_shade2.glb" )),
("mailbox", File ( path: "materials/mailbox.glb" )),
("Trash Container", File ( path: "blueprints/Trash Container.glb" )),
("DarkGrey", File ( path: "materials/DarkGrey.glb" )),
("Green", File ( path: "materials/Green.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("DarkGrey", File ( path: "materials/DarkGrey.glb" )),
("Cone", File ( path: "blueprints/Cone.glb" )),
("White", File ( path: "materials/White.glb" )),
("Orange", File ( path: "materials/Orange.glb" )),
("Black", File ( path: "materials/Black.glb" )),
("White", File ( path: "materials/White.glb" )),
("Dark_gray", File ( path: "materials/Dark_gray.glb" )),
("Orange", File ( path: "materials/Orange.glb" )),
("Trash Bag", File ( path: "blueprints/Trash Bag.glb" )),
("mat17", File ( path: "materials/mat17.glb" )),
("Bus Stop", File ( path: "blueprints/Bus Stop.glb" )),
("BlueBusStop", File ( path: "materials/BlueBusStop.glb" )),
("LightBlue_BusStop", File ( path: "materials/LightBlue_BusStop.glb" )),
("BlueBusStop", File ( path: "materials/BlueBusStop.glb" )),
("Bus Stop Sign", File ( path: "blueprints/Bus Stop Sign.glb" )),
("White", File ( path: "materials/White.glb" )),
("Orang", File ( path: "materials/Orang.glb" )),
("Black", File ( path: "materials/Black.glb" )),
("Silver", File ( path: "materials/Silver.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("Black", File ( path: "materials/Black.glb" )),
("White", File ( path: "materials/White.glb" )),
("Orang", File ( path: "materials/Orang.glb" )),
("Box", File ( path: "blueprints/Box.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("Fence Piece", File ( path: "blueprints/Fence Piece.glb" )),
Expand All @@ -136,20 +136,20 @@
("Metal Fence", File ( path: "blueprints/Metal Fence.glb" )),
("Silver", File ( path: "materials/Silver.glb" )),
("Overpass Tunnel", File ( path: "blueprints/Overpass Tunnel.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("Black", File ( path: "materials/Black.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("Overpass Block", File ( path: "blueprints/Overpass Block.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("Npc Pizza", File ( path: "blueprints/Npc Pizza.glb" )),
("Woman", File ( path: "materials/Woman.glb" )),
("Npc Mail", File ( path: "blueprints/Npc Mail.glb" )),
("Skin", File ( path: "materials/Skin.glb" )),
("Pants", File ( path: "materials/Pants.glb" )),
("Socks", File ( path: "materials/Socks.glb" )),
("Eyes", File ( path: "materials/Eyes.glb" )),
("Pants", File ( path: "materials/Pants.glb" )),
("Shirt", File ( path: "materials/Shirt.glb" )),
("Skin", File ( path: "materials/Skin.glb" )),
("Hair", File ( path: "materials/Hair.glb" )),
]
)
75 changes: 36 additions & 39 deletions assets/registry.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,24 @@
"type": "array",
"typeInfo": "Tuple"
},
"(foxtrot::character::controller::FloatHeight, foxtrot::character::controller::WalkSpeed, foxtrot::character::controller::JumpHeight)": {
"(foxtrot::character::controller::WalkControllerConfig, foxtrot::character::controller::JumpControllerConfig)": {
"isComponent": false,
"isResource": false,
"items": false,
"long_name": "(foxtrot::character::controller::FloatHeight, foxtrot::character::controller::WalkSpeed, foxtrot::character::controller::JumpHeight)",
"long_name": "(foxtrot::character::controller::WalkControllerConfig, foxtrot::character::controller::JumpControllerConfig)",
"prefixItems": [
{
"type": {
"$ref": "#/$defs/foxtrot::character::controller::FloatHeight"
"$ref": "#/$defs/foxtrot::character::controller::WalkControllerConfig"
}
},
{
"type": {
"$ref": "#/$defs/foxtrot::character::controller::WalkSpeed"
}
},
{
"type": {
"$ref": "#/$defs/foxtrot::character::controller::JumpHeight"
"$ref": "#/$defs/foxtrot::character::controller::JumpControllerConfig"
}
}
],
"short_name": "(FloatHeight, WalkSpeed, JumpHeight)",
"short_name": "(WalkControllerConfig, JumpControllerConfig)",
"type": "array",
"typeInfo": "Tuple"
},
Expand Down Expand Up @@ -17470,53 +17465,55 @@
"type": "string",
"typeInfo": "Enum"
},
"foxtrot::character::controller::FloatHeight": {
"foxtrot::character::controller::JumpControllerConfig": {
"additionalProperties": false,
"isComponent": true,
"isResource": false,
"items": false,
"long_name": "foxtrot::character::controller::FloatHeight",
"prefixItems": [
{
"long_name": "foxtrot::character::controller::JumpControllerConfig",
"properties": {
"height": {
"type": {
"$ref": "#/$defs/f32"
}
}
},
"required": [
"height"
],
"short_name": "FloatHeight",
"type": "array",
"typeInfo": "TupleStruct"
"short_name": "JumpControllerConfig",
"type": "object",
"typeInfo": "Struct"
},
"foxtrot::character::controller::JumpHeight": {
"foxtrot::character::controller::WalkControllerConfig": {
"additionalProperties": false,
"isComponent": true,
"isResource": false,
"items": false,
"long_name": "foxtrot::character::controller::JumpHeight",
"prefixItems": [
{
"long_name": "foxtrot::character::controller::WalkControllerConfig",
"properties": {
"float_height": {
"type": {
"$ref": "#/$defs/f32"
}
}
],
"short_name": "JumpHeight",
"type": "array",
"typeInfo": "TupleStruct"
},
"foxtrot::character::controller::WalkSpeed": {
"isComponent": true,
"isResource": false,
"items": false,
"long_name": "foxtrot::character::controller::WalkSpeed",
"prefixItems": [
{
},
"max_speed": {
"type": {
"$ref": "#/$defs/f32"
}
},
"sprint_multiplier": {
"type": {
"$ref": "#/$defs/f32"
}
}
},
"required": [
"max_speed",
"sprint_multiplier",
"float_height"
],
"short_name": "WalkSpeed",
"type": "array",
"typeInfo": "TupleStruct"
"short_name": "WalkControllerConfig",
"type": "object",
"typeInfo": "Struct"
},
"foxtrot::character::spawn::InsertCharacterController": {
"additionalProperties": false,
Expand Down
Loading

0 comments on commit 58cb171

Please sign in to comment.