interesting
/
go-opengl-pixel
mirror of https://github.com/faiface/pixel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #142 from thegtproject/glslstandardization 

standardized glsl variable naming
This commit is contained in:
Michal Štrba 2018-10-07 20:37:30 +02:00 committed by GitHub
parent 8f9e91e617 dc545043c1
commit 749271768b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pixelgl/canvas.go
View File

@ -46,8 +46,8 @@ func NewCanvas(bounds pixel.Rect) *Canvas {
// SetUniform will update the named uniform with the value of any supported underlying
// attribute variable. If the uniform already exists, including defaults, they will be reassigned
// to the new value. The value can be a pointer.
func (c *Canvas) SetUniform(Name string, Value interface{}) {
c.shader.setUniform(Name, Value)
func (c *Canvas) SetUniform(name string, value interface{}) {
c.shader.setUniform(name, value)
}
// SetFragmentShader allows you to set a new fragment shader on the underlying
@ -363,8 +363,8 @@ const (
)
var defaultCanvasVertexFormat = glhf.AttrFormat{
canvasPosition: {Name: "position", Type: glhf.Vec2},
canvasColor: {Name: "color", Type: glhf.Vec4},
canvasTexCoords: {Name: "texCoords", Type: glhf.Vec2},
canvasIntensity: {Name: "intensity", Type: glhf.Float},
canvasPosition: {Name: "aPosition", Type: glhf.Vec2},
canvasColor: {Name: "aColor", Type: glhf.Vec4},
canvasTexCoords: {Name: "aTexCoords", Type: glhf.Vec2},
canvasIntensity: {Name: "aIntensity", Type: glhf.Float},
}

67
pixelgl/glshader.go
View File

@ -98,14 +98,14 @@ func (gs *glShader) setUniform(name string, value interface{}) {
func baseShader(c *Canvas) {
gs := &glShader{
vf: defaultCanvasVertexFormat,
vs: defaultCanvasVertexShader,
vs: baseCanvasVertexShader,
fs: baseCanvasFragmentShader,
}
gs.setUniform("u_transform", &gs.uniformDefaults.transform)
gs.setUniform("u_colormask", &gs.uniformDefaults.colormask)
gs.setUniform("u_bounds", &gs.uniformDefaults.bounds)
gs.setUniform("u_texbounds", &gs.uniformDefaults.texbounds)
gs.setUniform("uTransform", &gs.uniformDefaults.transform)
gs.setUniform("uColorMask", &gs.uniformDefaults.colormask)
gs.setUniform("uBounds", &gs.uniformDefaults.bounds)
gs.setUniform("uTexBounds", &gs.uniformDefaults.texbounds)
c.shader = gs
}
@ -215,54 +215,53 @@ func getAttrType(v interface{}) (glhf.AttrType, bool) {
}
}
var defaultCanvasVertexShader = `
var baseCanvasVertexShader = `
#version 330 core
in vec2 position;
in vec4 color;
in vec2 texCoords;
in float intensity;
out vec4 Color;
out vec2 texcoords;
out vec2 glpos;
out float Intensity;
in vec2 aPosition;
in vec4 aColor;
in vec2 aTexCoords;
in float aIntensity;
uniform mat3 u_transform;
uniform vec4 u_bounds;
out vec4 vColor;
out vec2 vTexCoords;
out float vIntensity;
uniform mat3 uTransform;
uniform vec4 uBounds;
void main() {
vec2 transPos = (u_transform * vec3(position, 1.0)).xy;
vec2 normPos = (transPos - u_bounds.xy) / u_bounds.zw * 2 - vec2(1, 1);
vec2 transPos = (uTransform * vec3(aPosition, 1.0)).xy;
vec2 normPos = (transPos - uBounds.xy) / uBounds.zw * 2 - vec2(1, 1);
gl_Position = vec4(normPos, 0.0, 1.0);
Color = color;
texcoords = texCoords;
Intensity = intensity;
glpos = transPos;
vColor = aColor;
vTexCoords = aTexCoords;
vIntensity = aIntensity;
}
`
var baseCanvasFragmentShader = `
#version 330 core
in vec4 Color;
in vec2 texcoords;
in float Intensity;
in vec4 vColor;
in vec2 vTexCoords;
in float vIntensity;
out vec4 fragColor;
uniform vec4 u_colormask;
uniform vec4 u_texbounds;
uniform sampler2D u_texture;
uniform vec4 uColorMask;
uniform vec4 uTexBounds;
uniform sampler2D uTexture;
void main() {
if (Intensity == 0) {
fragColor = u_colormask * Color;
if (vIntensity == 0) {
fragColor = uColorMask * vColor;
} else {
fragColor = vec4(0, 0, 0, 0);
fragColor += (1 - Intensity) * Color;
vec2 t = (texcoords - u_texbounds.xy) / u_texbounds.zw;
fragColor += Intensity * Color * texture(u_texture, t);
fragColor *= u_colormask;
fragColor += (1 - vIntensity) * vColor;
vec2 t = (vTexCoords - uTexBounds.xy) / uTexBounds.zw;
fragColor += vIntensity * vColor * texture(uTexture, t);
fragColor *= uColorMask;
}
}
`