Skip to content

Automatic filename from original #38

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

Open
paavoto7 wants to merge 1 commit into
base: gh-pages
Choose a base branch
from
Open

Automatic filename from original #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions javascripts/filedrop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,18 @@ NMO_FileDrop = new function(){
tga.load(new Uint8Array(data))
processedData = tga.getDataURL('image/png');
}

const textureNames = {
[NMO_Main.TextureEnum.NORMAL]: "NormalMap",
[NMO_Main.TextureEnum.DISPLACEMENT]: "DisplacementMap",
[NMO_Main.TextureEnum.AMBIENT]: "AmbientOcclusionMap",
[NMO_Main.TextureEnum.SPECULAR]: "SpecularMap",
};

const file_name = imgFile.name.replace(/\.[^/.]+$/, "") + '_';

document.getElementById('file_name').placeholder = file_name + textureNames[NMO_Main.current_texture];
NMO_Main.default_file_name = file_name;

if (type === "height")
await NMO_FileDrop.loadHeightmap(processedData);
Expand Down
19 changes: 12 additions & 7 deletions javascripts/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ var NMO_Main = new function(){
this.download_btn = document.getElementById('download');
this.download_all_btn = document.getElementById('download_all');

this.default_file_name = "";


this.activate_height_tab = function(type){
this.normal_map_mode = type;
Expand Down Expand Up @@ -94,7 +96,7 @@ var NMO_Main = new function(){
document.getElementById('specular_map').style.cssText = "display: none;";
document.getElementById('specular_settings').style.cssText = "display: none;";

document.getElementById('file_name').placeholder = "NormalMap";
document.getElementById('file_name').placeholder = this.default_file_name + "NormalMap";
this.current_texture = this.TextureEnum.NORMAL;
}

Expand All @@ -116,7 +118,7 @@ var NMO_Main = new function(){
document.getElementById('specular_map').style.cssText = "display: none;";
document.getElementById('specular_settings').style.cssText = "display: none;";

document.getElementById('file_name').placeholder = "DisplacementMap";
document.getElementById('file_name').placeholder = this.default_file_name + "DisplacementMap";
this.current_texture = this.TextureEnum.DISPLACEMENT;
//console.log("displace!");
}
Expand All @@ -138,7 +140,7 @@ var NMO_Main = new function(){
document.getElementById('specular_map').style.cssText = "display: none;";
document.getElementById('specular_settings').style.cssText = "display: none;";

document.getElementById('file_name').placeholder = "AmbientOcclusionMap";
document.getElementById('file_name').placeholder = this.default_file_name + "AmbientOcclusionMap";
this.current_texture = this.TextureEnum.AMBIENT;
//console.log("displace!");
}
Expand All @@ -160,7 +162,7 @@ var NMO_Main = new function(){
document.getElementById('specular_map').style.cssText = "";
document.getElementById('specular_settings').style.cssText = "";

document.getElementById('file_name').placeholder = "SpecularMap";
document.getElementById('file_name').placeholder = this.default_file_name + "SpecularMap";
this.current_texture = this.TextureEnum.SPECULAR;
//console.log("displace!");
}
Expand Down Expand Up @@ -375,9 +377,12 @@ var NMO_Main = new function(){
file_name="SpecularMap";
}

if (document.getElementById('file_name').value != "")
file_name = document.getElementById('file_name').value;

let file_name_el = document.getElementById('file_name');
if (file_name_el.value != "")
file_name = file_name_el.value;
else if (file_name_el.placeholder != file_name) {
file_name = this.default_file_name + file_name;
}


var qual = $('#file_jpg_qual_nmb').val() / 100;
Expand Down