OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 23:20:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert ContourMap texture-based rendering changes

Browse Source 
Reverts:
- ContourMap: Smooth texture edges with weighted alpha blending (2dc7123d8)
- ContourMap: Increase texture resolution with bilinear interpolation (2e1e99602)
- ContourMap: Add texture-based rendering as default rendering mode (87ef7a01b)
This commit is contained in:
Magne Sjaastad committed 2026-03-12 17:31:56 +01:00
1 parent 2dc7123d8f
commit 4b43fcf0a7
6 files changed
+19 -305
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ModelVisualization/RivContourMapProjectionPartMgr.h
-14
View File
@@ -32,7 +32,6 @@
#include "cvfVector4.h"
class RigContourMapGrid;
class RigContourMapProjection;
namespace cvf
{
@@ -41,7 +40,6 @@ class ScalarMapper;
class Color3f;
class ModelBasicList;
class Part;
class TextureImage;
} // namespace cvf
class RivContourMapProjectionPartMgr : public cvf::Object
@@ -72,12 +70,6 @@ public:
const cvf::Vec2d& pickPoint,
const RigContourMapGrid& contourMapGrid ) const;
void appendProjectionAsTexturedQuad( cvf::ModelBasicList* model,
const caf::DisplayCoordTransform* displayCoordTransform,
cvf::ScalarMapper* mapper,
const RigContourMapProjection& contourMapProjection,
const RigContourMapGrid& contourMapGrid );
cvf::ref<cvf::Vec2fArray> createTextureCoords( const std::vector<double>& values, cvf::ScalarMapper* scalarMapper ) const;
private:
@@ -112,15 +104,9 @@ private:
const RigContourPolygonsTools::ContourPolygons& previousLevel,
double tolerance );
cvf::ref<cvf::Part> createSingleTexturedQuadPart( const cvf::Vec3dArray& cornerPoints, cvf::ref<cvf::TextureImage> image, bool transparent );
static cvf::ref<cvf::DrawableGeo> createXYPlaneQuadGeoWithTexCoords( const cvf::Vec3dArray& cornerPoints );
static cvf::TextureImage* createTexture( const RigContourMapProjection* contourMapProjection, cvf::ScalarMapper* scalarMapper );
private:
caf::PdmPointer<caf::PdmObject> m_pdmObject;
std::vector<std::vector<cvf::BoundingBox>> m_labelBoundingBoxes;
cvf::ref<cvf::Effect> m_labelEffect;
cvf::ref<cvf::ShaderProgram> m_textureShaderProg;
};