basic input, frame timing, and other minor setup
parent
b770baa78d
commit
b5d707f5c7
|
@ -4,3 +4,6 @@
|
||||||
[submodule "libraries/imgui"]
|
[submodule "libraries/imgui"]
|
||||||
path = libraries/imgui
|
path = libraries/imgui
|
||||||
url = https://github.com/ocornut/imgui
|
url = https://github.com/ocornut/imgui
|
||||||
|
[submodule "libraries/openal-soft"]
|
||||||
|
path = libraries/openal-soft
|
||||||
|
url = https://github.com/kcat/openal-soft.git
|
||||||
|
|
|
@ -24,6 +24,7 @@ else ()
|
||||||
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
add_subdirectory(libraries/glfw-3.3.8)
|
add_subdirectory(libraries/glfw-3.3.8)
|
||||||
|
add_subdirectory(libraries/openal-soft)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
add_subdirectory(libraries/BLT)
|
add_subdirectory(libraries/BLT)
|
||||||
|
@ -113,6 +114,7 @@ if (EMSCRIPTEN)
|
||||||
target_link_options(BLT_WITH_GRAPHICS PRIVATE -Wall -Wpedantic -Wno-comment -Wno-strict-aliasing)
|
target_link_options(BLT_WITH_GRAPHICS PRIVATE -Wall -Wpedantic -Wno-comment -Wno-strict-aliasing)
|
||||||
else ()
|
else ()
|
||||||
target_link_libraries(BLT_WITH_GRAPHICS PUBLIC glfw)
|
target_link_libraries(BLT_WITH_GRAPHICS PUBLIC glfw)
|
||||||
|
target_link_libraries(BLT_WITH_GRAPHICS PUBLIC OpenAL)
|
||||||
|
|
||||||
target_compile_options(BLT_WITH_GRAPHICS PRIVATE -Wall -Werror -Wpedantic -Wno-comment -Wno-strict-aliasing -Wno-unused-function)
|
target_compile_options(BLT_WITH_GRAPHICS PRIVATE -Wall -Werror -Wpedantic -Wno-comment -Wno-strict-aliasing -Wno-unused-function)
|
||||||
target_link_options(BLT_WITH_GRAPHICS PRIVATE -Wall -Werror -Wpedantic -Wno-comment -Wno-strict-aliasing -Wno-unused-function)
|
target_link_options(BLT_WITH_GRAPHICS PRIVATE -Wall -Werror -Wpedantic -Wno-comment -Wno-strict-aliasing -Wno-unused-function)
|
||||||
|
|
|
@ -28,30 +28,40 @@ namespace blt::gfx
|
||||||
/**
|
/**
|
||||||
* layout (std140) uniform GlobalMatrices
|
* layout (std140) uniform GlobalMatrices
|
||||||
* {
|
* {
|
||||||
* mat4 projection;
|
* mat4 perspective; // full 3d perspective matrix
|
||||||
* mat4 view;
|
* mat4 ortho; // full 2d orthographic matrix
|
||||||
* mat4 pvm;
|
* mat4 view; // view matrix
|
||||||
|
* mat4 pvm; // perspective view matrix
|
||||||
|
* mat4 ovm; // ortho view matrix
|
||||||
* };
|
* };
|
||||||
*/
|
*/
|
||||||
class matrix_state_manager
|
class matrix_state_manager
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
blt::mat4x4 perspective;
|
blt::mat4x4 perspective;
|
||||||
|
blt::mat4x4 ortho;
|
||||||
blt::mat4x4 view;
|
blt::mat4x4 view;
|
||||||
blt::mat4x4 pv;
|
blt::mat4x4 pvm;
|
||||||
|
blt::mat4x4 ovm;
|
||||||
|
std::int32_t last_width = 0, last_height = 0;
|
||||||
uniform_buffer* global_matrix_ubo = nullptr;
|
uniform_buffer* global_matrix_ubo = nullptr;
|
||||||
public:
|
public:
|
||||||
[[nodiscard]] inline const blt::mat4x4& computedPV() const
|
[[nodiscard]] inline const blt::mat4x4& computedPVM() const
|
||||||
{
|
{
|
||||||
return pv;
|
return pvm;
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard]] inline const blt::mat4x4& computedOVM() const
|
||||||
|
{
|
||||||
|
return ovm;
|
||||||
}
|
}
|
||||||
|
|
||||||
void create_internals()
|
void create_internals()
|
||||||
{
|
{
|
||||||
global_matrix_ubo = new uniform_buffer(sizeof(blt::mat4x4) * 3);
|
global_matrix_ubo = new uniform_buffer(sizeof(blt::mat4x4) * 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
void delete_internals()
|
void cleanup()
|
||||||
{
|
{
|
||||||
delete global_matrix_ubo;
|
delete global_matrix_ubo;
|
||||||
}
|
}
|
||||||
|
@ -59,15 +69,24 @@ namespace blt::gfx
|
||||||
template<typename U>
|
template<typename U>
|
||||||
void setView(U&& mat)
|
void setView(U&& mat)
|
||||||
{
|
{
|
||||||
view = std::forward(mat);
|
view = mat;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename U>
|
template<typename U>
|
||||||
void setPerspective(U&& mat)
|
void setPerspective(U&& mat)
|
||||||
{
|
{
|
||||||
perspective = std::forward(mat);
|
perspective = mat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename U>
|
||||||
|
void setOrtho(U&& mat)
|
||||||
|
{
|
||||||
|
ortho = mat;
|
||||||
|
}
|
||||||
|
|
||||||
|
void update_perspectives(std::int32_t width, std::int32_t height, float fov = 90, float near = 0.1f, float far = 500.0f,
|
||||||
|
float ortho_near = -1, float ortho_far = 1);
|
||||||
|
|
||||||
void update();
|
void update();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,350 @@
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// HEADER BEGINS HERE
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef STB_VORBIS_INCLUDE_STB_VORBIS_H
|
||||||
|
#define STB_VORBIS_INCLUDE_STB_VORBIS_H
|
||||||
|
|
||||||
|
#if defined(STB_VORBIS_NO_CRT) && !defined(STB_VORBIS_NO_STDIO)
|
||||||
|
#define STB_VORBIS_NO_STDIO 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef STB_VORBIS_NO_STDIO
|
||||||
|
#include <stdio.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/////////// THREAD SAFETY
|
||||||
|
|
||||||
|
// Individual stb_vorbis* handles are not thread-safe; you cannot decode from
|
||||||
|
// them from multiple threads at the same time. However, you can have multiple
|
||||||
|
// stb_vorbis* handles and decode from them independently in multiple thrads.
|
||||||
|
|
||||||
|
|
||||||
|
/////////// MEMORY ALLOCATION
|
||||||
|
|
||||||
|
// normally stb_vorbis uses malloc() to allocate memory at startup,
|
||||||
|
// and alloca() to allocate temporary memory during a frame on the
|
||||||
|
// stack. (Memory consumption will depend on the amount of setup
|
||||||
|
// data in the file and how you set the compile flags for speed
|
||||||
|
// vs. size. In my test files the maximal-size usage is ~150KB.)
|
||||||
|
//
|
||||||
|
// You can modify the wrapper functions in the source (setup_malloc,
|
||||||
|
// setup_temp_malloc, temp_malloc) to change this behavior, or you
|
||||||
|
// can use a simpler allocation model: you pass in a buffer from
|
||||||
|
// which stb_vorbis will allocate _all_ its memory (including the
|
||||||
|
// temp memory). "open" may fail with a VORBIS_outofmem if you
|
||||||
|
// do not pass in enough data; there is no way to determine how
|
||||||
|
// much you do need except to succeed (at which point you can
|
||||||
|
// query get_info to find the exact amount required. yes I know
|
||||||
|
// this is lame).
|
||||||
|
//
|
||||||
|
// If you pass in a non-NULL buffer of the type below, allocation
|
||||||
|
// will occur from it as described above. Otherwise just pass NULL
|
||||||
|
// to use malloc()/alloca()
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
char *alloc_buffer;
|
||||||
|
int alloc_buffer_length_in_bytes;
|
||||||
|
} stb_vorbis_alloc;
|
||||||
|
|
||||||
|
|
||||||
|
/////////// FUNCTIONS USEABLE WITH ALL INPUT MODES
|
||||||
|
|
||||||
|
typedef struct stb_vorbis stb_vorbis;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
unsigned int sample_rate;
|
||||||
|
int channels;
|
||||||
|
|
||||||
|
unsigned int setup_memory_required;
|
||||||
|
unsigned int setup_temp_memory_required;
|
||||||
|
unsigned int temp_memory_required;
|
||||||
|
|
||||||
|
int max_frame_size;
|
||||||
|
} stb_vorbis_info;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
char *vendor;
|
||||||
|
|
||||||
|
int comment_list_length;
|
||||||
|
char **comment_list;
|
||||||
|
} stb_vorbis_comment;
|
||||||
|
|
||||||
|
// get general information about the file
|
||||||
|
extern stb_vorbis_info stb_vorbis_get_info(stb_vorbis *f);
|
||||||
|
|
||||||
|
// get ogg comments
|
||||||
|
extern stb_vorbis_comment stb_vorbis_get_comment(stb_vorbis *f);
|
||||||
|
|
||||||
|
// get the last error detected (clears it, too)
|
||||||
|
extern int stb_vorbis_get_error(stb_vorbis *f);
|
||||||
|
|
||||||
|
// close an ogg vorbis file and free all memory in use
|
||||||
|
extern void stb_vorbis_close(stb_vorbis *f);
|
||||||
|
|
||||||
|
// this function returns the offset (in samples) from the beginning of the
|
||||||
|
// file that will be returned by the next decode, if it is known, or -1
|
||||||
|
// otherwise. after a flush_pushdata() call, this may take a while before
|
||||||
|
// it becomes valid again.
|
||||||
|
// NOT WORKING YET after a seek with PULLDATA API
|
||||||
|
extern int stb_vorbis_get_sample_offset(stb_vorbis *f);
|
||||||
|
|
||||||
|
// returns the current seek point within the file, or offset from the beginning
|
||||||
|
// of the memory buffer. In pushdata mode it returns 0.
|
||||||
|
extern unsigned int stb_vorbis_get_file_offset(stb_vorbis *f);
|
||||||
|
|
||||||
|
/////////// PUSHDATA API
|
||||||
|
|
||||||
|
#ifndef STB_VORBIS_NO_PUSHDATA_API
|
||||||
|
|
||||||
|
// this API allows you to get blocks of data from any source and hand
|
||||||
|
// them to stb_vorbis. you have to buffer them; stb_vorbis will tell
|
||||||
|
// you how much it used, and you have to give it the rest next time;
|
||||||
|
// and stb_vorbis may not have enough data to work with and you will
|
||||||
|
// need to give it the same data again PLUS more. Note that the Vorbis
|
||||||
|
// specification does not bound the size of an individual frame.
|
||||||
|
|
||||||
|
extern stb_vorbis *stb_vorbis_open_pushdata(
|
||||||
|
const unsigned char * datablock, int datablock_length_in_bytes,
|
||||||
|
int *datablock_memory_consumed_in_bytes,
|
||||||
|
int *error,
|
||||||
|
const stb_vorbis_alloc *alloc_buffer);
|
||||||
|
// create a vorbis decoder by passing in the initial data block containing
|
||||||
|
// the ogg&vorbis headers (you don't need to do parse them, just provide
|
||||||
|
// the first N bytes of the file--you're told if it's not enough, see below)
|
||||||
|
// on success, returns an stb_vorbis *, does not set error, returns the amount of
|
||||||
|
// data parsed/consumed on this call in *datablock_memory_consumed_in_bytes;
|
||||||
|
// on failure, returns NULL on error and sets *error, does not change *datablock_memory_consumed
|
||||||
|
// if returns NULL and *error is VORBIS_need_more_data, then the input block was
|
||||||
|
// incomplete and you need to pass in a larger block from the start of the file
|
||||||
|
|
||||||
|
extern int stb_vorbis_decode_frame_pushdata(
|
||||||
|
stb_vorbis *f,
|
||||||
|
const unsigned char *datablock, int datablock_length_in_bytes,
|
||||||
|
int *channels, // place to write number of float * buffers
|
||||||
|
float ***output, // place to write float ** array of float * buffers
|
||||||
|
int *samples // place to write number of output samples
|
||||||
|
);
|
||||||
|
// decode a frame of audio sample data if possible from the passed-in data block
|
||||||
|
//
|
||||||
|
// return value: number of bytes we used from datablock
|
||||||
|
//
|
||||||
|
// possible cases:
|
||||||
|
// 0 bytes used, 0 samples output (need more data)
|
||||||
|
// N bytes used, 0 samples output (resynching the stream, keep going)
|
||||||
|
// N bytes used, M samples output (one frame of data)
|
||||||
|
// note that after opening a file, you will ALWAYS get one N-bytes,0-sample
|
||||||
|
// frame, because Vorbis always "discards" the first frame.
|
||||||
|
//
|
||||||
|
// Note that on resynch, stb_vorbis will rarely consume all of the buffer,
|
||||||
|
// instead only datablock_length_in_bytes-3 or less. This is because it wants
|
||||||
|
// to avoid missing parts of a page header if they cross a datablock boundary,
|
||||||
|
// without writing state-machiney code to record a partial detection.
|
||||||
|
//
|
||||||
|
// The number of channels returned are stored in *channels (which can be
|
||||||
|
// NULL--it is always the same as the number of channels reported by
|
||||||
|
// get_info). *output will contain an array of float* buffers, one per
|
||||||
|
// channel. In other words, (*output)[0][0] contains the first sample from
|
||||||
|
// the first channel, and (*output)[1][0] contains the first sample from
|
||||||
|
// the second channel.
|
||||||
|
//
|
||||||
|
// *output points into stb_vorbis's internal output buffer storage; these
|
||||||
|
// buffers are owned by stb_vorbis and application code should not free
|
||||||
|
// them or modify their contents. They are transient and will be overwritten
|
||||||
|
// once you ask for more data to get decoded, so be sure to grab any data
|
||||||
|
// you need before then.
|
||||||
|
|
||||||
|
extern void stb_vorbis_flush_pushdata(stb_vorbis *f);
|
||||||
|
// inform stb_vorbis that your next datablock will not be contiguous with
|
||||||
|
// previous ones (e.g. you've seeked in the data); future attempts to decode
|
||||||
|
// frames will cause stb_vorbis to resynchronize (as noted above), and
|
||||||
|
// once it sees a valid Ogg page (typically 4-8KB, as large as 64KB), it
|
||||||
|
// will begin decoding the _next_ frame.
|
||||||
|
//
|
||||||
|
// if you want to seek using pushdata, you need to seek in your file, then
|
||||||
|
// call stb_vorbis_flush_pushdata(), then start calling decoding, then once
|
||||||
|
// decoding is returning you data, call stb_vorbis_get_sample_offset, and
|
||||||
|
// if you don't like the result, seek your file again and repeat.
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
////////// PULLING INPUT API
|
||||||
|
|
||||||
|
#ifndef STB_VORBIS_NO_PULLDATA_API
|
||||||
|
// This API assumes stb_vorbis is allowed to pull data from a source--
|
||||||
|
// either a block of memory containing the _entire_ vorbis stream, or a
|
||||||
|
// FILE * that you or it create, or possibly some other reading mechanism
|
||||||
|
// if you go modify the source to replace the FILE * case with some kind
|
||||||
|
// of callback to your code. (But if you don't support seeking, you may
|
||||||
|
// just want to go ahead and use pushdata.)
|
||||||
|
|
||||||
|
#if !defined(STB_VORBIS_NO_STDIO) && !defined(STB_VORBIS_NO_INTEGER_CONVERSION)
|
||||||
|
extern int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_rate, short **output);
|
||||||
|
#endif
|
||||||
|
#if !defined(STB_VORBIS_NO_INTEGER_CONVERSION)
|
||||||
|
extern int stb_vorbis_decode_memory(const unsigned char *mem, int len, int *channels, int *sample_rate, short **output);
|
||||||
|
#endif
|
||||||
|
// decode an entire file and output the data interleaved into a malloc()ed
|
||||||
|
// buffer stored in *output. The return value is the number of samples
|
||||||
|
// decoded, or -1 if the file could not be opened or was not an ogg vorbis file.
|
||||||
|
// When you're done with it, just free() the pointer returned in *output.
|
||||||
|
|
||||||
|
extern stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len,
|
||||||
|
int *error, const stb_vorbis_alloc *alloc_buffer);
|
||||||
|
// create an ogg vorbis decoder from an ogg vorbis stream in memory (note
|
||||||
|
// this must be the entire stream!). on failure, returns NULL and sets *error
|
||||||
|
|
||||||
|
#ifndef STB_VORBIS_NO_STDIO
|
||||||
|
extern stb_vorbis * stb_vorbis_open_filename(const char *filename,
|
||||||
|
int *error, const stb_vorbis_alloc *alloc_buffer);
|
||||||
|
// create an ogg vorbis decoder from a filename via fopen(). on failure,
|
||||||
|
// returns NULL and sets *error (possibly to VORBIS_file_open_failure).
|
||||||
|
|
||||||
|
extern stb_vorbis * stb_vorbis_open_file(FILE *f, int close_handle_on_close,
|
||||||
|
int *error, const stb_vorbis_alloc *alloc_buffer);
|
||||||
|
// create an ogg vorbis decoder from an open FILE *, looking for a stream at
|
||||||
|
// the _current_ seek point (ftell). on failure, returns NULL and sets *error.
|
||||||
|
// note that stb_vorbis must "own" this stream; if you seek it in between
|
||||||
|
// calls to stb_vorbis, it will become confused. Moreover, if you attempt to
|
||||||
|
// perform stb_vorbis_seek_*() operations on this file, it will assume it
|
||||||
|
// owns the _entire_ rest of the file after the start point. Use the next
|
||||||
|
// function, stb_vorbis_open_file_section(), to limit it.
|
||||||
|
|
||||||
|
extern stb_vorbis * stb_vorbis_open_file_section(FILE *f, int close_handle_on_close,
|
||||||
|
int *error, const stb_vorbis_alloc *alloc_buffer, unsigned int len);
|
||||||
|
// create an ogg vorbis decoder from an open FILE *, looking for a stream at
|
||||||
|
// the _current_ seek point (ftell); the stream will be of length 'len' bytes.
|
||||||
|
// on failure, returns NULL and sets *error. note that stb_vorbis must "own"
|
||||||
|
// this stream; if you seek it in between calls to stb_vorbis, it will become
|
||||||
|
// confused.
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern int stb_vorbis_seek_frame(stb_vorbis *f, unsigned int sample_number);
|
||||||
|
extern int stb_vorbis_seek(stb_vorbis *f, unsigned int sample_number);
|
||||||
|
// these functions seek in the Vorbis file to (approximately) 'sample_number'.
|
||||||
|
// after calling seek_frame(), the next call to get_frame_*() will include
|
||||||
|
// the specified sample. after calling stb_vorbis_seek(), the next call to
|
||||||
|
// stb_vorbis_get_samples_* will start with the specified sample. If you
|
||||||
|
// do not need to seek to EXACTLY the target sample when using get_samples_*,
|
||||||
|
// you can also use seek_frame().
|
||||||
|
|
||||||
|
extern int stb_vorbis_seek_start(stb_vorbis *f);
|
||||||
|
// this function is equivalent to stb_vorbis_seek(f,0)
|
||||||
|
|
||||||
|
extern unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f);
|
||||||
|
extern float stb_vorbis_stream_length_in_seconds(stb_vorbis *f);
|
||||||
|
// these functions return the total length of the vorbis stream
|
||||||
|
|
||||||
|
extern int stb_vorbis_get_frame_float(stb_vorbis *f, int *channels, float ***output);
|
||||||
|
// decode the next frame and return the number of samples. the number of
|
||||||
|
// channels returned are stored in *channels (which can be NULL--it is always
|
||||||
|
// the same as the number of channels reported by get_info). *output will
|
||||||
|
// contain an array of float* buffers, one per channel. These outputs will
|
||||||
|
// be overwritten on the next call to stb_vorbis_get_frame_*.
|
||||||
|
//
|
||||||
|
// You generally should not intermix calls to stb_vorbis_get_frame_*()
|
||||||
|
// and stb_vorbis_get_samples_*(), since the latter calls the former.
|
||||||
|
|
||||||
|
#ifndef STB_VORBIS_NO_INTEGER_CONVERSION
|
||||||
|
extern int stb_vorbis_get_frame_short_interleaved(stb_vorbis *f, int num_c, short *buffer, int num_shorts);
|
||||||
|
extern int stb_vorbis_get_frame_short (stb_vorbis *f, int num_c, short **buffer, int num_samples);
|
||||||
|
#endif
|
||||||
|
// decode the next frame and return the number of *samples* per channel.
|
||||||
|
// Note that for interleaved data, you pass in the number of shorts (the
|
||||||
|
// size of your array), but the return value is the number of samples per
|
||||||
|
// channel, not the total number of samples.
|
||||||
|
//
|
||||||
|
// The data is coerced to the number of channels you request according to the
|
||||||
|
// channel coercion rules (see below). You must pass in the size of your
|
||||||
|
// buffer(s) so that stb_vorbis will not overwrite the end of the buffer.
|
||||||
|
// The maximum buffer size needed can be gotten from get_info(); however,
|
||||||
|
// the Vorbis I specification implies an absolute maximum of 4096 samples
|
||||||
|
// per channel.
|
||||||
|
|
||||||
|
// Channel coercion rules:
|
||||||
|
// Let M be the number of channels requested, and N the number of channels present,
|
||||||
|
// and Cn be the nth channel; let stereo L be the sum of all L and center channels,
|
||||||
|
// and stereo R be the sum of all R and center channels (channel assignment from the
|
||||||
|
// vorbis spec).
|
||||||
|
// M N output
|
||||||
|
// 1 k sum(Ck) for all k
|
||||||
|
// 2 * stereo L, stereo R
|
||||||
|
// k l k > l, the first l channels, then 0s
|
||||||
|
// k l k <= l, the first k channels
|
||||||
|
// Note that this is not _good_ surround etc. mixing at all! It's just so
|
||||||
|
// you get something useful.
|
||||||
|
|
||||||
|
extern int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float *buffer, int num_floats);
|
||||||
|
extern int stb_vorbis_get_samples_float(stb_vorbis *f, int channels, float **buffer, int num_samples);
|
||||||
|
// gets num_samples samples, not necessarily on a frame boundary--this requires
|
||||||
|
// buffering so you have to supply the buffers. DOES NOT APPLY THE COERCION RULES.
|
||||||
|
// Returns the number of samples stored per channel; it may be less than requested
|
||||||
|
// at the end of the file. If there are no more samples in the file, returns 0.
|
||||||
|
|
||||||
|
#ifndef STB_VORBIS_NO_INTEGER_CONVERSION
|
||||||
|
extern int stb_vorbis_get_samples_short_interleaved(stb_vorbis *f, int channels, short *buffer, int num_shorts);
|
||||||
|
extern int stb_vorbis_get_samples_short(stb_vorbis *f, int channels, short **buffer, int num_samples);
|
||||||
|
#endif
|
||||||
|
// gets num_samples samples, not necessarily on a frame boundary--this requires
|
||||||
|
// buffering so you have to supply the buffers. Applies the coercion rules above
|
||||||
|
// to produce 'channels' channels. Returns the number of samples stored per channel;
|
||||||
|
// it may be less than requested at the end of the file. If there are no more
|
||||||
|
// samples in the file, returns 0.
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//////// ERROR CODES
|
||||||
|
|
||||||
|
enum STBVorbisError
|
||||||
|
{
|
||||||
|
VORBIS__no_error,
|
||||||
|
|
||||||
|
VORBIS_need_more_data=1, // not a real error
|
||||||
|
|
||||||
|
VORBIS_invalid_api_mixing, // can't mix API modes
|
||||||
|
VORBIS_outofmem, // not enough memory
|
||||||
|
VORBIS_feature_not_supported, // uses floor 0
|
||||||
|
VORBIS_too_many_channels, // STB_VORBIS_MAX_CHANNELS is too small
|
||||||
|
VORBIS_file_open_failure, // fopen() failed
|
||||||
|
VORBIS_seek_without_length, // can't seek in unknown-length file
|
||||||
|
|
||||||
|
VORBIS_unexpected_eof=10, // file is truncated?
|
||||||
|
VORBIS_seek_invalid, // seek past EOF
|
||||||
|
|
||||||
|
// decoding errors (corrupt/invalid stream) -- you probably
|
||||||
|
// don't care about the exact details of these
|
||||||
|
|
||||||
|
// vorbis errors:
|
||||||
|
VORBIS_invalid_setup=20,
|
||||||
|
VORBIS_invalid_stream,
|
||||||
|
|
||||||
|
// ogg errors:
|
||||||
|
VORBIS_missing_capture_pattern=30,
|
||||||
|
VORBIS_invalid_stream_structure_version,
|
||||||
|
VORBIS_continued_packet_flag_invalid,
|
||||||
|
VORBIS_incorrect_stream_serial_number,
|
||||||
|
VORBIS_invalid_first_page,
|
||||||
|
VORBIS_bad_packet_type,
|
||||||
|
VORBIS_cant_find_last_page,
|
||||||
|
VORBIS_seek_failed,
|
||||||
|
VORBIS_ogg_skeleton_not_supported
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // STB_VORBIS_INCLUDE_STB_VORBIS_H
|
||||||
|
//
|
||||||
|
// HEADER ENDS HERE
|
||||||
|
//
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
|
@ -166,7 +166,7 @@ namespace blt::gfx
|
||||||
struct texture_gl2D : public texture_gl
|
struct texture_gl2D : public texture_gl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
texture_gl2D(const texture_data& data);
|
explicit texture_gl2D(const texture_data& data);
|
||||||
|
|
||||||
texture_gl2D(int width, int height, GLint colorMode = GL_RGBA8);
|
texture_gl2D(int width, int height, GLint colorMode = GL_RGBA8);
|
||||||
|
|
||||||
|
|
|
@ -84,6 +84,12 @@ namespace blt::gfx
|
||||||
|
|
||||||
bool isKeyPressed(int key);
|
bool isKeyPressed(int key);
|
||||||
|
|
||||||
|
double getFrameDeltaSeconds();
|
||||||
|
|
||||||
|
double getFrameDeltaMilliseconds();
|
||||||
|
|
||||||
|
std::int64_t getFrameDelta();
|
||||||
|
|
||||||
void cleanup();
|
void cleanup();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 4a2426449a4c65028c65c68ed9426495dec251e4
|
Subproject commit 240ab5890b2e8da294937a1710b021ac3f271472
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit cfab14287405a0d34f6a0fec1336f46415728fcf
|
|
@ -20,9 +20,25 @@
|
||||||
|
|
||||||
void blt::gfx::matrix_state_manager::update()
|
void blt::gfx::matrix_state_manager::update()
|
||||||
{
|
{
|
||||||
pv = perspective * view;
|
pvm = perspective * view;
|
||||||
BLT_ASSERT(global_matrix_ubo != nullptr && "You forgot to call create_internals(). Make sure you call delete_internals() as well!");
|
ovm = ortho * view;
|
||||||
|
BLT_ASSERT(global_matrix_ubo != nullptr && "You forgot to call create_internals(). Make sure you call cleanup() as well!");
|
||||||
global_matrix_ubo->upload((void*)perspective.ptr(), sizeof(blt::mat4x4), 0);
|
global_matrix_ubo->upload((void*)perspective.ptr(), sizeof(blt::mat4x4), 0);
|
||||||
global_matrix_ubo->upload((void*)view.ptr(), sizeof(blt::mat4x4), sizeof(blt::mat4x4));
|
global_matrix_ubo->upload((void*)ortho.ptr(), sizeof(blt::mat4x4), sizeof(blt::mat4x4));
|
||||||
global_matrix_ubo->upload((void*)pv.ptr(), sizeof(blt::mat4x4), sizeof(blt::mat4x4));
|
global_matrix_ubo->upload((void*)view.ptr(), sizeof(blt::mat4x4), sizeof(blt::mat4x4) * 2);
|
||||||
|
global_matrix_ubo->upload((void*)pvm.ptr(), sizeof(blt::mat4x4), sizeof(blt::mat4x4) * 3);
|
||||||
|
global_matrix_ubo->upload((void*)ovm.ptr(), sizeof(blt::mat4x4), sizeof(blt::mat4x4) * 4);
|
||||||
|
}
|
||||||
|
|
||||||
|
void blt::gfx::matrix_state_manager::update_perspectives(std::int32_t width, std::int32_t height, float fov, float near, float far, float ortho_near,
|
||||||
|
float ortho_far)
|
||||||
|
{
|
||||||
|
if (width != last_width || height != last_height)
|
||||||
|
{
|
||||||
|
last_width = width;
|
||||||
|
last_height = height;
|
||||||
|
|
||||||
|
perspective = blt::perspective(fov, (float)width / (float)height, near, far);
|
||||||
|
ortho = blt::ortho(0, (float)width, (float)height, 0, ortho_near, ortho_far);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -6,6 +6,7 @@
|
||||||
#include <blt/gfx/window.h>
|
#include <blt/gfx/window.h>
|
||||||
#include <blt/std/assert.h>
|
#include <blt/std/assert.h>
|
||||||
#include <blt/std/logging.h>
|
#include <blt/std/logging.h>
|
||||||
|
#include <blt/std/time.h>
|
||||||
#include <blt/gfx/input.h>
|
#include <blt/gfx/input.h>
|
||||||
#include <queue>
|
#include <queue>
|
||||||
#include <imgui.h>
|
#include <imgui.h>
|
||||||
|
@ -33,6 +34,10 @@ namespace blt::gfx
|
||||||
/* current width and height of the window */
|
/* current width and height of the window */
|
||||||
std::int32_t width = 0;
|
std::int32_t width = 0;
|
||||||
std::int32_t height = 0;
|
std::int32_t height = 0;
|
||||||
|
std::int64_t lastTime = blt::system::nanoTime();
|
||||||
|
std::int64_t deltaTime = 0;
|
||||||
|
double nanoDelta = 0;
|
||||||
|
double millisDelta = 0;
|
||||||
} window_state;
|
} window_state;
|
||||||
|
|
||||||
void create_callbacks()
|
void create_callbacks()
|
||||||
|
@ -156,6 +161,13 @@ namespace blt::gfx
|
||||||
/* -- Update GLFW state -- */
|
/* -- Update GLFW state -- */
|
||||||
glfwSwapBuffers(window_state.window);
|
glfwSwapBuffers(window_state.window);
|
||||||
glfwPollEvents();
|
glfwPollEvents();
|
||||||
|
|
||||||
|
/* -- Update Frame Timing Information -- */
|
||||||
|
auto current_time = blt::system::nanoTime();
|
||||||
|
window_state.deltaTime = current_time - window_state.lastTime;
|
||||||
|
window_state.lastTime = current_time;
|
||||||
|
window_state.nanoDelta = static_cast<double>(window_state.deltaTime) / 1e9f;
|
||||||
|
window_state.millisDelta = static_cast<double>(window_state.deltaTime) / 1e6f;
|
||||||
}
|
}
|
||||||
|
|
||||||
void init(const window_data& data)
|
void init(const window_data& data)
|
||||||
|
@ -298,4 +310,19 @@ namespace blt::gfx
|
||||||
{
|
{
|
||||||
return window_state.inputManager.isKeyPressed(key);
|
return window_state.inputManager.isKeyPressed(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double getFrameDeltaSeconds()
|
||||||
|
{
|
||||||
|
return window_state.nanoDelta;
|
||||||
|
}
|
||||||
|
|
||||||
|
double getFrameDeltaMilliseconds()
|
||||||
|
{
|
||||||
|
return window_state.millisDelta;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::int64_t getFrameDelta()
|
||||||
|
{
|
||||||
|
return window_state.deltaTime;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,13 +13,17 @@ out vec2 uv;
|
||||||
layout (std140) uniform GlobalMatrices
|
layout (std140) uniform GlobalMatrices
|
||||||
{
|
{
|
||||||
mat4 projection;
|
mat4 projection;
|
||||||
|
mat4 ortho;
|
||||||
mat4 view;
|
mat4 view;
|
||||||
mat4 pvm;
|
mat4 pvm;
|
||||||
|
mat4 ovm;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
uniform mat4 model;
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
//gl_Position = projection * view * vec4(vertex.x, vertex.y, vertex.z, 1.0);
|
//gl_Position = projection * view * vec4(vertex.x, vertex.y, vertex.z, 1.0);
|
||||||
gl_Position = vec4(vertex, 1.0);
|
gl_Position = ovm * model * vec4(vertex, 1.0);
|
||||||
pos = vertex.xy;
|
pos = vertex.xy;
|
||||||
uv = uv_in;
|
uv = uv_in;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#include <blt/gfx/shader.h>
|
#include <blt/gfx/shader.h>
|
||||||
#include <blt/gfx/texture.h>
|
#include <blt/gfx/texture.h>
|
||||||
#include <blt/gfx/model.h>
|
#include <blt/gfx/model.h>
|
||||||
|
#include <blt/gfx/state.h>
|
||||||
#include <blt/std/logging.h>
|
#include <blt/std/logging.h>
|
||||||
#include <imgui.h>
|
#include <imgui.h>
|
||||||
#include "blt/gfx/imgui/IconsFontAwesome5.h"
|
#include "blt/gfx/imgui/IconsFontAwesome5.h"
|
||||||
|
@ -9,23 +10,24 @@
|
||||||
#include <shaders/test.vert>
|
#include <shaders/test.vert>
|
||||||
#include <shaders/test.frag>
|
#include <shaders/test.frag>
|
||||||
|
|
||||||
|
|
||||||
const float raw_vertices[18] = {
|
const float raw_vertices[18] = {
|
||||||
// first triangle
|
// first triangle
|
||||||
0.5f, 0.5f, 0.0f, // top right
|
0.5f, 0.5f, 0.0f, // top right
|
||||||
0.5f, -0.5f, 0.0f, // bottom right
|
0.5f, -0.5f, 0.0f, // bottom right
|
||||||
-0.5f, 0.5f, 0.0f, // top left
|
-0.5f, 0.5f, 0.0f, // top left
|
||||||
// second triangle
|
// second triangle
|
||||||
0.5f, -0.5f, 0.0f, // bottom right
|
0.5f, -0.5f, 0.0f, // bottom right
|
||||||
-0.5f, -0.5f, 0.0f, // bottom left
|
-0.5f, -0.5f, 0.0f, // bottom left
|
||||||
-0.5f, 0.5f, 0.0f // top left
|
-0.5f, 0.5f, 0.0f // top left
|
||||||
};
|
};
|
||||||
|
|
||||||
float vertices[20] = {
|
float vertices[20] = {
|
||||||
// positions // texture coords
|
// positions // texture coords
|
||||||
0.5f, 0.5f, 0.0f, 1.0f, 1.0f, // top right
|
0.5f, 0.5f, 0.0f, 1.0f, 1.0f, // top right
|
||||||
0.5f, -0.5f, 0.0f, 1.0f, 0.0f, // bottom right
|
0.5f, -0.5f, 0.0f, 1.0f, 0.0f, // bottom right
|
||||||
-0.5f, -0.5f, 0.0f, 0.0f, 0.0f, // bottom left
|
-0.5f, -0.5f, 0.0f, 0.0f, 0.0f, // bottom left
|
||||||
-0.5f, 0.5f, 0.0f, 0.0f, 1.0f // top left
|
-0.5f, 0.5f, 0.0f, 0.0f, 1.0f // top left
|
||||||
};
|
};
|
||||||
const unsigned int indices[6] = { // note that we start from 0!
|
const unsigned int indices[6] = { // note that we start from 0!
|
||||||
0, 1, 3, // first triangle
|
0, 1, 3, // first triangle
|
||||||
|
@ -35,6 +37,34 @@ const unsigned int indices[6] = { // note that we start from 0!
|
||||||
blt::gfx::vertex_array* vao;
|
blt::gfx::vertex_array* vao;
|
||||||
blt::gfx::shader_t* shader;
|
blt::gfx::shader_t* shader;
|
||||||
blt::gfx::texture_gl2D* texture;
|
blt::gfx::texture_gl2D* texture;
|
||||||
|
blt::gfx::matrix_state_manager global_matrices;
|
||||||
|
float x = 0, y = 0, z = 0;
|
||||||
|
|
||||||
|
void handle_input()
|
||||||
|
{
|
||||||
|
using namespace blt::gfx;
|
||||||
|
float moveAtX = 0;
|
||||||
|
float moveAtZ = 0;
|
||||||
|
if (isKeyPressed(GLFW_KEY_W))
|
||||||
|
moveAtX = 1;
|
||||||
|
else if (isKeyPressed(GLFW_KEY_S))
|
||||||
|
moveAtX = -1;
|
||||||
|
else
|
||||||
|
moveAtX = 0;
|
||||||
|
if (isKeyPressed(GLFW_KEY_A))
|
||||||
|
moveAtZ = 1;
|
||||||
|
else if (isKeyPressed(GLFW_KEY_D))
|
||||||
|
moveAtZ = -1;
|
||||||
|
else
|
||||||
|
moveAtZ = 0;
|
||||||
|
const float speed = 270;
|
||||||
|
y -= static_cast<float>(moveAtX * speed * getFrameDeltaSeconds());
|
||||||
|
x += static_cast<float>(moveAtZ * speed * getFrameDeltaSeconds());
|
||||||
|
|
||||||
|
blt::mat4x4 view;
|
||||||
|
view.translate(x, y, z);
|
||||||
|
global_matrices.setView(view);
|
||||||
|
}
|
||||||
|
|
||||||
void init()
|
void init()
|
||||||
{
|
{
|
||||||
|
@ -60,24 +90,32 @@ void init()
|
||||||
|
|
||||||
texture_file file("../resources/textures/cumdollar.jpg");
|
texture_file file("../resources/textures/cumdollar.jpg");
|
||||||
texture = new texture_gl2D(file.texture());
|
texture = new texture_gl2D(file.texture());
|
||||||
|
global_matrices.create_internals();
|
||||||
}
|
}
|
||||||
|
|
||||||
void update(std::int32_t width, std::int32_t height)
|
void update(std::int32_t width, std::int32_t height)
|
||||||
{
|
{
|
||||||
|
global_matrices.update_perspectives(width, height);
|
||||||
ImGui::ShowDemoWindow();
|
ImGui::ShowDemoWindow();
|
||||||
ImGui::Text("%s among %d items", ICON_FA_FILE, 0);
|
ImGui::SetNextWindowSize(ImVec2(150, 65));
|
||||||
ImGui::Button(ICON_FA_SEARCH " Search");
|
ImGui::Begin("Debug Info Panel", nullptr, ImGuiWindowFlags_NoResize);
|
||||||
|
ImGui::Text("%s FPS: %f", ICON_FA_WRENCH, 1.0e9 / static_cast<double>(blt::gfx::getFrameDelta()));
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
|
|
||||||
|
handle_input();
|
||||||
|
|
||||||
|
global_matrices.update();
|
||||||
|
|
||||||
shader->bind();
|
shader->bind();
|
||||||
|
blt::mat4x4 model;
|
||||||
|
model.translate((float) width / 2.0f, (float) height / 2.0f, 0.0f);
|
||||||
|
model.scale(500, 500, 1);
|
||||||
|
shader->setMatrix("model", model);
|
||||||
|
|
||||||
glActiveTexture(GL_TEXTURE0);
|
glActiveTexture(GL_TEXTURE0);
|
||||||
texture->bind();
|
texture->bind();
|
||||||
|
|
||||||
vao->bind();
|
vao->bind();
|
||||||
glEnableVertexAttribArray(0);
|
|
||||||
glEnableVertexAttribArray(1);
|
|
||||||
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
|
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,6 +125,7 @@ int main()
|
||||||
delete vao;
|
delete vao;
|
||||||
delete shader;
|
delete shader;
|
||||||
delete texture;
|
delete texture;
|
||||||
|
global_matrices.cleanup();
|
||||||
blt::gfx::cleanup();
|
blt::gfx::cleanup();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue