Merge pull request #1 from odecay/master

Reorganization of examples and remove submodule.
BrianWiz · Nov 10, 2023 · 85496b5 · 85496b5
2 parents 9eac1b2 + 4f71818
commit 85496b5
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 30 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,10 +20,14 @@ thiserror = "1.0.50"
 usage = "1.4.0"
 
 shalrath = "0.2.5"
-shambler = {path = "./shambler"}
-bevy_xpbd_3d = { version = "0.3.1", optional = true }
+shambler = { git = "https://github.com/BrianWiz/shambler.git" }
+bevy_xpbd_3d = { version = "0.3.2", optional = true }
 bevy_rapier3d = { version = "0.23.0", optional = true }
 
+[[example]]
+name = "first_person"
+required-features = ["xpbd"]
+
 [features]
-xpbd=["bevy_xpbd_3d"]
-rapier=["bevy_rapier3d"]
+xpbd = ["bevy_xpbd_3d"]
+rapier = ["bevy_rapier3d"]
diff --git a/example/assets/example.map → assets/example.map b/example/assets/example.map → assets/example.map
diff --git a/...odels/editor_directional_light_arrow.gltf → ...odels/editor_directional_light_arrow.gltf b/...odels/editor_directional_light_arrow.gltf → ...odels/editor_directional_light_arrow.gltf
diff --git a/example/assets/models/monkey.gltf → assets/models/monkey.gltf b/example/assets/models/monkey.gltf → assets/models/monkey.gltf
diff --git a/example/assets/textures/blue_tiles.png → assets/textures/blue_tiles.png b/example/assets/textures/blue_tiles.png → assets/textures/blue_tiles.png
diff --git a/example/assets/textures/grey_tiles.png → assets/textures/grey_tiles.png b/example/assets/textures/grey_tiles.png → assets/textures/grey_tiles.png
diff --git a/example/assets/textures/orange_tiles.png → assets/textures/orange_tiles.png b/example/assets/textures/orange_tiles.png → assets/textures/orange_tiles.png
diff --git a/example/assets/textures/red_tiles.png → assets/textures/red_tiles.png b/example/assets/textures/red_tiles.png → assets/textures/red_tiles.png
diff --git a/example/assets/textures/uv_test.png → assets/textures/uv_test.png b/example/assets/textures/uv_test.png → assets/textures/uv_test.png
diff --git a/example/Cargo.toml b/example/Cargo.toml
diff --git a/example/src/main.rs → examples/first_person.rs b/example/src/main.rs → examples/first_person.rs
diff --git a/...e/trenchbroom/Qevy Example/GameConfig.cfg → ...s/trenchbroom/qevy_example/GameConfig.cfg b/...e/trenchbroom/Qevy Example/GameConfig.cfg → ...s/trenchbroom/qevy_example/GameConfig.cfg
diff --git a/example/trenchbroom/Qevy Example/icon.png → examples/trenchbroom/qevy_example/icon.png b/example/trenchbroom/Qevy Example/icon.png → examples/trenchbroom/qevy_example/icon.png
diff --git a/...trenchbroom/Qevy Example/qevy_example.fgd → ...trenchbroom/qevy_example/qevy_example.fgd b/...trenchbroom/Qevy Example/qevy_example.fgd → ...trenchbroom/qevy_example/qevy_example.fgd
diff --git a/shambler b/shambler