display -- (almost) final touches
This commit is contained in:
@@ -96,7 +96,7 @@ class Display {
|
||||
name = lime_display_get_name(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);
|
||||
|
||||
@@ -106,7 +106,7 @@ class Display {
|
||||
for (i in 0...numModes) {
|
||||
|
||||
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));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@ namespace lime {
|
||||
|
||||
public:
|
||||
|
||||
static value Display::GetCurrentDisplayMode (int displayIndex);
|
||||
static value Display::GetDisplayMode (int displayIndex, int modeIndex);
|
||||
static value GetCurrentDisplayMode (int displayIndex);
|
||||
static value GetDisplayMode (int displayIndex, int modeIndex);
|
||||
static int GetNumDevices ();
|
||||
static const char* GetDisplayName (int displayIndex);
|
||||
static int GetNumDisplayModes (int displayIndex);
|
||||
|
||||
@@ -10,8 +10,8 @@ namespace lime {
|
||||
SDL_GetCurrentDisplayMode(displayIndex, &mode);
|
||||
|
||||
value mValue = alloc_empty_object ();
|
||||
alloc_field (mValue, val_id("w"), alloc_int(mode.w));
|
||||
alloc_field (mValue, val_id("h"), alloc_int(mode.h));
|
||||
alloc_field (mValue, val_id("width"), alloc_int(mode.w));
|
||||
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("format"), alloc_int(mode.format));
|
||||
return mValue;
|
||||
@@ -24,8 +24,8 @@ namespace lime {
|
||||
SDL_GetDisplayMode(displayIndex, modeIndex, &mode);
|
||||
|
||||
value mValue = alloc_empty_object ();
|
||||
alloc_field (mValue, val_id("w"), alloc_int(mode.w));
|
||||
alloc_field (mValue, val_id("h"), alloc_int(mode.h));
|
||||
alloc_field (mValue, val_id("width"), alloc_int(mode.w));
|
||||
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("format"), alloc_int(mode.format));
|
||||
return mValue;
|
||||
|
||||
Reference in New Issue
Block a user