Fix shader errs
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -1,3 +1,3 @@
|
|||||||
!build/shader.v
|
!build/vertex.glsl
|
||||||
!build/shader.f
|
!build/fragment.glsl
|
||||||
build/
|
build/
|
||||||
|
|||||||
9
build/fragment.glsl
Normal file
9
build/fragment.glsl
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
#version 460 core
|
||||||
|
|
||||||
|
out vec4 fragcolor;
|
||||||
|
|
||||||
|
void main(){
|
||||||
|
|
||||||
|
fragcolor = vec4(1.0, 0.5, 0.2, 1.0);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
#version 460 core
|
|
||||||
out vec4 FragColor;
|
|
||||||
void main(){
|
|
||||||
|
|
||||||
FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f);
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
#version 460 core
|
#version 460 core
|
||||||
|
|
||||||
layout (location = 0) in vec3 aPos;
|
layout (location = 0) in vec3 aPos;
|
||||||
|
|
||||||
void main(){
|
void main(){
|
||||||
|
gl_Position = vec4(aPos, 1.0);
|
||||||
gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0);
|
};
|
||||||
|
|
||||||
}
|
|
||||||
43
src/main.c
43
src/main.c
@@ -5,7 +5,8 @@
|
|||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
void keyfunc (RGFW_window* win, RGFW_key key, u8 keychar, RGFW_keymod keymod, RGFW_bool repeat, RGFW_bool pressed){
|
void keyfunc(RGFW_window *win, RGFW_key key, u8 keychar, RGFW_keymod keymod,
|
||||||
|
RGFW_bool repeat, RGFW_bool pressed) {
|
||||||
RGFW_UNUSED(repeat);
|
RGFW_UNUSED(repeat);
|
||||||
if (key == RGFW_escape && pressed) {
|
if (key == RGFW_escape && pressed) {
|
||||||
RGFW_window_setShouldClose(win, 1);
|
RGFW_window_setShouldClose(win, 1);
|
||||||
@@ -16,7 +17,9 @@ RGFW_window* SetupWindow(){
|
|||||||
hints->major = 4;
|
hints->major = 4;
|
||||||
hints->minor = 6;
|
hints->minor = 6;
|
||||||
RGFW_setGlobalHints_OpenGL(hints);
|
RGFW_setGlobalHints_OpenGL(hints);
|
||||||
RGFW_window* win = RGFW_createWindow("PACMAN CLONE", 0,0, 800, 600, RGFW_windowCenter | RGFW_windowNoResize | RGFW_windowOpenGL | RGFW_windowHide);
|
RGFW_window *win = RGFW_createWindow("PACMAN CLONE", 0, 0, 800, 600,
|
||||||
|
RGFW_windowCenter | RGFW_windowNoResize |
|
||||||
|
RGFW_windowOpenGL | RGFW_windowHide);
|
||||||
RGFW_window_createContext_OpenGL(win, hints);
|
RGFW_window_createContext_OpenGL(win, hints);
|
||||||
RGFW_window_show(win);
|
RGFW_window_show(win);
|
||||||
|
|
||||||
@@ -37,8 +40,7 @@ long stat_GetSize(FILE* file ) {
|
|||||||
fseek(file, 0, SEEK_SET); // Reset to the beginning
|
fseek(file, 0, SEEK_SET); // Reset to the beginning
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
char* LoadFile(const char* Path)
|
char *LoadFile(const char *Path) {
|
||||||
{
|
|
||||||
FILE *fptr;
|
FILE *fptr;
|
||||||
fptr = fopen(Path, "r");
|
fptr = fopen(Path, "r");
|
||||||
if (!fptr) {
|
if (!fptr) {
|
||||||
@@ -46,15 +48,16 @@ char* LoadFile(const char* Path)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
long size = stat_GetSize(fptr);
|
long size = stat_GetSize(fptr);
|
||||||
char* text = malloc(sizeof(char) * size);
|
char *text = malloc(sizeof(char) * (size + 1));
|
||||||
fread(text , size , 1, fptr);
|
memset(text, 0x00, sizeof(char)*(size + 1));
|
||||||
|
fread(text, size + 1, 1, fptr);
|
||||||
fclose(fptr);
|
fclose(fptr);
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
uint CompileShader(const char *FilePath, GLenum ShaderType) {
|
uint CompileShader(const char *FilePath, GLenum ShaderType) {
|
||||||
char *shdr_text = LoadFile(FilePath);
|
char *shdr_text = LoadFile(FilePath);
|
||||||
|
printf("%s\n" , shdr_text);
|
||||||
uint shader = glCreateShader(ShaderType);
|
uint shader = glCreateShader(ShaderType);
|
||||||
glShaderSource(shader, 1, (const char **)&shdr_text, NULL);
|
glShaderSource(shader, 1, (const char **)&shdr_text, NULL);
|
||||||
glCompileShader(shader);
|
glCompileShader(shader);
|
||||||
@@ -63,25 +66,19 @@ uint CompileShader (const char* FilePath , GLenum ShaderType ) {
|
|||||||
glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
|
glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
|
||||||
if (!status) {
|
if (!status) {
|
||||||
glGetShaderInfoLog(shader, 512, NULL, info);
|
glGetShaderInfoLog(shader, 512, NULL, info);
|
||||||
const char* typename = ShaderType == GL_VERTEX_SHADER ? "VERTEX" : "FRAGMENT";
|
const char *typename =
|
||||||
|
ShaderType == GL_VERTEX_SHADER ? "VERTEX" : "FRAGMENT";
|
||||||
printf("ERROR::SHADER::%s::COMPILATION %s\n", typename, info);
|
printf("ERROR::SHADER::%s::COMPILATION %s\n", typename, info);
|
||||||
}
|
}
|
||||||
free(shdr_text);
|
free(shdr_text);
|
||||||
return shader;
|
return shader;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
float vertices[] = {
|
float vertices[] = {
|
||||||
0.5f, 0.5f, 0.0f,
|
0.5f, 0.5f, 0.0f, 0.5f, -0.5f, 0.0f, -0.5f, -0.5f, 0.0f, -0.5f, 0.5f, 0.0f,
|
||||||
0.5f, -0.5f, 0.0f,
|
|
||||||
-0.5f, -0.5f, 0.0f,
|
|
||||||
-0.5f, 0.5f, 0.0f,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
uint indices[] = {
|
uint indices[] = {0, 1, 3, 1, 2, 3};
|
||||||
0,1,3,
|
|
||||||
1,2,3
|
|
||||||
};
|
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
unsigned int shaderProgram;
|
unsigned int shaderProgram;
|
||||||
@@ -92,9 +89,9 @@ struct {
|
|||||||
|
|
||||||
void Setup() {
|
void Setup() {
|
||||||
// Load Vertex Shader
|
// Load Vertex Shader
|
||||||
uint vert_shader = CompileShader("shader.v", GL_VERTEX_SHADER);
|
uint vert_shader = CompileShader("vertex.glsl", GL_VERTEX_SHADER);
|
||||||
// Load Fragment Shader
|
// Load Fragment Shader
|
||||||
uint frag_shader = CompileShader("shader.f", GL_FRAGMENT_SHADER);
|
uint frag_shader = CompileShader("fragment.glsl", GL_FRAGMENT_SHADER);
|
||||||
|
|
||||||
RenderVariables.shaderProgram = glCreateProgram();
|
RenderVariables.shaderProgram = glCreateProgram();
|
||||||
glAttachShader(RenderVariables.shaderProgram, vert_shader);
|
glAttachShader(RenderVariables.shaderProgram, vert_shader);
|
||||||
@@ -117,11 +114,12 @@ void Setup(){
|
|||||||
|
|
||||||
glBindVertexArray(RenderVariables.VAO);
|
glBindVertexArray(RenderVariables.VAO);
|
||||||
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, RenderVariables.EBO);
|
glBindBuffer(GL_ARRAY_BUFFER, RenderVariables.VBO);
|
||||||
glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
|
glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
|
||||||
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, RenderVariables.EBO);
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, RenderVariables.EBO);
|
||||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW);
|
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices,
|
||||||
|
GL_STATIC_DRAW);
|
||||||
|
|
||||||
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void *)0);
|
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void *)0);
|
||||||
glEnableVertexAttribArray(0);
|
glEnableVertexAttribArray(0);
|
||||||
@@ -144,11 +142,8 @@ int main (int argc, char **argv){
|
|||||||
glBindVertexArray(RenderVariables.VAO);
|
glBindVertexArray(RenderVariables.VAO);
|
||||||
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
|
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
|
||||||
RGFW_window_swapBuffers_OpenGL(win);
|
RGFW_window_swapBuffers_OpenGL(win);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
RGFW_window_close(win);
|
RGFW_window_close(win);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user