Add backdrop.color libf3d and f3 d option#2956
Add backdrop.color libf3d and f3 d option#2956PedroAbreuMaia wants to merge 33 commits intof3d-app:masterfrom
Conversation
…ole and application options.
mwestphal
left a comment
There was a problem hiding this comment.
let me know when you need a review @PedroAbreuMaia
|
@PedroAbreuMaia please do not merge with master, but use rebase instead: |
| f3d_test(NAME TestBackdropColorRed DATA suzanne.ply ARGS -n --backdrop-color=1.0,0.0,0.0 UI) | ||
| f3d_test(NAME TestBackdropColorGreen DATA suzanne.ply ARGS -n --backdrop-color=0.0,1.0,0.0 UI) | ||
| f3d_test(NAME TestBackdropColorBlue DATA suzanne.ply ARGS -n --backdrop-color=0.0,0.0,1.0 UI) | ||
| f3d_test(NAME TestBackdropColorWhite DATA suzanne.ply ARGS -n --backdrop-color=1.0,1.0,1.0 UI) |
There was a problem hiding this comment.
no need to test all the colors, just a single test is fine, ideally not a full color (like 1,0,0) but something else.
| ImGui::SetNextWindowSizeConstraints( | ||
| ImVec2(10.f, winHeight), ImVec2(std::numeric_limits<float>::max(), winHeight)); | ||
| ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); | ||
| //ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); |
|
|
||
| ::SetupNextWindow(ImVec2(viewport->GetWorkCenter().x - 0.5f * totalWidth, margin), winSize); | ||
| ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); | ||
| //ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); |
| viewport->GetWorkCenter().y - 0.5f * winSize.y), | ||
| winSize); | ||
| ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); | ||
| //ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); |
| ::SetupNextWindow( | ||
| ImVec2(viewport->GetWorkCenter().x - 0.5f * totalWidth + winOffsetX, margin), winSize); | ||
| ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); | ||
| //ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); |
| ImVec2( | ||
| this->Pimpl->CheatSheetWidth, std::min(viewport->WorkSize.y - (2 * margin), textHeight))); | ||
| ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); | ||
| //ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); |
|
|
||
| ::SetupNextWindow(position, winSize); | ||
| ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); | ||
| //ImGui::SetNextWindowBgAlpha(this->BackdropOpacity); |
| */ | ||
| void SetBackdropOpacity(const double backdropOpacity); | ||
|
|
||
| void SetBackdropColor(const std::array<double, 3>& color); |
There was a problem hiding this comment.
This is just to add the doxygen annotations?
| this->BackdropColor = color; | ||
| this->Initialized = false; | ||
| } | ||
| } No newline at end of file |
There was a problem hiding this comment.
missing end of line at the end of the file
|
\ci fast |
mwestphal
left a comment
There was a problem hiding this comment.
small changes needed. Let me know if anything is unclear :)
I've also run the fast CI to see if it finds anything.
|
Style Checks CI failed: diff --git a/library/src/window_impl.cxx b/library/src/window_impl.cxx
index d3fe715..faf12c5 100644
--- a/library/src/window_impl.cxx
+++ b/library/src/window_impl.cxx
@@ -470,7 +470,7 @@ void window_impl::UpdateDynamicOptions()
{
f3d::color_t color = opt.ui.backdrop.color.value();
renderer->SetBackdropColor({ color[0], color[1], color[2] });
- }
+ }
if (this->Internals->Interactor)
{ |
…thub.com/PedroAbreuMaia/f3d into Add-backdrop.color-libf3d-and-F3D-option
…ole and application options.
…thub.com/PedroAbreuMaia/f3d into Add-backdrop.color-libf3d-and-F3D-option
…ole and application options.
Co-authored-by: Archie Payne <115465107+ArchiePayne@users.noreply.github.com>
* do not set axes grid center position * update test interaction * Not use interaction test * do not set axes grid center position * update test interaction * Not use interaction test
…ole and application options.
Co-authored-by: Archie Payne <115465107+ArchiePayne@users.noreply.github.com>
|
Looks like the merge/rebase did not went well, do you need help with that ? |
|
Yes, please. I've been trying to do it last night and could not figure it out. |
|
here is your branch rebase on master: #2975 Let me know if you need help recover it locally and force pushing to your fork. |
|
I pulled the one you created locally, but I could not force push it. So I colse that branch and push the local one to its place. Should I open a new PR? |
|
there is no reason that you could not force pus on your own fork, but as you prefer :) |
|
Still, should I open a new PR? Or use the one you opened? And how do get the PR reviewed? |
Yes
That you cannot.
Once you created the PR, you will be able to request a review, it is all documented here: https://f3d.app/dev/CONTRIBUTING#f3d-development-workflow |
Describe your changes
Issue ticket number and link if any
#2861
Checklist for finalizing the PR
.github/workflows/versions.json, I have updateddocker_timestampContinuous integration
Please write a comment to run CI, eg:
\ci fast.See here for more info.