Update material editor for new system
This commit is contained in:
parent
8502521934
commit
fbf46e223c
1 changed files with 34 additions and 239 deletions
|
|
@ -18,92 +18,6 @@ Scene* MaterialEditor::get_scene() const {
|
|||
return scene;
|
||||
}
|
||||
|
||||
const float node_margin = 5.0f;
|
||||
const float node_margin_2 = node_margin * 2;
|
||||
const float property_width = 150.0f;
|
||||
|
||||
const auto calc_text_size = [](float& max_text_size, const std::string_view name) {
|
||||
auto size = ImGui::CalcTextSize(name.data());
|
||||
if(size.x > max_text_size)
|
||||
max_text_size = size.x;
|
||||
};
|
||||
|
||||
float get_input_margin(MaterialNode& node) {
|
||||
float width = 0.0f;
|
||||
|
||||
float max_input_text_size = 0.0f;
|
||||
for(auto input : node.inputs) {
|
||||
calc_text_size(max_input_text_size, input.name);
|
||||
}
|
||||
|
||||
// account for connection circle size
|
||||
if(!node.inputs.empty())
|
||||
width += 20.0f;
|
||||
|
||||
return width;
|
||||
}
|
||||
|
||||
float get_width(MaterialNode& node) {
|
||||
const float max_input_text_size = get_input_margin(node);
|
||||
|
||||
float max_output_text_size = 0.0f;
|
||||
for(auto output : node.outputs) {
|
||||
calc_text_size(max_output_text_size, output.name);
|
||||
}
|
||||
|
||||
float real_property_width = 0.0f;
|
||||
if(!node.properties.empty())
|
||||
real_property_width = property_width;
|
||||
|
||||
const float width = real_property_width + max_input_text_size + max_output_text_size + 40.0f;
|
||||
const float title_width = ImGui::CalcTextSize(node.get_name()).x;
|
||||
|
||||
return std::max(width, title_width) + node_margin_2;
|
||||
}
|
||||
|
||||
float get_height(MaterialNode& node) {
|
||||
float base_height = 20.0f + node_margin_2;
|
||||
|
||||
const int max_outputs_or_inputs = std::max(node.outputs.size(), node.inputs.size());
|
||||
const float input_output_height = max_outputs_or_inputs * 20.0f;
|
||||
|
||||
const float property_height = node.properties.size() * 40.0f;
|
||||
|
||||
return base_height + std::max(input_output_height, property_height);
|
||||
}
|
||||
|
||||
ImRect get_window_rect(MaterialNode& node) {
|
||||
const auto pos = ImGui::GetCursorScreenPos();
|
||||
|
||||
return ImRect(ImVec2(pos.x + node.x, pos.y + node.y), ImVec2(pos.x + node.x + get_width(node), pos.y + node.y + get_height(node)));
|
||||
}
|
||||
|
||||
ImRect get_input_rect(MaterialNode& node, int pos) {
|
||||
const auto rect = get_window_rect(node);
|
||||
|
||||
return ImRect(ImVec2(rect.Min.x, rect.Min.y + 20.0f + (pos * 20.0f)), ImVec2(rect.Min.x + 20.0f, rect.Min.y + 40.0f + (pos * 20.0f)));
|
||||
}
|
||||
|
||||
ImRect get_output_rect(MaterialNode& node, int pos) {
|
||||
const auto rect = get_window_rect(node);
|
||||
|
||||
return ImRect(ImVec2(rect.Max.x - 20.0f, rect.Min.y + 20.0f + (pos * 20.0f)), ImVec2(rect.Max.x, rect.Min.y + 40.0f + (pos * 20.0f)));
|
||||
}
|
||||
|
||||
ImRect get_input_rect(MaterialNode& node, MaterialConnector* connector) {
|
||||
const auto vec = node.inputs;
|
||||
const auto pos = find(vec.begin(), vec.end(), *connector) - vec.begin();
|
||||
|
||||
return get_input_rect(node, pos);
|
||||
}
|
||||
|
||||
ImRect get_output_rect(MaterialNode& node, MaterialConnector* connector) {
|
||||
const auto vec = node.outputs;
|
||||
const auto pos = find(vec.begin(), vec.end(), *connector) - vec.begin();
|
||||
|
||||
return get_output_rect(node, pos);
|
||||
}
|
||||
|
||||
void MaterialEditor::setup_windows(ImGuiID dockspace) {
|
||||
ImGuiID dock_main_id = dockspace;
|
||||
|
||||
|
|
@ -157,22 +71,6 @@ void MaterialEditor::draw(CommonEditor* editor) {
|
|||
ImGui::EndMenu();
|
||||
}
|
||||
|
||||
if(ImGui::BeginMenu("Add Node")) {
|
||||
if(ImGui::MenuItem("Material Output"))
|
||||
material->nodes.push_back(std::make_unique<MaterialOutput>());
|
||||
|
||||
if(ImGui::MenuItem("Texture"))
|
||||
material->nodes.push_back(std::make_unique<TextureNode>());
|
||||
|
||||
if(ImGui::MenuItem("Float Constant"))
|
||||
material->nodes.push_back(std::make_unique<FloatConstant>());
|
||||
|
||||
if(ImGui::MenuItem("Vec3 Constant"))
|
||||
material->nodes.push_back(std::make_unique<Vector3Constant>());
|
||||
|
||||
ImGui::EndMenu();
|
||||
}
|
||||
|
||||
if(ImGui::MenuItem("Compile"))
|
||||
recompile(*material);
|
||||
|
||||
|
|
@ -194,150 +92,47 @@ void MaterialEditor::draw(CommonEditor* editor) {
|
|||
if(begin("Node Editor")) {
|
||||
const auto draw_list = ImGui::GetWindowDrawList();
|
||||
const auto window_pos = ImGui::GetCursorScreenPos();
|
||||
|
||||
static bool dragging = false;
|
||||
static MaterialNode* dragging_node = nullptr;
|
||||
|
||||
static bool dragging_connector = false;
|
||||
static MaterialConnector* drag_connector = nullptr;
|
||||
static int drag_index = 0;
|
||||
|
||||
std::vector<MaterialNode*> deferred_deletions;
|
||||
|
||||
for(auto& node : material->nodes) {
|
||||
const auto rect = get_window_rect(*node);
|
||||
|
||||
ImGui::PushID(&node);
|
||||
|
||||
bool changed = false;
|
||||
|
||||
draw_list->AddRectFilled(rect.Min, rect.Max, IM_COL32(50, 50, 50, 255));
|
||||
draw_list->AddRect(rect.Min, rect.Max, IM_COL32(255, 255, 255, 255), 5.0f);
|
||||
|
||||
draw_list->AddText(ImVec2(rect.Min.x + 5.0f, rect.Min.y + 5.0f), IM_COL32(255, 255, 255, 255), node->get_name());
|
||||
|
||||
for(auto [i, input] : utility::enumerate(node->inputs)) {
|
||||
auto input_rect = get_input_rect(*node, i);
|
||||
|
||||
draw_list->AddText(ImVec2(input_rect.Min.x + 20.0f, input_rect.Min.y), IM_COL32(255, 255, 255, 255), input.name.c_str());
|
||||
|
||||
ImGui::ItemAdd(input_rect, ImGui::GetID(node.get()));
|
||||
bool changed = false;
|
||||
|
||||
if(dragging_connector && ImGui::IsItemHovered() && ImGui::IsMouseReleased(ImGuiMouseButton_Left)) {
|
||||
input.connected_connector = drag_connector;
|
||||
input.connected_node = dragging_node;
|
||||
input.connected_index = drag_index;
|
||||
|
||||
drag_connector->connected_connector = &input;
|
||||
drag_connector->connected_node = node.get();
|
||||
drag_connector->connected_index = drag_index;
|
||||
|
||||
changed = true;
|
||||
}
|
||||
|
||||
draw_list->AddCircleFilled(input_rect.GetCenter(), 3.0, IM_COL32(255, 255, 255, 255));
|
||||
auto& property = material->colorProperty;
|
||||
|
||||
if(ImGui::IsItemClicked() && !dragging && !dragging_connector) {
|
||||
dragging_connector = true;
|
||||
drag_connector = &input;
|
||||
drag_index = i;
|
||||
}
|
||||
|
||||
if(input.connected_connector != nullptr) {
|
||||
auto output_rect = get_output_rect(*input.connected_node, input.connected_index);
|
||||
draw_list->AddLine(input_rect.GetCenter(), output_rect.GetCenter(), IM_COL32(255, 255, 255, 255));
|
||||
}
|
||||
ImGui::PushID(property.name.c_str());
|
||||
|
||||
if(ImGui::BeginCombo("Type", "test")) {
|
||||
if(ImGui::Selectable("Vector3"))
|
||||
property.type = DataType::Vector3;
|
||||
|
||||
if(ImGui::Selectable("Texture"))
|
||||
property.type = DataType::AssetTexture;
|
||||
|
||||
if(ImGui::Selectable("Float"))
|
||||
property.type = DataType::Float;
|
||||
|
||||
ImGui::EndCombo();
|
||||
}
|
||||
|
||||
for(auto [i, output] : utility::enumerate(node->outputs)) {
|
||||
auto output_rect = get_output_rect(*node, i);
|
||||
|
||||
const auto text_size = ImGui::CalcTextSize(output.name.c_str());
|
||||
|
||||
draw_list->AddText(ImVec2(output_rect.Max.x - text_size.x - 20.0f, output_rect.Min.y), IM_COL32(255, 255, 255, 255), output.name.c_str());
|
||||
|
||||
draw_list->AddCircleFilled(output_rect.GetCenter(), 3.0, IM_COL32(255, 255, 255, 255));
|
||||
|
||||
ImGui::ItemAdd(output_rect, ImGui::GetID(node.get()));
|
||||
|
||||
if(ImGui::IsItemClicked() && !dragging && !dragging_connector) {
|
||||
dragging_connector = true;
|
||||
drag_connector = &output;
|
||||
drag_index = i;
|
||||
dragging_node = node.get();
|
||||
}
|
||||
|
||||
ImGui::TextDisabled("%s", property.name.c_str());
|
||||
|
||||
switch(property.type) {
|
||||
case DataType::Vector3:
|
||||
changed |= ImGui::ColorEdit3("", property.value.ptr());
|
||||
break;
|
||||
case DataType::Float:
|
||||
changed |= ImGui::DragFloat("", &property.float_value);
|
||||
break;
|
||||
case DataType::AssetTexture:
|
||||
changed |= editor->edit_asset("", property.value_tex);
|
||||
break;
|
||||
}
|
||||
|
||||
ImGui::ItemAdd(rect, ImGui::GetID(node.get()));
|
||||
|
||||
if(ImGui::IsItemClicked() && !dragging_connector) {
|
||||
dragging = true;
|
||||
dragging_node = node.get();
|
||||
}
|
||||
|
||||
if(dragging && node.get() == dragging_node) {
|
||||
node->x += ImGui::GetIO().MouseDelta.x;
|
||||
node->y += ImGui::GetIO().MouseDelta.y;
|
||||
}
|
||||
|
||||
if(ImGui::IsMouseReleased(ImGuiMouseButton_Left) && (dragging || dragging_connector)) {
|
||||
dragging = false;
|
||||
dragging_connector = false;
|
||||
}
|
||||
|
||||
if(ImGui::BeginPopupContextItem()) {
|
||||
if(ImGui::Selectable("Delete"))
|
||||
deferred_deletions.push_back(node.get());
|
||||
|
||||
ImGui::EndPopup();
|
||||
}
|
||||
|
||||
if(dragging_connector && node.get() == dragging_node) {
|
||||
const auto output_rect = get_output_rect(*node, drag_index);
|
||||
draw_list->AddLine(output_rect.GetCenter(), ImGui::GetIO().MousePos, IM_COL32(255, 255, 255, 255));
|
||||
}
|
||||
|
||||
const auto input_margin = get_input_margin(*node);
|
||||
|
||||
ImGui::SetNextWindowPos(ImVec2(rect.Min.x + input_margin + node_margin, rect.Min.y + 20.0f));
|
||||
|
||||
ImGui::BeginChild("test", ImVec2(property_width * 2.0f, 0.0f));
|
||||
|
||||
for(auto& property : node->properties) {
|
||||
ImGui::PushID(property.name.c_str());
|
||||
|
||||
ImGui::TextDisabled("%s", property.name.c_str());
|
||||
|
||||
switch(property.type) {
|
||||
case DataType::Vector3:
|
||||
changed |= ImGui::ColorEdit3("", property.value.ptr());
|
||||
break;
|
||||
case DataType::Float:
|
||||
changed |= ImGui::DragFloat("", &property.float_value);
|
||||
break;
|
||||
case DataType::AssetTexture:
|
||||
changed |= editor->edit_asset("", property.value_tex);
|
||||
break;
|
||||
}
|
||||
|
||||
ImGui::PopID();
|
||||
}
|
||||
|
||||
ImGui::EndChild();
|
||||
|
||||
for(auto& node_to_delete : deferred_deletions) {
|
||||
material->delete_node(node_to_delete);
|
||||
changed = true;
|
||||
}
|
||||
|
||||
if(changed)
|
||||
recompile(*material);
|
||||
|
||||
|
||||
ImGui::PopID();
|
||||
|
||||
ImGui::SetCursorScreenPos(window_pos);
|
||||
}
|
||||
|
||||
if(changed)
|
||||
recompile(*material);
|
||||
|
||||
}
|
||||
|
||||
|
||||
ImGui::End();
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue