forked from hannibal002/SkyHanni
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert shader version for Mac compatability
- Loading branch information
Showing
6 changed files
with
20 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
#version 130 | ||
#version 120 | ||
|
||
out vec4 color; | ||
varying vec4 color; | ||
|
||
void main() { | ||
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; | ||
color = gl_Color; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
src/main/resources/assets/skyhanni/shaders/standard_chroma.vsh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
// Chroma Vertex Shader | ||
// (Same as textured_chroma.vsh but isn't restricted to only texture elements) | ||
|
||
#version 130 | ||
#version 120 | ||
|
||
out vec4 originalColor; | ||
varying vec4 originalColor; | ||
|
||
void main() { | ||
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; | ||
|
||
// Pass original color to fragment | ||
originalColor = gl_Color; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
src/main/resources/assets/skyhanni/shaders/textured_chroma.vsh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
// Textured Chroma Vertex Shader | ||
// Credit: https://github.com/BiscuitDevelopment/SkyblockAddons/blob/main/src/main/resources/assets/skyblockaddons/shaders/program/chroma_screen_textured.vsh | ||
|
||
#version 130 | ||
#version 120 | ||
|
||
out vec2 outTextureCoords; | ||
out vec4 outColor; | ||
varying vec2 outTextureCoords; | ||
varying vec4 outColor; | ||
|
||
void main() { | ||
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; | ||
|
||
// Pass the color & texture coords to the fragment shader | ||
outColor = gl_Color; | ||
outTextureCoords = gl_MultiTexCoord0.st; | ||
} | ||
} |