Skip to content

Commit

Permalink
use the shaders from their sources
Browse files Browse the repository at this point in the history
  • Loading branch information
@toloudis
toloudis committed Jan 20, 2025
1 parent 9f53db9 commit 9ba2d51
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 1,928 deletions.
1 change: 0 additions & 1 deletion renderlib/graphics/glsl/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ target_sources(renderlib PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/shaders.h"
)
add_subdirectory(shadersrc)

222 changes: 3 additions & 219 deletions renderlib/graphics/glsl/GLBasicVolumeShader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "glad/glad.h"

#include "Logging.h"
#include "shaders.h"

#include <gl/Util.h>
#include <glm.h>
Expand All @@ -16,231 +17,14 @@ GLBasicVolumeShader::GLBasicVolumeShader()
, attr_coords()
{
vshader = new GLShader(GL_VERTEX_SHADER);
vshader->compileSourceCode(R"(
#version 400 core
layout (location = 0) in vec3 position;
uniform mat4 modelViewMatrix;
uniform mat4 projectionMatrix;
out VertexData
{
vec3 pObj;
} outData;
void main()
{
outData.pObj = position;
gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
}
)");
vshader->compileSourceCode(getShaderSource("basicVolume_vert").c_str());

if (!vshader->isCompiled()) {
LOG_ERROR << "GLBasicVolumeShader: Failed to compile vertex shader\n" << vshader->log();
}

fshader = new GLShader(GL_FRAGMENT_SHADER);
fshader->compileSourceCode(R"(
#version 400 core
in VertexData
{
vec3 pObj;
} inData;
out vec4 outputColour;
uniform mat4 inverseModelViewMatrix;
uniform sampler3D textureAtlas;
uniform sampler2D textureAtlasMask;
//uniform sampler2D lut;
#define M_PI 3.14159265358979323846
uniform vec2 iResolution;
uniform float isPerspective;
uniform float orthoScale;
uniform float GAMMA_MIN;
uniform float GAMMA_MAX;
uniform float GAMMA_SCALE;
uniform float BRIGHTNESS;
uniform float DENSITY;
uniform float maskAlpha;
uniform int BREAK_STEPS;
uniform vec3 AABB_CLIP_MIN;
uniform vec3 AABB_CLIP_MAX;
uniform vec3 flipVolumeAxes;
uniform float dataRangeMin; // 0..1 (mapped from 0..uint16_max)
uniform float dataRangeMax; // 0..1 (mapped from 0..uint16_max)
uniform vec4 g_clipPlane;
float powf(float a, float b) {
return pow(a, b);
}
float rand(vec2 co) {
float threadId = gl_FragCoord.x / (gl_FragCoord.y + 1.0);
float bigVal = threadId*1299721.0 / 911.0;
vec2 smallVal = vec2(threadId*7927.0 / 577.0, threadId*104743.0 / 1039.0);
return fract(sin(dot(co, smallVal)) * bigVal);
}
vec4 luma2Alpha(vec4 color, float vmin, float vmax, float C) {
float x = max(color[2], max(color[0], color[1]));
float xi = (x - vmin) / (vmax - vmin);
xi = clamp(xi, 0.0, 1.0);
float y = pow(xi, C);
y = clamp(y, 0.0, 1.0);
color[3] = y;
return(color);
}
vec4 sampleAs3DTexture(sampler3D tex, vec4 pos) {
float bounds = float(pos[0] > 0.001 && pos[0] < 0.999 &&
pos[1] > 0.001 && pos[1] < 0.999 &&
pos[2] > 0.001 && pos[2] < 0.999);
vec4 texval = textureLod(tex, pos.xyz*flipVolumeAxes, 0).rgba;
vec4 retval = vec4(texval.rgb, 1.0);
// float texval = textureLod(tex, pos.xyz, 0).r;
// texval = (texval - dataRangeMin) / (dataRangeMax - dataRangeMin);
// vec4 retval = vec4(texval, texval, texval, 1.0);
return bounds*retval;
}
vec4 sampleStack(sampler3D tex, vec4 pos) {
vec4 col = sampleAs3DTexture(tex, pos);
col = luma2Alpha(col, GAMMA_MIN, GAMMA_MAX, GAMMA_SCALE);
return col;
}
//->intersect AXIS-ALIGNED box routine
//
bool intersectBox(in vec3 r_o, in vec3 r_d, in vec3 boxMin, in vec3 boxMax, out float tnear, out float tfar) {
vec3 invR = vec3(1.0, 1.0, 1.0) / r_d;
vec3 tbot = invR * (boxMin - r_o);
vec3 ttop = invR * (boxMax - r_o);
vec3 tmin = min(ttop, tbot);
vec3 tmax = max(ttop, tbot);
float largest_tmin = max(max(tmin.x, tmin.y), max(tmin.x, tmin.z));
float smallest_tmax = min(min(tmax.x, tmax.y), min(tmax.x, tmax.z));
tnear = largest_tmin;
tfar = smallest_tmax;
// now constrain near and far using clipPlane if active.
// plane xyz is normal, plane w is -distance from origin.
float denom = dot(r_d, g_clipPlane.xyz);
if (abs(denom) > 0.0001f) // your favorite epsilon
{
float tClip = dot(g_clipPlane.xyz*(-g_clipPlane.w) - r_o, g_clipPlane.xyz) / denom;
if (denom < 0.0f) {
tnear = max(tnear, tClip);
}
else {
tfar = min(tfar, tClip);
}
}
else
{
// todo check to see which side of the plane we are on ?
}
return(tfar > tnear);
}
vec4 integrateVolume(vec4 eye_o, vec4 eye_d,
float tnear, float tfar,
float clipNear, float clipFar,
sampler3D textureAtlas
) {
vec4 C = vec4(0.0);
float tend = min(tfar, clipFar);
float tbegin = tnear;
const int maxSteps = 512;
float csteps = clamp(float(BREAK_STEPS), 1.0, float(maxSteps));
float invstep = 1.0 / csteps;
float r = 0.5 - 1.0*rand(eye_d.xy);
float tstep = invstep;
float tfarsurf = r*tstep;
float overflow = mod((tfarsurf - tend), tstep);
float t = tbegin + overflow;
t += r*tstep;
float tdist = 0.0;
int numSteps = 0;
vec4 pos, col;
float s = 0.5 * float(maxSteps) / csteps;
for (int i = 0; i<maxSteps; i++) {
pos = eye_o + eye_d*t;
pos.xyz = (pos.xyz + 0.5);//0.5 * (pos + 1.0); // map position from [boxMin, boxMax] to [0, 1] coordinates
col = sampleStack(textureAtlas, pos);
//Finish up by adding brightness/density
col.xyz *= BRIGHTNESS;
col.w *= DENSITY;
float stepScale = (1.0 - powf((1.0 - col.w), s));
col.w = stepScale;
col.xyz *= col.w;
col = clamp(col, 0.0, 1.0);
C = (1.0 - C.w)*col + C;
t += tstep;
numSteps = i;
if (t > tend)
break;
if (C.w > 1.0)
break;
}
return C;
}
void main()
{
outputColour = vec4(1.0, 0.0, 0.0, 1.0);
// gl_FragCoord defaults to 0,0 at lower left
vec2 vUv = gl_FragCoord.xy/iResolution.xy;
vec3 eyeRay_o, eyeRay_d;
if (isPerspective != 0.0) {
// camera position in camera space is 0,0,0!
eyeRay_o = (inverseModelViewMatrix * vec4(0.0, 0.0, 0.0, 1.0)).xyz;
eyeRay_d = normalize(inData.pObj - eyeRay_o);
}
else {
float zDist = 2.0;
eyeRay_d = (inverseModelViewMatrix*vec4(0.0, 0.0, -zDist, 0.0)).xyz;
vec4 ray_o = vec4(2.0*vUv - 1.0, 1.0, 1.0);
ray_o.xy *= orthoScale;
ray_o.x *= iResolution.x/iResolution.y;
eyeRay_o = (inverseModelViewMatrix*ray_o).xyz;
}
vec3 boxMin = AABB_CLIP_MIN;
vec3 boxMax = AABB_CLIP_MAX;
float tnear, tfar;
bool hit = intersectBox(eyeRay_o, eyeRay_d, boxMin, boxMax, tnear, tfar);
if (!hit) {
outputColour = vec4(1.0, 0.0, 1.0, 0.0);
return;
}
//else {
// outputColour = vec4(1.0, 1.0, 1.0, 1.0);
// return;
//}
float clipNear = 0.0;//-(dot(eyeRay_o.xyz, eyeNorm) + dNear) / dot(eyeRay_d.xyz, eyeNorm);
float clipFar = 10000.0;//-(dot(eyeRay_o.xyz,-eyeNorm) + dFar ) / dot(eyeRay_d.xyz,-eyeNorm);
vec4 C = integrateVolume(vec4(eyeRay_o, 1.0), vec4(eyeRay_d, 0.0),
tnear, tfar,
clipNear, clipFar,
textureAtlas);
C = clamp(C, 0.0, 1.0);
outputColour = C;
return;
}
)");
fshader->compileSourceCode(getShaderSource("basicVolume_frag").c_str());

if (!fshader->isCompiled()) {
LOG_ERROR << "GLBasicVolumeShader: Failed to compile fragment shader\n" << fshader->log();
Expand Down
29 changes: 3 additions & 26 deletions renderlib/graphics/glsl/GLCopyShader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "glad/glad.h"

#include "Logging.h"
#include "shaders.h"

#include <gl/Util.h>
#include <glm.h>
Expand All @@ -15,38 +16,14 @@ GLCopyShader::GLCopyShader()
, m_fshader()
{
m_vshader = new GLShader(GL_VERTEX_SHADER);
m_vshader->compileSourceCode(R"(
#version 400 core
layout (location = 0) in vec3 position;
layout (location = 1) in vec2 uv;
out vec2 vUv;
void main()
{
vUv = uv;
gl_Position = vec4( position, 1.0 );
}
)");
m_vshader->compileSourceCode(getShaderSource("copy_vert").c_str());

if (!m_vshader->isCompiled()) {
LOG_ERROR << "GLCopyShader: Failed to compile vertex shader\n" << m_vshader->log();
}

m_fshader = new GLShader(GL_FRAGMENT_SHADER);
m_fshader->compileSourceCode(R"(
#version 400 core
uniform sampler2D tTexture0;
in vec2 vUv;
out vec4 out_FragColor;
void main()
{
out_FragColor = texture(tTexture0, vUv);
}
)");
m_fshader->compileSourceCode(getShaderSource("copy_frag").c_str());

if (!m_fshader->isCompiled()) {
LOG_ERROR << "GLCopyShader: Failed to compile fragment shader\n" << m_fshader->log();
Expand Down
31 changes: 3 additions & 28 deletions renderlib/graphics/glsl/GLFlatShader2D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <glm.h>

#include "Logging.h"
#include "shaders.h"

#include <iostream>

Expand All @@ -15,39 +16,13 @@ GLFlatShader2D::GLFlatShader2D()
, m_uniform_mvp()
{
m_vshader = new GLShader(GL_VERTEX_SHADER);
m_vshader->compileSourceCode("#version 400 core\n"
"\n"
"uniform vec4 colour;\n"
"uniform mat4 mvp;\n"
"\n"
"layout (location = 0) in vec3 position;\n"
"\n"
"out VertexData\n"
"{\n"
" vec4 f_colour;\n"
"} outData;\n"
"\n"
"void main(void) {\n"
" gl_Position = mvp * vec4(position, 1.0);\n"
" outData.f_colour = colour;\n"
"}\n");
m_vshader->compileSourceCode(getShaderSource("flat_vert").c_str());
if (!m_vshader->isCompiled()) {
LOG_ERROR << "Failed to compile vertex shader\n" << m_vshader->log();
}

m_fshader = new GLShader(GL_FRAGMENT_SHADER);
m_fshader->compileSourceCode("#version 400 core\n"
"\n"
"in VertexData\n"
"{\n"
" vec4 f_colour;\n"
"} inData;\n"
"\n"
"out vec4 outputColour;\n"
"\n"
"void main(void) {\n"
" outputColour = inData.f_colour;\n"
"}\n");
m_fshader->compileSourceCode(getShaderSource("flat_frag").c_str());
if (!m_fshader->isCompiled()) {
LOG_ERROR << "GLFlatShader2D: Failed to compile fragment shader\n" << m_fshader->log();
}
Expand Down
Loading

0 comments on commit 9ba2d51

Please sign in to comment.