Browse Source

remove GLAD, force aspect ratio

master
Alexandros Theodotou 2 years ago
parent
commit
e1854a40cc
Signed by: alex GPG Key ID: 022EAE42313D70F3
  1. 7
      README.md
  2. 290
      inc/KHR/khrplatform.h
  3. 3611
      inc/glad/glad.h
  4. 16
      inc/gui/gl.h
  5. 1840
      src/glad.c
  6. 42
      src/gui/gl.c
  7. 71
      src/main.c
  8. 2
      src/meson.build

7
README.md

@ -1,7 +1,12 @@
Ion
===
Ion is a rhythm game TODO
Ion is a rhythm game modelled closely after osu!
It is written in C using OpenGL and pangocairo for
graphics.
This is a WIP
# License
AGPLv3+

290
inc/KHR/khrplatform.h

@ -1,290 +0,0 @@
#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_ */

3611
inc/glad/glad.h
File diff suppressed because it is too large
View File

16
inc/gui/gl.h

@ -26,6 +26,12 @@
#ifndef __GUI_GL_H__
#define __GUI_GL_H__
/* see https://www.rapidtables.com/web/dev/screen-resolution-statistics.html */
#define ION_GL_WINDOW_WIDTH 1366
#define ION_GL_WINDOW_HEIGHT 768
#define ION_GL_MIN_WINDOW_WIDTH 1280
#define ION_GL_MIN_WINDOW_HEIGHT 720
/**
* Texture info.
*/
@ -44,6 +50,16 @@ typedef struct IonGlTexture
void
ion_gl_init ();
/**
* Draws a test triangle.
*/
void
ion_gl_draw_test_triangle (
float x,
float y,
float width,
float height);
/**
* Generate a texture with an ID for the given data
* of the given dimensions.

1840
src/glad.c
File diff suppressed because it is too large
View File

42
src/gui/gl.c

@ -19,13 +19,13 @@
#include <stdlib.h>
/*#include <glad/glad.h>*/
#include <GLFW/glfw3.h>
#include <glib.h>
#include "gui/gl.h"
#include <nanovg.h>
#define WINDOW_WIDTH 800
#define WINDOW_HEIGHT 600
#include "gui/gl.h"
/**
* Initialization during startup.
@ -42,10 +42,13 @@ ion_gl_init ()
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable (GL_TEXTURE_2D);
glViewport (0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
glViewport (
0, 0, ION_GL_WINDOW_WIDTH, ION_GL_WINDOW_HEIGHT);
glMatrixMode (GL_PROJECTION);
glLoadIdentity ();
glOrtho (0, WINDOW_WIDTH, WINDOW_HEIGHT, 0, -1, 1);
glOrtho (
0, ION_GL_WINDOW_WIDTH, ION_GL_WINDOW_HEIGHT,
0, -1, 1);
glMatrixMode (GL_MODELVIEW);
glLoadIdentity ();
}
@ -77,9 +80,38 @@ ion_gl_create_texture (
texture->width = width;
texture->height = height;
g_message (
"created texture %d with width %u and height %u",
texture->id, width, height);
return texture;
}
/**
* Draws a test triangle.
*/
void
ion_gl_draw_test_triangle (
float x,
float y,
float width,
float height)
{
glPushMatrix ();
glBindTexture (GL_TEXTURE_2D, 0);
glColor3f (0.f, 1.0f, 1.0f);
glBegin (GL_QUADS);
glVertex2f (x, y);
glVertex2f (x + width, y);
glVertex2f (
x + width, y + height);
glVertex2f (x, y + height);
glEnd ();
glPopMatrix ();
}
/**
* Draws the texture in the given rectangle.
*/

71
src/main.c

@ -19,7 +19,6 @@
#include <stdio.h>
#include <glad/glad.h>
#include <pango/pangocairo.h>
#include <GLFW/glfw3.h>
@ -41,6 +40,9 @@ void framebuffer_size_cb (
{
/* make sure the viewport matches the new window
* dimensions */
g_message (
"changing viewport to (%d, %d)",
width, height);
glViewport (0, 0, width, height);
}
@ -59,33 +61,64 @@ static void scroll_cb (
{
}
static void
error_cb (
int error,
const char * description)
{
g_critical (
"A GLFW error occurred (%d): %s",
error, description);
}
static void
window_close_cb (
GLFWwindow* window)
{
g_message ("closing window");
/*if (!time_to_close)*/
/*glfwSetWindowShouldClose(window, GLFW_FALSE);*/
}
int main (
int argc, char **argv)
{
GLFWwindow* window;
g_message (
"GLFW version %s",
glfwGetVersionString ());
glfwSetErrorCallback (error_cb);
/* Initialize the library */
if (!glfwInit ())
{
return -1;
}
glfwWindowHint (GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint (GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint (
GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint (GLFW_SAMPLES, 4);
/* Create a windowed mode window and its OpenGL
* context */
window =
glfwWindowHint (GLFW_SAMPLES, 4);
glfwWindowHint (GLFW_DOUBLEBUFFER, GLFW_TRUE);
GLFWwindow * window =
glfwCreateWindow (
640, 480, PROJECT_NAME, NULL, NULL);
ION_GL_WINDOW_WIDTH, ION_GL_WINDOW_HEIGHT,
PROJECT_NAME, NULL, NULL);
if (!window)
{
glfwTerminate ();
g_error ("failed to create window");
g_error ("failed to create GLFW window");
}
glfwSetWindowSizeLimits (
window, ION_GL_MIN_WINDOW_WIDTH,
ION_GL_MIN_WINDOW_HEIGHT, GLFW_DONT_CARE,
GLFW_DONT_CARE);
glfwSetWindowAspectRatio (window, 16, 9);
/* set window icon */
/*GLFWimage images[2];*/
/*images[0] = load_icon ("my_icon.png");*/
/*images[1] = load_icon ("my_icon_small.png");*/
/*glfwSetWindowIcon (window, 2, images);*/
/* Make the window's context current */
glfwMakeContextCurrent (window);
@ -95,13 +128,8 @@ int main (
window, framebuffer_size_cb);
glfwSetCursorPosCallback (window, mouse_cb);
glfwSetScrollCallback (window, scroll_cb);
/* init GLAD */
if (!gladLoadGLLoader (
(GLADloadproc) glfwGetProcAddress))
{
g_error ("Failed to initialize GLAD");
}
glfwSetWindowCloseCallback (
window, window_close_cb);
/* init openGL */
ion_gl_init ();
@ -112,16 +140,11 @@ int main (
/* Loop until the user closes the window */
while (!glfwWindowShouldClose(window))
{
/* frame logic */
float current_frame = glfwGetTime ();
(void) current_frame;
/* process user input */
/*process_input (window);*/
/* Render */
glClear(GL_COLOR_BUFFER_BIT);
ion_gl_draw_texture (texture, 0.f, 0.f);
ion_gl_draw_test_triangle (
0.f, 0.f, 20.f, 20.f);
/* Swap front and back buffers */
glfwSwapBuffers (window);

2
src/meson.build

@ -16,7 +16,7 @@
# along with Ion. If not, see <https://www.gnu.org/licenses/>.
ion_main = files ('main.c')
ion_srcs = files (['glad.c'])
ion_srcs = files ([])
subdir ('gui')
subdir ('utils')

Loading…
Cancel
Save