Fix: Small fix for dependencies

This commit is contained in:
Afonso Clerigo Mendes de Sousa 2025-11-05 23:17:48 +00:00
parent d92557ebda
commit 47e9700a4a
5 changed files with 231 additions and 137 deletions

2
.env Normal file
View File

@ -0,0 +1,2 @@
WEATHER_API_KEY=b5337f9628db3b0949f914f3864834b4
LOCAL=Lisbond

20
imgui.ini Normal file
View File

@ -0,0 +1,20 @@
[Window][Debug##Default]
Pos=60,60
Size=400,400
[Window][API Key Status]
Pos=60,60
Size=201,51
[Window][Status]
Pos=24,27
Size=234,142
[Window][Debug Window]
Pos=23,27
Size=370,226
[Window][Weather Data]
Pos=30,266
Size=862,225

54
include/http_get.c Normal file
View File

@ -0,0 +1,54 @@
#include "http_get.h"
// Callback for libcurl to write response into our struct
static size_t write_callback(void *data, size_t size, size_t nmemb, void *userp) {
size_t realsize = size * nmemb;
struct Memory *mem = (struct Memory *)userp;
char *ptr = realloc(mem->response, mem->size + realsize + 1);
if(ptr == NULL) {
// Out of memory!
fprintf(stderr, "realloc() failed\n");
return 0;
}
mem->response = ptr;
memcpy(&(mem->response[mem->size]), data, realsize);
mem->size += realsize;
mem->response[mem->size] = '\0';
return realsize;
}
// Function: GET request, returns heap string (caller must free)
char *http_get(const char *url) {
CURL *curl;
CURLcode res;
struct Memory chunk;
chunk.response = malloc(1); // start with empty buffer
chunk.size = 0;
curl_global_init(CURL_GLOBAL_ALL);
curl = curl_easy_init();
if(curl) {
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); // follow redirects
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
res = curl_easy_perform(curl);
if(res != CURLE_OK) {
fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
free(chunk.response);
chunk.response = NULL;
}
curl_easy_cleanup(curl);
}
curl_global_cleanup();
return chunk.response;
}

29
include/http_get.h Normal file
View File

@ -0,0 +1,29 @@
#ifndef HTTP_GET_H
#define HTTP_GET_H
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <curl/curl.h>
#ifdef __cplusplus
extern "C" {
#endif
// Struct to hold response data
struct Memory {
char *response;
size_t size;
};
// Callback for libcurl to write response into our struct
static size_t write_callback(void *data, size_t size, size_t nmemb, void *userp);
// Function: GET request, returns heap string (caller must free)
char *http_get(const char *url);
#ifdef __cplusplus
}
#endif
#endif // HTTP_GET_H

View File

@ -1,12 +1,12 @@
#include <iostream>
#include <fstream> #include <fstream>
#include <iostream>
#include <sstream> #include <sstream>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
// glad and GLFW // glad and GLFW
#include <glad/glad.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <glad/glad.h>
// glm math // glm math
#include <glm/glm.hpp> #include <glm/glm.hpp>
@ -25,7 +25,8 @@ const float SCR_HEIGHT = 1200.0f;
int main(void) { int main(void) {
// Initialize GLFW // Initialize GLFW
if (!glfwInit()) return -1; if (!glfwInit())
return -1;
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
@ -33,7 +34,7 @@ int main(void) {
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint(GLFW_SAMPLES, 8); // 8x MSAA glfwWindowHint(GLFW_SAMPLES, 8); // 8x MSAA
GLFWwindow* window = glfwCreateWindow((int)SCR_WIDTH, (int)SCR_HEIGHT, "RASTER", nullptr, nullptr); GLFWwindow *window = glfwCreateWindow((int)SCR_WIDTH, (int)SCR_HEIGHT, "RASTER", nullptr, nullptr);
if (!window) { if (!window) {
glfwTerminate(); glfwTerminate();
return -1; return -1;
@ -47,7 +48,7 @@ int main(void) {
glViewport(0, 0, (int)SCR_WIDTH, (int)SCR_HEIGHT); glViewport(0, 0, (int)SCR_WIDTH, (int)SCR_HEIGHT);
//DEBUG // DEBUG
std::cout << "OpenGL Version: " << glGetString(GL_VERSION) << std::endl; std::cout << "OpenGL Version: " << glGetString(GL_VERSION) << std::endl;
// ERROR: macOS does not support compute shaders in OpenGL < 4.3. // ERROR: macOS does not support compute shaders in OpenGL < 4.3.
@ -56,41 +57,33 @@ int main(void) {
// ----- Vertex Data ----- // ----- Vertex Data -----
// Cube // Cube
// Positions // Positions
float vertices[] = { float vertices[] = {// positions
// positions -1.0f, -1.0f, 0.0f, 1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 0.0f, -1.0f, 1.0f, 0.0f};
-1.0f, -1.0f, 0.0f,
1.0f, -1.0f, 0.0f,
1.0f, 1.0f, 0.0f,
-1.0f, 1.0f, 0.0f
};
unsigned int indices[] = { unsigned int indices[] = {0, 1, 2, 2, 3, 0};
0, 1, 2,
2, 3, 0
};
GLuint VAO, VBO, EBO; GLuint VAO, VBO, EBO;
glGenVertexArrays(1,&VAO); glGenVertexArrays(1, &VAO);
glGenBuffers(1,&VBO); glGenBuffers(1, &VBO);
glGenBuffers(1,&EBO); glGenBuffers(1, &EBO);
glBindVertexArray(VAO); glBindVertexArray(VAO);
glBindBuffer(GL_ARRAY_BUFFER,VBO); glBindBuffer(GL_ARRAY_BUFFER, VBO);
glBufferData(GL_ARRAY_BUFFER,sizeof(vertices),vertices,GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,EBO); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO);
glBufferData(GL_ELEMENT_ARRAY_BUFFER,sizeof(indices),indices,GL_STATIC_DRAW); glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW);
// position - VERTEX SHADER // position - VERTEX SHADER
glVertexAttribPointer(0,3,GL_FLOAT,GL_FALSE,3*sizeof(float),(void*)0); glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void *)0);
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
// color - FRAGMENT SHADER // color - FRAGMENT SHADER
glVertexAttribPointer(1,3,GL_FLOAT,GL_FALSE,3*sizeof(float),(void*)(3*sizeof(float))); glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void *)(3 * sizeof(float)));
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
glBindBuffer(GL_ARRAY_BUFFER,0); glBindBuffer(GL_ARRAY_BUFFER, 0);
// glBindVertexArray(0); // glBindVertexArray(0);
// Load shaders // Load shaders
@ -105,17 +98,16 @@ int main(void) {
// Caulculate model, view, projection matrices // Caulculate model, view, projection matrices
glm::mat4 model = glm::mat4(1.0f); glm::mat4 model = glm::mat4(1.0f);
glm::mat4 view = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 0.0f, -1.0f)); glm::mat4 view = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 0.0f, -1.0f));
glm::mat4 projection = glm::perspective(glm::radians(45.0f), (SCR_WIDTH/SCR_HEIGHT)*2, 0.1f, 100.0f); glm::mat4 projection = glm::perspective(glm::radians(45.0f), (SCR_WIDTH / SCR_HEIGHT) * 2, 0.1f, 100.0f);
GLuint modelLoc = (unsigned int) glGetUniformLocation(shaderProgram, "model"); GLuint modelLoc = (unsigned int)glGetUniformLocation(shaderProgram, "model");
GLuint viewLoc = (unsigned int) glGetUniformLocation(shaderProgram, "view"); GLuint viewLoc = (unsigned int)glGetUniformLocation(shaderProgram, "view");
GLuint projLoc = (unsigned int) glGetUniformLocation(shaderProgram, "projection"); GLuint projLoc = (unsigned int)glGetUniformLocation(shaderProgram, "projection");
glUseProgram(shaderProgram); glUseProgram(shaderProgram);
glUniformMatrix4fv((int) modelLoc, 1, GL_FALSE, glm::value_ptr(model)); glUniformMatrix4fv((int)modelLoc, 1, GL_FALSE, glm::value_ptr(model));
glUniformMatrix4fv((int) viewLoc, 1, GL_FALSE, glm::value_ptr(view)); glUniformMatrix4fv((int)viewLoc, 1, GL_FALSE, glm::value_ptr(view));
glUniformMatrix4fv((int) projLoc, 1, GL_FALSE, glm::value_ptr(projection)); glUniformMatrix4fv((int)projLoc, 1, GL_FALSE, glm::value_ptr(projection));
GLint resLoc = glGetUniformLocation(shaderProgram, "u_resolution"); GLint resLoc = glGetUniformLocation(shaderProgram, "u_resolution");
glUniform2f(resLoc, SCR_WIDTH, SCR_HEIGHT); // hardcode for now glUniform2f(resLoc, SCR_WIDTH, SCR_HEIGHT); // hardcode for now
@ -150,12 +142,14 @@ int main(void) {
// Scroll to zoom in/out // Scroll to zoom in/out
if (glfwGetKey(window, GLFW_KEY_UP) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_UP) == GLFW_PRESS) {
scale += 0.01f; scale += 0.01f;
if (scale > 10.0f) scale = 10.0f; // Max zoom if (scale > 10.0f)
scale = 10.0f; // Max zoom
} }
if (glfwGetKey(window, GLFW_KEY_DOWN) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_DOWN) == GLFW_PRESS) {
scale -= 0.01f; scale -= 0.01f;
if (scale < 0.1f) scale = 0.1f; // Min zoom if (scale < 0.1f)
scale = 0.1f; // Min zoom
} }
// --- FPS Counter --- // --- FPS Counter ---
@ -164,11 +158,7 @@ int main(void) {
if (delta >= 1.0) { // print every ~1 second if (delta >= 1.0) { // print every ~1 second
fps = double(frameCount) / delta; fps = double(frameCount) / delta;
std::cout << "FPS: " << fps std::cout << "FPS: " << fps << " Time: " << timeValue << " Scale: " << scale << " Mouse: (" << mousePos[0] << ", " << mousePos[1] << ")" << std::endl;
<< " Time: " << timeValue
<< " Scale: " << scale
<< " Mouse: (" << mousePos[0] << ", " << mousePos[1] << ")"
<< std::endl;
frameCount = 0; frameCount = 0;
lastTime = currentTime; lastTime = currentTime;
@ -183,20 +173,19 @@ int main(void) {
glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glBindVertexArray(VAO); glBindVertexArray(VAO);
glDrawElements(GL_TRIANGLES,6,GL_UNSIGNED_INT,0); glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
glUseProgram(shaderProgram); glUseProgram(shaderProgram);
glfwSwapBuffers(window); glfwSwapBuffers(window);
} }
glDeleteVertexArrays(1,&VAO); glDeleteVertexArrays(1, &VAO);
glDeleteBuffers(1,&VBO); glDeleteBuffers(1, &VBO);
glDeleteBuffers(1,&EBO); glDeleteBuffers(1, &EBO);
glDeleteProgram(shaderProgram); glDeleteProgram(shaderProgram);
glfwDestroyWindow(window); glfwDestroyWindow(window);
glfwTerminate(); glfwTerminate();
return 0; return 0;
} }