tri11paragon
/
BLT-With-Graphics-Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tri11paragon:fab759dd4c7c1dd02feae2f2d6c3eb28ceac09da
Branches Tags
tri11paragon:main
..
compare: tri11paragon:ec9450c2c17a902bebb239a846c14cbc30df3ad9
Branches Tags
tri11paragon:main

No commits in common. "fab759dd4c7c1dd02feae2f2d6c3eb28ceac09da" and "ec9450c2c17a902bebb239a846c14cbc30df3ad9" have entirely different histories.
fab759dd4c ... ec9450c2c1

7 changed files with 11 additions and 11 deletions
Show Stats Expand all files Collapse all files

2
include/blt/gfx/model.h
View File

@ -130,7 +130,7 @@ namespace blt::gfx
private: private:
GLuint vaoID; GLuint vaoID;
static_dynamic_array VBOs; static_dynamic_array VBOs;
blt::hashset_t<GLuint> used_attributes; HASHSET<GLuint> used_attributes;
vbo_t element; vbo_t element;
void handle_vbo(const vbo_t& vbo, int attribute_number, int coordinate_size, GLenum type, int stride, long offset); void handle_vbo(const vbo_t& vbo, int attribute_number, int coordinate_size, GLenum type, int stride, long offset);

2
include/blt/gfx/renderer/batch_2d_renderer.h
View File

@ -69,7 +69,7 @@ namespace blt::gfx
vertex_array* square_vao = nullptr; vertex_array* square_vao = nullptr;
shader_t* shader = nullptr; shader_t* shader = nullptr;
resource_manager& resources; resource_manager& resources;
blt::hashmap_t<std::string, blt::hashmap_t<blt::vec4, blt::hashmap_t<blt::vec4, std::vector<rectangle2d_t>, vec_hash>, vec_hash>> complex_rectangles; HASHMAP<std::string, HASHMAP<blt::vec4, HASHMAP<blt::vec4, std::vector<rectangle2d_t>, vec_hash>, vec_hash>> complex_rectangles;
size_t draw_count_ = 0; size_t draw_count_ = 0;
public: public:
explicit batch_renderer_2d(resource_manager& resources): resources(resources) explicit batch_renderer_2d(resource_manager& resources): resources(resources)

2
include/blt/gfx/renderer/resource_manager.h
View File

@ -48,7 +48,7 @@ namespace blt::gfx
std::mutex save_lock; std::mutex save_lock;
std::vector<loadable_texture> textures_to_load; std::vector<loadable_texture> textures_to_load;
std::vector<texture_file*> loaded_textures; std::vector<texture_file*> loaded_textures;
blt::hashmap_t<std::string, texture_gl2D*> textures_2d; HASHMAP<std::string, texture_gl2D*> textures_2d;
public: public:
resource_manager() = default; resource_manager() = default;

2
libraries/BLT

@ -1 +1 @@
Subproject commit 9950fd3c94d2fd52e6f953bfd188962e16e55a08 Subproject commit 68f6a0af44fe8ba5044a7f37b8bac9809ab709f1

2
libraries/imgui

@ -1 +1 @@
Subproject commit 96839b445e32e46d87a44fd43a9cdd60c806f7e1 Subproject commit a1b06823fe2d964a62fda99385499b218cf5cea5

2
libraries/openal-soft

@ -1 +1 @@
Subproject commit 358fee381e2d0d6f56f8dcc4e2eeda7449270545 Subproject commit 6675317107257c2cc16c947b359d557821d85bf2

10
src/blt/gfx/window.cpp
View File

@ -44,7 +44,7 @@ namespace blt::gfx
void create_callbacks() void create_callbacks()
{ {
/* Setup keyboard callback */ /* Setup keyboard callback */
glfwSetKeyCallback(window_state.window, [](GLFWwindow*, int key, int, int action, int) { glfwSetKeyCallback(window_state.window, [](GLFWwindow* window, int key, int scancode, int action, int mods) {
if (key < 0 || key == GLFW_KEY_UNKNOWN) if (key < 0 || key == GLFW_KEY_UNKNOWN)
return; return;
KEY_STATE state; KEY_STATE state;
@ -64,7 +64,7 @@ namespace blt::gfx
}); });
/* Setup mouse button callback */ /* Setup mouse button callback */
glfwSetMouseButtonCallback(window_state.window, [](GLFWwindow*, int button, int action, int) { glfwSetMouseButtonCallback(window_state.window, [](GLFWwindow* window, int button, int action, int mods) {
if (button < 0) if (button < 0)
return; return;
MOUSE_STATE state; MOUSE_STATE state;
@ -82,18 +82,18 @@ namespace blt::gfx
}); });
/* Setup mouse cursor callback */ /* Setup mouse cursor callback */
glfwSetCursorPosCallback(window_state.window, [](GLFWwindow*, double x, double y) { glfwSetCursorPosCallback(window_state.window, [](GLFWwindow* window, double x, double y) {
window_state.inputManager.updateMousePos(x, y); window_state.inputManager.updateMousePos(x, y);
window_state.inputManager.mouse_moved = true; window_state.inputManager.mouse_moved = true;
}); });
/* Setup mouse scroll callback */ /* Setup mouse scroll callback */
glfwSetScrollCallback(window_state.window, [](GLFWwindow*, double, double s) { glfwSetScrollCallback(window_state.window, [](GLFWwindow* window, double x, double s) {
window_state.inputManager.updateScroll(s); window_state.inputManager.updateScroll(s);
}); });
/* Setup drop input callback */ /* Setup drop input callback */
glfwSetDropCallback(window_state.window, [](GLFWwindow*, int count, const char** paths) { glfwSetDropCallback(window_state.window, [](GLFWwindow* window, int count, const char** paths) {
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
window_state.pendingPaths.emplace(paths[i]); window_state.pendingPaths.emplace(paths[i]);
}); });