qyy
/
RigidElasticSim
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

rm trival menu

master
cflin 3 years ago
parent
76faa16a95
commit
3d92a0a25a
7 changed files with 175 additions and 332 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      CMakeLists.txt
  2. 1
      src/CMakeLists.txt
  3. 19
      src/SimState.cpp
  4. 13
      src/main.cpp
  5. 236
      src/viewer/UIMenu.cpp
  6. 6
      src/viewer/UISimState.cpp
  7. 1
      src/viewer/UIStaticSimState.h

3
CMakeLists.txt
View File

@ -351,6 +351,7 @@ if (RIGID_IPC_WITH_PYTHON)
add_subdirectory(python) add_subdirectory(python)
endif () endif ()
add_subdirectory(src)
add_subdirectory(engine) add_subdirectory(engine)
add_subdirectory(static_sim) add_subdirectory(static_sim)
target_compile_definitions(rigid_ipc_sim PUBLIC CMAKE_SOURCE_DIR="${CMAKE_SOURCE_DIR}")

1
src/CMakeLists.txt
View File

@ -1 +0,0 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/path_config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/path_config.h @ONLY)

19
src/SimState.cpp
View File

@ -271,17 +271,14 @@ nlohmann::json SimState::get_active_config()
{ {
nlohmann::json active_args; nlohmann::json active_args;
active_args["时间步"] = problem_ptr->timestep(); active_args["时间步"] = problem_ptr->timestep();
// active_args["scene_type"] = problem_ptr->name(); active_args["scene_type"] = problem_ptr->name();
// active_args[problem_ptr->name()] = problem_ptr->settings(); active_args[problem_ptr->name()] = problem_ptr->settings();
// active_args[problem_ptr->constraint().name()] = active_args[problem_ptr->constraint().name()] =
// problem_ptr->constraint().settings(); problem_ptr->constraint().settings();
// active_args[problem_ptr->solver().name()] = active_args[problem_ptr->solver().name()] =
// problem_ptr->solver().settings(); problem_ptr->solver().settings();
// if (problem_ptr->solver().has_inner_solver()) {
// active_args[problem_ptr->solver().inner_solver().name()] =
// problem_ptr->solver().inner_solver().settings();
// }
return active_args; return active_args;
} }

13
src/main.cpp
View File

@ -15,7 +15,6 @@
#endif #endif
#include <logger.hpp> #include <logger.hpp>
#include <profiler.hpp> #include <profiler.hpp>
#include "path_config.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
using namespace ipc::rigid; using namespace ipc::rigid;
@ -89,17 +88,9 @@ int main(int argc, char* argv[])
if (with_viewer) { if (with_viewer) {
#ifdef RIGID_IPC_WITH_OPENGL #ifdef RIGID_IPC_WITH_OPENGL
// UISimState ui; UISimState ui;
// ui.launch(scene_path);
// Static Simulation
ssim::SimTargetOption option;
option.set_option(option.U_NORM);
std::string obj_path=CMAKE_SOURCE_DIR "/assets/armadillo.obj";
std::shared_ptr<ssim::StaticSim> sp_StaticSim = std::make_shared<ssim::StaticSim>(option,obj_path);
UIStaticSimState ui(sp_StaticSim);
ui.launch(scene_path); ui.launch(scene_path);
#else #else
exit(app.exit(CLI::Error( exit(app.exit(CLI::Error(
"gui", "gui",

236
src/viewer/UIMenu.cpp
View File

@ -10,8 +10,7 @@
namespace ipc::rigid { namespace ipc::rigid {
void UISimState::draw_menu() void UISimState::draw_menu() {
{
// if (m_show_vertex_data) { // if (m_show_vertex_data) {
// draw_labels_window(); // draw_labels_window();
// } // }
@ -29,18 +28,20 @@ void UISimState::draw_menu()
bool _viewer_menu_visible = true; bool _viewer_menu_visible = true;
ImGui::Begin( ImGui::Begin(
"控制菜单", &_viewer_menu_visible, "菜单", &_viewer_menu_visible,
ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_AlwaysAutoResize); ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_AlwaysAutoResize);
ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.6f); ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.6f);
{ {
const char* level_strings[] = { "trace", "debug", "info", "warning", // const char* level_strings[] = { "trace", "debug", "info", "warning",
"error", "critical", "off" }; // "error", "critical", "off" };
int log_level = spdlog::get_level(); // int log_level = spdlog::get_level();
// if (ImGui::Combo( // if (ImGui::Combo(
// "log-level##logger", &log_level, level_strings, // "log-level##logger", &log_level, level_strings,
// CCD_IM_ARRAYSIZE(level_strings))) { // CCD_IM_ARRAYSIZE(level_strings))) {
// set_logger_level(static_cast<spdlog::level::level_enum>(log_level)); // set_logger_level(static_cast<spdlog::level::level_enum>(log_level));
// } // }
set_logger_level(spdlog::level::level_enum::off);
draw_io(); draw_io();
if (m_has_scene) { if (m_has_scene) {
@ -49,7 +50,6 @@ void UISimState::draw_menu()
"运行", &player_menu, ImGuiTreeNodeFlags_DefaultOpen)) { "运行", &player_menu, ImGuiTreeNodeFlags_DefaultOpen)) {
draw_simulation_player(); draw_simulation_player();
} }
ImGui::Spacing();
if (ImGui::CollapsingHeader( if (ImGui::CollapsingHeader(
"结果", &settings_menu, ImGuiTreeNodeFlags_DefaultOpen)) "结果", &settings_menu, ImGuiTreeNodeFlags_DefaultOpen))
draw_settings(); draw_settings();
@ -68,7 +68,7 @@ void UISimState::draw_menu()
ImGui::SetNextWindowSizeConstraints( ImGui::SetNextWindowSizeConstraints(
ImVec2(200.0f, 30.0f), ImVec2(legends_width, -1.0f)); ImVec2(200.0f, 30.0f), ImVec2(legends_width, -1.0f));
bool _colors_menu_visible = true; bool _colors_menu_visible = true;
// TODO: only add edge
// ImGui::Begin( // ImGui::Begin(
// "Legend", &_colors_menu_visible, // "Legend", &_colors_menu_visible,
// ImGuiWindowFlags_NoSavedSettings // ImGuiWindowFlags_NoSavedSettings
@ -78,10 +78,9 @@ void UISimState::draw_menu()
// } // }
// ImGui::End(); // ImGui::End();
} }
} // namespace ipc::rigid } // namespace ipc::rigid
void UISimState::draw_io() void UISimState::draw_io() {
{
if (ImGui::Button("加载文件##IO", ImVec2(-1, 0))) { if (ImGui::Button("加载文件##IO", ImVec2(-1, 0))) {
std::string fname = igl::file_dialog_open(); std::string fname = igl::file_dialog_open();
if (fname != "") { if (fname != "") {
@ -104,10 +103,10 @@ void UISimState::draw_io()
} }
ImGui::EndChild(); ImGui::EndChild();
// if (ImGui::Button("Save simulation", ImVec2(-1, 0))) { if (ImGui::Button("Save simulation", ImVec2(-1, 0))) {
// std::string fname = igl::file_dialog_save(); std::string fname = igl::file_dialog_save();
// save(fname); save(fname);
// } }
// if (ImGui::Button("Save OBJ sequence", ImVec2(-1, 0))) { // if (ImGui::Button("Save OBJ sequence", ImVec2(-1, 0))) {
// std::string dir_name = igl::file_dialog_save(); // std::string dir_name = igl::file_dialog_save();
@ -123,23 +122,14 @@ void UISimState::draw_io()
// } // }
// } // }
// if (ImGui::Button("Save screenshot", ImVec2(-1, 0))) { if (ImGui::Button("Start recording", ImVec2(-1, 0))) {
// std::string fname = igl::file_dialog_save(); std::string fname = igl::file_dialog_save();
// save_screenshot(fname); start_recording(fname);
// } }
// if (m_is_gif_recording) { }
// if (ImGui::Button("End recording", ImVec2(-1, 0))) {
// end_recording();
// }
// } else if (ImGui::Button("Start recording", ImVec2(-1, 0))) {
// std::string fname = igl::file_dialog_save();
// start_recording(fname);
// }
} }
}
void UISimState::draw_simulation_player() void UISimState::draw_simulation_player() {
{
int player_state = static_cast<int>(m_player_state); int player_state = static_cast<int>(m_player_state);
ImGui::RadioButton("开始##SimPlayer", &player_state, PlayerState::Playing); ImGui::RadioButton("开始##SimPlayer", &player_state, PlayerState::Playing);
@ -155,101 +145,37 @@ void UISimState::draw_simulation_player()
} }
m_player_state = static_cast<PlayerState>(player_state); m_player_state = static_cast<PlayerState>(player_state);
if (ImGui::CollapsingHeader( if (ImGui::Button("Step##SimPlayer", ImVec2(-1, 0))) {
"边界条件设置##SimPlayer", ImGuiTreeNodeFlags_DefaultOpen)) { m_player_state = PlayerState::Playing;
// -------------------------------------------------------------------- pre_draw_loop();
ImGui::Checkbox("边界包围盒", &m_bkp_has_intersections); m_player_state = PlayerState::Paused;
// ImGui::Checkbox("受力", &m_state.m_solve_collisions);
static float zoom = 50.0f;
static float zoom1 = 50.0f;
static float zoom2 = 50.0f;
ImGui::SliderFloat("x-受力", &zoom, -50, 50, "%.3f");
ImGui::SliderFloat("y-受力", &zoom1, -50, 50, "%.3f");
ImGui::SliderFloat("z-受力", &zoom2, -50, 50, "%.3f");
} }
// ImGui::Checkbox("受力大小", &m_bkp_optimization_failed);
// ImGui::SameLine();
// ImGui::HelpMarker("yes - stop playing if step optimization failed.");
// ImGui::Checkbox("pause on collisions", &m_bkp_had_collision);
// ImGui::SameLine();
// ImGui::HelpMarker("yes - stop playing if step had a collision.");
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// if (ImGui::SliderInt(
// "step##Replay", &m_state.m_num_simulation_steps, 0,
// m_state.state_sequence.size() - 1)) {
// replaying = true;
// }
// if (ImGui::Button("结果##SimPlayer", ImVec2(-1, 0))) {
// m_player_state = PlayerState::Playing;
// pre_draw_loop();
// m_player_state = PlayerState::Paused;
// }
// -------------------------------------------------------------------- // --------------------------------------------------------------------
if (ImGui::CollapsingHeader("材料设置", ImGuiTreeNodeFlags_DefaultOpen)) { if (ImGui::SliderInt(
static float f0 = 0.001f; "步##Replay", &m_state.m_num_simulation_steps, 0,
static float f1 = 0.001f; m_state.state_sequence.size() - 1)) {
static float f2 = 0.001f; replaying = true;
ImGui::InputFloat("杨氏模量", &f0, 0.01f, 1.0f, "%.3f"); }
ImGui::InputFloat("泊松比", &f1, 0.01f, 1.0f, "%.3f");
ImGui::InputFloat("密度", &f2, 0.01f, 1.0f, "%.3f");
} }
if (ImGui::CollapsingHeader(
"其他设置", ImGuiTreeNodeFlags_DefaultOpen)) {
static float f3 = 0.01f;
ImGui::InputFloat("时间步", &f3, 0.01f, 1.0f, "%.2f");}
}
void UISimState::draw_settings()
{
// auto config = m_state.get_active_config();
// ImGui::BeginChild(
// "##config", ImVec2(ImGui::GetWindowContentRegionWidth(), 20), false,
// ImGuiWindowFlags_HorizontalScrollbar);
// {
// ImGui::TreeNodeJson(config);
// }
// ImGui::EndChild();
// if (ImGui::Button("应力##IO", ImVec2(-1, 0))) {
// std::string fname = igl::file_dialog_save();
// if (fname != "") {
// load(fname);
// }
// }
// ImGui::Checkbox("柔顺度(compliance)", &compliance);
char* desc = "121.82"; void UISimState::draw_settings() {
ImGui::Text("柔顺度(compliance)"); auto config = m_state.get_active_config();
if (ImGui::IsItemHovered()) { ImGui::BeginChild(
// 显示工具的提示 "##config", ImVec2(ImGui::GetWindowContentRegionWidth(), 300), false,
ImGui::BeginTooltip(); ImGuiWindowFlags_HorizontalScrollbar);
// 使得文字的区域可以自己控制， {
// 但是这里我感觉更推荐使用：TextWrapped接口，之后的部分有提到他们的区别 ImGui::TreeNodeJson(config);
ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
ImGui::TextUnformatted(desc);
ImGui::PopTextWrapPos();
// 结束工具提示
ImGui::EndTooltip();
} }
if (ImGui::Button("应力##IO", ImVec2(-1, 0))) { ImGui::EndChild();
// std::string fname = igl::file_dialog_open();
// if (fname != "") {
// load(fname);
// }
} }
}
void UISimState::draw_legends() void UISimState::draw_legends() {
{
static float second_col = 100; static float second_col = 100;
float slider_width = ImGui::GetWindowWidth() * 0.2f; float slider_width = ImGui::GetWindowWidth() * 0.2f;
for (auto& data : datas_) { for (auto &data: datas_) {
const std::string& label = data.first; const std::string &label = data.first;
const auto& ptr = data.second; const auto &ptr = data.second;
/// visibility checkbox /// visibility checkbox
bool tmp = ptr->visibility(); bool tmp = ptr->visibility();
@ -266,77 +192,7 @@ void UISimState::draw_legends()
} else if (ImGui::Checkbox((label + "##UI-check").c_str(), &tmp)) { } else if (ImGui::Checkbox((label + "##UI-check").c_str(), &tmp)) {
ptr->visibility(tmp); ptr->visibility(tmp);
} }
/// other specific attributes
if (ptr->is_mesh()) {
ImGui::SameLine(second_col);
if (ImGui::Checkbox(
("数据##UI-" + label).c_str(), &m_show_vertex_data)) { }
ptr->show_vertex_data = m_show_vertex_data;
ptr->update_vertex_data();
ImGui::SameLine();
ImGui::PushItemWidth(slider_width);
{
float point_size = ptr->data().point_size / pixel_ratio();
if (ImGui::SliderFloat(
("顶点##UI-scaling" + label).c_str(), &point_size,
0.00f, 10.0f, "%1.f")) {
ptr->data().point_size = point_size * pixel_ratio();
}
}
ImGui::PopItemWidth();
} else if (ptr->is_scalar_field()) {
ImGui::SameLine();
if (ImGui::Checkbox(
("log##UI-" + label).c_str(), &ptr->m_use_log_scale)) {
ptr->recolor();
} }
ImGui::SameLine();
bool show_iso = ptr->data().show_overlay;
if (ImGui::Checkbox(("isolines##UI-" + label).c_str(), &show_iso)) {
ptr->data().show_overlay = show_iso;
}
ImGui::SameLine();
bool show_faces = ptr->data().show_faces;
if (ImGui::Checkbox(("faces##UI-" + label).c_str(), &show_faces)) {
ptr->data().show_faces = show_faces;
}
} // else if (ptr->is_vector_field()) {
// ImGui::SameLine(second_col);
// if (ImGui::Checkbox(
// ("norm##UI-" + label).c_str(), &ptr->m_normalized)) {
// ptr->recolor();
// }
// ImGui::SameLine();
// ImGui::PushItemWidth(slider_width);
// {
// float aux = float(ptr->m_scaling);
// if (ImGui::SliderFloat(
// ("scale##UI-scaling" + label).c_str(), &aux, 0.00f,
// 10.0f, "%1.f")) {
// ptr->m_scaling = double(aux);
// ptr->recolor();
// }
// }
// ImGui::PopItemWidth();
// } else if (ptr->is_com()) {
// ImGui::SameLine();
// ImGui::PushItemWidth(ImGui::GetWindowWidth() - 150);
// {
// float aux = float(ptr->m_scaling);
// if (ImGui::SliderFloat(
// ("scale##UI-com-scaling" + label).c_str(), &aux,
// 0.00f, 10.0f, "%1.1f", 1.0f)) {
// ptr->m_scaling = double(aux);
// ptr->recolor();
// }
// }
// ImGui::PopItemWidth();
// }
} }
}
} // namespace ipc::rigid } // namespace ipc::rigid

6
src/viewer/UISimState.cpp
View File

@ -5,7 +5,7 @@
#include <physics/rigid_body_problem.hpp> #include <physics/rigid_body_problem.hpp>
#include <utils/eigen_ext.hpp> #include <utils/eigen_ext.hpp>
#include "path_config.h"
namespace ipc::rigid { namespace ipc::rigid {
UISimState::UISimState() UISimState::UISimState()
@ -45,12 +45,11 @@ void UISimState::launch(const std::string& inital_scene)
}; };
m_viewer.launch( m_viewer.launch(
/*resizable=*/true, /*fullscreen=*/false, /*resizable=*/true, /*fullscreen=*/false,
/*name=*/"仿真"); /*name=*/"动力学仿真");
} }
void UISimState::init(igl::opengl::glfw::Viewer* _viewer) void UISimState::init(igl::opengl::glfw::Viewer* _viewer)
{ {
Super::init(_viewer); Super::init(_viewer);
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
io.Fonts->Clear(); io.Fonts->Clear();
@ -76,6 +75,7 @@ void UISimState::init(igl::opengl::glfw::Viewer* _viewer)
viewer->append_mesh(); viewer->append_mesh();
com_data = std::make_unique<igl::opengl::CoMData>(_viewer); com_data = std::make_unique<igl::opengl::CoMData>(_viewer);
// com_data->visibility(true); // com_data->visibility(true);
// TODO:?
com_data->visibility(false); com_data->visibility(false);
datas_.emplace_back("edges", mesh_data); datas_.emplace_back("edges", mesh_data);

1
src/viewer/UIStaticSimState.h
View File

@ -18,7 +18,6 @@
#include <viewer/igl_viewer_ext.hpp> #include <viewer/igl_viewer_ext.hpp>
#include "UISimState.hpp" #include "UISimState.hpp"
#include "path_config.h"
#include "../../static_sim/StaticSim.h" #include "../../static_sim/StaticSim.h"
namespace ipc { namespace ipc {

Write Preview
Loading…
Cancel
Save