kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display -- (almost) final touches

Browse Source
This commit is contained in:
Lars A. Doucet
2015-07-30 15:47:19 -05:00
parent 8dfe690981
commit bad547d090
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lime/system/Display.hx
View File

@@ -96,7 +96,7 @@ class Display {
name = lime_display_get_name(id); name = lime_display_get_name(id);
var obj = lime_display_get_current_display_mode(id); var obj = lime_display_get_current_display_mode(id);
mode = new DisplayMode(obj.width, obj.height, obj.refreshRate, obj.format); mode = new DisplayMode(obj.width, obj.height, obj.refresh_rate, obj.format);
resolution = new ConstVector2(mode.width, mode.height); resolution = new ConstVector2(mode.width, mode.height);
@@ -106,7 +106,7 @@ class Display {
for (i in 0...numModes) { for (i in 0...numModes) {
obj = lime_display_get_display_mode(id, i); obj = lime_display_get_display_mode(id, i);
modes.push(new DisplayMode(obj.width, obj.height, obj.refreshRate, obj.format)); modes.push(new DisplayMode(obj.width, obj.height, obj.refresh_rate, obj.format));
} }
} }

4
project/include/system/Display.h
View File

@@ -11,8 +11,8 @@ namespace lime {
public: public:
static value Display::GetCurrentDisplayMode (int displayIndex); static value GetCurrentDisplayMode (int displayIndex);
static value Display::GetDisplayMode (int displayIndex, int modeIndex); static value GetDisplayMode (int displayIndex, int modeIndex);
static int GetNumDevices (); static int GetNumDevices ();
static const char* GetDisplayName (int displayIndex); static const char* GetDisplayName (int displayIndex);
static int GetNumDisplayModes (int displayIndex); static int GetNumDisplayModes (int displayIndex);

8
project/src/backend/sdl/SDLDisplay.cpp
View File

@@ -10,8 +10,8 @@ namespace lime {
SDL_GetCurrentDisplayMode(displayIndex, &mode); SDL_GetCurrentDisplayMode(displayIndex, &mode);
value mValue = alloc_empty_object (); value mValue = alloc_empty_object ();
alloc_field (mValue, val_id("w"), alloc_int(mode.w)); alloc_field (mValue, val_id("width"), alloc_int(mode.w));
alloc_field (mValue, val_id("h"), alloc_int(mode.h)); alloc_field (mValue, val_id("height"), alloc_int(mode.h));
alloc_field (mValue, val_id("refresh_rate"), alloc_int(mode.refresh_rate)); alloc_field (mValue, val_id("refresh_rate"), alloc_int(mode.refresh_rate));
alloc_field (mValue, val_id("format"), alloc_int(mode.format)); alloc_field (mValue, val_id("format"), alloc_int(mode.format));
return mValue; return mValue;
@@ -24,8 +24,8 @@ namespace lime {
SDL_GetDisplayMode(displayIndex, modeIndex, &mode); SDL_GetDisplayMode(displayIndex, modeIndex, &mode);
value mValue = alloc_empty_object (); value mValue = alloc_empty_object ();
alloc_field (mValue, val_id("w"), alloc_int(mode.w)); alloc_field (mValue, val_id("width"), alloc_int(mode.w));
alloc_field (mValue, val_id("h"), alloc_int(mode.h)); alloc_field (mValue, val_id("height"), alloc_int(mode.h));
alloc_field (mValue, val_id("refresh_rate"), alloc_int(mode.refresh_rate)); alloc_field (mValue, val_id("refresh_rate"), alloc_int(mode.refresh_rate));
alloc_field (mValue, val_id("format"), alloc_int(mode.format)); alloc_field (mValue, val_id("format"), alloc_int(mode.format));
return mValue; return mValue;