From f10b14afb365923a2f10869c43a8bb5dd8d708b3 Mon Sep 17 00:00:00 2001 From: John Alanbrook Date: Mon, 17 Feb 2025 15:03:43 -0600 Subject: [PATCH] Fix bug by setting default camera configuration before initialization Set default width and height if none are provided in config.js. This prevents camera initialization errors when the values are missing. --- scripts/modules/render.js | 47 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/scripts/modules/render.js b/scripts/modules/render.js index dabd5e0e..c31abf41 100644 --- a/scripts/modules/render.js +++ b/scripts/modules/render.js @@ -6,7 +6,31 @@ var controller = use('controller') var tracy = use('tracy') var graphics = use('graphics') +var default_conf = { + title:`Prosperon [${prosperon.version}-${prosperon.revision}]`, + width: 1280, + height: 720, + icon: graphics.make_texture(io.slurpbytes('icons/moon.gif')), + high_dpi:0, + alpha:1, + fullscreen:0, + sample_count:1, + enable_clipboard:true, + enable_dragndrop: true, + max_dropped_files: 1, + swap_interval: 1, + name: "Prosperon", + version:prosperon.version + "-" + prosperon.revision, + identifier: "world.pockle.prosperon", + creator: "Pockle World LLC", + copyright: "Copyright Pockle World 2025", + type: "application", + url: "https://github.com/johnbrethauer/prosperon" +} + var config = use('config.js') +config.__proto__ = default_conf + prosperon.camera = use('camera').make() prosperon.camera.size = [config.width,config.height] @@ -92,29 +116,8 @@ appy.inputs["M-f4"] = os.exit; controller.player[0].control(appy); -var default_conf = { - title:`Prosperon [${prosperon.version}-${prosperon.revision}]`, - width: 1280, - height: 720, - icon: graphics.make_texture(io.slurpbytes('icons/moon.gif')), - high_dpi:0, - alpha:1, - fullscreen:0, - sample_count:1, - enable_clipboard:true, - enable_dragndrop: true, - max_dropped_files: 1, - swap_interval: 1, - name: "Prosperon", - version:prosperon.version + "-" + prosperon.revision, - identifier: "world.pockle.prosperon", - creator: "Pockle World LLC", - copyright: "Copyright Pockle World 2025", - type: "application", - url: "https://github.com/johnbrethauer/prosperon" -} -config.__proto__ = default_conf + prosperon.window = prosperon.engine_start(config);