diff options
| author | Matt Strapp <matt@mattstrapp.net> | 2021-09-20 18:15:14 -0500 |
|---|---|---|
| committer | Matt Strapp <matt@mattstrapp.net> | 2021-09-20 18:15:14 -0500 |
| commit | 342403a02f8063903d0f38327430721d4d0ae331 (patch) | |
| tree | 29d020a27bc16939c568dd4b29166566d1c0e658 /dev/MinGfx/src/shaders/text.frag | |
| parent | Fix parenthesis (diff) | |
| download | csci4611-5a8b6d8538618b144e39618350ad06a4d9e232fa.tar csci4611-5a8b6d8538618b144e39618350ad06a4d9e232fa.tar.gz csci4611-5a8b6d8538618b144e39618350ad06a4d9e232fa.tar.bz2 csci4611-5a8b6d8538618b144e39618350ad06a4d9e232fa.tar.lz csci4611-5a8b6d8538618b144e39618350ad06a4d9e232fa.tar.xz csci4611-5a8b6d8538618b144e39618350ad06a4d9e232fa.tar.zst csci4611-5a8b6d8538618b144e39618350ad06a4d9e232fa.zip | |
do ass1submission-p1.0
Diffstat (limited to 'dev/MinGfx/src/shaders/text.frag')
| -rw-r--r-- | dev/MinGfx/src/shaders/text.frag | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/dev/MinGfx/src/shaders/text.frag b/dev/MinGfx/src/shaders/text.frag index 2642061..187eb3b 100644 --- a/dev/MinGfx/src/shaders/text.frag +++ b/dev/MinGfx/src/shaders/text.frag @@ -1,25 +1,25 @@ -#version 330 - -/* - This file is part of the MinGfx Project. - - Copyright (c) 2017,2018 Regents of the University of Minnesota. - All Rights Reserved. - - Original Author(s) of this File: - Dan Keefe, 2018, University of Minnesota - - Author(s) of Significant Updates/Modifications to the File: - ... - */ - -in vec2 uv; -uniform vec4 color; -uniform sampler2D font_atlas; - -out vec4 frag_color; - -void main() { - frag_color = color * texture(font_atlas, uv); - // frag_color.a = frag_color.r; +#version 330
+
+/*
+ This file is part of the MinGfx Project.
+
+ Copyright (c) 2017,2018 Regents of the University of Minnesota.
+ All Rights Reserved.
+
+ Original Author(s) of this File:
+ Dan Keefe, 2018, University of Minnesota
+
+ Author(s) of Significant Updates/Modifications to the File:
+ ...
+ */
+
+in vec2 uv;
+uniform vec4 color;
+uniform sampler2D font_atlas;
+
+out vec4 frag_color;
+
+void main() {
+ frag_color = color * texture(font_atlas, uv);
+ // frag_color.a = frag_color.r;
}
\ No newline at end of file |