edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Save window rect

Browse Source
This commit is contained in:
luboslenco
2019-09-04 00:03:15 +02:00
parent 3fbaf4ce47
commit c3f306793c
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bundled/common/config.arm
+4 -5
View File
@@ -2,18 +2,17 @@
"rp_bloom": false,
"rp_gi": false,
"rp_motionblur": false,
"rp_shadowmap_cube": 0,
"rp_shadowmap_cascade": 0,
"rp_ssgi": true,
"rp_ssr": false,
"rp_supersample": 1.0,
"window_w": 1600,
"window_h": 900,
"window_x": -1,
"window_y": -1,
"window_maximizable": true,
"window_minimizable": true,
"window_mode": 0,
"window_msaa": 1,
"window_resizable": true,
"window_scale": 1.0,
"window_vsync": true,
"window_w": 1600
"window_vsync": true
}
Sources/Main.hx
+3 -2
View File
@@ -34,8 +34,9 @@ class Main {
if (c.window_maximizable == null) c.window_maximizable = true;
if (c.window_w == null) c.window_w = 1600;
if (c.window_h == null) c.window_h = 900;
if (c.window_x == null) c.window_x = -1;
if (c.window_y == null) c.window_y = -1;
if (c.window_scale == null) c.window_scale = 1.0;
if (c.window_msaa == null) c.window_msaa = 1;
if (c.window_vsync == null) c.window_vsync = true;
var windowMode = c.window_mode == 0 ? WindowMode.Windowed : WindowMode.Fullscreen;
@@ -54,7 +55,7 @@ class Main {
var title = "untitled - ArmorPaint";
#end
System.start({title: title, width: c.window_w, height: c.window_h, window: {mode: windowMode, windowFeatures: windowFeatures}, framebuffer: {samplesPerPixel: c.window_msaa, verticalSync: c.window_vsync}}, function(window:Window) {
System.start({title: title, window: {width: c.window_w, height: c.window_h, x: c.window_x, y: c.window_y, mode: windowMode, windowFeatures: windowFeatures}, framebuffer: {samplesPerPixel: 1, verticalSync: c.window_vsync}}, function(window:Window) {
iron.App.init(function() {
Scene.setActive("Scene", function(o:Object) {
Uniforms.init();
Sources/arm/App.hx
+12 -10
View File
@@ -217,19 +217,21 @@ class App {
winw = System.windowWidth();
winh = System.windowHeight();
// Save window size
// Config.raw.window_w = System.windowWidth();
// Config.raw.window_h = System.windowHeight();
// Cap height, window is not centered properly
// var disp = kha.Display.primary;
// if (disp.height > 0 && Config.raw.window_h > disp.height - 140) {
// Config.raw.window_h = disp.height - 140;
// }
// Config.save();
saveWindowRect();
}
#end
static function saveWindowRect() {
#if krom_windows
Config.raw.window_w = System.windowWidth();
Config.raw.window_h = System.windowHeight();
Config.raw.window_x = kha.Window.get(0).x;
Config.raw.window_y = kha.Window.get(0).y;
Config.save();
#end
}
public static function resize() {
if (System.windowWidth() == 0 || System.windowHeight() == 0) return;
Sources/arm/Config.hx
+2 -6
View File
@@ -38,8 +38,6 @@ class Config {
raw.rp_bloom = false;
raw.rp_gi = false;
raw.rp_motionblur = false;
raw.rp_shadowmap_cube = 0;
raw.rp_shadowmap_cascade = 0;
raw.rp_ssgi = true;
raw.rp_ssr = false;
raw.rp_supersample = 1.0;
@@ -179,19 +177,17 @@ class Config {
}
typedef TConfig = {
@:optional var debug_console:Null<Bool>;
@:optional var window_mode:Null<Int>; // window, fullscreen
@:optional var window_w:Null<Int>;
@:optional var window_h:Null<Int>;
@:optional var window_x:Null<Int>;
@:optional var window_y:Null<Int>;
@:optional var window_resizable:Null<Bool>;
@:optional var window_maximizable:Null<Bool>;
@:optional var window_minimizable:Null<Bool>;
@:optional var window_vsync:Null<Bool>;
@:optional var window_msaa:Null<Int>;
@:optional var window_scale:Null<Float>;
@:optional var rp_supersample:Null<Float>;
@:optional var rp_shadowmap_cube:Null<Int>; // size
@:optional var rp_shadowmap_cascade:Null<Int>; // size for single cascade
@:optional var rp_ssgi:Null<Bool>;
@:optional var rp_ssr:Null<Bool>;
@:optional var rp_bloom:Null<Bool>;