Compare commits

...

5 Commits

Author SHA1 Message Date
eee534d816 triangle 2020-06-24 21:47:26 +02:00
63eb97b908 Merge commit 'cfb92518908a98e1e04cf559d44a454fa3f9527b' 2020-06-22 19:23:10 +02:00
cfb9251890 Squashed 'lib/advanced_C_standard_liberary/' changes from 59accca..a87fc37
a87fc37 acl dir to include

git-subtree-dir: lib/advanced_C_standard_liberary
git-subtree-split: a87fc373ba579da68d784d17431c35cf438b094f
2020-06-22 19:23:10 +02:00
6a2a10b5cd Merge commit 'f41cba863448c6c18649077f7c3e82d23587149c' 2020-06-22 19:19:24 +02:00
f41cba8634 Squashed 'lib/advanced_C_standard_liberary/' changes from 68f0bb5..59accca
59accca ReadTextFile renamed

git-subtree-dir: lib/advanced_C_standard_liberary
git-subtree-split: 59acccac883425c4d25158a26c2c126ccb4bff05
2020-06-22 19:19:23 +02:00
8 changed files with 75 additions and 29 deletions

View File

@ -1,7 +1,7 @@
project(minecraft-clone C)
cmake_minimum_required(VERSION 3.9)
set( CMAKE_EXPORT_COMPILE_COMMANDS ON )
include_directories(lib/glad/include lib/advanced_C_standard_liberary/include)
include_directories(lib/glad/include lib/advanced_C_standard_liberary/include include)
file(GLOB SOURCES "src/*.c" "lib/*/src/*.c")
find_program(CCACHE_PROGRAM ccache)
add_executable(test.out ${SOURCES})

View File

@ -4,5 +4,6 @@
#include <GLFW/glfw3.h>
void glfwError(int id, const char *description);
void framebuffer_size_callback(GLFWwindow *window, int width, int height);
unsigned int parseShader(const char *filePath);
unsigned int parseShader(const char *filePath, const GLenum shaderType);
unsigned int linkShader(unsigned int vertexShader, unsigned int fragmentShader);
#endif

View File

@ -1,5 +1,5 @@
#ifndef acl_file_h
#define acl_file_h
#include <stdbool.h>
char* acl_ReadFileString(char *filePath, bool *sucess);
char* acl_ReadTextFile(char *filePath, bool *sucess);
#endif

View File

@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdbool.h>
#include <stdlib.h>
char* acl_ReadFileString(char *filePath, bool *sucess){
char* acl_ReadTextFile(char *filePath, bool *sucess){
FILE *fp = fopen(filePath, "rb");
size_t lSize;
char *buffer;

7
shader/test.frag Normal file
View File

@ -0,0 +1,7 @@
#version 330 core
out vec4 FragColor;
void main()
{
FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f);
}

7
shader/test.vert Normal file
View File

@ -0,0 +1,7 @@
#version 330 core
layout (location = 0) in vec3 aPos;
void main()
{
gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0);
}

View File

@ -4,6 +4,7 @@
#include <glad/glad.h>
#include <GLFW/glfw3.h>
#include "main.h"
#include <acl/file.h>
int main() {
if(!glfwInit()) {
@ -36,13 +37,27 @@ int main() {
0.5f, -0.5f, 0.0f,
0.0f, 0.5f, 0.0f
};
// parse shader
unsigned int vertexShader = parseShader("shader/test.vert", GL_VERTEX_SHADER);
unsigned int fragmentShader = parseShader("shader/test.frag", GL_FRAGMENT_SHADER);
unsigned int shaderProgram = linkShader(vertexShader, fragmentShader);
glUseProgram(shaderProgram);
unsigned int VBO;
glGenBuffers(1, &VBO);
glGenBuffers(1, &VBO);
glBindBuffer(GL_ARRAY_BUFFER, VBO);
glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
unsigned int VAO;
glGenVertexArrays(1, &VAO);
glBindVertexArray(VAO);
glBindBuffer(GL_ARRAY_BUFFER, VBO);
glBindBuffer(GL_ARRAY_BUFFER, VBO);
glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void*)0);
glEnableVertexAttribArray(0);
while(!glfwWindowShouldClose(window)) {
glClearColor(0.2f, 0.3f, 0.3f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
glUseProgram(shaderProgram);
glBindVertexArray(VAO);
glDrawArrays(GL_TRIANGLES, 0, 3);
glfwSwapBuffers(window);
glfwPollEvents();
}
@ -56,28 +71,44 @@ void glfwError(int id, const char* description) {
void framebuffer_size_callback(GLFWwindow* window, int width, int height) {
glViewport(0, 0, width, height);
}
unsigned int parseShader(const char *filePath) {
FILE *fp = fopen(filePath, "rb");
size_t lSize;
char *buffer;
if(!fp) {
perror(filePath);
unsigned int parseShader(const char *filePath, const GLenum shaderType) {
bool success;
unsigned int ShaderId;
char *ShaderSrc = acl_ReadTextFile(filePath, &success);
if(!success) {
printf("Failed to read Shader: %s", filePath);
glfwTerminate();
exit(-1);
}
fseek(fp, 0L, SEEK_END);
lSize = ftell(fp);
rewind(fp);
buffer = malloc(lSize + 1);
if(!buffer) {
fclose(fp);
printf("out of memory");
exit(1);
ShaderId = glCreateShader(shaderType);
const char *tmpShaderSrc = ShaderSrc;
glShaderSource(ShaderId, 1, &tmpShaderSrc, NULL);
glCompileShader(ShaderId);
free(ShaderSrc);
int compileSuccess;
glGetShaderiv(ShaderId, GL_COMPILE_STATUS, &compileSuccess);
if(!compileSuccess) {
char infoLog[512];
glGetShaderInfoLog(ShaderId, 512, NULL, infoLog);
printf("Failed to compile Shader: %s Error: %s", filePath, infoLog);
}
size_t readReturn = fread(buffer, lSize, 1, fp);
fclose(fp);
if(readReturn != 1) {
printf("Can't read Shader");
exit(1);
}
printf("%s", buffer);
return 0;
return ShaderId;
}
unsigned int linkShader(unsigned int vertexShader, unsigned int fragmentShader) {
unsigned int shaderProgram = glCreateProgram();
glAttachShader(shaderProgram, vertexShader);
glAttachShader(shaderProgram, fragmentShader);
glLinkProgram(shaderProgram);
int success;
glGetProgramiv(shaderProgram, GL_LINK_STATUS, &success);
if(!success) {
char infoLog[512];
glGetProgramInfoLog(shaderProgram, 512, NULL, infoLog);
printf("Failed to link Shader. Error: %s", infoLog);
glfwTerminate();
exit(-1);
}
glDeleteShader(vertexShader);
glDeleteShader(fragmentShader);
return shaderProgram;
}