OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Integrated changes for framework

Browse Source 
Pdm fields can contain a forward declared Pdm object without the include
file
VizFwk: Added VertexColoring shader to be able to use per vertex color
used from drawableGeo::setColorArray()
This commit is contained in:
Magne Sjaastad
2014-04-11 11:06:42 +02:00
parent 4125ab3ae8
commit 486f383de7
68 changed files with 2177 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Fwk/VizFwk/LibRender/cvfShaderSourceStrings.h
+21
View File
@@ -914,6 +914,24 @@ static const char src_TwoSidedColor_inl[] =
//#############################################################################################################################
//#############################################################################################################################
static const char src_VaryingColorGlobalAlpha_inl[] =
" \n"
"uniform float u_alpha; \n"
" \n"
"varying vec4 v_color; \n"
" \n"
"//-------------------------------------------------------------------------------------------------- \n"
"/// RGB color from varying, alpha from uniform \n"
"//-------------------------------------------------------------------------------------------------- \n"
"vec4 srcFragment() \n"
"{ \n"
" return vec4(v_color.rgb, u_alpha); \n"
"} \n";
//#############################################################################################################################
//#############################################################################################################################
static const char vs_DistanceScaledPoints_inl[] =
@@ -1147,10 +1165,12 @@ static const char vs_Standard_inl[] =
"attribute vec4 cvfa_vertex; \n"
"attribute vec3 cvfa_normal; \n"
"attribute vec2 cvfa_texCoord; \n"
"attribute vec4 cvfa_color; \n"
" \n"
"varying vec3 v_ecPosition; \n"
"varying vec3 v_ecNormal; \n"
"varying vec2 v_texCoord; \n"
"varying vec4 v_color; \n"
" \n"
"//-------------------------------------------------------------------------------------------------- \n"
"/// Vertex Shader - Standard \n"
@@ -1165,6 +1185,7 @@ static const char vs_Standard_inl[] =
" v_ecPosition = (cvfu_modelViewMatrix * cvfa_vertex).xyz; \n"
" v_ecNormal = cvfu_normalMatrix * cvfa_normal; \n"
" v_texCoord = cvfa_texCoord; \n"
" v_color = cvfa_color; \n"
" \n"
"#ifdef CVF_CALC_CLIP_DISTANCES_IMPL \n"
" calcClipDistances(vec4(v_ecPosition, 1)); \n"