Skip to content

Commit 60873b7

Browse files
committed
Merge pull request #521 from fooflare/master
Fix virtual functions in Linux PolycodePlayer
2 parents a69be0d + 16e2fb0 commit 60873b7

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Core/Contents/Include/PolySDLCore.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ namespace Polycode {
4949
void enableMouse(bool newval);
5050
void captureMouse(bool);
5151
unsigned int getTicks();
52-
bool Update();
52+
bool systemUpdate();
5353
void Render();
54-
void setVideoMode(int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel);
54+
void setVideoMode(int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel, bool retinaSupport = true);
5555
void createThread(Threaded *target);
5656
std::vector<Rectangle> getVideoModes();
5757

@@ -68,6 +68,7 @@ namespace Polycode {
6868
void removeDiskItem(const String& itemPath);
6969
String openFolderPicker();
7070
std::vector<String> openFilePicker(std::vector<CoreFileExtension> extensions, bool allowMultiple);
71+
String saveFilePicker(std::vector<CoreFileExtension> extensions);
7172
void resizeTo(int xRes, int yRes);
7273

7374
String executeExternalCommand(String command, String args, String inDirectory="");

Core/Contents/Source/PolySDLCore.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ SDLCore::SDLCore(PolycodeView *view, int _xRes, int _yRes, bool fullScreen, bool
133133
CoreServices::getInstance()->installModule(new GLSLShaderModule());
134134
}
135135

136-
void SDLCore::setVideoMode(int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel) {
136+
void SDLCore::setVideoMode(int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel, bool retinaSupport) {
137137
this->xRes = xRes;
138138
this->yRes = yRes;
139139
this->fullScreen = fullScreen;
@@ -313,7 +313,7 @@ void SDLCore::Render() {
313313
SDL_GL_SwapBuffers();
314314
}
315315

316-
bool SDLCore::Update() {
316+
bool SDLCore::systemUpdate() {
317317
if(!running)
318318
return false;
319319
doSleep();
@@ -499,6 +499,11 @@ vector<String> SDLCore::openFilePicker(vector<CoreFileExtension> extensions, boo
499499
return r;
500500
}
501501

502+
String SDLCore::saveFilePicker(std::vector<CoreFileExtension> extensions) {
503+
String r = "";
504+
return r;
505+
}
506+
502507
void SDLCore::resizeTo(int xRes, int yRes) {
503508
renderer->Resize(xRes, yRes);
504509
}

0 commit comments

Comments
 (0)