Skip to content
Snippets Groups Projects
Commit fa29633c authored by StarToaster's avatar StarToaster
Browse files

Fixed missing merge things.

parent 9f74c710
No related branches found
No related tags found
No related merge requests found
...@@ -38,24 +38,10 @@ fn startup( ...@@ -38,24 +38,10 @@ fn startup(
fn main() { fn main() {
BevyApp::new() BevyApp::new()
<<<<<<< HEAD
.insert_resource(WindowDescriptor {
width: 1270.0,
height: 720.0,
title: String::from("UI Example"),
..Default::default()
})
.insert_resource(ImageSettings::default_nearest())
.add_plugins(DefaultPlugins)
.add_plugin(BevyKayakUIPlugin)
.add_startup_system(startup)
.run();
=======
.insert_resource(ImageSettings::default_nearest()) .insert_resource(ImageSettings::default_nearest())
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.add_plugin(ContextPlugin) .add_plugin(ContextPlugin)
.add_plugin(KayakWidgets) .add_plugin(KayakWidgets)
.add_startup_system(startup) .add_startup_system(startup)
.run() .run()
>>>>>>> exp/main
} }
...@@ -60,24 +60,10 @@ fn startup( ...@@ -60,24 +60,10 @@ fn startup(
fn main() { fn main() {
BevyApp::new() BevyApp::new()
<<<<<<< HEAD
.insert_resource(WindowDescriptor {
width: 1270.0,
height: 720.0,
title: String::from("UI Example"),
..Default::default()
})
.insert_resource(ImageSettings::default_nearest())
.add_plugins(DefaultPlugins)
.add_plugin(BevyKayakUIPlugin)
.add_startup_system(startup)
.run();
=======
.insert_resource(ImageSettings::default_nearest()) .insert_resource(ImageSettings::default_nearest())
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.add_plugin(ContextPlugin) .add_plugin(ContextPlugin)
.add_plugin(KayakWidgets) .add_plugin(KayakWidgets)
.add_startup_system(startup) .add_startup_system(startup)
.run() .run()
>>>>>>> exp/main
} }
...@@ -16,48 +16,6 @@ fn startup( ...@@ -16,48 +16,6 @@ fn startup(
mut font_mapping: ResMut<FontMapping>, mut font_mapping: ResMut<FontMapping>,
asset_server: Res<AssetServer>, asset_server: Res<AssetServer>,
) { ) {
<<<<<<< HEAD
commands.spawn_bundle(UICameraBundle::new());
font_mapping.set_default(asset_server.load("roboto.kayak_font"));
let theme = TabTheme {
primary: Default::default(),
bg: Color::new(0.176, 0.227, 0.255, 1.0),
fg: Color::new(0.286, 0.353, 0.392, 1.0),
focus: Color::new(0.388, 0.474, 0.678, 0.5),
text: ColorState {
normal: Color::new(0.949, 0.956, 0.968, 1.0),
hovered: Color::new(0.650, 0.574, 0.669, 1.0),
active: Color::new(0.949, 0.956, 0.968, 1.0),
},
active_tab: ColorState {
normal: Color::new(0.286, 0.353, 0.392, 1.0),
hovered: Color::new(0.246, 0.323, 0.352, 1.0),
active: Color::new(0.196, 0.283, 0.312, 1.0),
},
inactive_tab: ColorState {
normal: Color::new(0.176, 0.227, 0.255, 1.0),
hovered: Color::new(0.16, 0.21, 0.23, 1.0),
active: Color::new(0.196, 0.283, 0.312, 1.0),
},
tab_height: 22.0,
};
let context = BevyContext::new(|context| {
render! {
<App>
<Window position={(50.0, 50.0)} size={(600.0, 300.0)} title={"Tabs Example".to_string()}>
<TabThemeProvider initial_theme={theme}>
<TabDemo />
</TabThemeProvider>
</Window>
</App>
}
});
commands.insert_resource(context);
=======
font_mapping.set_default(asset_server.load("roboto.kayak_font")); font_mapping.set_default(asset_server.load("roboto.kayak_font"));
commands.spawn(UICameraBundle::new()); commands.spawn(UICameraBundle::new());
...@@ -103,28 +61,14 @@ fn startup( ...@@ -103,28 +61,14 @@ fn startup(
} }
commands.insert_resource(widget_context); commands.insert_resource(widget_context);
>>>>>>> exp/main
} }
fn main() { fn main() {
BevyApp::new() BevyApp::new()
<<<<<<< HEAD
.insert_resource(WindowDescriptor {
width: 1270.0,
height: 720.0,
title: String::from("UI Example"),
..Default::default()
})
.add_plugins(DefaultPlugins)
.add_plugin(BevyKayakUIPlugin)
.add_startup_system(startup)
.run();
=======
.insert_resource(ImageSettings::default_nearest()) .insert_resource(ImageSettings::default_nearest())
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.add_plugin(ContextPlugin) .add_plugin(ContextPlugin)
.add_plugin(KayakWidgets) .add_plugin(KayakWidgets)
.add_startup_system(startup) .add_startup_system(startup)
.run() .run()
>>>>>>> exp/main
} }
...@@ -111,21 +111,6 @@ fn startup( ...@@ -111,21 +111,6 @@ fn startup(
mut font_mapping: ResMut<FontMapping>, mut font_mapping: ResMut<FontMapping>,
asset_server: Res<AssetServer>, asset_server: Res<AssetServer>,
) { ) {
<<<<<<< HEAD
commands.spawn_bundle(UICameraBundle::new());
font_mapping.set_default(asset_server.load("roboto.kayak_font"));
let context = BevyContext::new(|context| {
render! {
<App>
<TextBoxExample />
</App>
}
});
commands.insert_resource(context);
=======
font_mapping.set_default(asset_server.load("roboto.kayak_font")); font_mapping.set_default(asset_server.load("roboto.kayak_font"));
commands.spawn(UICameraBundle::new()); commands.spawn(UICameraBundle::new());
...@@ -152,27 +137,13 @@ fn startup( ...@@ -152,27 +137,13 @@ fn startup(
</KayakAppBundle> </KayakAppBundle>
} }
commands.insert_resource(widget_context); commands.insert_resource(widget_context);
>>>>>>> exp/main
} }
fn main() { fn main() {
BevyApp::new() BevyApp::new()
<<<<<<< HEAD
.insert_resource(WindowDescriptor {
width: 1270.0,
height: 720.0,
title: String::from("UI Example"),
..Default::default()
})
.add_plugins(DefaultPlugins)
.add_plugin(BevyKayakUIPlugin)
.add_startup_system(startup)
.run();
=======
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.add_plugin(ContextPlugin) .add_plugin(ContextPlugin)
.add_plugin(KayakWidgets) .add_plugin(KayakWidgets)
.add_startup_system(startup) .add_startup_system(startup)
.run() .run()
>>>>>>> exp/main
} }
...@@ -34,35 +34,6 @@ fn startup( ...@@ -34,35 +34,6 @@ fn startup(
mut font_mapping: ResMut<FontMapping>, mut font_mapping: ResMut<FontMapping>,
asset_server: Res<AssetServer>, asset_server: Res<AssetServer>,
) { ) {
<<<<<<< HEAD
commands.spawn_bundle(UICameraBundle::new());
font_mapping.set_default(asset_server.load("roboto.kayak_font"));
let context = BevyContext::new(|context| {
render! {
<App>
<TodoApp />
</App>
}
});
commands.insert_resource(context);
}
fn main() {
BevyApp::new()
.insert_resource(WindowDescriptor {
width: 1270.0,
height: 720.0,
title: String::from("UI Example"),
..Default::default()
})
.add_plugins(DefaultPlugins)
.add_plugin(BevyKayakUIPlugin)
.add_startup_system(startup)
.run();
=======
font_mapping.set_default(asset_server.load("roboto.kayak_font")); font_mapping.set_default(asset_server.load("roboto.kayak_font"));
commands.spawn(UICameraBundle::new()); commands.spawn(UICameraBundle::new());
...@@ -102,5 +73,4 @@ fn main() { ...@@ -102,5 +73,4 @@ fn main() {
.insert_non_send_resource(TodoList::new()) .insert_non_send_resource(TodoList::new())
.add_startup_system(startup) .add_startup_system(startup)
.run() .run()
>>>>>>> exp/main
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment