Skip to content

Minor Update #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcamarmas merged 16 commits into from
Sep 30, 2025
Merged

Minor Update #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a1e86d8
Merge pull request #26 from dcamarmas/master
dcamarmas Sep 25, 2025
9fe265a
Merge pull request #15 from creatorsim-community/master
dcamarmas Sep 25, 2025
e084235
Merge pull request #13 from creatorsim-community/master
dcamarmas Sep 25, 2025
13c7c9f
Merge pull request #202 from creatorsim-community/master
dcamarmas Sep 25, 2025
141de92
Merge pull request #27 from dcamarmas/master
dcamarmas Sep 26, 2025
1e745cc
Merge pull request #16 from creatorsim-community/master
dcamarmas Sep 26, 2025
1a8450a
Merge pull request #14 from creatorsim-community/master
dcamarmas Sep 26, 2025
53603b2
Merge pull request #203 from creatorsim-community/master
dcamarmas Sep 26, 2025
2db4fea
Merge pull request #28 from dcamarmas/master
dcamarmas Sep 28, 2025
2e81416
Merge pull request #17 from creatorsim-community/master
dcamarmas Sep 28, 2025
3f62ad2
Merge pull request #15 from creatorsim-community/master
dcamarmas Sep 28, 2025
45aacb0
Merge pull request #204 from creatorsim-community/master
dcamarmas Sep 28, 2025
a8eae6d
fixed race condition on architecture load on web
ALVAROPING1 Sep 30, 2025
5d05be9
Merge pull request #18 from creatorsim-community/master
dcamarmas Sep 30, 2025
e489346
Merge pull request #16 from creatorsim-community/master
dcamarmas Sep 30, 2025
969b241
Merge pull request #205 from creatorsim-community/master
dcamarmas Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/general/creator_uielto_toolbar_btngroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@
// Architecture Selector
//

load_arch_select(arch)
async load_arch_select(arch)
{
uielto_preload_architecture.methods.load_arch_select(arch);
await uielto_preload_architecture.methods.load_arch_select(arch);

//Close all toast and refresh
app.$bvToast.hide()
Expand Down
3 changes: 2 additions & 1 deletion components/load_architecture/creator_uielto_backup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@
},

//Load backup from cache
load_copy()
async load_copy()
{
await wasm_loader; // wait for wasm to be loaded
//Load architecture from cache
const arch_json = localStorage.getItem("backup_arch")
var aux_architecture = JSON.parse(arch_json);
Expand Down
7 changes: 4 additions & 3 deletions components/load_architecture/creator_uielto_new_architecture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
show_loading();

//Read architecture JSON
$.getJSON('architecture/new_arch.json' + "?v=" + new Date().getTime(), function(cfg){
uielto_new_architecture.methods.load_arch_select_aux(cfg);
$.getJSON('architecture/new_arch.json' + "?v=" + new Date().getTime(), async function(cfg){
await uielto_new_architecture.methods.load_arch_select_aux(cfg);

//Refresh UI
hide_loading();
Expand All @@ -58,8 +58,9 @@
},

//Load architecture in CREATOR
load_arch_select_aux(cfg)
async load_arch_select_aux(cfg)
{
await wasm_loader; // wait for wasm to be loaded
//Load architecture
var aux_architecture = cfg;
architecture = register_value_deserialize(aux_architecture);
Expand Down
20 changes: 11 additions & 9 deletions components/load_architecture/creator_uielto_preload_architecture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*
*/

let wasm_loader;
let wasm;

/* jshint esversion: 6 */
Expand Down Expand Up @@ -97,9 +98,9 @@ let wasm;
});

//Read architecture JSON
$.getJSON('architecture/'+e.file+'.json' + "?v=" + new Date().getTime(), function(cfg){
$.getJSON('architecture/'+e.file+'.json' + "?v=" + new Date().getTime(), async function(cfg){
try {
uielto_preload_architecture.methods.load_arch_select_aux(cfg, true, e);
await uielto_preload_architecture.methods.load_arch_select_aux(cfg, true, e);
show_notification(e.name + ' architecture has been loaded correctly', 'success');
} catch (error) {
show_notification(e.name + ' architecture is invalid: ' + error, 'danger');
Expand All @@ -120,7 +121,7 @@ let wasm;
},

//Load selected architecture on CREATOR
load_arch_select(e)
async load_arch_select(e)
{
show_loading();

Expand All @@ -138,7 +139,7 @@ let wasm;
{
var aux_architecture = JSON.parse(load_architectures[i].architecture);
try {
uielto_preload_architecture.methods.load_arch_select_aux(aux_architecture, true, e);
await uielto_preload_architecture.methods.load_arch_select_aux(aux_architecture, true, e);
show_notification(e.name + ' architecture has been loaded correctly', 'success');
} catch (error) {
show_notification(e.name + ' architecture is invalid: ' + error, 'danger');
Expand All @@ -159,9 +160,9 @@ let wasm;
});

//Read architecture JSON
$.getJSON('architecture/'+e.file+'.json' + "?v=" + new Date().getTime(), function(cfg){
$.getJSON('architecture/'+e.file+'.json' + "?v=" + new Date().getTime(), async function(cfg){
try {
uielto_preload_architecture.methods.load_arch_select_aux(cfg, true, e);
await uielto_preload_architecture.methods.load_arch_select_aux(cfg, true, e);
show_notification(e.name + ' architecture has been loaded correctly', 'success');
} catch (error) {
show_notification(e.name + ' architecture is invalid: ' + error, 'danger');
Expand All @@ -180,8 +181,9 @@ let wasm;
},

//Load architecture in CREATOR
load_arch_select_aux(cfg, load_associated_examples, e)
async load_arch_select_aux(cfg, load_associated_examples, e)
{
await wasm_loader; // wait for wasm to be loaded
//Load architecture
var aux_architecture = cfg;
architecture = register_value_deserialize(aux_architecture);
Expand Down Expand Up @@ -272,8 +274,8 @@ let wasm;
//If no current_architecture loaded then load the associated
if (current_architecture == '')
{
$.getJSON('architecture/'+ set[i].architecture +'.json', function(cfg) {
uielto_preload_architecture.methods.load_arch_select_aux(cfg, false, null);
$.getJSON('architecture/'+ set[i].architecture +'.json', async function(cfg) {
await uielto_preload_architecture.methods.load_arch_select_aux(cfg, false, null);
}) ;
}

Expand Down
4 changes: 2 additions & 2 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,9 @@ try
/************************
* Mounted vue instance *
************************/
async mounted(){
mounted(){
this.validate_browser();
await this.load_compiler_wasm();
wasm_loader = this.load_compiler_wasm();
uielto_backup.methods.backup_modal(this);

//Pre-load following URL params
Expand Down
4 changes: 2 additions & 2 deletions js/creator_preload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@
}

return $.getJSON( 'architecture/available_arch.json',
function (arch_availables) {
async function (arch_availables) {
var a_i = preload_find_architecture(arch_availables, arch_name) ;
uielto_preload_architecture.methods.load_arch_select(a_i) ;
await uielto_preload_architecture.methods.load_arch_select(a_i) ;
return 'Architecture loaded.' ;
}
) ;
Expand Down