Skip to content

Commit

Permalink
fixed transform bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
AnneKitsune committed May 1, 2019
1 parent d32aec0 commit 6361121
Show file tree
Hide file tree
Showing 27 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions amethyst_test/src/amethyst_application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ impl AmethystApplication<GameData<'static, 'static>, StateEvent, StateEventReade
AC: Hash + Eq + Clone + Send + Sync + 'static,
{
AmethystApplication::blank()
.with_bundle(TransformBundle::new())
.with_bundle(TransformBundle::<f32>::new())
.with_ui_bundles::<AX, AC>()
.with_resource(ScreenDimensions::new(SCREEN_WIDTH, SCREEN_HEIGHT, HIDPI))
}
Expand Down Expand Up @@ -161,7 +161,7 @@ impl AmethystApplication<GameData<'static, 'static>, StateEvent, StateEventReade
"sprite_render_animation_control_system",
"sprite_render_sampler_interpolation_system",
))
.with_bundle(TransformBundle::new().with_dep(&[
.with_bundle(TransformBundle::<f32>::new().with_dep(&[
"material_animation_control_system",
"material_sampler_interpolation_system",
"sprite_render_animation_control_system",
Expand Down
2 changes: 1 addition & 1 deletion examples/animation/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ fn main() -> amethyst::Result<()> {
"animation_control_system",
"sampler_interpolation_system",
))?
.with_bundle(TransformBundle::new().with_dep(&["sampler_interpolation_system"]))?
.with_bundle(TransformBundle::<f32>::new().with_dep(&["sampler_interpolation_system"]))?
.with_basic_renderer(display_config_path, DrawShaded::<PosNormTex, f32>::new(), false)?;
let mut game = Application::new(resources, Example::default(), game_data)?;
game.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/appendix_a/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn main() -> amethyst::Result<()> {
InputBundle::<String, String>::new().with_bindings_from_file(&key_bindings_path)?,
)?
.with_bundle(PongBundle::default())?
.with_bundle(TransformBundle::new().with_dep(&["ball_system", "paddle_system"]))?
.with_bundle(TransformBundle::<f32>::new().with_dep(&["ball_system", "paddle_system"]))?
.with_bundle(AudioBundle::<f32>::default())?
.with(
DjSystem::new(|music: &mut Music| music.music.next()),
Expand Down
2 changes: 1 addition & 1 deletion examples/arc_ball_camera/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ fn main() -> Result<(), Error> {

let game_data = GameDataBuilder::default()
.with(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with_bundle(TransformBundle::new().with_dep(&[]))?
.with_bundle(TransformBundle::<f32>::new().with_dep(&[]))?
.with_bundle(
InputBundle::<String, String>::new().with_bindings_from_file(&key_bindings_path)?,
)?
Expand Down
2 changes: 1 addition & 1 deletion examples/asset_loading/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ fn main() -> Result<(), Error> {

let game_data = GameDataBuilder::default()
.with_bundle(InputBundle::<String, String>::new())?
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_basic_renderer(display_config_path, DrawShaded::<PosNormTex, f32>::new(), false)?;

let mut game = Application::new(resources_directory, AssetsExample, game_data)?;
Expand Down
2 changes: 1 addition & 1 deletion examples/auto_fov/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fn main() -> Result<(), Error> {
.with(PrefabLoaderSystem::<ScenePrefab>::default(), "prefab", &[])
.with(AutoFovSystem, "auto_fov", &["prefab"]) // This makes the system adjust the camera right after it has been loaded (in the same frame), preventing any flickering
.with(ShowFovSystem, "show_fov", &["auto_fov"])
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_bundle(InputBundle::<String, String>::new())?
.with_bundle(UiBundle::<String, String>::new())?
.with_basic_renderer(display_config, DrawShaded::<PosNormTex, f32>::new(), true)?;
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_game_data/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ fn main() -> Result<(), Error> {
let game_data = CustomGameDataBuilder::default()
.with_base(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with_running::<ExampleSystem>(ExampleSystem::default(), "example_system", &[])
.with_base_bundle(TransformBundle::new())?
.with_base_bundle(TransformBundle::<f32>::new())?
.with_base_bundle(UiBundle::<String, String>::new())?
.with_base_bundle(FPSCounterBundle::default())?
.with_base_bundle(RenderBundle::<_, _, f32>::new(pipeline_builder, Some(display_config)))?
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_ui/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ fn main() -> amethyst::Result<()> {

let game_data = GameDataBuilder::default()
.with(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_bundle(UiBundle::<String, String, CustomUi>::new())?
.with_basic_renderer(display_config_path, DrawShaded::<PosNormTex, f32>::new(), true)?;
let mut game = Application::new(resources, Example, game_data)?;
Expand Down
2 changes: 1 addition & 1 deletion examples/debug_lines/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ fn main() -> amethyst::Result<()> {
)?
.with(ExampleLinesSystem, "example_lines_system", &[])
.with_bundle(fly_control_bundle)?
.with_bundle(TransformBundle::new().with_dep(&["fly_movement"]))?
.with_bundle(TransformBundle::<f32>::new().with_dep(&["fly_movement"]))?
.with_bundle(RenderBundle::<'_, _, _, f32>::new(pipe, Some(config)))?;

let mut game = Application::new(resources, ExampleState, game_data)?;
Expand Down
2 changes: 1 addition & 1 deletion examples/fly_camera/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fn main() -> Result<(), Error> {
)
.with_sensitivity(0.1, 0.1),
)?
.with_bundle(TransformBundle::new().with_dep(&["fly_movement"]))?
.with_bundle(TransformBundle::<f32>::new().with_dep(&["fly_movement"]))?
.with_bundle(
InputBundle::<String, String>::new().with_bindings_from_file(&key_bindings_path)?,
)?
Expand Down
2 changes: 1 addition & 1 deletion examples/gltf/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ fn main() -> Result<(), amethyst::Error> {
.with_sensitivity(0.1, 0.1)
.with_speed(5.),
)?
.with_bundle(TransformBundle::new().with_dep(&[
.with_bundle(TransformBundle::<f32>::new().with_dep(&[
"animation_control",
"sampler_interpolation",
"fly_movement",
Expand Down
2 changes: 1 addition & 1 deletion examples/material/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ fn main() -> amethyst::Result<()> {
let resources = app_root.join("examples/assets/");

let game_data = GameDataBuilder::default()
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_basic_renderer(path, DrawPbm::<PosNormTangTex, f32>::new(), false)?;
let mut game = Application::new(&resources, Example, game_data)?;
game.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/pong/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ fn main() -> amethyst::Result<()> {
)?
.with_bundle(PongBundle)?
.with_bundle(RenderBundle::<'_, _, _, f32>::new(pipe, Some(config)).with_sprite_sheet_processor())?
.with_bundle(TransformBundle::new().with_dep(&["ball_system", "paddle_system"]))?
.with_bundle(TransformBundle::<f32>::new().with_dep(&["ball_system", "paddle_system"]))?
.with_bundle(AudioBundle::<f32>::default())?
.with(
DjSystem::new(|music: &mut Music| music.music.next()),
Expand Down
2 changes: 1 addition & 1 deletion examples/pong_tutorial_02/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fn main() -> amethyst::Result<()> {
);
let game_data = GameDataBuilder::default()
.with_bundle(RenderBundle::<'_, _, _, f32>::new(pipe, Some(config)).with_sprite_sheet_processor())?
.with_bundle(TransformBundle::new())?;
.with_bundle(TransformBundle::<f32>::new())?;

// This line is not mentioned in the pong tutorial as it is specific to the context
// of the git repository. It only is a different location to load the assets from.
Expand Down
2 changes: 1 addition & 1 deletion examples/pong_tutorial_03/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn main() -> amethyst::Result<()> {

let game_data = GameDataBuilder::default()
.with_bundle(RenderBundle::<'_, _, _, f32>::new(pipe, Some(config)).with_sprite_sheet_processor())?
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_bundle(input_bundle)?
.with(systems::PaddleSystem, "paddle_system", &["input_system"]);
let mut game = Application::new(assets_dir, Pong, game_data)?;
Expand Down
2 changes: 1 addition & 1 deletion examples/pong_tutorial_04/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn main() -> amethyst::Result<()> {

let game_data = GameDataBuilder::default()
.with_bundle(RenderBundle::<'_, _, _, f32>::new(pipe, Some(config)).with_sprite_sheet_processor())?
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_bundle(input_bundle)?
.with(systems::PaddleSystem, "paddle_system", &["input_system"])
.with(systems::MoveBallsSystem, "ball_system", &[])
Expand Down
2 changes: 1 addition & 1 deletion examples/pong_tutorial_05/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fn main() -> amethyst::Result<()> {

let game_data = GameDataBuilder::default()
.with_bundle(RenderBundle::<'_, _, _, f32>::new(pipe, Some(config)).with_sprite_sheet_processor())?
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_bundle(UiBundle::<String, String>::new())?
.with_bundle(input_bundle)?
.with(systems::PaddleSystem, "paddle_system", &["input_system"])
Expand Down
2 changes: 1 addition & 1 deletion examples/prefab/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fn main() -> Result<(), Error> {

let game_data = GameDataBuilder::default()
.with(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_basic_renderer(display_config_path, DrawShaded::<PosNormTex, f32>::new(), false)?;

let mut game = Application::new(resources_directory, AssetsExample, game_data)?;
Expand Down
2 changes: 1 addition & 1 deletion examples/renderable/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ fn main() -> Result<(), Error> {
let game_data = GameDataBuilder::default()
.with(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with::<ExampleSystem>(ExampleSystem::default(), "example_system", &[])
.with_bundle(TransformBundle::new().with_dep(&["example_system"]))?
.with_bundle(TransformBundle::<f32>::new().with_dep(&["example_system"]))?
.with_bundle(UiBundle::<String, String>::new())?
.with_bundle(HotReloadBundle::default())?
.with_bundle(FPSCounterBundle::default())?
Expand Down
2 changes: 1 addition & 1 deletion examples/separate_sphere/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fn main() -> amethyst::Result<()> {

let game_data = GameDataBuilder::default()
.with(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_basic_renderer(display_config_path, DrawShadedSeparate::<f32>::new(), false)?;
let mut game = Application::new(resources, Example, game_data)?;
game.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_image/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn main() -> amethyst::Result<()> {
);

let game_data = GameDataBuilder::default()
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_bundle(RenderBundle::<'_, _, _, f32>::new(pipe, Some(config)).with_sprite_sheet_processor())?;

let mut game = Application::build(resources, Example)?.build(game_data)?;
Expand Down
2 changes: 1 addition & 1 deletion examples/sphere/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fn main() -> amethyst::Result<()> {

let game_data = GameDataBuilder::default()
.with(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_basic_renderer(display_config_path, DrawShaded::<PosNormTex, f32>::new(), false)?;
let mut game = Application::new(resources, Example, game_data)?;
game.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/sphere_multisample/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn main() -> amethyst::Result<()> {

let game_data = GameDataBuilder::default()
.with(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_basic_renderer(display_config_path, DrawShaded::<PosNormTex, f32>::new(), false)?;
let mut game = Application::new(resources, Example, game_data)?;
game.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/spotlights/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fn main() -> amethyst::Result<()> {

let game_data = GameDataBuilder::default()
.with(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_basic_renderer(display_config_path, DrawPbm::<PosNormTangTex, f32>::new(), false)?;
let mut game = Application::new(resources, Example, game_data)?;
game.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/sprite_camera_follow/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ fn main() -> amethyst::Result<()> {
);

let game_data = GameDataBuilder::default()
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_bundle(
InputBundle::<String, String>::new().with_bindings_from_file(root.join("input.ron"))?,
)?
Expand Down
2 changes: 1 addition & 1 deletion examples/sprites_ordered/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ fn main() -> amethyst::Result<()> {
let assets_directory = app_root.join("examples/assets/");

let game_data = GameDataBuilder::default()
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_bundle(
RenderBundle::<'_, _, _, f32>::new(pipe, Some(display_config))
.with_sprite_sheet_processor()
Expand Down
2 changes: 1 addition & 1 deletion examples/ui/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ fn main() -> amethyst::Result<()> {

let game_data = GameDataBuilder::default()
.with(PrefabLoaderSystem::<MyPrefabData>::default(), "", &[])
.with_bundle(TransformBundle::new())?
.with_bundle(TransformBundle::<f32>::new())?
.with_bundle(UiBundle::<String, String>::new())?
.with(Processor::<Source>::new(), "source_processor", &[])
.with(UiEventHandlerSystem::new(), "ui_event_handler", &[])
Expand Down

0 comments on commit 6361121

Please sign in to comment.