Fix 208, fix vertex click, misc. upgrades #209
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The interpolation request declares a type "T", which will be used in the getter methods. When "value" is a Vector3, the getters will get Vector3s; when "value" is a float, the getters will get floats. This procedure therefore works with 3D interpolation (e.g. translocation) as well as 1D interpolation (e.g. scale).
Refine paint vertex controls dock panel Fix several bugs with setting viewports to the wrong size on high DPI devices
More accurate documentation of the tangents in the Hermite cubic interpolation.
neomonkeus
reviewed
Feb 3, 2022
src/data/niftypes.h
Outdated
| @@ -1452,6 +1462,7 @@ class Color4 | |||
|
|
|||
| friend class NifIStream; | |||
| friend class NifOStream; | |||
| friend class ByteColor4; | |||
| if ( Node::SELECTING ) { | ||
| if ( scene->selMode & Scene::SelObject ) { | ||
| if ( scene->actionMode & Scene::Object ) { | ||
| int s_nodeId = ID2COLORKEY( nodeId ); |
There was a problem hiding this comment.
Formatting seems to be all over the shop here.
| as linear interpolation, however if their magnitude is not correct, then | ||
| temporally there will be a speed up/down, even if the spacial trajectory is | ||
| a straight line. | ||
| */ | ||
|
|
||
| // Tangent 1 |
src/gl/glcontroller.cpp
Outdated
| setting v1's corresponding "Backward" value to 1 and v2's | ||
| corresponding "Forward" to 1 results in a linear interpolation. | ||
| */ | ||
| Interpolate X, Y, and Z values independently, along a segment between |
src/glview.cpp
Outdated
| glDepthFunc( GL_ALWAYS ); | ||
| glLineWidth( 2.0f ); | ||
| glColor3f( 1.0, 0.0, 0.0 ); | ||
| //drawCircle(Vector3(0, 0, 0), Vector3(0,0,1), 0.2); |
src/glview.cpp
Outdated
| @@ -622,7 +623,7 @@ void GLView::paintGL() | |||
| if ( scene->options & Scene::ShowAxes ) { | |||
| // Resize viewport to small corner of screen | |||
| int axesSize = std::min( width() / 10, 125 ); | |||
| glViewport( 0, 0, axesSize, axesSize ); | |||
| glViewport( 0, 0, axesSize*devicePixelRatioF(), axesSize*devicePixelRatioF() ); | |||
src/glview.cpp
Outdated
|
|
||
| if (cfg.vertexPaintSettings.brushMode == PaintBlendMode::BlendNormal) | ||
| { | ||
| blend = (cfg.vertexPaintSettings.brushColor * cfg.vertexPaintSettings.brushOpacity) + (base * (Color4() - cfg.vertexPaintSettings.brushOpacity)); |
There was a problem hiding this comment.
(cfg.vertexPaintSettings.brushColor * cfg.vertexPaintSettings.brushOpacity) can be pulled outside of the for loop.
Could also assign cfg.vertexPaintSettings.brushOpacity to a variable as used in a few locations aswell.
src/ui/widgets/vertexpaintwidget.cpp
Outdated
| value_.brushSize = (float)ui->brushSize->value(); | ||
|
|
||
| float opacity = (float)ui->opacity->value() / 255.0f; | ||
| if (ui->opacityMode->currentIndex() == 0) // Color only |
There was a problem hiding this comment.
Thoughts on moving these ints as to const modes rather than magic numbers?
src/ui/widgets/vertexpaintwidget.cpp
Outdated
|
|
||
| void PaintSettingsWidget::showColorPicker() | ||
| { | ||
|
|
src/ui/widgets/vertexpaintwidget.cpp
Outdated
| int g = colorDoubleToInt(ui->colorG->value()); | ||
| int b = colorDoubleToInt(ui->colorB->value()); | ||
| int a = colorDoubleToInt(ui->colorA->value()); | ||
|
|
There was a problem hiding this comment.
Can you add a comment here as feel there is something iteresting going on 😵💫
Address minor PR comments
|
Thanks for the feedback. I've normalized the whitespace in all files touched by this PR to use tabs (whoops), and addressed all your comments. |
|
I need to look through this still, but also will need to compare it against my dev8 branch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #208
Enhances the vertex click operation.
Adds a vertex color painting mode.