Imported glad; cleaned up opengl init code; fixed some

CMakeLists.txt

@@ -3,11 +3,14 @@ project(Informatikprojekt C)
 
 set(CMAKE_C_STANDARD 11)
 
-add_executable(Informatikprojekt main.c particlesystem.h particlesystem.c init.h)
+add_executable(Informatikprojekt main.c particlesystem.h particlesystem.c init.h initOpenGL.h initOpenGL.c glad/src/glad.c)
 
 # GLFW
 add_subdirectory(./glfw-3.3)
 include_directories(./glfw-3.3/include)
-target_link_libraries(Informatikprojekt -lOpenGL32 glfw ${GLFW_LIBRARIES})
+target_link_libraries(Informatikprojekt OpenGL32 glfw ${GLFW_LIBRARIES})
+
+# glad
+include_directories(./glad/include)
 
 

glad/include/KHR/khrplatform.h

@@ -0,0 +1,290 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2018 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.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * The master copy of khrplatform.h is maintained in the Khronos EGL
+ * Registry repository at https://github.com/KhronosGroup/EGL-Registry
+ * The last semantic modification to khrplatform.h was at commit ID:
+ *      67a3e0864c2d75ea5287b9f3d2eb74a745936692
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by filing pull requests or issues on
+ * the EGL Registry repository linked above.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
+#   define KHRONOS_STATIC 1
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(KHRONOS_STATIC)
+    /* If the preprocessor constant KHRONOS_STATIC is defined, make the
+     * header compatible with static linking. */
+#   define KHRONOS_APICALL
+#elif defined(_WIN32)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#elif defined(__ANDROID__)
+#   define KHRONOS_APICALL __attribute__((visibility("default")))
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(KHRONOS_STATIC)
+    /* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64,
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef _WIN64
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE  = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */

initOpenGL.c

@@ -0,0 +1,72 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "initOpenGL.h"
+
+void initGlad()
+{
+    if(!gladLoadGL()) {
+        printf("Glad could not be loaded!\n");
+        exit(EXIT_FAILURE);
+    }
+}
+
+void initGLFW()
+{
+    if (!glfwInit())
+    {
+        printf("GLFW could not be initialized!\n");
+        exit(EXIT_FAILURE);
+    }
+}
+
+void setErrorCallbackGL()
+{
+    glfwSetErrorCallback(errorCallback);
+}
+
+void setFramebufferSizeCallbackGL(GLFWwindow *window)
+{
+    glfwSetFramebufferSizeCallback(window, framebufferSizeCallback);
+}
+
+void setCurrentContextGL(GLFWwindow *window)
+{
+    glfwMakeContextCurrent(window);
+}
+
+GLFWwindow *createGLFWWindow(int width, int height, char *title)
+{
+    GLFWwindow* window = glfwCreateWindow(width, height, title, NULL, NULL);
+
+    if (!window)
+    {
+        glfwTerminate();
+        exit(EXIT_FAILURE);
+    }
+
+    return window;
+}
+
+void terminateGLFW(GLFWwindow *window)
+{
+    glfwDestroyWindow(window);
+    glfwTerminate();
+}
+
+void errorCallback(int error, const char* description)
+{
+    fputs(description, stderr);
+}
+void framebufferSizeCallback(GLFWwindow *window, int width, int height)
+{
+    glViewport(0, 0, width, height);
+}
+
+void initVertexBuffer(unsigned int *VBO, float *vertices)
+{
+    glGenBuffers(1, VBO);
+    glBindBuffer(GL_ARRAY_BUFFER, *VBO);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
+}
+

initOpenGL.h

@@ -0,0 +1,23 @@
+
+#include "glad/glad.h"
+
+#include <GLFW/glfw3.h>
+
+#ifndef INFORMATIKPROJEKT_INITOPENGL_H
+#define INFORMATIKPROJEKT_INITOPENGL_H
+
+void initGlad();
+
+void initGLFW();
+void setErrorCallbackGL();
+void setFramebufferSizeCallbackGL(GLFWwindow *window);
+void setCurrentContextGL(GLFWwindow *window);
+GLFWwindow *createGLFWWindow(int width, int height, char *title);
+void terminateGLFW(GLFWwindow *window);
+
+void errorCallback(int error, const char* description);
+void framebufferSizeCallback(GLFWwindow *window, int width, int height);
+
+void initVertexBuffer(unsigned int *VBO,float *vertices);
+
+#endif //INFORMATIKPROJEKT_INITOPENGL_H

main.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <stdlib.h>
-#include <GLFW/glfw3.h>
 
 #include "particlesystem.h"
+#include "initOpenGL.h"
 
 char *printVector(vector3f *v);
 void printParticle(particle *v);
@@ -11,34 +11,34 @@ void printEmitter(emitter *e);
 void initRandomParticles(emitter *e);
 void error_callback(int error, const char* description);
 
+void calcPos(particle *p, float dt);
+void calcCol(particle *p);
+
 int main()
 {
-    if (!glfwInit())
+    // Init OpenGL and GLFW
-    {
+    initGLFW();
-        exit(EXIT_FAILURE);
+    setErrorCallbackGL();
-    }
 
-    glfwSetErrorCallback(error_callback);
+    int width = 800, height = 800;
+    GLFWwindow *window = createGLFWWindow(width, height, "Informatikprojekt - OpenGL");
 
-    GLFWwindow* window = glfwCreateWindow(1920, 1080, "My Title", NULL, NULL);
+    setCurrentContextGL(window);
+    setFramebufferSizeCallbackGL(window);
 
-    if (!window)
+    // glad
-    {
+    initGlad();
-        glfwTerminate();
-        exit(EXIT_FAILURE);
-    }
-
-    glfwMakeContextCurrent(window);
 
     vector3f *epos = initVector3f(0, 0, 0);
-    emitter *e = initEmitter(epos, 10000);
+    emitter *e = initEmitter(epos, 1000);
     particle_system *ps = initParticleSystem(1);
     (ps->emitters)[0] = e;
 
     initRandomParticles(e);
 
     double time, tFrame, tLast = 0;
-    int width, height, b = 0;
+    unsigned int vbo;
+    float vert[3] = {0.1f, 0.2f, 0.3f};
 
     while (!glfwWindowShouldClose(window))
     {
@@ -46,26 +46,14 @@ int main()
         tFrame = time - tLast;
         tLast = time;
 
+        glClearColor(0.05f, 0.05f, 0.05f, 0);
+        glClear(GL_COLOR_BUFFER_BIT);
         glfwGetFramebufferSize(window, &width, &height);
 
-        for (int i = 0; !b && i < e->pamount; i++)
+        initVertexBuffer(&vbo, vert);
-        {
-            vector3f *p = (e->particles)[i]->position;
-            if (p->x > 1 || p->x < -1 || p->y > 1 || p->y < -1 || p->z > 1 || p->z < -1)
-            {
-                b=1;
-            }
-        }
 
-        if (!b)
+        updateParticles((float) tFrame, ps, calcPos, calcCol);
-        {
-            updateParticles((float) tFrame, ps);
-        }
 
-        glViewport(0, 0, width, height);
-        glClear(GL_COLOR_BUFFER_BIT);
-
-        glBegin(GL_POINTS);
         particle *p;
         vector3f *pos;
         for (int i = 0; i < e->pamount; i++)
@@ -73,17 +61,21 @@ int main()
             p = (e->particles)[i];
             glColor3f(p->color->x, p->color->y, p->color->z);
             pos = p->position;
+
+            glBegin(GL_QUADS);
             glVertex3f(pos->x, pos->y, pos->z);
-        }
+            glVertex3f(pos->x+.1, pos->y, pos->z);
+            glVertex3f(pos->x+.1, pos->y-.1, pos->z);
+            glVertex3f(pos->x, pos->y-.1, pos->z);
             glEnd();
+        }
 
         glfwSwapBuffers(window);
         glfwPollEvents();
     }
 
     //END
-    glfwDestroyWindow(window);
+    terminateGLFW(window);
-    glfwTerminate();
 
     free(epos);
     freeParticleSystem(ps);
@@ -91,11 +83,21 @@ int main()
     return 0;
 }
 
-void error_callback(int error, const char* description)
+void calcPos(particle *p, float dt)
 {
-    fputs(description, stderr);
+    p->position->x += p->direction->x * dt;
+    p->position->y += p->direction->y * dt;
+    p->position->z += p->direction->z * dt;
 }
 
+void calcCol(particle *p)
+{
+    p->color->x = 0.5f;
+    p->color->y = 0.01f;
+    p->color->z = 0.9f;
+}
+
+/*************************************************************************************************************/
 /*************************/
 float rv()
 {
@@ -110,7 +112,7 @@ void initRandomParticles(emitter *e)
     {
         vector3f *pos = initVector3f(e->position->x, e->position->y, e->position->z);
         vector3f *dir = initVector3f(rv(), rv(), rv());
-        vector3f *color = initVector3f(255, 255, 255);
+        vector3f *color = initVector3f(1, 1, 1);
         (e->particles)[i] = initParticle(pos, dir, color, 100.f);
     }
 }

particlesystem.c

@@ -1,5 +1,4 @@
 #include <malloc.h>
-#include <GLFW/glfw3.h>
 
 #include "particlesystem.h"
 
@@ -42,7 +41,7 @@ particle_system *initParticleSystem(int eamount)
 /*
  * Updates particles
  */
-int updateParticles(float dt, particle_system *ps)
+int updateParticles(float dt, particle_system *ps, CalculatePositionFunction calculatePosition, CalculateColorFunction calculateColor)
 {
     emitter *e;
     particle *p;
@@ -52,14 +51,8 @@ int updateParticles(float dt, particle_system *ps)
         for (int j = 0; j < e->pamount; j++)
         {
             p = (e->particles)[j];
-
+            calculatePosition(p, dt);
-            p->position->x += p->direction->x * dt;
+            calculateColor(p);
-            p->position->y += p->direction->y * dt;
-            p->position->z += p->direction->z * dt;
-
-            p->color->x -= 0.25f;
-            p->color->y -= 0.25f;
-            p->color->z -= 0.25f;
         }
     }
 }
@@ -85,6 +78,17 @@ vector3f *initVector3f(float x, float y, float z)
     return vector;
 }
 
+/*
+ * Frees a given particle and all corresponding data
+ */
+void freeParticle(particle *p)
+{
+    free(p->position);
+    free(p->direction);
+    free(p->color);
+    free(p);
+}
+
 /*
  * Frees a given emitter and all corresponding particles
  */
@@ -92,7 +96,7 @@ void freeEmitter(emitter *e)
 {
     for (int j = 0; j < e->pamount; j++)
     {
-        free((e->particles)[j]);
+        freeParticle((e->particles)[j]);
     }
 
     free(e);

particlesystem.h

@@ -38,6 +38,16 @@ typedef struct particle_system
     int eamount;
 } particle_system;
 
+/*
+ * A function to calculate the new position of a particle
+ */
+typedef void (* CalculatePositionFunction)(particle *particle, float dt);
+
+/*
+ * A function to calculate the new color of a particle
+ */
+typedef void (* CalculateColorFunction)(particle *particle);
+
 /*
  * Initializes a particle
  */
@@ -56,7 +66,7 @@ particle_system *initParticleSystem(int eamount);
 /*
  * Updates particle
  */
-int updateParticles(float dt, particle_system *particleSystem);
+int updateParticles(float dt, particle_system *particleSystem, CalculatePositionFunction calculatePosition, CalculateColorFunction calculateColor);
 
 /*
  * Updates particle
@@ -69,6 +79,11 @@ int drawParticles(particle_system *particleSystem);
  */
 vector3f *initVector3f(float x, float y, float z);
 
+/*
+ * Frees a given particle and all corresponding data
+ */
+void freeParticle(particle *p);
+
 /*
  * Frees an given emitter with all particles
  */