mirror of
https://github.com/libretro/ppsspp.git
synced 2024-11-23 16:19:44 +00:00
"Thin Borders" touch button style, ability to choose.
Also a Gold color scheme. Not sure whether to use or not.
This commit is contained in:
Henrik Rydgard
parent
d394282bc6
commit
7271367ac1
@ -259,6 +259,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
|
||||
|
||||
#endif
|
||||
control->Get("DisableDpadDiagonals", &bDisableDpadDiagonals, false);
|
||||
control->Get("TouchButtonStyle", &iTouchButtonStyle, 0);
|
||||
control->Get("TouchButtonOpacity", &iTouchButtonOpacity, 65);
|
||||
//set these to -1 if not initialized. initializing these
|
||||
//requires pixel coordinates which is not known right now.
|
||||
@ -523,7 +524,7 @@ void Config::Save() {
|
||||
control->Set("DeadzoneRadius", fDeadzoneRadius);
|
||||
#endif
|
||||
control->Set("DisableDpadDiagonals", bDisableDpadDiagonals);
|
||||
|
||||
control->Set("TouchButtonStyle", iTouchButtonStyle);
|
||||
control->Set("TouchButtonOpacity", iTouchButtonOpacity);
|
||||
control->Set("ActionButtonScale", fActionButtonScale);
|
||||
control->Set("ActionButtonSpacing2", fActionButtonSpacing);
|
||||
|
||||
@ -148,6 +148,8 @@ public:
|
||||
|
||||
// Disable diagonals
|
||||
bool bDisableDpadDiagonals;
|
||||
// Control Style
|
||||
int iTouchButtonStyle;
|
||||
// Control Positions
|
||||
int iTouchButtonOpacity;
|
||||
//space between PSP buttons
|
||||
|
||||
@ -245,6 +245,9 @@ void GameSettingsScreen::CreateViews() {
|
||||
CheckBox *disableDiags = controlsSettings->Add(new CheckBox(&g_Config.bDisableDpadDiagonals, c->T("Disable D-Pad diagonals (4-way touch)")));
|
||||
disableDiags->SetEnabledPtr(&g_Config.bShowTouchControls);
|
||||
controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 100, c->T("Button Opacity"), screenManager()));
|
||||
static const char *touchControlStyles[] = {"Classic", "Thin borders"};
|
||||
View *style = controlsSettings->Add(new PopupMultiChoice(&g_Config.iTouchButtonStyle, c->T("Button style"), touchControlStyles, 0, ARRAY_SIZE(touchControlStyles), c, screenManager()));
|
||||
disableDiags->SetEnabledPtr(&g_Config.bShowTouchControls);
|
||||
|
||||
// System
|
||||
ViewGroup *systemSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
|
||||
@ -261,13 +264,26 @@ void GameSettingsScreen::CreateViews() {
|
||||
|
||||
systemSettings->Add(new CheckBox(&g_Config.bSeparateCPUThread, s->T("Multithreaded (experimental)")))->SetEnabled(!PSP_IsInited());
|
||||
systemSettings->Add(new CheckBox(&g_Config.bSeparateIOThread, s->T("I/O on thread (experimental)")))->SetEnabled(!PSP_IsInited());
|
||||
systemSettings->Add(new PopupSliderChoice(&g_Config.iLockedCPUSpeed, 0, 1000, s->T("Change CPU Clock", "Change CPU Clock (0 = default)"), screenManager()));
|
||||
systemSettings->Add(new PopupSliderChoice(&g_Config.iLockedCPUSpeed, 0, 1000, s->T("Change CPU Clock", "Change CPU Clock (0 = default) (unstable)"), screenManager()));
|
||||
#ifndef USING_GLES2
|
||||
systemSettings->Add(new PopupSliderChoice(&g_Config.iRewindFlipFrequency, 0, 1800, s->T("Rewind Snapshot Frequency", "Rewind Snapshot Frequency (0 = off, mem hog)"), screenManager()));
|
||||
#endif
|
||||
|
||||
systemSettings->Add(new CheckBox(&g_Config.bAtomicAudioLocks, s->T("Atomic Audio locks (experimental)")))->SetEnabled(!PSP_IsInited());
|
||||
|
||||
systemSettings->Add(new ItemHeader(s->T("Developer Tools")));
|
||||
systemSettings->Add(new Choice(s->T("Developer Tools")))->OnClick.Handle(this, &GameSettingsScreen::OnDeveloperTools);
|
||||
|
||||
systemSettings->Add(new ItemHeader(s->T("General")));
|
||||
systemSettings->Add(new Choice(s->T("Clear Recent Games List")))->OnClick.Handle(this, &GameSettingsScreen::OnClearRecents);
|
||||
systemSettings->Add(new Choice(s->T("Restore Default Settings")))->OnClick.Handle(this, &GameSettingsScreen::OnRestoreDefaultSettings);
|
||||
systemSettings->Add(new CheckBox(&g_Config.bEnableAutoLoad, s->T("Auto Load Newest Savestate")));
|
||||
|
||||
enableReports_ = Reporting::IsEnabled();
|
||||
enableReportsCheckbox_ = new CheckBox(&enableReports_, s->T("Enable Compatibility Server Reports"));
|
||||
enableReportsCheckbox_->SetEnabled(Reporting::IsSupported());
|
||||
systemSettings->Add(enableReportsCheckbox_);
|
||||
|
||||
systemSettings->Add(new ItemHeader(s->T("Networking")));
|
||||
systemSettings->Add(new CheckBox(&g_Config.bEnableWlan, s->T("Enable networking", "Enable networking/wlan (beta)")));
|
||||
|
||||
@ -278,18 +294,6 @@ void GameSettingsScreen::CreateViews() {
|
||||
LinearLayout *list = root_->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)));
|
||||
systemSettings->SetSpacing(0);
|
||||
|
||||
systemSettings->Add(new ItemHeader(s->T("General")));
|
||||
systemSettings->Add(new Choice(s->T("Developer Tools")))->OnClick.Handle(this, &GameSettingsScreen::OnDeveloperTools);
|
||||
systemSettings->Add(new Choice(s->T("Clear Recent Games List")))->OnClick.Handle(this, &GameSettingsScreen::OnClearRecents);
|
||||
systemSettings->Add(new Choice(s->T("Restore Default Settings")))->OnClick.Handle(this, &GameSettingsScreen::OnRestoreDefaultSettings);
|
||||
systemSettings->Add(new CheckBox(&g_Config.bEnableAutoLoad, s->T("Auto Load Newest Savestate")));
|
||||
|
||||
enableReports_ = Reporting::IsEnabled();
|
||||
enableReportsCheckbox_ = new CheckBox(&enableReports_, s->T("Enable Compatibility Server Reports"));
|
||||
enableReportsCheckbox_->SetEnabled(Reporting::IsSupported());
|
||||
systemSettings->Add(enableReportsCheckbox_);
|
||||
|
||||
|
||||
systemSettings->Add(new ItemHeader(s->T("PSP Settings")));
|
||||
// TODO: Come up with a way to display a keyboard for mobile users,
|
||||
// so until then, this is Windows/Desktop only.
|
||||
|
||||
@ -34,6 +34,10 @@
|
||||
#define USE_PAUSE_BUTTON 0
|
||||
#endif
|
||||
|
||||
static u32 GetButtonColor() {
|
||||
return g_Config.iTouchButtonStyle == 1 ? 0xFFFFFF : 0xc0b080;
|
||||
}
|
||||
|
||||
void MultiTouchButton::GetContentDimensions(const UIContext &dc, float &w, float &h) const {
|
||||
const AtlasImage &image = dc.Draw()->GetAtlas()->images[bgImg_];
|
||||
w = image.w * scale_;
|
||||
@ -63,7 +67,7 @@ void MultiTouchButton::Draw(UIContext &dc) {
|
||||
scale *= 2.0f;
|
||||
opacity *= 1.15f;
|
||||
}
|
||||
uint32_t colorBg = colorAlpha(0xc0b080, opacity);
|
||||
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
|
||||
uint32_t color = colorAlpha(0xFFFFFF, opacity);
|
||||
|
||||
dc.Draw()->DrawImageRotated(bgImg_, bounds_.centerX(), bounds_.centerY(), scale, angle_ * (M_PI * 2 / 360.0f), colorBg, flipImageH_);
|
||||
@ -191,7 +195,7 @@ void PSPDpad::ProcessTouch(float x, float y, bool down) {
|
||||
void PSPDpad::Draw(UIContext &dc) {
|
||||
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
||||
|
||||
uint32_t colorBg = colorAlpha(0xc0b080, opacity);
|
||||
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
|
||||
uint32_t color = colorAlpha(0xFFFFFF, opacity);
|
||||
|
||||
static const float xoff[4] = {1, 0, -1, 0};
|
||||
@ -223,7 +227,7 @@ void PSPStick::GetContentDimensions(const UIContext &dc, float &w, float &h) con
|
||||
void PSPStick::Draw(UIContext &dc) {
|
||||
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
||||
|
||||
uint32_t colorBg = colorAlpha(0xc0b080, opacity);
|
||||
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
|
||||
uint32_t color = colorAlpha(0x808080, opacity);
|
||||
|
||||
float stickX = bounds_.centerX();
|
||||
@ -447,41 +451,48 @@ UI::ViewGroup *CreatePadLayout(bool *pause) {
|
||||
const int halfW = dp_xres / 2;
|
||||
|
||||
if (g_Config.bShowTouchControls) {
|
||||
int roundImage = g_Config.iTouchButtonStyle ? I_ROUND_LINE : I_ROUND;
|
||||
int rectImage = g_Config.iTouchButtonStyle ? I_RECT_LINE : I_RECT;
|
||||
int shoulderImage = g_Config.iTouchButtonStyle ? I_SHOULDER_LINE : I_SHOULDER;
|
||||
int dirImage = g_Config.iTouchButtonStyle ? I_DIR_LINE : I_DIR;
|
||||
int stickImage = g_Config.iTouchButtonStyle ? I_STICK_LINE : I_STICK;
|
||||
int stickBg = g_Config.iTouchButtonStyle ? I_STICK_BG_LINE : I_STICK_BG;
|
||||
|
||||
#if USE_PAUSE_BUTTON
|
||||
root->Add(new BoolButton(pause, I_ROUND, I_ARROW, 1.0f, new AnchorLayoutParams(halfW, 20, NONE, NONE, true)))->SetAngle(90);
|
||||
root->Add(new BoolButton(pause, roundImage, I_ARROW, 1.0f, new AnchorLayoutParams(halfW, 20, NONE, NONE, true)))->SetAngle(90);
|
||||
#endif
|
||||
if (g_Config.bShowTouchCircle)
|
||||
root->Add(new PSPButton(CTRL_CIRCLE, I_ROUND, I_CIRCLE, Action_button_scale, new AnchorLayoutParams(Action_circle_button_X, Action_circle_button_Y, NONE, NONE, true)));
|
||||
root->Add(new PSPButton(CTRL_CIRCLE, roundImage, I_CIRCLE, Action_button_scale, new AnchorLayoutParams(Action_circle_button_X, Action_circle_button_Y, NONE, NONE, true)));
|
||||
|
||||
if (g_Config.bShowTouchCross)
|
||||
root->Add(new PSPButton(CTRL_CROSS, I_ROUND, I_CROSS, Action_button_scale, new AnchorLayoutParams(Action_cross_button_X, Action_cross_button_Y, NONE, NONE, true)));
|
||||
root->Add(new PSPButton(CTRL_CROSS, roundImage, I_CROSS, Action_button_scale, new AnchorLayoutParams(Action_cross_button_X, Action_cross_button_Y, NONE, NONE, true)));
|
||||
|
||||
if (g_Config.bShowTouchTriangle)
|
||||
root->Add(new PSPButton(CTRL_TRIANGLE, I_ROUND, I_TRIANGLE, Action_button_scale, new AnchorLayoutParams(Action_triangle_button_X, Action_triangle_button_Y, NONE, NONE, true)));
|
||||
root->Add(new PSPButton(CTRL_TRIANGLE, roundImage, I_TRIANGLE, Action_button_scale, new AnchorLayoutParams(Action_triangle_button_X, Action_triangle_button_Y, NONE, NONE, true)));
|
||||
|
||||
if (g_Config.bShowTouchSquare)
|
||||
root->Add(new PSPButton(CTRL_SQUARE, I_ROUND, I_SQUARE, Action_button_scale, new AnchorLayoutParams(Action_square_button_X, Action_square_button_Y, NONE, NONE, true)));
|
||||
root->Add(new PSPButton(CTRL_SQUARE, roundImage, I_SQUARE, Action_button_scale, new AnchorLayoutParams(Action_square_button_X, Action_square_button_Y, NONE, NONE, true)));
|
||||
|
||||
if (g_Config.bShowTouchStart)
|
||||
root->Add(new PSPButton(CTRL_START, I_RECT, I_START, start_key_scale, new AnchorLayoutParams(start_key_X, start_key_Y, NONE, NONE, true)));
|
||||
root->Add(new PSPButton(CTRL_START, rectImage, I_START, start_key_scale, new AnchorLayoutParams(start_key_X, start_key_Y, NONE, NONE, true)));
|
||||
|
||||
if (g_Config.bShowTouchSelect)
|
||||
root->Add(new PSPButton(CTRL_SELECT, I_RECT, I_SELECT, select_key_scale, new AnchorLayoutParams(select_key_X, select_key_Y, NONE, NONE, true)));
|
||||
root->Add(new PSPButton(CTRL_SELECT, rectImage, I_SELECT, select_key_scale, new AnchorLayoutParams(select_key_X, select_key_Y, NONE, NONE, true)));
|
||||
|
||||
if (g_Config.bShowTouchUnthrottle)
|
||||
root->Add(new BoolButton(&PSP_CoreParameter().unthrottle, I_RECT, I_ARROW, unthrottle_key_scale, new AnchorLayoutParams(unthrottle_key_X, unthrottle_key_Y, NONE, NONE, true)))->SetAngle(180);
|
||||
root->Add(new BoolButton(&PSP_CoreParameter().unthrottle, rectImage, I_ARROW, unthrottle_key_scale, new AnchorLayoutParams(unthrottle_key_X, unthrottle_key_Y, NONE, NONE, true)))->SetAngle(180);
|
||||
|
||||
if (g_Config.bShowTouchLTrigger)
|
||||
root->Add(new PSPButton(CTRL_LTRIGGER, I_SHOULDER, I_L, l_key_scale, new AnchorLayoutParams(l_key_X, l_key_Y, NONE, NONE, true)));
|
||||
root->Add(new PSPButton(CTRL_LTRIGGER, shoulderImage, I_L, l_key_scale, new AnchorLayoutParams(l_key_X, l_key_Y, NONE, NONE, true)));
|
||||
|
||||
if (g_Config.bShowTouchRTrigger)
|
||||
root->Add(new PSPButton(CTRL_RTRIGGER, I_SHOULDER, I_R, r_key_scale, new AnchorLayoutParams(r_key_X,r_key_Y, NONE, NONE, true)))->FlipImageH(true);
|
||||
root->Add(new PSPButton(CTRL_RTRIGGER, shoulderImage, I_R, r_key_scale, new AnchorLayoutParams(r_key_X,r_key_Y, NONE, NONE, true)))->FlipImageH(true);
|
||||
|
||||
if (g_Config.bShowTouchDpad)
|
||||
root->Add(new PSPDpad(I_DIR, I_ARROW, D_pad_scale, D_pad_spacing, new AnchorLayoutParams(D_pad_X, D_pad_Y, NONE, NONE, true)));
|
||||
root->Add(new PSPDpad(dirImage, I_ARROW, D_pad_scale, D_pad_spacing, new AnchorLayoutParams(D_pad_X, D_pad_Y, NONE, NONE, true)));
|
||||
|
||||
if (g_Config.bShowTouchAnalogStick)
|
||||
root->Add(new PSPStick(I_STICKBG, I_STICK, 0, analog_stick_scale, new AnchorLayoutParams(analog_stick_X, analog_stick_Y, NONE, NONE, true)));
|
||||
root->Add(new PSPStick(stickBg, stickImage, 0, analog_stick_scale, new AnchorLayoutParams(analog_stick_X, analog_stick_Y, NONE, NONE, true)));
|
||||
}
|
||||
|
||||
return root;
|
||||
|
||||
@ -83,7 +83,11 @@ void DrawBackground(float alpha) {
|
||||
glstate.colorMask.set(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
|
||||
glClearColor(0.1f,0.2f,0.43f,1.0f);
|
||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
|
||||
ui_draw2d.DrawImageStretch(I_BG, 0, 0, dp_xres, dp_yres);
|
||||
int img = I_BG;
|
||||
#ifdef GOLD
|
||||
img = I_BG_GOLD;
|
||||
#endif
|
||||
ui_draw2d.DrawImageStretch(img, 0, 0, dp_xres, dp_yres);
|
||||
float t = time_now();
|
||||
for (int i = 0; i < 100; i++) {
|
||||
float x = xbase[i];
|
||||
|
||||
@ -456,6 +456,16 @@ void NativeInitGraphics() {
|
||||
ui_theme.buttonHighlightedStyle = ui_theme.itemHighlightedStyle;
|
||||
|
||||
ui_theme.popupTitle.fgColor = 0xFFE3BE59;
|
||||
|
||||
#ifdef GOLD
|
||||
ui_theme.itemFocusedStyle.background = UI::Drawable(0xFF4cc2ed);
|
||||
ui_theme.itemDownStyle.background = UI::Drawable(0xFF39a9ee);
|
||||
ui_theme.itemDisabledStyle.background = UI::Drawable(0x55AFD4E0);
|
||||
ui_theme.itemHighlightedStyle.background = UI::Drawable(0x5539BBbd);
|
||||
|
||||
ui_theme.popupTitle.fgColor = 0xFF59BEE3;
|
||||
#endif
|
||||
|
||||
ui_draw2d.Init();
|
||||
ui_draw2d_front.Init();
|
||||
|
||||
|
||||
@ -30,6 +30,10 @@
|
||||
|
||||
static const int leftColumnWidth = 140;
|
||||
|
||||
static u32 GetButtonColor() {
|
||||
return g_Config.iTouchButtonStyle == 1 ? 0xFFFFFF : 0xc0b080;
|
||||
}
|
||||
|
||||
// convert from screen coordinates (leftColumnWidth to dp_xres) to actual fullscreen coordinates (0 to 1.0)
|
||||
static inline float toFullscreenCoord(int screenx) {
|
||||
return (float)(screenx - leftColumnWidth) / (dp_xres - leftColumnWidth);
|
||||
@ -76,7 +80,7 @@ public:
|
||||
PSPActionButtons(float &x, float &y, float &scale, float &spacing)
|
||||
: DragDropButton(x, y, -1, -1, scale), spacing_(spacing) {
|
||||
using namespace UI;
|
||||
roundId_ = I_ROUND;
|
||||
roundId_ = g_Config.iTouchButtonStyle ? I_ROUND_LINE : I_ROUND;
|
||||
|
||||
circleId_ = I_CIRCLE;
|
||||
crossId_ = I_CROSS;
|
||||
@ -105,7 +109,7 @@ public:
|
||||
void Draw(UIContext &dc) {
|
||||
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
||||
|
||||
uint32_t colorBg = colorAlpha(0xc0b080, opacity);
|
||||
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
|
||||
uint32_t color = colorAlpha(0xFFFFFF, opacity);
|
||||
|
||||
int centerX = bounds_.centerX();
|
||||
@ -165,18 +169,20 @@ public:
|
||||
void Draw(UIContext &dc) {
|
||||
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
|
||||
|
||||
uint32_t colorBg = colorAlpha(0xc0b080, opacity);
|
||||
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
|
||||
uint32_t color = colorAlpha(0xFFFFFF, opacity);
|
||||
|
||||
static const float xoff[4] = {1, 0, -1, 0};
|
||||
static const float yoff[4] = {0, 1, 0, -1};
|
||||
|
||||
int dirImage = g_Config.iTouchButtonStyle ? I_DIR_LINE : I_DIR;
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
float x = bounds_.centerX() + xoff[i] * D_pad_Radius * spacing_;
|
||||
float y = bounds_.centerY() + yoff[i] * D_pad_Radius * spacing_;
|
||||
float angle = i * M_PI / 2;
|
||||
|
||||
dc.Draw()->DrawImageRotated(I_DIR, x, y, scale_, angle + PI, colorBg, false);
|
||||
dc.Draw()->DrawImageRotated(dirImage, x, y, scale_, angle + PI, colorBg, false);
|
||||
dc.Draw()->DrawImageRotated(I_ARROW, x, y, scale_, angle + PI, color);
|
||||
}
|
||||
}
|
||||
@ -363,36 +369,42 @@ void TouchControlLayoutScreen::CreateViews() {
|
||||
|
||||
controls_.push_back(actionButtons);
|
||||
|
||||
int rectImage = g_Config.iTouchButtonStyle ? I_RECT_LINE : I_RECT;
|
||||
int shoulderImage = g_Config.iTouchButtonStyle ? I_SHOULDER_LINE : I_SHOULDER;
|
||||
int dirImage = g_Config.iTouchButtonStyle ? I_DIR_LINE : I_DIR;
|
||||
int stickImage = g_Config.iTouchButtonStyle ? I_STICK_LINE : I_STICK;
|
||||
int stickBg = g_Config.iTouchButtonStyle ? I_STICK_BG_LINE : I_STICK_BG;
|
||||
|
||||
if (g_Config.bShowTouchDpad) {
|
||||
controls_.push_back(new PSPDPadButtons(g_Config.fDpadX, g_Config.fDpadY, g_Config.fDpadScale, g_Config.fDpadSpacing));
|
||||
}
|
||||
|
||||
if (g_Config.bShowTouchSelect) {
|
||||
controls_.push_back(new DragDropButton(g_Config.fSelectKeyX, g_Config.fSelectKeyY, I_RECT, I_SELECT, g_Config.fSelectKeyScale));
|
||||
controls_.push_back(new DragDropButton(g_Config.fSelectKeyX, g_Config.fSelectKeyY, rectImage, I_SELECT, g_Config.fSelectKeyScale));
|
||||
}
|
||||
|
||||
if (g_Config.bShowTouchStart) {
|
||||
controls_.push_back(new DragDropButton(g_Config.fStartKeyX, g_Config.fStartKeyY, I_RECT, I_START, g_Config.fStartKeyScale));
|
||||
controls_.push_back(new DragDropButton(g_Config.fStartKeyX, g_Config.fStartKeyY, rectImage, I_START, g_Config.fStartKeyScale));
|
||||
}
|
||||
|
||||
if (g_Config.bShowTouchUnthrottle) {
|
||||
DragDropButton *unthrottle = new DragDropButton(g_Config.fUnthrottleKeyX, g_Config.fUnthrottleKeyY, I_RECT, I_ARROW, g_Config.fUnthrottleKeyScale);
|
||||
DragDropButton *unthrottle = new DragDropButton(g_Config.fUnthrottleKeyX, g_Config.fUnthrottleKeyY, rectImage, I_ARROW, g_Config.fUnthrottleKeyScale);
|
||||
unthrottle->SetAngle(180.0f);
|
||||
controls_.push_back(unthrottle);
|
||||
}
|
||||
|
||||
if (g_Config.bShowTouchLTrigger) {
|
||||
controls_.push_back(new DragDropButton(g_Config.fLKeyX, g_Config.fLKeyY, I_SHOULDER, I_L, g_Config.fLKeyScale));
|
||||
controls_.push_back(new DragDropButton(g_Config.fLKeyX, g_Config.fLKeyY, shoulderImage, I_L, g_Config.fLKeyScale));
|
||||
}
|
||||
|
||||
if (g_Config.bShowTouchRTrigger) {
|
||||
DragDropButton *rbutton = new DragDropButton(g_Config.fRKeyX, g_Config.fRKeyY, I_SHOULDER, I_R, g_Config.fRKeyScale);
|
||||
DragDropButton *rbutton = new DragDropButton(g_Config.fRKeyX, g_Config.fRKeyY, shoulderImage, I_R, g_Config.fRKeyScale);
|
||||
rbutton->FlipImageH(true);
|
||||
controls_.push_back(rbutton);
|
||||
}
|
||||
|
||||
if (g_Config.bShowTouchAnalogStick) {
|
||||
controls_.push_back(new DragDropButton(g_Config.fAnalogStickX, g_Config.fAnalogStickY, I_STICKBG, I_STICK, g_Config.fAnalogStickScale));
|
||||
controls_.push_back(new DragDropButton(g_Config.fAnalogStickX, g_Config.fAnalogStickY, stickBg, stickImage, g_Config.fAnalogStickScale));
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < controls_.size(); i++) {
|
||||
|
||||
67707
UI/ui_atlas.cpp
67707
UI/ui_atlas.cpp
File diff suppressed because it is too large
Load Diff
@ -18,21 +18,28 @@
|
||||
#define I_ARROW 7
|
||||
#define I_DIR 8
|
||||
#define I_ROUND 9
|
||||
#define I_STICK 10
|
||||
#define I_SHOULDER 11
|
||||
#define I_CHECKEDBOX 12
|
||||
#define I_RECT 13
|
||||
#define I_STICKBG 14
|
||||
#define I_BG 15
|
||||
#define I_L 16
|
||||
#define I_R 17
|
||||
#define I_DROP_SHADOW 18
|
||||
#define I_LINES 19
|
||||
#define I_GRID 20
|
||||
#define I_LOGO 21
|
||||
#define I_ICON 22
|
||||
#define I_ICONGOLD 23
|
||||
#define I_RECT 10
|
||||
#define I_STICK 11
|
||||
#define I_STICK_BG 12
|
||||
#define I_SHOULDER 13
|
||||
#define I_DIR_LINE 14
|
||||
#define I_ROUND_LINE 15
|
||||
#define I_RECT_LINE 16
|
||||
#define I_SHOULDER_LINE 17
|
||||
#define I_STICK_LINE 18
|
||||
#define I_STICK_BG_LINE 19
|
||||
#define I_CHECKEDBOX 20
|
||||
#define I_BG 21
|
||||
#define I_BG_GOLD 22
|
||||
#define I_L 23
|
||||
#define I_R 24
|
||||
#define I_DROP_SHADOW 25
|
||||
#define I_LINES 26
|
||||
#define I_GRID 27
|
||||
#define I_LOGO 28
|
||||
#define I_ICON 29
|
||||
#define I_ICONGOLD 30
|
||||
|
||||
|
||||
extern const Atlas ui_atlas;
|
||||
extern const AtlasImage ui_images[24];
|
||||
extern const AtlasImage ui_images[31];
|
||||
|
||||
@ -3,105 +3,105 @@
|
||||
#include "ui_atlas.h"
|
||||
|
||||
const AtlasChar font_UBUNTU24_chardata[] = {
|
||||
// RANGE: 0x20 - 0x80, start 0x18
|
||||
// RANGE: 0x20 - 0x80, start 0x1f
|
||||
{0.000000f, 0.000000f, 0.001953f, 0.001953f, -2.0000f, -4.0000f, 7.5000f, 1, 1}, // 0020
|
||||
{0.603516f, 0.455078f, 0.619141f, 0.511719f, 0.2500f, -28.1875f, 7.8750f, 8, 29}, // 0021
|
||||
{0.710938f, 0.167969f, 0.734375f, 0.193359f, 0.1875f, -28.1875f, 11.6875f, 12, 13}, // 0022
|
||||
{0.242188f, 0.320313f, 0.281250f, 0.376953f, -1.0625f, -28.1875f, 18.0000f, 20, 29}, // 0023
|
||||
{0.943359f, 0.292969f, 0.978516f, 0.363281f, -0.2500f, -32.0000f, 17.3125f, 18, 36}, // 0024
|
||||
{0.894531f, 0.292969f, 0.941406f, 0.349609f, -0.3750f, -28.5000f, 22.6875f, 24, 29}, // 0025
|
||||
{0.154297f, 0.302734f, 0.197266f, 0.359375f, -0.8750f, -28.5000f, 19.7500f, 22, 29}, // 0026
|
||||
{0.804688f, 0.314453f, 0.820313f, 0.339844f, -0.1875f, -28.1875f, 6.8125f, 8, 13}, // 0027
|
||||
{0.121094f, 0.423828f, 0.144531f, 0.500000f, -0.0625f, -31.0000f, 10.0625f, 12, 39}, // 0028
|
||||
{0.146484f, 0.423828f, 0.169922f, 0.500000f, -1.6250f, -31.0000f, 10.1250f, 12, 39}, // 0029
|
||||
{0.554688f, 0.455078f, 0.583984f, 0.486328f, -0.8750f, -21.9375f, 13.1875f, 15, 16}, // 002a
|
||||
{0.265625f, 0.425781f, 0.302734f, 0.468750f, -0.8750f, -24.0625f, 17.2500f, 19, 22}, // 002b
|
||||
{0.121094f, 0.369141f, 0.138672f, 0.394531f, -1.0625f, -7.5625f, 6.8750f, 9, 13}, // 002c
|
||||
{0.681641f, 0.458984f, 0.707031f, 0.472656f, 0.2500f, -15.5625f, 13.0625f, 13, 7}, // 002d
|
||||
{0.199219f, 0.302734f, 0.214844f, 0.318359f, 0.3125f, -7.3750f, 8.3125f, 8, 8}, // 002e
|
||||
{0.966797f, 0.123047f, 0.998047f, 0.183594f, -1.8750f, -28.2500f, 12.1250f, 16, 31}, // 002f
|
||||
{0.283203f, 0.367188f, 0.320313f, 0.423828f, -0.3125f, -28.5000f, 17.5625f, 19, 29}, // 0030
|
||||
{0.412109f, 0.429688f, 0.437500f, 0.486328f, 1.0625f, -28.5625f, 17.5625f, 13, 29}, // 0031
|
||||
{0.804688f, 0.367188f, 0.841797f, 0.423828f, -0.2500f, -28.5000f, 17.5000f, 19, 29}, // 0032
|
||||
{0.082031f, 0.369141f, 0.119141f, 0.425781f, -0.3750f, -28.5000f, 17.5000f, 19, 29}, // 0033
|
||||
{0.550781f, 0.332031f, 0.589844f, 0.388672f, -0.8750f, -28.1875f, 17.5625f, 20, 29}, // 0034
|
||||
{0.000000f, 0.392578f, 0.035156f, 0.449219f, 0.1250f, -28.1875f, 17.5000f, 18, 29}, // 0035
|
||||
{0.322266f, 0.371094f, 0.359375f, 0.427734f, -0.0625f, -28.5000f, 17.5625f, 19, 29}, // 0036
|
||||
{0.361328f, 0.371094f, 0.398438f, 0.427734f, -0.6250f, -28.1875f, 17.5625f, 19, 29}, // 0037
|
||||
{0.400391f, 0.371094f, 0.437500f, 0.427734f, -0.5000f, -28.5000f, 17.5625f, 19, 29}, // 0038
|
||||
{0.714844f, 0.373047f, 0.751953f, 0.429688f, -0.5625f, -28.5000f, 17.5000f, 19, 29}, // 0039
|
||||
{0.470703f, 0.285156f, 0.486328f, 0.328125f, 0.3125f, -21.9375f, 7.9375f, 8, 22}, // 003a
|
||||
{0.980469f, 0.259766f, 0.998047f, 0.312500f, -0.1875f, -21.9375f, 7.8750f, 9, 27}, // 003b
|
||||
{0.439453f, 0.451172f, 0.470703f, 0.490234f, -1.0000f, -20.6875f, 15.1250f, 16, 20}, // 003c
|
||||
{0.634766f, 0.167969f, 0.667969f, 0.195313f, 0.1875f, -20.1250f, 16.9375f, 17, 14}, // 003d
|
||||
{0.000000f, 0.451172f, 0.033203f, 0.490234f, -0.1250f, -20.5000f, 15.3750f, 17, 20}, // 003e
|
||||
{0.878906f, 0.412109f, 0.912109f, 0.468750f, -1.2500f, -28.5625f, 14.3750f, 17, 29}, // 003f
|
||||
{0.095703f, 0.238281f, 0.152344f, 0.308594f, -0.5000f, -27.6250f, 27.5625f, 29, 36}, // 0040
|
||||
{0.281250f, 0.308594f, 0.324219f, 0.365234f, -1.5000f, -28.2500f, 18.6875f, 22, 29}, // 0041
|
||||
{0.000000f, 0.333984f, 0.039063f, 0.390625f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0042
|
||||
{0.041016f, 0.333984f, 0.080078f, 0.390625f, -0.3125f, -28.5000f, 18.8125f, 20, 29}, // 0043
|
||||
{0.591797f, 0.337891f, 0.630859f, 0.394531f, 0.3125f, -28.1875f, 19.8125f, 20, 29}, // 0044
|
||||
{0.037109f, 0.392578f, 0.072266f, 0.449219f, 0.3125f, -28.1875f, 16.4375f, 18, 29}, // 0045
|
||||
{0.572266f, 0.396484f, 0.607422f, 0.453125f, 0.3125f, -28.1875f, 16.4375f, 18, 29}, // 0046
|
||||
{0.326172f, 0.312500f, 0.367188f, 0.369141f, -0.3125f, -28.5000f, 19.8750f, 21, 29}, // 0047
|
||||
{0.369141f, 0.312500f, 0.410156f, 0.369141f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 0048
|
||||
{0.621094f, 0.455078f, 0.636719f, 0.511719f, 0.6250f, -28.1875f, 8.6250f, 8, 29}, // 0049
|
||||
{0.609375f, 0.396484f, 0.644531f, 0.453125f, -1.1250f, -28.1875f, 16.3125f, 18, 29}, // 004a
|
||||
{0.412109f, 0.312500f, 0.453125f, 0.369141f, 0.3125f, -28.1875f, 18.8125f, 21, 29}, // 004b
|
||||
{0.646484f, 0.396484f, 0.681641f, 0.453125f, 0.3125f, -28.1875f, 16.3750f, 18, 29}, // 004c
|
||||
{0.667969f, 0.279297f, 0.716797f, 0.335938f, 0.1875f, -28.1875f, 24.7500f, 25, 29}, // 004d
|
||||
{0.718750f, 0.314453f, 0.759766f, 0.371094f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 004e
|
||||
{0.761719f, 0.314453f, 0.802734f, 0.371094f, -0.3750f, -28.5625f, 20.1875f, 21, 29}, // 004f
|
||||
{0.632813f, 0.337891f, 0.671875f, 0.394531f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0050
|
||||
{0.953125f, 0.000000f, 0.998047f, 0.062500f, -0.3750f, -28.5625f, 20.6250f, 23, 32}, // 0051
|
||||
{0.673828f, 0.337891f, 0.712891f, 0.394531f, 0.3125f, -28.1875f, 18.9375f, 20, 29}, // 0052
|
||||
{0.865234f, 0.351563f, 0.904297f, 0.408203f, -0.5625f, -28.5000f, 18.1250f, 20, 29}, // 0053
|
||||
{0.199219f, 0.320313f, 0.240234f, 0.376953f, -1.3750f, -28.1875f, 17.3125f, 21, 29}, // 0054
|
||||
{0.455078f, 0.332031f, 0.496094f, 0.388672f, 0.0625f, -28.1875f, 20.1250f, 21, 29}, // 0055
|
||||
{0.953125f, 0.064453f, 0.998047f, 0.121094f, -1.6875f, -28.1875f, 18.6875f, 23, 29}, // 0056
|
||||
{0.609375f, 0.279297f, 0.666016f, 0.335938f, -1.5000f, -28.1875f, 25.8125f, 29, 29}, // 0057
|
||||
{0.820313f, 0.308594f, 0.863281f, 0.365234f, -1.2500f, -28.1875f, 18.6875f, 22, 29}, // 0058
|
||||
{0.095703f, 0.310547f, 0.138672f, 0.367188f, -1.5625f, -28.1875f, 18.6875f, 22, 29}, // 0059
|
||||
{0.753906f, 0.373047f, 0.791016f, 0.429688f, -0.6875f, -28.1875f, 16.6875f, 19, 29}, // 005a
|
||||
{0.201172f, 0.423828f, 0.220703f, 0.498047f, 0.1250f, -31.8125f, 8.4375f, 10, 38}, // 005b
|
||||
{0.683594f, 0.396484f, 0.714844f, 0.457031f, -1.6250f, -28.2500f, 12.3750f, 16, 31}, // 005c
|
||||
{0.978516f, 0.427734f, 0.998047f, 0.501953f, -1.8125f, -31.8125f, 8.3750f, 10, 38}, // 005d
|
||||
{0.865234f, 0.308594f, 0.894531f, 0.341797f, -1.1250f, -28.2500f, 12.7500f, 15, 17}, // 005e
|
||||
{0.492188f, 0.257813f, 0.525391f, 0.271484f, -1.8750f, -4.0625f, 13.3125f, 17, 7}, // 005f
|
||||
{0.218750f, 0.238281f, 0.240234f, 0.255859f, -0.8750f, -29.2500f, 9.8750f, 11, 9}, // 0060
|
||||
{0.074219f, 0.427734f, 0.109375f, 0.472656f, -0.7500f, -22.3125f, 16.0625f, 18, 23}, // 0061
|
||||
{0.140625f, 0.361328f, 0.175781f, 0.421875f, -0.0625f, -29.8750f, 16.7500f, 18, 31}, // 0062
|
||||
{0.341797f, 0.429688f, 0.375000f, 0.474609f, -0.7500f, -22.2500f, 15.4375f, 17, 23}, // 0063
|
||||
{0.945313f, 0.365234f, 0.980469f, 0.425781f, -0.6875f, -29.8750f, 16.7500f, 18, 31}, // 0064
|
||||
{0.941406f, 0.427734f, 0.976563f, 0.472656f, -0.7500f, -22.2500f, 15.5000f, 18, 23}, // 0065
|
||||
{0.171875f, 0.423828f, 0.199219f, 0.484375f, -1.3125f, -30.2500f, 10.0625f, 14, 31}, // 0066
|
||||
{0.228516f, 0.378906f, 0.263672f, 0.437500f, -0.6250f, -22.3125f, 16.7500f, 18, 30}, // 0067
|
||||
{0.843750f, 0.410156f, 0.876953f, 0.468750f, -0.1250f, -29.9375f, 16.6875f, 17, 30}, // 0068
|
||||
{0.982422f, 0.314453f, 0.998047f, 0.373047f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 0069
|
||||
{0.476563f, 0.390625f, 0.498047f, 0.464844f, -3.1875f, -29.9375f, 7.8125f, 11, 38}, // 006a
|
||||
{0.498047f, 0.378906f, 0.533203f, 0.437500f, -0.0625f, -29.9375f, 15.5000f, 18, 30}, // 006b
|
||||
{0.585938f, 0.455078f, 0.601563f, 0.513672f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 006c
|
||||
{0.498047f, 0.332031f, 0.548828f, 0.376953f, -0.0625f, -22.3125f, 25.6875f, 26, 23}, // 006d
|
||||
{0.376953f, 0.429688f, 0.410156f, 0.474609f, -0.0625f, -22.3125f, 16.8125f, 17, 23}, // 006e
|
||||
{0.527344f, 0.115234f, 0.564453f, 0.160156f, -0.7500f, -22.2500f, 16.7500f, 19, 23}, // 006f
|
||||
{0.439453f, 0.390625f, 0.474609f, 0.449219f, -0.0625f, -22.3125f, 16.7500f, 18, 30}, // 0070
|
||||
{0.535156f, 0.390625f, 0.570313f, 0.449219f, -0.6875f, -22.2500f, 16.7500f, 18, 30}, // 0071
|
||||
{0.527344f, 0.451172f, 0.552734f, 0.496094f, -0.0625f, -22.3125f, 10.4375f, 13, 23}, // 0072
|
||||
{0.716797f, 0.431641f, 0.750000f, 0.476563f, -0.8750f, -22.2500f, 15.0000f, 17, 23}, // 0073
|
||||
{0.500000f, 0.439453f, 0.525391f, 0.492188f, -1.5000f, -26.4375f, 10.1875f, 13, 27}, // 0074
|
||||
{0.751953f, 0.431641f, 0.785156f, 0.476563f, -0.1250f, -21.9375f, 16.7500f, 17, 23}, // 0075
|
||||
{0.792969f, 0.425781f, 0.830078f, 0.468750f, -1.5000f, -22.0000f, 15.0000f, 19, 22}, // 0076
|
||||
{0.177734f, 0.378906f, 0.226563f, 0.421875f, -1.3750f, -22.0000f, 22.0625f, 25, 22}, // 0077
|
||||
{0.304688f, 0.429688f, 0.339844f, 0.472656f, -1.4375f, -22.0000f, 15.0000f, 18, 22}, // 0078
|
||||
{0.906250f, 0.351563f, 0.943359f, 0.410156f, -1.6875f, -22.0000f, 15.0000f, 19, 30}, // 0079
|
||||
{0.222656f, 0.439453f, 0.255859f, 0.482422f, -0.6875f, -22.0000f, 15.0000f, 17, 22}, // 007a
|
||||
{0.972656f, 0.185547f, 0.998047f, 0.257813f, -1.1250f, -30.5625f, 10.0000f, 13, 37}, // 007b
|
||||
{0.638672f, 0.455078f, 0.652344f, 0.519531f, 0.1875f, -28.1875f, 7.4375f, 7, 33}, // 007c
|
||||
{0.914063f, 0.412109f, 0.939453f, 0.484375f, -1.5000f, -30.5625f, 10.0000f, 13, 37}, // 007d
|
||||
{0.669922f, 0.167969f, 0.708984f, 0.189453f, -0.1875f, -17.3750f, 19.6250f, 20, 11}, // 007e
|
||||
{0.525391f, 0.615234f, 0.541016f, 0.671875f, 0.2500f, -28.1875f, 7.8750f, 8, 29}, // 0021
|
||||
{0.218750f, 0.333984f, 0.242188f, 0.359375f, 0.1875f, -28.1875f, 11.6875f, 12, 13}, // 0022
|
||||
{0.052734f, 0.492188f, 0.091797f, 0.548828f, -1.0625f, -28.1875f, 18.0000f, 20, 29}, // 0023
|
||||
{0.830078f, 0.296875f, 0.865234f, 0.367188f, -0.2500f, -32.0000f, 17.3125f, 18, 36}, // 0024
|
||||
{0.642578f, 0.460938f, 0.689453f, 0.517578f, -0.3750f, -28.5000f, 22.6875f, 24, 29}, // 0025
|
||||
{0.691406f, 0.482422f, 0.734375f, 0.539063f, -0.8750f, -28.5000f, 19.7500f, 22, 29}, // 0026
|
||||
{0.914063f, 0.488281f, 0.929688f, 0.513672f, -0.1875f, -28.1875f, 6.8125f, 8, 13}, // 0027
|
||||
{0.857422f, 0.591797f, 0.880859f, 0.667969f, -0.0625f, -31.0000f, 10.0625f, 12, 39}, // 0028
|
||||
{0.882813f, 0.591797f, 0.906250f, 0.667969f, -1.6250f, -31.0000f, 10.1250f, 12, 39}, // 0029
|
||||
{0.494141f, 0.615234f, 0.523438f, 0.646484f, -0.8750f, -21.9375f, 13.1875f, 15, 16}, // 002a
|
||||
{0.714844f, 0.599609f, 0.751953f, 0.642578f, -0.8750f, -24.0625f, 17.2500f, 19, 22}, // 002b
|
||||
{0.857422f, 0.455078f, 0.875000f, 0.480469f, -1.0625f, -7.5625f, 6.8750f, 9, 13}, // 002c
|
||||
{0.720703f, 0.371094f, 0.746094f, 0.384766f, 0.2500f, -15.5625f, 13.0625f, 13, 7}, // 002d
|
||||
{0.853516f, 0.369141f, 0.869141f, 0.384766f, 0.3125f, -7.3750f, 8.3125f, 8, 8}, // 002e
|
||||
{0.324219f, 0.548828f, 0.355469f, 0.609375f, -1.8750f, -28.2500f, 12.1250f, 16, 31}, // 002f
|
||||
{0.662109f, 0.541016f, 0.699219f, 0.597656f, -0.3125f, -28.5000f, 17.5625f, 19, 29}, // 0030
|
||||
{0.248047f, 0.609375f, 0.273438f, 0.666016f, 1.0625f, -28.5625f, 17.5625f, 13, 29}, // 0031
|
||||
{0.701172f, 0.541016f, 0.738281f, 0.597656f, -0.2500f, -28.5000f, 17.5000f, 19, 29}, // 0032
|
||||
{0.740234f, 0.541016f, 0.777344f, 0.597656f, -0.3750f, -28.5000f, 17.5000f, 19, 29}, // 0033
|
||||
{0.093750f, 0.494141f, 0.132813f, 0.550781f, -0.8750f, -28.1875f, 17.5625f, 20, 29}, // 0034
|
||||
{0.074219f, 0.552734f, 0.109375f, 0.609375f, 0.1250f, -28.1875f, 17.5000f, 18, 29}, // 0035
|
||||
{0.779297f, 0.541016f, 0.816406f, 0.597656f, -0.0625f, -28.5000f, 17.5625f, 19, 29}, // 0036
|
||||
{0.818359f, 0.541016f, 0.855469f, 0.597656f, -0.6250f, -28.1875f, 17.5625f, 19, 29}, // 0037
|
||||
{0.355469f, 0.544922f, 0.392578f, 0.601563f, -0.5000f, -28.5000f, 17.5625f, 19, 29}, // 0038
|
||||
{0.394531f, 0.544922f, 0.431641f, 0.601563f, -0.5625f, -28.5000f, 17.5000f, 19, 29}, // 0039
|
||||
{0.982422f, 0.232422f, 0.998047f, 0.275391f, 0.3125f, -21.9375f, 7.9375f, 8, 22}, // 003a
|
||||
{0.433594f, 0.361328f, 0.451172f, 0.414063f, -0.1875f, -21.9375f, 7.8750f, 9, 27}, // 003b
|
||||
{0.099609f, 0.611328f, 0.130859f, 0.650391f, -1.0000f, -20.6875f, 15.1250f, 16, 20}, // 003c
|
||||
{0.142578f, 0.333984f, 0.175781f, 0.361328f, 0.1875f, -20.1250f, 16.9375f, 17, 14}, // 003d
|
||||
{0.064453f, 0.611328f, 0.097656f, 0.650391f, -0.1250f, -20.5000f, 15.3750f, 17, 20}, // 003e
|
||||
{0.583984f, 0.578125f, 0.617188f, 0.634766f, -1.2500f, -28.5625f, 14.3750f, 17, 29}, // 003f
|
||||
{0.525391f, 0.425781f, 0.582031f, 0.496094f, -0.5000f, -27.6250f, 27.5625f, 29, 36}, // 0040
|
||||
{0.736328f, 0.482422f, 0.779297f, 0.539063f, -1.5000f, -28.2500f, 18.6875f, 22, 29}, // 0041
|
||||
{0.134766f, 0.494141f, 0.173828f, 0.550781f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0042
|
||||
{0.500000f, 0.498047f, 0.539063f, 0.554688f, -0.3125f, -28.5000f, 18.8125f, 20, 29}, // 0043
|
||||
{0.541016f, 0.498047f, 0.580078f, 0.554688f, 0.3125f, -28.1875f, 19.8125f, 20, 29}, // 0044
|
||||
{0.111328f, 0.552734f, 0.146484f, 0.609375f, 0.3125f, -28.1875f, 16.4375f, 18, 29}, // 0045
|
||||
{0.472656f, 0.556641f, 0.507813f, 0.613281f, 0.3125f, -28.1875f, 16.4375f, 18, 29}, // 0046
|
||||
{0.371094f, 0.486328f, 0.412109f, 0.542969f, -0.3125f, -28.5000f, 19.8750f, 21, 29}, // 0047
|
||||
{0.414063f, 0.486328f, 0.455078f, 0.542969f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 0048
|
||||
{0.542969f, 0.615234f, 0.558594f, 0.671875f, 0.6250f, -28.1875f, 8.6250f, 8, 29}, // 0049
|
||||
{0.509766f, 0.556641f, 0.544922f, 0.613281f, -1.1250f, -28.1875f, 16.3125f, 18, 29}, // 004a
|
||||
{0.457031f, 0.486328f, 0.498047f, 0.542969f, 0.3125f, -28.1875f, 18.8125f, 21, 29}, // 004b
|
||||
{0.546875f, 0.556641f, 0.582031f, 0.613281f, 0.3125f, -28.1875f, 16.3750f, 18, 29}, // 004c
|
||||
{0.947266f, 0.455078f, 0.996094f, 0.511719f, 0.1875f, -28.1875f, 24.7500f, 25, 29}, // 004d
|
||||
{0.871094f, 0.488281f, 0.912109f, 0.544922f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 004e
|
||||
{0.226563f, 0.490234f, 0.267578f, 0.546875f, -0.3750f, -28.5625f, 20.1875f, 21, 29}, // 004f
|
||||
{0.914063f, 0.513672f, 0.953125f, 0.570313f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0050
|
||||
{0.947266f, 0.390625f, 0.992188f, 0.453125f, -0.3750f, -28.5625f, 20.6250f, 23, 32}, // 0051
|
||||
{0.955078f, 0.513672f, 0.994141f, 0.570313f, 0.3125f, -28.1875f, 18.9375f, 20, 29}, // 0052
|
||||
{0.582031f, 0.519531f, 0.621094f, 0.576172f, -0.5625f, -28.5000f, 18.1250f, 20, 29}, // 0053
|
||||
{0.269531f, 0.490234f, 0.310547f, 0.546875f, -1.3750f, -28.1875f, 17.3125f, 21, 29}, // 0054
|
||||
{0.312500f, 0.490234f, 0.353516f, 0.546875f, 0.0625f, -28.1875f, 20.1250f, 21, 29}, // 0055
|
||||
{0.179688f, 0.482422f, 0.224609f, 0.539063f, -1.6875f, -28.1875f, 18.6875f, 23, 29}, // 0056
|
||||
{0.583984f, 0.460938f, 0.640625f, 0.517578f, -1.5000f, -28.1875f, 25.8125f, 29, 29}, // 0057
|
||||
{0.781250f, 0.482422f, 0.824219f, 0.539063f, -1.2500f, -28.1875f, 18.6875f, 22, 29}, // 0058
|
||||
{0.826172f, 0.482422f, 0.869141f, 0.539063f, -1.5625f, -28.1875f, 18.6875f, 22, 29}, // 0059
|
||||
{0.433594f, 0.544922f, 0.470703f, 0.601563f, -0.6875f, -28.1875f, 16.6875f, 19, 29}, // 005a
|
||||
{0.976563f, 0.572266f, 0.996094f, 0.646484f, 0.1250f, -31.8125f, 8.4375f, 10, 38}, // 005b
|
||||
{0.943359f, 0.572266f, 0.974609f, 0.632813f, -1.6250f, -28.2500f, 12.3750f, 16, 31}, // 005c
|
||||
{0.830078f, 0.599609f, 0.849609f, 0.673828f, -1.8125f, -31.8125f, 8.3750f, 10, 38}, // 005d
|
||||
{0.462891f, 0.615234f, 0.492188f, 0.648438f, -1.1250f, -28.2500f, 12.7500f, 15, 17}, // 005e
|
||||
{0.597656f, 0.283203f, 0.630859f, 0.296875f, -1.8750f, -4.0625f, 13.3125f, 17, 7}, // 005f
|
||||
{0.830078f, 0.369141f, 0.851563f, 0.386719f, -0.8750f, -29.2500f, 9.8750f, 11, 9}, // 0060
|
||||
{0.792969f, 0.599609f, 0.828125f, 0.644531f, -0.7500f, -22.3125f, 16.0625f, 18, 23}, // 0061
|
||||
{0.000000f, 0.539063f, 0.035156f, 0.599609f, -0.0625f, -29.8750f, 16.7500f, 18, 31}, // 0062
|
||||
{0.357422f, 0.603516f, 0.390625f, 0.648438f, -0.7500f, -22.2500f, 15.4375f, 17, 23}, // 0063
|
||||
{0.175781f, 0.541016f, 0.210938f, 0.601563f, -0.6875f, -29.8750f, 16.7500f, 18, 31}, // 0064
|
||||
{0.000000f, 0.601563f, 0.035156f, 0.646484f, -0.7500f, -22.2500f, 15.5000f, 18, 23}, // 0065
|
||||
{0.685547f, 0.599609f, 0.712891f, 0.660156f, -1.3125f, -30.2500f, 10.0625f, 14, 31}, // 0066
|
||||
{0.212891f, 0.548828f, 0.248047f, 0.607422f, -0.6250f, -22.3125f, 16.7500f, 18, 30}, // 0067
|
||||
{0.908203f, 0.572266f, 0.941406f, 0.630859f, -0.1250f, -29.9375f, 16.6875f, 17, 30}, // 0068
|
||||
{0.982422f, 0.171875f, 0.998047f, 0.230469f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 0069
|
||||
{0.976563f, 0.285156f, 0.998047f, 0.359375f, -3.1875f, -29.9375f, 7.8125f, 11, 38}, // 006a
|
||||
{0.250000f, 0.548828f, 0.285156f, 0.607422f, -0.0625f, -29.9375f, 15.5000f, 18, 30}, // 006b
|
||||
{0.132813f, 0.611328f, 0.148438f, 0.669922f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 006c
|
||||
{0.000000f, 0.492188f, 0.050781f, 0.537109f, -0.0625f, -22.3125f, 25.6875f, 26, 23}, // 006d
|
||||
{0.392578f, 0.603516f, 0.425781f, 0.648438f, -0.0625f, -22.3125f, 16.8125f, 17, 23}, // 006e
|
||||
{0.646484f, 0.599609f, 0.683594f, 0.644531f, -0.7500f, -22.2500f, 16.7500f, 19, 23}, // 006f
|
||||
{0.287109f, 0.548828f, 0.322266f, 0.607422f, -0.0625f, -22.3125f, 16.7500f, 18, 30}, // 0070
|
||||
{0.037109f, 0.550781f, 0.072266f, 0.609375f, -0.6875f, -22.2500f, 16.7500f, 18, 30}, // 0071
|
||||
{0.455078f, 0.236328f, 0.480469f, 0.281250f, -0.0625f, -22.3125f, 10.4375f, 13, 23}, // 0072
|
||||
{0.427734f, 0.603516f, 0.460938f, 0.648438f, -0.8750f, -22.2500f, 15.0000f, 17, 23}, // 0073
|
||||
{0.037109f, 0.611328f, 0.062500f, 0.664063f, -1.5000f, -26.4375f, 10.1875f, 13, 27}, // 0074
|
||||
{0.212891f, 0.609375f, 0.246094f, 0.654297f, -0.1250f, -21.9375f, 16.7500f, 17, 23}, // 0075
|
||||
{0.753906f, 0.599609f, 0.791016f, 0.642578f, -1.5000f, -22.0000f, 15.0000f, 19, 22}, // 0076
|
||||
{0.857422f, 0.546875f, 0.906250f, 0.589844f, -1.3750f, -22.0000f, 22.0625f, 25, 22}, // 0077
|
||||
{0.175781f, 0.603516f, 0.210938f, 0.646484f, -1.4375f, -22.0000f, 15.0000f, 18, 22}, // 0078
|
||||
{0.623047f, 0.519531f, 0.660156f, 0.578125f, -1.6875f, -22.0000f, 15.0000f, 19, 30}, // 0079
|
||||
{0.275391f, 0.609375f, 0.308594f, 0.652344f, -0.6875f, -22.0000f, 15.0000f, 17, 22}, // 007a
|
||||
{0.148438f, 0.552734f, 0.173828f, 0.625000f, -1.1250f, -30.5625f, 10.0000f, 13, 37}, // 007b
|
||||
{0.343750f, 0.611328f, 0.357422f, 0.675781f, 0.1875f, -28.1875f, 7.4375f, 7, 33}, // 007c
|
||||
{0.619141f, 0.580078f, 0.644531f, 0.652344f, -1.5000f, -30.5625f, 10.0000f, 13, 37}, // 007d
|
||||
{0.177734f, 0.333984f, 0.216797f, 0.355469f, -0.1875f, -17.3750f, 19.6250f, 20, 11}, // 007e
|
||||
{0.000000f, 0.000000f, 0.001953f, 0.001953f, -2.0000f, -4.0000f, 0.1875f, 1, 1}, // 007f
|
||||
// RANGE: 0xfffd - 0xfffe, start 0x78
|
||||
{0.908203f, 0.195313f, 0.970703f, 0.291016f, -0.6250f, -39.6875f, 30.1875f, 32, 49}, // fffd
|
||||
// RANGE: 0xfffd - 0xfffe, start 0x7f
|
||||
{0.882813f, 0.390625f, 0.945313f, 0.486328f, -0.6250f, -39.6875f, 30.1875f, 32, 49}, // fffd
|
||||
};
|
||||
const AtlasCharRange font_UBUNTU24_ranges[] = {
|
||||
{ 32, 128, 0 },
|
||||
@ -120,34 +120,41 @@ const AtlasFont font_UBUNTU24 = {
|
||||
const AtlasFont *ui_fonts[1] = {
|
||||
&font_UBUNTU24,
|
||||
};
|
||||
const AtlasImage ui_images[24] = {
|
||||
{0.719727f, 0.280273f, 0.749023f, 0.309570f, 16, 16, "I_SOLIDWHITE"},
|
||||
{0.219727f, 0.258789f, 0.278320f, 0.317383f, 31, 31, "I_CROSS"},
|
||||
{0.155273f, 0.239258f, 0.215820f, 0.299805f, 32, 32, "I_CIRCLE"},
|
||||
{0.493164f, 0.274414f, 0.547852f, 0.329102f, 29, 29, "I_SQUARE"},
|
||||
{0.752930f, 0.256836f, 0.817383f, 0.311523f, 34, 29, "I_TRIANGLE"},
|
||||
{0.356445f, 0.258789f, 0.489258f, 0.282227f, 69, 13, "I_SELECT"},
|
||||
{0.356445f, 0.286133f, 0.467773f, 0.309570f, 58, 13, "I_START"},
|
||||
{0.036133f, 0.452148f, 0.059570f, 0.499023f, 13, 25, "I_ARROW"},
|
||||
{0.635742f, 0.196289f, 0.749023f, 0.276367f, 59, 42, "I_DIR"},
|
||||
{0.528320f, 0.168945f, 0.631836f, 0.270508f, 54, 53, "I_ROUND"},
|
||||
{0.569336f, 0.000977f, 0.737305f, 0.165039f, 87, 85, "I_STICK"},
|
||||
{0.741211f, 0.125977f, 0.963867f, 0.192383f, 115, 35, "I_SHOULDER"},
|
||||
{0.551758f, 0.274414f, 0.606445f, 0.329102f, 29, 29, "I_CHECKEDBOX"},
|
||||
{0.752930f, 0.196289f, 0.905273f, 0.252930f, 79, 30, "I_RECT"},
|
||||
{0.000977f, 0.000977f, 0.239258f, 0.235352f, 123, 121, "I_STICKBG"},
|
||||
{0.741211f, 0.000977f, 0.950195f, 0.122070f, 108, 63, "I_BG"},
|
||||
{0.844727f, 0.368164f, 0.860352f, 0.395508f, 9, 15, "I_L"},
|
||||
{0.655273f, 0.456055f, 0.678711f, 0.483398f, 13, 15, "I_R"},
|
||||
{0.000977f, 0.239258f, 0.092773f, 0.331055f, 48, 48, "I_DROP_SHADOW"},
|
||||
{0.821289f, 0.256836f, 0.891602f, 0.305664f, 37, 26, "I_LINES"},
|
||||
{0.282227f, 0.258789f, 0.352539f, 0.305664f, 37, 25, "I_GRID"},
|
||||
{0.243164f, 0.000977f, 0.565430f, 0.112305f, 166, 58, "I_LOGO"},
|
||||
{0.243164f, 0.116211f, 0.381836f, 0.254883f, 72, 72, "I_ICON"},
|
||||
{0.385742f, 0.116211f, 0.524414f, 0.254883f, 72, 72, "I_ICONGOLD"},
|
||||
const AtlasImage ui_images[31] = {
|
||||
{0.311523f, 0.612305f, 0.340820f, 0.641602f, 16, 16, "I_SOLIDWHITE"},
|
||||
{0.118164f, 0.432617f, 0.176758f, 0.491211f, 31, 31, "I_CROSS"},
|
||||
{0.370117f, 0.362305f, 0.430664f, 0.422852f, 32, 32, "I_CIRCLE"},
|
||||
{0.254883f, 0.432617f, 0.309570f, 0.487305f, 29, 29, "I_SQUARE"},
|
||||
{0.657227f, 0.116211f, 0.721680f, 0.170898f, 34, 29, "I_TRIANGLE"},
|
||||
{0.721680f, 0.456055f, 0.854492f, 0.479492f, 69, 13, "I_SELECT"},
|
||||
{0.000977f, 0.465820f, 0.112305f, 0.489258f, 58, 13, "I_START"},
|
||||
{0.118164f, 0.381836f, 0.141602f, 0.428711f, 13, 25, "I_ARROW"},
|
||||
{0.000977f, 0.381836f, 0.114258f, 0.461914f, 59, 42, "I_DIR"},
|
||||
{0.870117f, 0.286133f, 0.973633f, 0.387695f, 54, 53, "I_ROUND"},
|
||||
{0.370117f, 0.426758f, 0.522461f, 0.483398f, 79, 30, "I_RECT"},
|
||||
{0.485352f, 0.116211f, 0.653320f, 0.280273f, 87, 85, "I_STICK"},
|
||||
{0.000977f, 0.000977f, 0.239258f, 0.235352f, 123, 121, "I_STICK_BG"},
|
||||
{0.143555f, 0.362305f, 0.366211f, 0.428711f, 115, 35, "I_SHOULDER"},
|
||||
{0.598633f, 0.372070f, 0.717773f, 0.458008f, 62, 45, "I_DIR_LINE"},
|
||||
{0.870117f, 0.172852f, 0.979492f, 0.282227f, 57, 57, "I_ROUND_LINE"},
|
||||
{0.721680f, 0.391602f, 0.879883f, 0.452148f, 82, 32, "I_RECT_LINE"},
|
||||
{0.598633f, 0.297852f, 0.827148f, 0.368164f, 118, 37, "I_SHOULDER_LINE"},
|
||||
{0.811523f, 0.000977f, 0.983398f, 0.168945f, 89, 87, "I_STICK_LINE"},
|
||||
{0.243164f, 0.000977f, 0.481445f, 0.233398f, 123, 120, "I_STICK_BG_LINE"},
|
||||
{0.313477f, 0.432617f, 0.368164f, 0.487305f, 29, 29, "I_CHECKEDBOX"},
|
||||
{0.657227f, 0.172852f, 0.866211f, 0.293945f, 108, 63, "I_BG"},
|
||||
{0.243164f, 0.237305f, 0.452148f, 0.358398f, 108, 63, "I_BG_GOLD"},
|
||||
{0.977539f, 0.362305f, 0.993164f, 0.389648f, 9, 15, "I_L"},
|
||||
{0.151367f, 0.627930f, 0.174805f, 0.655273f, 13, 15, "I_R"},
|
||||
{0.143555f, 0.239258f, 0.235352f, 0.331055f, 48, 48, "I_DROP_SHADOW"},
|
||||
{0.725586f, 0.116211f, 0.795898f, 0.165039f, 37, 26, "I_LINES"},
|
||||
{0.180664f, 0.432617f, 0.250977f, 0.479492f, 37, 25, "I_GRID"},
|
||||
{0.485352f, 0.000977f, 0.807617f, 0.112305f, 166, 58, "I_LOGO"},
|
||||
{0.000977f, 0.239258f, 0.139648f, 0.377930f, 72, 72, "I_ICON"},
|
||||
{0.456055f, 0.284180f, 0.594727f, 0.422852f, 72, 72, "I_ICONGOLD"},
|
||||
};
|
||||
const Atlas ui_atlas = {
|
||||
"ui_atlas.zim",
|
||||
ui_fonts, 1,
|
||||
ui_images, 24,
|
||||
ui_images, 31,
|
||||
};
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -11,12 +11,19 @@ image I_START source_assets/image/start.png copy
|
||||
image I_ARROW source_assets/image/arrow.png copy
|
||||
image I_DIR source_assets/image/dir.png copy
|
||||
image I_ROUND source_assets/image/round.png copy
|
||||
image I_STICK source_assets/image/stick.png copy
|
||||
image I_SHOULDER source_assets/image/shoulder.png copy
|
||||
image I_CHECKEDBOX source_assets/image/checkedbox.png copy
|
||||
image I_RECT source_assets/image/rect.png copy
|
||||
image I_STICKBG source_assets/image/stick_bg.png copy
|
||||
image I_STICK source_assets/image/stick.png copy
|
||||
image I_STICK_BG source_assets/image/stick_bg.png copy
|
||||
image I_SHOULDER source_assets/image/shoulder.png copy
|
||||
image I_DIR_LINE source_assets/image/dir_line.png copy
|
||||
image I_ROUND_LINE source_assets/image/round_line.png copy
|
||||
image I_RECT_LINE source_assets/image/rect_line.png copy
|
||||
image I_SHOULDER_LINE source_assets/image/shoulder_line.png copy
|
||||
image I_STICK_LINE source_assets/image/stick_line.png copy
|
||||
image I_STICK_BG_LINE source_assets/image/stick_bg_line.png copy
|
||||
image I_CHECKEDBOX source_assets/image/checkedbox.png copy
|
||||
image I_BG source_assets/image/background2.png copy
|
||||
image I_BG_GOLD source_assets/image/background_gold.png copy
|
||||
image I_L source_assets/image/L.png copy
|
||||
image I_R source_assets/image/R.png copy
|
||||
image I_DROP_SHADOW source_assets/image/dropshadow.png copy
|
||||
|
||||
@ -10,12 +10,19 @@ image I_START source_assets/image/start.png copy
|
||||
image I_ARROW source_assets/image/arrow.png copy
|
||||
image I_DIR source_assets/image/dir.png copy
|
||||
image I_ROUND source_assets/image/round.png copy
|
||||
image I_STICK source_assets/image/stick.png copy
|
||||
image I_SHOULDER source_assets/image/shoulder.png copy
|
||||
image I_CHECKEDBOX source_assets/image/checkedbox.png copy
|
||||
image I_RECT source_assets/image/rect.png copy
|
||||
image I_STICKBG source_assets/image/stick_bg.png copy
|
||||
image I_STICK source_assets/image/stick.png copy
|
||||
image I_STICK_BG source_assets/image/stick_bg.png copy
|
||||
image I_SHOULDER source_assets/image/shoulder.png copy
|
||||
image I_DIR_LINE source_assets/image/dir_line.png copy
|
||||
image I_ROUND_LINE source_assets/image/round_line.png copy
|
||||
image I_RECT_LINE source_assets/image/rect_line.png copy
|
||||
image I_SHOULDER_LINE source_assets/image/shoulder_line.png copy
|
||||
image I_STICK_LINE source_assets/image/stick_line.png copy
|
||||
image I_STICK_BG_LINE source_assets/image/stick_bg_line.png copy
|
||||
image I_CHECKEDBOX source_assets/image/checkedbox.png copy
|
||||
image I_BG source_assets/image/background2.png copy
|
||||
image I_BG_GOLD source_assets/image/background_gold.png copy
|
||||
image I_L source_assets/image/L.png copy
|
||||
image I_R source_assets/image/R.png copy
|
||||
image I_DROP_SHADOW source_assets/image/dropshadow.png copy
|
||||
|
||||
BIN
source_assets/image/background_gold.png
Normal file
BIN
source_assets/image/background_gold.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
@ -358,7 +358,7 @@
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="2.8"
|
||||
inkscape:cx="198.95268"
|
||||
inkscape:cx="143.23839"
|
||||
inkscape:cy="892.72876"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
@ -376,7 +376,7 @@
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
@ -387,8 +387,8 @@
|
||||
<rect
|
||||
style="fill:#000000;fill-opacity:1;stroke:none"
|
||||
id="rect5044"
|
||||
width="186.1122"
|
||||
height="240.11224"
|
||||
width="399.68362"
|
||||
height="362.96939"
|
||||
x="1.3355882"
|
||||
y="-8.7092419" />
|
||||
<g
|
||||
@ -699,12 +699,12 @@
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-ydpi="135" />
|
||||
<path
|
||||
style="fill:#809eb0;fill-opacity:1;stroke:#ffffff;stroke-width:1.68099999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.64893613"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;color:#000000;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
d="m 148.92858,176.6479 3.57142,0 1.96429,-3.21429 7.85714,0 2.14285,3.21429 15.89287,0 0,25 -31.42857,0 z"
|
||||
id="rect4715"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="ccccccccc"
|
||||
inkscape:export-filename="D:\Dev\Emulatorer\potemkin\android\source_assets\image\folder.png"
|
||||
inkscape:export-filename="C:\dev\ppsspp\source_assets\image\folder_line.png"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-ydpi="135" />
|
||||
<g
|
||||
@ -732,18 +732,81 @@
|
||||
x="208.57143"
|
||||
sodipodi:role="line">PSP</tspan></text>
|
||||
</g>
|
||||
<rect
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none"
|
||||
id="rect3093"
|
||||
width="10.678391"
|
||||
height="16.017588"
|
||||
x="121.0386"
|
||||
y="196.85159" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none"
|
||||
d="m 126.3778,188.23298 15.10154,15.10153 -30.20307,0 z"
|
||||
id="rect3097"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccc" />
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;color:#000000;stroke-width:1.57648360999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
d="M 126.375 188.21875 L 111.28125 203.34375 L 121.03125 203.34375 L 121.03125 212.875 L 131.71875 212.875 L 131.71875 203.34375 L 141.46875 203.34375 L 126.375 188.21875 z "
|
||||
id="rect3093"
|
||||
inkscape:export-filename="C:\dev\ppsspp\source_assets\image\up_line.png"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-ydpi="135" />
|
||||
<g
|
||||
transform="translate(-30.410433,-27.908275)"
|
||||
id="g3918-1"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-ydpi="135"
|
||||
inkscape:export-filename="D:\Dev\Emulatorer\potemkin\android\source_assets\image\round_line.png">
|
||||
<path
|
||||
inkscape:export-ydpi="135"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-filename="D:\Dev\Emulatorer\potemkin\gfx\round.png"
|
||||
transform="matrix(0.12501803,0,0,0.12501803,39.336944,18.00774)"
|
||||
d="m 257.14286,175.21933 a 142.85715,140 0 1 1 -285.714294,0 142.85715,140 0 1 1 285.714294,0 z"
|
||||
sodipodi:ry="140"
|
||||
sodipodi:rx="142.85715"
|
||||
sodipodi:cy="175.21933"
|
||||
sodipodi:cx="114.28571"
|
||||
id="path4099-7"
|
||||
style="fill:none;stroke:#ffffff;stroke-width:11.99826937;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
sodipodi:type="arc" />
|
||||
</g>
|
||||
<g
|
||||
transform="translate(-36.677673,-20.090557)"
|
||||
id="g3922-0"
|
||||
style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
inkscape:export-filename="D:\Dev\Emulatorer\potemkin\android\source_assets\image\dir_line.png"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-ydpi="135">
|
||||
<path
|
||||
inkscape:export-ydpi="135"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-filename="D:\Dev\Emulatorer\potemkin\android\source_assets\image\dir.png"
|
||||
sodipodi:nodetypes="cccccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="rect4891-9"
|
||||
d="m 40.960556,72.970184 26.951938,0 12.339439,14.148651 -12.339439,14.102175 -26.951938,0 z"
|
||||
style="fill:none;fill-opacity:0.67021275000000002;stroke:#ffffff;color:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
</g>
|
||||
<g
|
||||
transform="translate(-29.645712,31.056656)"
|
||||
id="g3914-2"
|
||||
inkscape:export-filename="D:\Dev\Emulatorer\potemkin\android\source_assets\image\rect_line.png"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-ydpi="135"
|
||||
style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
|
||||
<rect
|
||||
inkscape:export-ydpi="135"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-filename="D:\Dev\Emulatorer\potemkin\gfx\rect.png"
|
||||
y="114.53461"
|
||||
x="34.285713"
|
||||
height="19.970411"
|
||||
width="52.862854"
|
||||
id="rect4948-4"
|
||||
style="fill:none;fill-opacity:0.67021275000000002;stroke:#ffffff;color:#000000;fill-rule:nonzero;stroke-width:1.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||
</g>
|
||||
<g
|
||||
transform="translate(-49.660865,31.263025)"
|
||||
id="g3910-2"
|
||||
inkscape:export-filename="C:\dev\ppsspp\source_assets\image\shoulder_line.png"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-ydpi="135">
|
||||
<path
|
||||
sodipodi:nodetypes="ccccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="rect4948-1-7"
|
||||
d="m -209.01624,172.9664 c 0,0 56.95966,-1.22843 62.44214,5.17045 3.64304,10.55266 3.3703,20.66414 3.3703,20.66414 l -76.38753,0 z"
|
||||
style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.57648361;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
transform="matrix(-1,0,-0.4247234,0.90532316,0,0)" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 38 KiB |
BIN
source_assets/image/dir_line.png
Normal file
BIN
source_assets/image/dir_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 811 B |
BIN
source_assets/image/folder_line.png
Normal file
BIN
source_assets/image/folder_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 456 B |
BIN
source_assets/image/rect_line.png
Normal file
BIN
source_assets/image/rect_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 281 B |
BIN
source_assets/image/round_line.png
Normal file
BIN
source_assets/image/round_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
BIN
source_assets/image/shoulder_line.png
Normal file
BIN
source_assets/image/shoulder_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 913 B |
BIN
source_assets/image/stick_bg_line.png
Normal file
BIN
source_assets/image/stick_bg_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
BIN
source_assets/image/stick_line.png
Normal file
BIN
source_assets/image/stick_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
BIN
source_assets/image/up_line.png
Normal file
BIN
source_assets/image/up_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 720 B |
Loading…
Reference in New Issue
Block a user