Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filepath fixes

Browse Source 
Former-commit-id: b3134806904d8fb0b7fb1ee4dc05ea96af1474e8
This commit is contained in:
Pfauenauge 2019-03-29 22:36:15 +01:00
parent 99e364dc54
commit 51e41ade07
4 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
voxygen/src/hud/mod.rs
View File

@ -235,7 +235,7 @@ impl Imgs {
// Settings at Mini-Map
mmap_button: load("element/buttons/border.png"),
mmap_button_hover: load("element/buttons/border_hover.png"),
mmap_button_hover: load("element/buttons/border_mo.png"),
mmap_button_press: load("element/buttons/border_press.png"),
mmap_button_open: load("element/buttons/border_pressed.png"),
@ -264,9 +264,9 @@ impl Imgs {
settings_button_mo: load("element/buttons/blue_mo.png"),
check: load("element/buttons/check/no.png"),
check_mo: load("element/buttons/check/no_mo.png"),
check_press: load("element/buttons/check/no_press.png"),
check_press: load("element/buttons/check/press.png"),
check_checked: load("element/buttons/check/yes.png"),
check_checked_mo: load("selement/buttons/check/yes_mo.png"),
check_checked_mo: load("element/buttons/check/yes_mo.png"),
slider: load("element/slider/track.png"),
slider_indicator: load("element/slider/indicator.png"),
button_blank: load("element/nothing.png"),
@ -280,7 +280,7 @@ impl Imgs {
//Map Window
map_bg: load("element/misc_backgrounds/small_bg.png"),
map_icon: load("element/icons/map.png"),
map_frame: load("map/window_frame_map.png"),
map_frame: load("element/frames/window_map.png"),
// Spell Book Window
spellbook_bg: load("element/misc_backgrounds/small_bg.png"),
@ -358,14 +358,14 @@ impl Hud {
let font_opensans = ui.new_font(
conrod_core::text::font::from_file(concat!(
env!("CARGO_MANIFEST_DIR"),
"/test_assets/font/OpenSans-Regular.ttf"
"/../assets/voxygen/font/OpenSans-Regular.ttf"
))
.unwrap(),
);
let font_metamorph = ui.new_font(
conrod_core::text::font::from_file(concat!(
env!("CARGO_MANIFEST_DIR"),
"/test_assets/font/Metamorphous-Regular.ttf"
"/../assets/voxygen/font/Metamorphous-Regular.ttf"
))
.unwrap(),
);

126
voxygen/src/menu/char_selection/ui.rs
View File

@ -226,7 +226,7 @@ impl Imgs {
let image = image::open(
&[
env!("CARGO_MANIFEST_DIR"),
"/test_assets/ui/char_selection/",
"/../assets/voxygen/",
filename,
]
.concat(),
@ -235,73 +235,73 @@ impl Imgs {
ui.new_image(renderer, &image).unwrap()
};
Imgs {
v_logo: load("v_logo.png"),
bg_selection: load("bg_selection.png"),
bg_creation: load("bg_creation.png"),
selection_window: load("selection_frame.png"),
button_dark: load("buttons/button_dark.png"),
button_dark_hover: load("buttons/button_dark_hover.png"),
button_dark_press: load("buttons/button_dark_press.png"),
button_dark_red: load("buttons/button_dark_red.png"),
button_dark_red_hover: load("buttons/button_dark_red_hover.png"),
button_dark_red_press: load("buttons/button_dark_red_press.png"),
test_char_l_button: load("test_char_l.png"),
test_char_l_big: load("test_char_l_big.png"),
name_input: load("input_bg.png"),
creation_window: load("creation_window.png"),
creation_window_body: load("creation_window_body.png"),
frame_closed: load("frame_closed_button.png"),
frame_closed_mo: load("frame_closed_mo_button.png"),
frame_closed_press: load("frame_closed_press_button.png"),
frame_open: load("frame_open_button.png"),
frame_open_mo: load("frame_open_mo_button.png"),
frame_open_press: load("frame_open_press_button.png"),
skin_eyes_window: load("frame_skin_eyes.png"),
hair_window: load("frame_skin_eyes.png"),
accessories_window: load("frame_skin_eyes.png"),
color_picker_bg: load("color_picker_blank.png"),
slider_range: load("slider_range.png"),
slider_indicator: load("slider_indicator.png"),
v_logo: load("element/v_logo.png"),
bg_selection: load("background/bg_selection.png"),
bg_creation: load("background/bg_creation.png"),
selection_window: load("element/frames/selection.png"),
button_dark: load("element/buttons/button_dark.png"),
button_dark_hover: load("element/buttons/button_dark_hover.png"),
button_dark_press: load("element/buttons/button_dark_press.png"),
button_dark_red: load("element/buttons/button_dark_red.png"),
button_dark_red_hover: load("element/buttons/button_dark_red_hover.png"),
button_dark_red_press: load("element/buttons/button_dark_red_press.png"),
test_char_l_button: load("element/misc_backgrounds/test_char_l.png"),
test_char_l_big: load("element/misc_backgrounds/test_char_l_big.png"),
name_input: load("element/misc_backgrounds/textbox.png"),
creation_window: load("element/frames/char_creation.png"),
creation_window_body: load("element/frames/body_creation.png"),
frame_closed: load("element/buttons/frame/closed.png"),
frame_closed_mo: load("element/buttons/frame/closed_mo.png"),
frame_closed_press: load("element/buttons/frame/closed_press.png"),
frame_open: load("element/buttons/frame/open.png"),
frame_open_mo: load("element/buttons/frame/open_mo.png"),
frame_open_press: load("element/buttons/frame/open_press.png"),
skin_eyes_window: load("element/frames/skin_eyes.png"),
hair_window: load("element/frames/skin_eyes.png"),
accessories_window: load("element/frames/skin_eyes.png"),
color_picker_bg: load("element/misc_backgrounds/color_picker_blank.png"),
slider_range: load("element/slider/track.png"),
slider_indicator: load("element/slider/indicator.png"),
// Weapon Icons
daggers: load("icons/daggers_icon.png"),
sword_shield: load("icons/swordshield_icon.png"),
sword: load("icons/sword_icon.png"),
axe: load("icons/axe_icon.png"),
hammer: load("icons/hammer_icon.png"),
bow: load("icons/bow_icon.png"),
staff: load("icons/staff_icon.png"),
daggers: load("element/icons/daggers.png"),
sword_shield: load("element/icons/swordshield.png"),
sword: load("element/icons/sword.png"),
axe: load("element/icons/axe.png"),
hammer: load("element/icons/hammer.png"),
bow: load("element/icons/bow.png"),
staff: load("element/icons/staff.png"),
//test_char_m_button: load("test_char_m_button"),
//test_char_r_button: load("test_char_r_button"),
// Race Icons
male: load("icons/male.png"),
female: load("icons/female.png"),
human_m: load("icons/human_m.png"),
human_f: load("icons/human_f.png"),
orc_m: load("icons/orc_m.png"),
orc_f: load("icons/orc_f.png"),
dwarf_m: load("icons/dwarf_m.png"),
dwarf_f: load("icons/dwarf_f.png"),
undead_m: load("icons/ud_m.png"),
undead_f: load("icons/ud_f.png"),
elf_m: load("icons/elf_m.png"),
elf_f: load("icons/elf_f.png"),
danari_m: load("icons/danari_m.png"),
danari_f: load("icons/danari_f.png"),
male: load("element/icons/male.png"),
female: load("element/icons/female.png"),
human_m: load("element/icons/human_m.png"),
human_f: load("element/icons/human_f.png"),
orc_m: load("element/icons/orc_m.png"),
orc_f: load("element/icons/orc_f.png"),
dwarf_m: load("element/icons/dwarf_m.png"),
dwarf_f: load("element/icons/dwarf_f.png"),
undead_m: load("element/icons/ud_m.png"),
undead_f: load("element/icons/ud_f.png"),
elf_m: load("element/icons/elf_m.png"),
elf_f: load("element/icons/elf_f.png"),
danari_m: load("element/icons/danari_m.png"),
danari_f: load("element/icons/danari_f.png"),
// Arrows
arrow_left: load("icons/arrow_left.png"),
arrow_left_mo: load("icons/arrow_left_mo.png"),
arrow_left_press: load("icons/arrow_left_press.png"),
arrow_left_grey: load("icons/arrow_left_grey.png"),
arrow_right: load("icons/arrow_right.png"),
arrow_right_mo: load("icons/arrow_right_mo.png"),
arrow_right_press: load("icons/arrow_right_press.png"),
arrow_right_grey: load("icons/arrow_right_grey.png"),
arrow_left: load("element/buttons/arrow/left.png"),
arrow_left_mo: load("element/buttons/arrow/left_mo.png"),
arrow_left_press: load("element/buttons/arrow/left_press.png"),
arrow_left_grey: load("element/buttons/arrow/left_inactive.png"),
arrow_right: load("element/buttons/arrow/right.png"),
arrow_right_mo: load("element/buttons/arrow/right_mo.png"),
arrow_right_press: load("element/buttons/arrow/right_press.png"),
arrow_right_grey: load("element/buttons/arrow/right_inactive.png"),
// Icon Borders
icon_border: load("buttons/border.png"),
icon_border_mo: load("buttons/border_mo.png"),
icon_border_press: load("buttons/border_press.png"),
icon_border_pressed: load("buttons/border_pressed.png"),
icon_border: load("element/buttons/border.png"),
icon_border_mo: load("element/buttons/border_mo.png"),
icon_border_press: load("element/buttons/border_press.png"),
icon_border_pressed: load("element/buttons/border_pressed.png"),
}
}
}
@ -373,14 +373,14 @@ impl CharSelectionUi {
let font_opensans = ui.new_font(
conrod_core::text::font::from_file(concat!(
env!("CARGO_MANIFEST_DIR"),
"/test_assets/font/OpenSans-Regular.ttf"
"/../assets/voxygen/font/OpenSans-Regular.ttf"
))
.unwrap(),
);
let font_metamorph = ui.new_font(
conrod_core::text::font::from_file(concat!(
env!("CARGO_MANIFEST_DIR"),
"/test_assets/font/Metamorphous-Regular.ttf"
"/../assets/voxygen/font/Metamorphous-Regular.ttf"
))
.unwrap(),
);

4
voxygen/src/menu/main/ui.rs
View File

@ -116,14 +116,14 @@ impl MainMenuUi {
let font_opensans = ui.new_font(
conrod_core::text::font::from_file(concat!(
env!("CARGO_MANIFEST_DIR"),
"/test_assets/font/OpenSans-Regular.ttf"
"/../assets/voxygen/font/OpenSans-Regular.ttf"
))
.unwrap(),
);
let font_metamorph = ui.new_font(
conrod_core::text::font::from_file(concat!(
env!("CARGO_MANIFEST_DIR"),
"/test_assets/font/Metamorphous-Regular.ttf"
"/../assets/voxygen/font/Metamorphous-Regular.ttf"
))
.unwrap(),
);

2
voxygen/src/scene/mod.rs
View File

@ -53,7 +53,7 @@ pub struct Scene {
// TODO: Make a proper asset loading system
fn load_segment(filename: &'static str) -> Segment {
Segment::from(dot_vox::load(&(concat!(env!("CARGO_MANIFEST_DIR"), "/test_assets/").to_string() + filename)).unwrap())
Segment::from(dot_vox::load(&(concat!(env!("CARGO_MANIFEST_DIR"), "/../assets/voxygen/voxel/").to_string() + filename)).unwrap())
}
impl Scene {