Skip to content

separate radius for edges/nodes #401

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
zsln wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −15
Open

separate radius for edges/nodes #401

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
8 changes: 6 additions & 2 deletions include/polyscope/curve_network.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@ class CurveNetwork : public Structure {

// set the radius of the points
CurveNetwork* setRadius(float newVal, bool isRelative = true);
float getRadius();
CurveNetwork* setEdgeRadius(float newVal, bool isRelative = true);
CurveNetwork* setNodeRadius(float newVal, bool isRelative = true);
float getEdgeRadius();
float getNodeRadius();

// Material
CurveNetwork* setMaterial(std::string name);
Expand All @@ -173,7 +176,8 @@ class CurveNetwork : public Structure {

// === Visualization parameters
PersistentValue<glm::vec3> color;
PersistentValue<ScaledValue<float>> radius;
PersistentValue<ScaledValue<float>> edge_radius;
PersistentValue<ScaledValue<float>> node_radius;
PersistentValue<std::string> material;

// Drawing related things
Expand Down
47 changes: 34 additions & 13 deletions src/curve_network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ const std::string CurveNetwork::structureTypeName = "Curve Network";
// Constructor
CurveNetwork::CurveNetwork(std::string name, std::vector<glm::vec3> nodes_, std::vector<std::array<size_t, 2>> edges_)
: // clang-format off
Structure(name, typeName()),
Structure(name, typeName()),
nodePositions(this, uniquePrefix() + "nodePositions", nodePositionsData),
edgeTailInds(this, uniquePrefix() + "edgeTailInds", edgeTailIndsData),
edgeTipInds(this, uniquePrefix() + "edgeTipInds", edgeTipIndsData),
edgeCenters(this, uniquePrefix() + "edgeCenters", edgeCentersData, std::bind(&CurveNetwork::computeEdgeCenters, this)),
nodePositionsData(std::move(nodes_)),
color(uniquePrefix() + "#color", getNextUniqueColor()),
radius(uniquePrefix() + "#radius", relativeValue(0.005)),
edgeCenters(this, uniquePrefix() + "edgeCenters", edgeCentersData, std::bind(&CurveNetwork::computeEdgeCenters, this)),
nodePositionsData(std::move(nodes_)),
color(uniquePrefix() + "#color", getNextUniqueColor()),
edge_radius(uniquePrefix() + "#edge_radius", relativeValue(0.005)),
node_radius(uniquePrefix() + "#node_radius", relativeValue(0.005)),
material(uniquePrefix() + "#material", "clay")
// clang-format on
{
Expand Down Expand Up @@ -83,7 +84,7 @@ float CurveNetwork::computeNodeRadiusMultiplierUniform() {
scalarQScale = std::max(0., radQ.getDataRange().second);
}

return getRadius() / scalarQScale;
return getNodeRadius() / scalarQScale;
}

float CurveNetwork::computeEdgeRadiusMultiplierUniform() {
Expand All @@ -105,7 +106,7 @@ float CurveNetwork::computeEdgeRadiusMultiplierUniform() {
scalarQScale = std::max(0., radQ.getDataRange().second);
}

return getRadius() / scalarQScale;
return getEdgeRadius() / scalarQScale;
}

// Helper to set uniforms
Expand Down Expand Up @@ -256,7 +257,7 @@ void CurveNetwork::prepare() {
// It no quantity is coloring the network, draw with a default color

// clang-format off
nodeProgram = render::engine->requestShader("RAYCAST_SPHERE",
nodeProgram = render::engine->requestShader("RAYCAST_SPHERE",
render::engine->addMaterialRules(getMaterial(),
addCurveNetworkNodeRules(
{"SHADE_BASECOLOR"}
Expand All @@ -265,7 +266,7 @@ void CurveNetwork::prepare() {
);


edgeProgram = render::engine->requestShader("RAYCAST_CYLINDER",
edgeProgram = render::engine->requestShader("RAYCAST_CYLINDER",
render::engine->addMaterialRules(getMaterial(),
addCurveNetworkEdgeRules(
{"SHADE_BASECOLOR"}
Expand Down Expand Up @@ -483,9 +484,14 @@ void CurveNetwork::buildCustomUI() {
}
ImGui::SameLine();
ImGui::PushItemWidth(100 * options::uiScale);
if (ImGui::SliderFloat("Radius", radius.get().getValuePtr(), 0.0, .1, "%.5f",
if (ImGui::SliderFloat("Edge Radius", edge_radius.get().getValuePtr(), 0.0, .1, "%.5f",
ImGuiSliderFlags_Logarithmic | ImGuiSliderFlags_NoRoundToFormat)) {
radius.manuallyChanged();
edge_radius.manuallyChanged();
requestRedraw();
}
if (ImGui::SliderFloat("Node Radius", node_radius.get().getValuePtr(), 0.0, .1, "%.5f",
ImGuiSliderFlags_Logarithmic | ImGuiSliderFlags_NoRoundToFormat)) {
node_radius.manuallyChanged();
requestRedraw();
}
ImGui::PopItemWidth();
Expand Down Expand Up @@ -626,11 +632,26 @@ void CurveNetwork::clearEdgeRadiusQuantity() {
};

CurveNetwork* CurveNetwork::setRadius(float newVal, bool isRelative) {
radius = ScaledValue<float>(newVal, isRelative);
edge_radius = ScaledValue<float>(newVal, isRelative);
node_radius = ScaledValue<float>(newVal, isRelative);
polyscope::requestRedraw();
return this;
}

CurveNetwork* CurveNetwork::setEdgeRadius(float newVal, bool isRelative) {
edge_radius = ScaledValue<float>(newVal, isRelative);
polyscope::requestRedraw();
return this;
}

CurveNetwork* CurveNetwork::setNodeRadius(float newVal, bool isRelative) {
node_radius = ScaledValue<float>(newVal, isRelative);
polyscope::requestRedraw();
return this;
}
float CurveNetwork::getRadius() { return radius.get().asAbsolute(); }

float CurveNetwork::getEdgeRadius() { return edge_radius.get().asAbsolute(); }
float CurveNetwork::getNodeRadius() { return node_radius.get().asAbsolute(); }

CurveNetwork* CurveNetwork::setMaterial(std::string m) {
material = m;
Expand Down