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

Updated to version 0.8.0

Browse Source
This commit is contained in:
unknown
2012-06-26 16:10:41 +02:00
parent 80dbfbaf1f
commit 2c9695e594
327 changed files with 15604 additions and 21837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ApplicationCode/Resources/EclipseInput48x48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

3
ApplicationCode/Resources/ResInsight.qrc
View File

@@ -22,7 +22,8 @@
<file>WellCollection.png</file>
<file>octave.png</file>
<file>Folder.png</file>
</qresource>
<file>EclipseInput48x48.png</file>
</qresource>
<qresource prefix="/Shader/">
<file>fs_CellFace.glsl</file>
<file>vs_CellFace.glsl</file>

16
ApplicationCode/Resources/vs_CellFace.glsl
View File

@@ -31,12 +31,12 @@ varying vec3 v_ecPosition;
varying vec3 v_ecNormal;
// End native vz stuff
#define POS_I 0
#define NEG_I 1
#define POS_J 2
#define NEG_J 3
#define POS_K 4
#define NEG_K 5
#define POS_I 0.0
#define NEG_I 1.0
#define POS_J 2.0
#define NEG_J 3.0
#define POS_K 4.0
#define NEG_K 5.0
//
// 7---------6
@@ -60,7 +60,7 @@ varying vec3 v_ecNormal;
vec4 getColorFromTextureCoord(float textureCoord, vec4 cellColor)
{
if (textureCoord < 0)
if (textureCoord < 0.0)
return cellColor;
else
return texture2D(u_edgeTexture2D, vec2(textureCoord, 0.5f ));
@@ -73,7 +73,7 @@ void main()
{
v_localCoord = a_localCoord;
if ( a_colorCell < 0)
if ( a_colorCell < 0.0)
v_cellColor = vec4(0.75, 0.75, 0.75, 1); // Light grayish
else
v_cellColor = texture2D(u_cellTexture2D, vec2( a_colorCell, 0.5f));