illegitimate-egg/fred
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving to different machine for development

Browse Source
This commit is contained in:
illegitimate-egg 2024-10-10 15:59:55 +01:00
parent 1e580fda9b
commit a1d9017be2
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -55,13 +55,13 @@ add_library(
include/imgui/backends/imgui_impl_opengl3.cpp)
target_link_libraries(imgui glfw)
include_directories(include) # Kill me please
# include_directories(include) # Kill me please. this is horrendously bad but ImGuIZMO.quat hardcodes imgui to be in a folder called ImGui
include_directories(include/imGuIZMO.quat)
add_library(
imGuIZMO STATIC
include/imGuIZMO.quat/imGuIZMO.quat/imGuIZMOquat.cpp
)
target_link_libraries(imGuIZMO imgui)
target_link_libraries(imGuIZMO imgui -DIMGUIZMO_IMGUI_FOLDER=${CMAKE_SOURCE_DIR}/include/imgui)
add_executable(fred engine.cpp shader.c)
if(UNIX)

3
TODO.md Normal file
View File

@ -0,0 +1,3 @@
[ ] Make ImGuIZMO.quat work
[ ] Make SOIL2 stop giving that smelly error message
[ ] Overhaul asset debug screen

38
engine.cpp
View File

@ -1,4 +1,3 @@
#include "imGuIZMO.quat/vgMath.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -14,9 +13,10 @@
#include <glm/trigonometric.hpp>
#define IMGUI_DEFINE_MATH_OPERATORS // ImGui
#include <imgui/backends/imgui_impl_glfw.h>
#include <imgui/backends/imgui_impl_opengl3.h>
#include <backends/imgui_impl_glfw.h>
#include <backends/imgui_impl_opengl3.h>
#include <imgui/imgui.h>
#define VGIZMO_USES_GLM
#include <imGuIZMO.quat/imGuIZMOquat.h>
#include <clog/clog.h>
@ -302,17 +302,17 @@ static int initWindow() {
return 0;
}
void imguiMat4Table(glm::mat4 matrix, const char *name) {
if (ImGui::BeginTable(name, 4)) {
for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
ImGui::TableNextColumn();
ImGui::Text("%f", matrix[i][j]);
}
}
ImGui::EndTable();
}
}
//void imguiMat4Table(glm::mat4 matrix, const char *name) {
// if (ImGui::BeginTable(name, 4)) {
// for (int i = 0; i < 4; i++) {
// for (int j = 0; j < 4; j++) {
// ImGui::TableNextColumn();
// ImGui::Text("%f", matrix[i][j]);
// }
// }
// ImGui::EndTable();
// }
//}
void render(Scene scene) {
// Clear this mf
@ -338,15 +338,7 @@ void render(Scene scene) {
char assetName[] = "Asset: 00";
sprintf(assetName, "Asset: %d", i);
ImGui::Begin(assetName);
ImGui::SeparatorText("Position Matrix:");
imguiMat4Table(translationMatrix, "posmat");
ImGui::SeparatorText("Rotation Matrix:");
imguiMat4Table(rotationMatrix, "rotmat");
ImGui::SeparatorText("Scaling Matrix:");
imguiMat4Table(scalingMatrix, "scalmat");
ImGui::SeparatorText("Model Matrix:");
imguiMat4Table(modelMatrix, "modmat");
ImGui::gizmo3D(assetName, currentAsset->rotation);
ImGui::End();
glUniformMatrix4fv(currentAsset->matrixID, 1, GL_FALSE, &mvp[0][0]);