Skip to content

Commit

Permalink
consolidated mesh editor material ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@DragoniteSpam
DragoniteSpam committed Nov 19, 2020
1 parent b6569f0 commit 3f312d0
Show file tree
Hide file tree
Showing 20 changed files with 81 additions and 376 deletions.
9 changes: 0 additions & 9 deletions DDDEditor2-23.yyp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

129 changes: 81 additions & 48 deletions scripts/dialog_create_mesh_material_settings/dialog_create_mesh_material_settings.gml
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
/// @param Dialog
/// @param selected-meshes
function dialog_create_mesh_material_settings(argument0, argument1) {

var root = argument0;
var selection = argument1;
function dialog_create_mesh_material_settings(dialog, selection) {
var mode = Stuff.mesh_ed;

var dw = 1200;
var dh = 840;

var dg = dialog_create(dw, dh, "Materials", dialog_default, dc_close_no_questions_asked, root);
dg.selection = selection;

var columns = 3;
var ew = dw / columns - 64;
var eh = 24;

var vx1 = ew / 2;
var vy1 = 0;
var vx2 = ew;
var vy2 = eh;

var c1x = 0 * dw / columns + 32;
var c2x = 1 * dw / columns + 32;
var c3x = 2 * dw / columns + 32;
var spacing = 16;

var yy = 64;
var yy_base = 64;

var id_base = -1;
var id_ambient = -1;
var id_specular_color = -1;
Expand All @@ -37,10 +32,10 @@ function dialog_create_mesh_material_settings(argument0, argument1) {
var id_bump = -1;
var id_displacement = -1;
var id_decal = -1;

#region figure out what is supposed to be selected
#region figure out what is supposed to be selected
var selected_things = ds_map_to_list(selection);

var stop = false;
for (var i = 0; i < ds_list_size(selected_things); i++) {
var thing = Stuff.all_meshes[| selected_things[| i]];
Expand All @@ -56,7 +51,7 @@ function dialog_create_mesh_material_settings(argument0, argument1) {
}
if (stop) break;
}

var stop = false;
for (var i = 0; i < ds_list_size(selected_things); i++) {
var thing = Stuff.all_meshes[| selected_things[| i]];
Expand All @@ -72,7 +67,7 @@ function dialog_create_mesh_material_settings(argument0, argument1) {
}
if (stop) break;
}

var stop = false;
for (var i = 0; i < ds_list_size(selected_things); i++) {
var thing = Stuff.all_meshes[| selected_things[| i]];
Expand All @@ -88,7 +83,7 @@ function dialog_create_mesh_material_settings(argument0, argument1) {
}
if (stop) break;
}

var stop = false;
for (var i = 0; i < ds_list_size(selected_things); i++) {
var thing = Stuff.all_meshes[| selected_things[| i]];
Expand All @@ -104,7 +99,7 @@ function dialog_create_mesh_material_settings(argument0, argument1) {
}
if (stop) break;
}

var stop = false;
for (var i = 0; i < ds_list_size(selected_things); i++) {
var thing = Stuff.all_meshes[| selected_things[| i]];
Expand All @@ -120,7 +115,7 @@ function dialog_create_mesh_material_settings(argument0, argument1) {
}
if (stop) break;
}

var stop = false;
for (var i = 0; i < ds_list_size(selected_things); i++) {
var thing = Stuff.all_meshes[| selected_things[| i]];
Expand All @@ -136,7 +131,7 @@ function dialog_create_mesh_material_settings(argument0, argument1) {
}
if (stop) break;
}

var stop = false;
for (var i = 0; i < ds_list_size(selected_things); i++) {
var thing = Stuff.all_meshes[| selected_things[| i]];
Expand All @@ -152,7 +147,7 @@ function dialog_create_mesh_material_settings(argument0, argument1) {
}
if (stop) break;
}

var stop = false;
for (var i = 0; i < ds_list_size(selected_things); i++) {
var thing = Stuff.all_meshes[| selected_things[| i]];
Expand All @@ -168,78 +163,116 @@ function dialog_create_mesh_material_settings(argument0, argument1) {
}
if (stop) break;
}
#endregion

var el_base = create_list(c1x, yy, "Base Texture", "no textures", ew, eh, 8, omu_meshes_mat_set_base, false, dg, Stuff.all_graphic_tilesets);
#endregion

var el_base = create_list(c1x, yy, "Base Texture", "no textures", ew, eh, 8, function(list) {
var selection = ui_list_selection(list);
for (var i = ds_map_find_first(list.root.selection); i != undefined; i = ds_map_find_next(list.root.selection, i)) {
Stuff.all_meshes[| i].tex_base = (selection + 1) ? Stuff.all_graphic_tilesets[| selection].GUID : NULL;
}
}, false, dg, Stuff.all_graphic_tilesets);
el_base.tooltip = "The main texture the model is rendered with (known as the \"diffuse\" texture in material-speak).";
el_base.entries_are = ListEntries.INSTANCES;
ui_list_select(el_base, id_base, true);
yy += ui_get_list_height(el_base) + spacing;

var el_ambient = create_list(c1x, yy, "Ambient Map", "no textures", ew, eh, 8, omu_meshes_mat_set_ambient, false, dg, Stuff.all_graphic_tilesets);

var el_ambient = create_list(c1x, yy, "Ambient Map", "no textures", ew, eh, 8, function(list) {
var selection = ui_list_selection(list);
for (var i = ds_map_find_first(list.root.selection); i != undefined; i = ds_map_find_next(list.root.selection, i)) {
Stuff.all_meshes[| i].tex_ambient = (selection + 1) ? Stuff.all_graphic_tilesets[| selection].GUID : NULL;
}
}, false, dg, Stuff.all_graphic_tilesets);
el_ambient.tooltip = "Texture map defining the ambient color of the material. Not currently supported.";
el_ambient.interactive = false;
el_ambient.entries_are = ListEntries.INSTANCES;
ui_list_select(el_ambient, id_ambient, true);
yy += ui_get_list_height(el_ambient) + spacing;

var el_specular_color = create_list(c1x, yy, "Specular Color Map", "no textures", ew, eh, 8, omu_meshes_mat_set_specular_color, false, dg, Stuff.all_graphic_tilesets);

var el_specular_color = create_list(c1x, yy, "Specular Color Map", "no textures", ew, eh, 8, function(list) {
var selection = ui_list_selection(list);
for (var i = ds_map_find_first(list.root.selection); i != undefined; i = ds_map_find_next(list.root.selection, i)) {
Stuff.all_meshes[| i].tex_specular_color = (selection + 1) ? Stuff.all_graphic_tilesets[| selection].GUID : NULL;
}
}, false, dg, Stuff.all_graphic_tilesets);
el_specular_color.tooltip = "Texture map defining the specular color of the material. Not currently supported.";
el_specular_color.interactive = false;
el_specular_color.entries_are = ListEntries.INSTANCES;
ui_list_select(el_specular_color, id_specular_color, true);
yy += ui_get_list_height(el_specular_color) + spacing;

yy = yy_base;

var el_specular_highlight = create_list(c2x, yy, "Specular Highlight Map", "no textures", ew, eh, 8, omu_meshes_mat_set_specular_highlight, false, dg, Stuff.all_graphic_tilesets);

var el_specular_highlight = create_list(c2x, yy, "Specular Highlight Map", "no textures", ew, eh, 8, function(list) {
var selection = ui_list_selection(list);
for (var i = ds_map_find_first(list.root.selection); i != undefined; i = ds_map_find_next(list.root.selection, i)) {
Stuff.all_meshes[| i].tex_specular_highlight = (selection + 1) ? Stuff.all_graphic_tilesets[| selection].GUID : NULL;
}
}, false, dg, Stuff.all_graphic_tilesets);
el_specular_highlight.tooltip = "Texture map defining the highlight of the material. Not currently supported.";
el_specular_highlight.interactive = false;
el_specular_highlight.entries_are = ListEntries.INSTANCES;
ui_list_select(el_specular_highlight, id_specular_highlight, true);
yy += ui_get_list_height(el_specular_highlight) + spacing;

var el_alpha = create_list(c2x, yy, "Alpha Map", "no textures", ew, eh, 8, omu_meshes_mat_set_alpha, false, dg, Stuff.all_graphic_tilesets);

var el_alpha = create_list(c2x, yy, "Alpha Map", "no textures", ew, eh, 8, function(list) {
var selection = ui_list_selection(list);
for (var i = ds_map_find_first(list.root.selection); i != undefined; i = ds_map_find_next(list.root.selection, i)) {
Stuff.all_meshes[| i].tex_alpha = (selection + 1) ? Stuff.all_graphic_tilesets[| selection].GUID : NULL;
}
}, false, dg, Stuff.all_graphic_tilesets);
el_alpha.tooltip = "Texture map defining the alpha of the material. Not currently supported.";
el_alpha.interactive = false;
el_alpha.entries_are = ListEntries.INSTANCES;
ui_list_select(el_alpha, id_alpha, true);
yy += ui_get_list_height(el_alpha) + spacing;

var el_bump = create_list(c2x, yy, "Bump Map", "no textures", ew, eh, 8, omu_meshes_mat_set_specular_bump, false, dg, Stuff.all_graphic_tilesets);

var el_bump = create_list(c2x, yy, "Bump Map", "no textures", ew, eh, 8, function(list) {
var selection = ui_list_selection(list);
for (var i = ds_map_find_first(list.root.selection); i != undefined; i = ds_map_find_next(list.root.selection, i)) {
Stuff.all_meshes[| i].tex_bump = (selection + 1) ? Stuff.all_graphic_tilesets[| selection].GUID : NULL;
}
}, false, dg, Stuff.all_graphic_tilesets);
el_bump.tooltip = "Texture map defining the roughness of the material (look up bump mapping, it's very cool). Not currently supported.";
el_bump.interactive = false;
el_bump.entries_are = ListEntries.INSTANCES;
ui_list_select(el_bump, id_bump, true);
yy += ui_get_list_height(el_bump) + spacing;

yy = yy_base;

var el_displacement = create_list(c3x, yy, "Displacement Map", "no textures", ew, eh, 8, omu_meshes_mat_set_specular_displacement, false, dg, Stuff.all_graphic_tilesets);

var el_displacement = create_list(c3x, yy, "Displacement Map", "no textures", ew, eh, 8, function(list) {
var selection = ui_list_selection(list);
for (var i = ds_map_find_first(list.root.selection); i != undefined; i = ds_map_find_next(list.root.selection, i)) {
Stuff.all_meshes[| i].tex_displacement = (selection + 1) ? Stuff.all_graphic_tilesets[| selection].GUID : NULL;
}
}, false, dg, Stuff.all_graphic_tilesets);
el_displacement.tooltip = "Texture map defining the displacement of the material. Not currently supported.";
el_displacement.interactive = false;
el_displacement.entries_are = ListEntries.INSTANCES;
ui_list_select(el_displacement, id_displacement, true);
yy += ui_get_list_height(el_displacement) + spacing;

var el_stencil = create_list(c3x, yy, "Stencil Map", "no textures", ew, eh, 8, omu_meshes_mat_set_specular_decal, false, dg, Stuff.all_graphic_tilesets);

var el_stencil = create_list(c3x, yy, "Stencil Map", "no textures", ew, eh, 8, function(list) {
var selection = ui_list_selection(list);
for (var i = ds_map_find_first(list.root.selection); i != undefined; i = ds_map_find_next(list.root.selection, i)) {
Stuff.all_meshes[| i].tex_decal = (selection + 1) ? Stuff.all_graphic_tilesets[| selection].GUID : NULL;
}
}, false, dg, Stuff.all_graphic_tilesets);
el_stencil.tooltip = "Texture map defining the stencil decals of the material. I have not been able to find an example of these in use, but I assume that they're very cool. Not currently supported.";
el_stencil.interactive = false;
el_stencil.entries_are = ListEntries.INSTANCES;
ui_list_select(el_stencil, id_decal, true);
yy += ui_get_list_height(el_stencil) + spacing;

var b_width = 128;
var b_height = 32;
var el_confirm = create_button(dw / 2 - b_width / 2, dh - 32 - b_height / 2, "Done", b_width, b_height, fa_center, dmu_dialog_commit, dg);

ds_list_add(dg.contents,
el_base, el_ambient, el_specular_color, el_specular_highlight,
el_alpha, el_bump, el_displacement, el_stencil,
el_confirm
);

return dg;


}
}
115 changes: 0 additions & 115 deletions scripts/dialog_create_mesh_vertex_format_editor/dialog_create_mesh_vertex_format_editor.gml
View file

This file was deleted.

Loading

0 comments on commit 3f312d0

Please sign in to comment.