OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2461 Align the vertices between shader and fixed function rendering methods.

Browse Source
This commit is contained in:
Jacob Støren
2018-02-13 12:53:50 +01:00
parent ab27efcb7d
commit 2e8a497989
2 changed files with 57 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h
View File

@@ -74,6 +74,7 @@ class RivWindowEdgeAxesOverlayItem : public cvf::OverlayItem
using Color3f = cvf::Color3f;
using String = cvf::String;
using Vec2f = cvf::Vec2f;
using Vec3f = cvf::Vec3f;
using Rectf = cvf::Rectf;
using DoubleArray = cvf::DoubleArray;
using MatrixState = cvf::MatrixState;
@@ -95,18 +96,19 @@ public:
int frameBorderHeight() { return static_cast<int>( m_frameBorderHeight); }
protected:
virtual Vec2ui sizeHint();
virtual void render(OpenGLContext* oglContext, const Vec2i& position, const Vec2ui& size);
virtual void renderSoftware(OpenGLContext* oglContext, const Vec2i& position, const Vec2ui& size);
virtual bool pick(int oglXCoord, int oglYCoord, const Vec2i& position, const Vec2ui& size);
Vec2ui sizeHint() override;
void render(OpenGLContext* oglContext, const Vec2i& position, const Vec2ui& size) override;
void renderSoftware(OpenGLContext* oglContext, const Vec2i& position, const Vec2ui& size) override;
bool pick(int oglXCoord, int oglYCoord, const Vec2i& position, const Vec2ui& size) override;
private:
void updateGeomerySizes();
void renderGeneric(OpenGLContext* oglContext, const Vec2i& position, const Vec2ui& size, bool software);
void renderSoftwareFrameAndTickLines(OpenGLContext* oglContext);
void renderShaderFrameAndTickLines(OpenGLContext* oglContext, const MatrixState& matrixState);
void addTextToTextDrawer(TextDrawer* textDrawer);
void updateGeomerySizes();
void renderGeneric(OpenGLContext* oglContext, const Vec2i& position, const Vec2ui& size, bool software);
void renderSoftwareFrameAndTickLines(OpenGLContext* oglContext);
void renderShaderFrameAndTickLines(OpenGLContext* oglContext, const MatrixState& matrixState);
void addTextToTextDrawer(TextDrawer* textDrawer);
std::array<Vec3f, 8> frameVertexArray();
private:
cvf::cref<caf::DisplayCoordTransform> m_dispalyCoordsTransform;