fixed stb_image.h

cf9856d fixed file.h

git-subtree-dir: lib/advanced_C_standard_liberary
git-subtree-split: cf9856d0614a5a4ac4b27c1f5b615a9fb0fb4d0e

.gitignore

@@ -65,3 +65,6 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 
+# other stuff
+update_subtree.sh
+.clangd

CMakeLists.txt

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

LICENSE

@@ -1,3 +1,7 @@
+The license of the libraries are located in the directory lib/<name of the liberay>
+
+License of any other files:
+
 GNU GENERAL PUBLIC LICENSE
 
 Version 3, 29 June 2007

include/main.h

@@ -0,0 +1,9 @@
+#ifndef main_h
+#define main_h
+#include <glad/glad.h>
+#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, const GLenum shaderType);
+unsigned int linkShader(unsigned int vertexShader, unsigned int fragmentShader);
+#endif

lib/advanced_C_standard_liberary/.gitignore

@@ -0,0 +1,69 @@
+# ---> C
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+# ---> CMake
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+# ---> Extra
+vgcore.*
+src/main.c

lib/advanced_C_standard_liberary/CMakeLists.txt

@@ -0,0 +1,11 @@
+project(advanced_C_standard_library C)
+set_property(GLOBAL PROPERTY C_STANDARD)
+cmake_minimum_required(VERSION 3.9)
+include_directories(include)
+file(GLOB SOURCES "src/*.c")
+add_executable(test.out ${SOURCES})
+find_program(CCACHE_PROGRAM ccache)
+if(CCACHE_PROGRAM)
+    set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+endif()
+set( CMAKE_EXPORT_COMPILE_COMMANDS ON )

lib/advanced_C_standard_liberary/LICENSE

@@ -0,0 +1,19 @@
+MIT License Copyright (c) 2020 Marcel Zinkel
+
+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:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+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.

lib/advanced_C_standard_liberary/README.md

@@ -0,0 +1,3 @@
+# advanced C standard library
+
+A collection of C functions, I commonly use.

lib/advanced_C_standard_liberary/build_and_run.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+rm -rf build
+cmake .
+make
+./build/test.out

lib/advanced_C_standard_liberary/include/acl/array.h

@@ -0,0 +1,5 @@
+#ifndef array_h
+#define array_h
+void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element);
+void* acl_arraylist_append(void *arraylist_void, void *element_void);
+#endif

lib/advanced_C_standard_liberary/include/acl/file.h

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

lib/advanced_C_standard_liberary/src/array.c

@@ -0,0 +1,37 @@
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+union arraylist_meta {
+	double dummy_double;
+	long double dummy_long_double;
+	long long dummy_long_long;
+        void *dummy_ptr;
+        void (*dummy_func_ptr)(void);
+        struct {
+        	size_t len;
+        	size_t cap;
+		size_t sizeof_one_element;
+        };
+};
+
+void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element) {
+	union arraylist_meta *arraylist_new = malloc(array_size * sizeof_one_element + sizeof*arraylist_new);
+	arraylist_new->len = array_size;
+	arraylist_new->cap = array_size;
+	arraylist_new->sizeof_one_element = sizeof_one_element;
+	return arraylist_new+1;
+}
+
+void* acl_arraylist_append(void *arraylist_void, void *element) {
+	union arraylist_meta *arraylist = arraylist_void;
+	--arraylist;
+	if(arraylist->len == arraylist->cap) {
+		arraylist->cap = arraylist->len + 10;
+		arraylist = realloc(arraylist, arraylist->cap * arraylist->sizeof_one_element + sizeof *arraylist);
+	}
+	memcpy((char*)(arraylist + 1) + arraylist->sizeof_one_element * arraylist->len, element, arraylist->sizeof_one_element);
+	++arraylist->len;
+	return arraylist+1;
+}

lib/advanced_C_standard_liberary/src/file.c

@@ -0,0 +1,25 @@
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdlib.h>
+char* acl_ReadTextFile(const char *filePath, bool *sucess){
+	FILE *fp = fopen(filePath, "rb");
+	size_t lSize;
+	char *buffer;
+	if(!fp) {
+		*sucess = false;
+		return buffer;
+	}
+	fseek(fp, 0L, SEEK_END);
+	lSize = ftell(fp);
+	rewind(fp);
+	buffer = malloc(lSize + 1);
+	if(!buffer) {
+		fclose(fp);
+		*sucess = false;
+		return buffer;
+	}
+	size_t readReturn = fread(buffer, lSize, 1, fp);
+	fclose(fp);
+	*sucess = readReturn == 1;
+	return buffer;
+}

lib/glad/LICENSE

@@ -0,0 +1,63 @@
+The glad source code:
+
+    The MIT License (MIT)
+
+    Copyright (c) 2013-2020 David Herberth
+
+    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:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    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.
+
+
+The Khronos Specifications:
+
+    Copyright (c) 2013-2020 The Khronos Group Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+
+The EGL Specification and various headers:
+
+    Copyright (c) 2007-2016 The Khronos Group Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and/or associated documentation files (the
+    "Materials"), to deal in the Materials without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Materials, and to
+    permit persons to whom the Materials are furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Materials.
+
+    THE MATERIALS ARE 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
+    MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

lib/stb/LICENSE

@@ -0,0 +1,37 @@
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+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:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+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.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+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 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.

shader/test.frag

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

shader/test.vert

@@ -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);
+}

src/main.c

@@ -4,7 +4,9 @@
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
 #include "main.h"
-
+#include <acl/file.h>
+#define STB_IMAGE_IMPLEMENTATION
+#include <stb_image.h>
 int main() {
 	if(!glfwInit()) {
 		printf("Faild to initalize GLFW\n");
@@ -31,9 +33,39 @@ int main() {
 	glViewport(0, 0, 1920, 1080);
 	glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
 	glfwSetInputMode(window, GLFW_STICKY_KEYS, GL_TRUE);
+	// texture settings
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+	float borderColor[] = { 1.0f, 1.0f, 1.0f, 0.0f, 1.0f };
+	glad_glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	float vertices[] = {
+		-0.5f, -0.5f, 0.0f,
+		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);  
+	glBindBuffer(GL_ARRAY_BUFFER, VBO);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
+	unsigned int VAO;
+	glGenVertexArrays(1, &VAO);
+	glBindVertexArray(VAO);
+	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();    
 	}
@@ -47,3 +79,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, 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);
+	}
+	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);
+	}
+	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;
+}

src/main.h

@@ -1,7 +0,0 @@
-#ifndef main_h
-#define main_h
-#include <glad/glad.h>
-#include <GLFW/glfw3.h>
-void glfwError(int id, const char* description);
-void framebuffer_size_callback(GLFWwindow* window, int width, int height);  
-#endif