opengl_x11

Playing with OpenGL
git clone git://bsandro.tech/opengl_x11
Log | Files | Refs | README | LICENSE

commit 90cd65b3f5846304ddb7e4d40baaef5998ecf1cb
parent f50e8a885327cfe783ecc0593222c212dca160a3
Author: bsandro <email@bsandro.tech>
Date:   Sun, 16 Nov 2025 09:32:11 +0200

MIT license

Diffstat:
MLICENSE | 37+++++++++++++++++--------------------
Mtexture.c | 6+++---
2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/LICENSE b/LICENSE @@ -1,24 +1,21 @@ -BSD 2-Clause License +The MIT License (MIT) -Copyright (c) 2025, bsandro. All rights reserved. +Copyright (c) 2025 Brian Sandro <email@bsandro.tech> -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/texture.c b/texture.c @@ -66,14 +66,14 @@ uniform sampler2D ourTex; out vec4 outColor; in vec2 texCoord; void main() { - /*vec3 color; + vec3 color; color.r = 0.2; color.g = 0.6; color.b = 0.1; float c1 = abs(sin(float(iTime))); float c2 = abs(cos(float(iTime))); - outColor = vec4(color+c1-c2, 1.0);*/ - outColor = texture(ourTex, texCoord); + vec4 modColor = vec4(color+c1-c2, 1.0); + outColor = texture(ourTex, texCoord) + modColor; } )";